Make pangoxft depend on pangoft2.

Sat Aug  2 14:33:28 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
        pangoxft depend on pangoft2.

        * pango/pangofc-fontmap.[ch]: Make pangofc-fontmap.cI
        into a real base class.

        * pango/pangofc-font.[ch]: Move some of the pangoxft/
        pangoft2 implementation here.

        * pango/pangoft2.c pango/pangoft2-fontmap.c
        pango/pangoft2-private.h pango/pangoxft-font.c
        pango/pangoxft2-fontmap.c pango/pangoxft-private.h: Adapt
        to the new scheme

        * modules/*/Makefile.am Modules/*/*/*-fc.c: Don't build
        separate FT2 and Xft shapers, just build one Fc shaper.

        * docs/pango-sections.txt docs/pango-docs.sgml
        docs/tmpl/pangofc-font{,map}.sgml: Basic docs for
        the new stuff.

        * configure.in: Up pango_module_version to 1.4.0.

13 files changed, 71 insertions, 251 deletions

diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index c6229ba4..3fe6fd38 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -1,8 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
-pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 INCLUDES = 				\
@@ -22,48 +20,25 @@ no_undefined = -no-undefined
 endif
 
 
-if HAVE_XFT
-INCLUDES += $(XFT_CFLAGS)
-if INCLUDE_ARABIC_XFT
-noinst_LTLIBRARIES += libpango-arabic-xft.la
-else
-module_LTLIBRARIES += pango-arabic-xft.la
-endif
-endif
-
-xft_sources = \
-	arabic-fc.c \
-	arabic-ot.c \
-	arabic-ot.h
-
-pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
-pango_arabic_xft_la_LIBADD = $(pangoxftlibs)
-pango_arabic_xft_la_SOURCES = $(xft_sources)
-pango_arabic_xft_la_CFLAGS = -DBUILD_XFT
-libpango_arabic_xft_la_SOURCES = $(xft_sources)
-libpango_arabic_xft_la_CFLAGS = -DBUILD_XFT -DPANGO_MODULE_PREFIX=_pango_arabic_xft
-
-
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS)
-if INCLUDE_ARABIC_FT2
-noinst_LTLIBRARIES += libpango-arabic-ft2.la
+if INCLUDE_ARABIC_FC
+noinst_LTLIBRARIES += libpango-arabic-fc.la
 else
-module_LTLIBRARIES += pango-arabic-ft2.la
+module_LTLIBRARIES += pango-arabic-fc.la
 endif
 endif
 
-ft2_sources = \
+fc_sources = \
 	arabic-fc.c \
 	arabic-ot.c \
 	arabic-ot.h
 
-pango_arabic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
-pango_arabic_ft2_la_LIBADD = $(pangoft2libs)
-pango_arabic_ft2_la_SOURCES = $(ft2_sources)
-pango_arabic_ft2_la_CFLAGS = -DBUILD_FT2
-libpango_arabic_ft2_la_SOURCES = $(ft2_sources)
-libpango_arabic_ft2_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_arabic_ft2
+pango_arabic_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_arabic_fc_la_LIBADD = $(pangoft2libs)
+pango_arabic_fc_la_SOURCES = $(fc_sources)
+libpango_arabic_fc_la_SOURCES = $(fc_sources)
+libpango_arabic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_arabic_fc
 
 
 included-modules: $(noinst_LTLIBRARIES)
diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index c94b2626..80c9ae81 100644
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -27,15 +27,9 @@
 #include "pango-engine.h"
 #include "pango-utils.h"
 
-#ifdef BUILD_XFT
-#include "pangoxft.h"
-#define SCRIPT_ENGINE_NAME "ArabicScriptEngineXft"
-#define RENDER_TYPE PANGO_RENDER_TYPE_XFT
-#else
-#include "pangoft2.h"
-#define SCRIPT_ENGINE_NAME "ArabicScriptEngineFt2"
-#define RENDER_TYPE PANGO_RENDER_TYPE_FT2
-#endif
+#include "pangofc-font.h"
+#define SCRIPT_ENGINE_NAME "ArabicScriptEngineFc"
+#define RENDER_TYPE PANGO_RENDER_TYPE_FC
 
 static PangoEngineRange arabic_ranges[] = {
   /* Language characters */
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index b5ec7b1e..765e8d42 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -4,7 +4,6 @@ basic_sources = basic-x.c
 
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
 pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
-pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 pangowin32libs = $(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la $(pangolibs)
 
@@ -40,38 +39,20 @@ libpango_basic_x_la_SOURCES = basic-x.c
 libpango_basic_x_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_x
 
 
-if HAVE_XFT
-INCLUDES += $(XFT_CFLAGS)
-if INCLUDE_BASIC_XFT
-noinst_LTLIBRARIES += libpango-basic-xft.la
-else
-module_LTLIBRARIES += pango-basic-xft.la
-endif
-endif
-
-pango_basic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
-pango_basic_xft_la_LIBADD = $(pangoxftlibs)
-pango_basic_xft_la_SOURCES = basic-fc.c
-pango_basic_xft_la_CFLAGS = -DBUILD_XFT
-libpango_basic_xft_la_SOURCES = basic-fc.c
-libpango_basic_xft_la_CFLAGS = -DBUILD_XFT -DPANGO_MODULE_PREFIX=_pango_basic_xft
-
-
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS)
-if INCLUDE_BASIC_FT2
-noinst_LTLIBRARIES += libpango-basic-ft2.la
+if INCLUDE_BASIC_FC
+noinst_LTLIBRARIES += libpango-basic-fc.la
 else
-module_LTLIBRARIES += pango-basic-ft2.la
+module_LTLIBRARIES += pango-basic-fc.la
 endif
 endif
 
-pango_basic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
-pango_basic_ft2_la_LIBADD = $(pangoft2libs)
-pango_basic_ft2_la_SOURCES = basic-fc.c
-pango_basic_ft2_la_CFLAGS = -DBUILD_FT2
-libpango_basic_ft2_la_SOURCES = basic-fc.c
-libpango_basic_ft2_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_basic_ft2
+pango_basic_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_basic_fc_la_LIBADD = $(pangoft2libs)
+pango_basic_fc_la_SOURCES = basic-fc.c
+libpango_basic_fc_la_SOURCES = basic-fc.c
+libpango_basic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_fc
 
 
 if HAVE_WIN32
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index 99e8c361..7af2d3af 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -28,15 +28,9 @@
 
 #include "basic-common.h"
 
-#ifdef BUILD_XFT
-#include "pangoxft.h"
-#define SCRIPT_ENGINE_NAME "BasicScriptEngineXft"
-#define RENDER_TYPE PANGO_RENDER_TYPE_XFT
-#else /* FT2 */
-#include "pangoft2.h"
-#define SCRIPT_ENGINE_NAME "BasicScriptEngineFt2"
-#define RENDER_TYPE PANGO_RENDER_TYPE_FT2
-#endif
+#include "pangofc-font.h"
+#define SCRIPT_ENGINE_NAME "BasicScriptEngineFc"
+#define RENDER_TYPE PANGO_RENDER_TYPE_FC
 
 static PangoEngineRange basic_ranges[] = {
   /* Basic Latin, Latin-1 Supplement, Latin Extended-A, Latin Extended-B,
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index 1faac747..e6f82b45 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -1,8 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
-pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 INCLUDES = 				\
@@ -22,42 +20,22 @@ module_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
 
-if HAVE_XFT
-INCLUDES += $(XFT_CFLAGS)
-if INCLUDE_HANGUL_XFT
-noinst_LTLIBRARIES += libpango-hangul-xft.la
-else
-module_LTLIBRARIES += pango-hangul-xft.la
-endif
-endif
-
-xft_sources = hangul-fc.c hangul-defs.h
-
-pango_hangul_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
-pango_hangul_xft_la_LIBADD = $(pangoxftlibs)
-pango_hangul_xft_la_SOURCES = $(xft_sources)
-pango_hangul_xft_la_CFLAGS = -DBUILD_XFT
-libpango_hangul_xft_la_SOURCES = $(xft_sources)
-libpango_hangul_xft_la_CFLAGS = -DBUILD_XFT -DPANGO_MODULE_PREFIX=_pango_hangul_xft
-
-
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS)
-if INCLUDE_HANGUL_FT2
-noinst_LTLIBRARIES += libpango-hangul-ft2.la
+if INCLUDE_HANGUL_FC
+noinst_LTLIBRARIES += libpango-hangul-fc.la
 else
-module_LTLIBRARIES += pango-hangul-ft2.la
+module_LTLIBRARIES += pango-hangul-fc.la
 endif
 endif
 
-ft2_sources = hangul-fc.c hangul-defs.h
+fc_sources = hangul-fc.c hangul-defs.h
 
-pango_hangul_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
-pango_hangul_ft2_la_LIBADD = $(pangoft2libs)
-pango_hangul_ft2_la_SOURCES = $(ft2_sources)
-pango_hangul_ft2_la_CFLAGS = -DBUILD_FT2
-libpango_hangul_ft2_la_SOURCES = $(ft2_sources)
-libpango_hangul_ft2_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_hangul_ft2
+pango_hangul_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_hangul_fc_la_LIBADD = $(pangoft2libs)
+pango_hangul_fc_la_SOURCES = $(fc_sources)
+libpango_hangul_fc_la_SOURCES = $(fc_sources)
+libpango_hangul_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_hangul_fc
 
 
 EXTRA_DIST =			\
diff --git a/modules/hangul/hangul-fc.c b/modules/hangul/hangul-fc.c
index 0008ba08..3ba6a479 100644
--- a/modules/hangul/hangul-fc.c
+++ b/modules/hangul/hangul-fc.c
@@ -28,15 +28,9 @@
 #include "hangul-defs.h"
 #include "tables-jamos.i"
 
-#ifdef BUILD_XFT
-#include "pangoxft.h"
-#define SCRIPT_ENGINE_NAME "HangulScriptEngineXft"
-#define RENDER_TYPE PANGO_RENDER_TYPE_XFT
-#else
-#include "pangoft2.h"
-#define SCRIPT_ENGINE_NAME "HangulScriptEngineFT2"
-#define RENDER_TYPE PANGO_RENDER_TYPE_FT2
-#endif
+#include "pangofc-font.h"
+#define SCRIPT_ENGINE_NAME "HangulScriptEngineFc"
+#define RENDER_TYPE PANGO_RENDER_TYPE_FC
 
 static PangoEngineRange hangul_ranges[] = {
   /* Language characters */
diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index f4480151..7f9297d1 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -1,8 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
-pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 INCLUDES =			\
@@ -20,31 +18,12 @@ noinst_LTLIBRARIES =
 common_sources = hebrew-shaper.c hebrew-shaper.h
 
 
-if HAVE_XFT
-INCLUDES += $(XFT_CFLAGS)
-if INCLUDE_HEBREW_XFT
-noinst_LTLIBRARIES += libpango-hebrew-xft.la
-else
-module_LTLIBRARIES += pango-hebrew-xft.la
-endif
-endif
-
-hebrew_xft_sources = $(common_sources) hebrew-fc.c 
-
-pango_hebrew_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
-pango_hebrew_xft_la_LIBADD = $(pangoxftlibs)
-pango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources)
-pango_hebrew_xft_la_CFLAGS = -DBUILD_XFT
-libpango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources)
-libpango_hebrew_xft_la_CFLAGS = -DBUILD_XFT -DPANGO_MODULE_PREFIX=_pango_hebrew_xft
-
-
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS)
-if INCLUDE_HEBREW_FT2
-noinst_LTLIBRARIES += libpango-hebrew-ft2.la
+if INCLUDE_HEBREW_FC
+noinst_LTLIBRARIES += libpango-hebrew-fc.la
 else
-module_LTLIBRARIES += pango-hebrew-ft2.la
+module_LTLIBRARIES += pango-hebrew-fc.la
 endif
 endif
 
@@ -52,14 +31,13 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-hebrew_ft2_sources = $(common_sources) hebrew-fc.c 
+hebrew_fc_sources = $(common_sources) hebrew-fc.c 
 
-pango_hebrew_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
-pango_hebrew_ft2_la_LIBADD = $(pangoft2libs)
-pango_hebrew_ft2_la_SOURCES = $(hebrew_ft2_sources)
-pango_hebrew_ft2_la_CFLAGS = -DBUILD_FT2
-libpango_hebrew_ft2_la_SOURCES = $(hebrew_ft2_sources)
-libpango_hebrew_ft2_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_hebrew_ft2
+pango_hebrew_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_hebrew_fc_la_LIBADD = $(pangoft2libs)
+pango_hebrew_fc_la_SOURCES = $(hebrew_fc_sources)
+libpango_hebrew_fc_la_SOURCES = $(hebrew_fc_sources)
+libpango_hebrew_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_hebrew_fc
 
 
 included-modules: $(noinst_LTLIBRARIES)
diff --git a/modules/hebrew/hebrew-fc.c b/modules/hebrew/hebrew-fc.c
index a18e3d09..273755e4 100644
--- a/modules/hebrew/hebrew-fc.c
+++ b/modules/hebrew/hebrew-fc.c
@@ -34,15 +34,9 @@ static PangoEngineRange hebrew_ranges[] = {
   { 0xfb1d, 0xfb4f, "*" }  /* Hebrew presentation forms */
 };
 
-#ifdef BUILD_XFT2	  
-#include "pangoxft.h"
-#define SCRIPT_ENGINE_NAME "HebrewScriptEngineXft"
-#define RENDER_TYPE PANGO_RENDER_TYPE_XFT
-#else
-#include "pangoft2.h"
-#define SCRIPT_ENGINE_NAME "HebrewScriptEngineFt2"
-#define RENDER_TYPE PANGO_RENDER_TYPE_FT2
-#endif
+#include "pangofc-font.h"
+#define SCRIPT_ENGINE_NAME "HebrewScriptEngineFc"
+#define RENDER_TYPE PANGO_RENDER_TYPE_FC
 
 static PangoEngineInfo script_engines[] = {
   {
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 4da765d1..38614d72 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -1,8 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
-pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 INCLUDES =					\
@@ -22,41 +20,16 @@ module_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
 
-if HAVE_XFT
-INCLUDES += $(XFT_CFLAGS)
-if INCLUDE_INDIC_XFT
-noinst_LTLIBRARIES += libpango-indic-xft.la
-else
-module_LTLIBRARIES += pango-indic-xft.la
-endif
-endif
-
-xft_sources =		 	\
-	indic-fc.c		\
-	indic-ot-class-tables.c	\
-	indic-ot.c		\
-	indic-ot.h		\
-	mprefixups.c		\
-	mprefixups.h
-
-pango_indic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
-pango_indic_xft_la_LIBADD = $(pangoxftlibs)
-pango_indic_xft_la_SOURCES = $(xft_sources)
-pango_indic_xft_la_CFLAGS = -DBUILD_XFT
-libpango_indic_xft_la_SOURCES = $(xft_sources)
-libpango_indic_xft_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_indic_xft
-
-
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS)
-if INCLUDE_INDIC_FT2
-noinst_LTLIBRARIES += libpango-indic-ft2.la
+if INCLUDE_INDIC_FC
+noinst_LTLIBRARIES += libpango-indic-fc.la
 else
-module_LTLIBRARIES += pango-indic-ft2.la
+module_LTLIBRARIES += pango-indic-fc.la
 endif
 endif
 
-ft2_sources =		 	\
+fc_sources =		 	\
 	indic-fc.c		\
 	indic-ot-class-tables.c	\
 	indic-ot.c		\
@@ -64,12 +37,11 @@ ft2_sources =		 	\
 	mprefixups.c		\
 	mprefixups.h
 
-pango_indic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
-pango_indic_ft2_la_LIBADD = $(pangoft2libs)
-pango_indic_ft2_la_SOURCES = $(ft2_sources)
-pango_indic_ft2_la_CFLAGS = -DBUILD_FT2
-libpango_indic_ft2_la_SOURCES = $(ft2_sources)
-libpango_indic_ft2_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_indic_ft2
+pango_indic_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_indic_fc_la_LIBADD = $(pangoft2libs)
+pango_indic_fc_la_SOURCES = $(fc_sources)
+libpango_indic_fc_la_SOURCES = $(fc_sources)
+libpango_indic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_indic_fc
 
 
 included-modules: $(noinst_LTLIBRARIES)
diff --git a/modules/indic/indic-fc.c b/modules/indic/indic-fc.c
index 44832304..bd4c8f4b 100644
--- a/modules/indic/indic-fc.c
+++ b/modules/indic/indic-fc.c
@@ -46,15 +46,9 @@ struct _PangoIndicInfo
   gchar             *gposQuarkName;
 };
 
-#ifdef BUILD_XFT
-#include "pangoxft.h"
-#define ENGINE_SUFFIX "ScriptEngineXft"
-#define RENDER_TYPE PANGO_RENDER_TYPE_XFT
-#else
-#include "pangoft2.h"
-#define ENGINE_SUFFIX "ScriptEngineFT2"
-#define RENDER_TYPE PANGO_RENDER_TYPE_FT2
-#endif
+#include "pangofc-font.h"
+#define ENGINE_SUFFIX "ScriptEngineFc"
+#define RENDER_TYPE PANGO_RENDER_TYPE_FC
 
 #define INDIC_ENGINE_INFO(script) {#script ENGINE_SUFFIX, PANGO_ENGINE_TYPE_SHAPE, RENDER_TYPE, script##_ranges, G_N_ELEMENTS(script##_ranges)}
 
diff --git a/modules/tamil/.cvsignore b/modules/tamil/.cvsignore
deleted file mode 100644
index 6e5ca7ed..00000000
--- a/modules/tamil/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index d093c6f2..bfa4a78e 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -1,8 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
-pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 INCLUDES =			\
@@ -24,42 +22,22 @@ noinst_LTLIBRARIES =
 common_sources = thai-shaper.c thai-shaper.h
 
 
-if HAVE_XFT
-INCLUDES += $(XFT_CFLAGS)
-if INCLUDE_THAI_XFT
-noinst_LTLIBRARIES += libpango-thai-xft.la
-else
-module_LTLIBRARIES += pango-thai-xft.la
-endif
-endif
-
-thai_xft_sources = $(common_sources) thai-fc.c 
-
-pango_thai_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
-pango_thai_xft_la_LIBADD = $(pangoxftlibs)
-pango_thai_xft_la_SOURCES = $(thai_xft_sources)
-pango_thai_xft_la_CFLAGS = -DBUILD_XFT
-libpango_thai_xft_la_SOURCES = $(thai_xft_sources)
-libpango_thai_xft_la_CFLAGS = -DBUILD_XFT -DPANGO_MODULE_PREFIX=_pango_thai_xft
-
-
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS)
-if INCLUDE_THAI_FT2
-noinst_LTLIBRARIES += libpango-thai-ft2.la
+if INCLUDE_THAI_FC
+noinst_LTLIBRARIES += libpango-thai-fc.la
 else
-module_LTLIBRARIES += pango-thai-ft2.la
+module_LTLIBRARIES += pango-thai-fc.la
 endif
 endif
 
-thai_ft2_sources = $(common_sources) thai-fc.c 
+thai_fc_sources = $(common_sources) thai-fc.c 
 
-pango_thai_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
-pango_thai_ft2_la_LIBADD = $(pangoft2libs)
-pango_thai_ft2_la_SOURCES = $(thai_ft2_sources)
-pango_thai_ft2_la_CFLAGS = -DBUILD_FT2
-libpango_thai_ft2_la_SOURCES = $(thai_ft2_sources)
-libpango_thai_ft2_la_CFLAGS = -DBUILD_FT2 -DPANGO_MODULE_PREFIX=_pango_thai_ft2
+pango_thai_fc_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_thai_fc_la_LIBADD = $(pangoft2libs)
+pango_thai_fc_la_SOURCES = $(thai_fc_sources)
+libpango_thai_fc_la_SOURCES = $(thai_fc_sources)
+libpango_thai_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_thai_fc
 
 
 included-modules: $(noinst_LTLIBRARIES)
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c
index a8e3ef3a..6c537639 100644
--- a/modules/thai/thai-fc.c
+++ b/modules/thai/thai-fc.c
@@ -33,15 +33,9 @@
 #include "pango-engine.h"
 #include "thai-shaper.h"
 
-#ifdef BUILD_XFT
-#include "pangoxft.h"
-#define SCRIPT_ENGINE_NAME "ThaiScriptEngineXft"
-#define RENDER_TYPE PANGO_RENDER_TYPE_XFT
-#else
-#include "pangoft2.h"
-#define SCRIPT_ENGINE_NAME "ThaiScriptEngineFT2"
-#define RENDER_TYPE PANGO_RENDER_TYPE_FT2
-#endif
+#include "pangofc-font.h"
+#define SCRIPT_ENGINE_NAME "ThaiScriptEngineFc"
+#define RENDER_TYPE PANGO_RENDER_TYPE_FC
 
 /* We handle the range U+0e01 to U+0e5b exactly
  */