Rename `ftxf86.[ch]' to `ftfntfmt.[ch]'.

CMakeLists.txt, builds/amiga/makefile, builds/amiga/makefile.os4,
builds/amiga/smakefile, builds/mac/FreeType.m68k_cfm.make.txt,
builds/mac/FreeType.m68k_far.make.txt,
builds/mac/FreeType.ppc_carbon.make.txt,
builds/mac/FreeType.ppc_classic.make.txt, builds/symbian/bld.inf,
builds/symbian/freetype.mmp, builds/wince/vc2005-ce/freetype.vcproj,
builds/wince/vc2008-ce/freetype.vcproj,
builds/windows/vc2005/freetype.vcproj,
builds/windows/vc2008/freetype.vcproj,
builds/windows/vc2010/freetype.vcxproj,
builds/windows/vc2010/freetype.vcxproj.filters,
builds/windows/visualc/freetype.dsp,
builds/windows/visualc/freetype.vcproj,
builds/windows/visualce/freetype.dsp,
builds/windows/visualce/freetype.vcproj, docs/INSTALL.ANY,
include/config/ftheader.h, include/ftfntfmt.h, modules.cfg,
src/base/ftfntfmt.c, vms_make.com: Updated.

19 files changed, 67 insertions, 66 deletions

diff --git a/builds/amiga/makefile b/builds/amiga/makefile
index 89e3e77f1..bcb45b9ed 100644
--- a/builds/amiga/makefile
+++ b/builds/amiga/makefile
@@ -96,6 +96,9 @@ ftbitmap.ppc.o: $(FTSRC)/base/ftbitmap.c
 ftcid.ppc.o: $(FTSRC)/base/ftcid.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
+ftfntfmt.ppc.o: $(FTSRC)/base/ftfntfmt.c
+	$(CC) -c $(CFLAGS) -o $@ $<
+
 ftfstype.ppc.o: $(FTSRC)/base/ftfstype.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
@@ -135,9 +138,6 @@ fttype1.ppc.o: $(FTSRC)/base/fttype1.c
 ftwinfnt.ppc.o: $(FTSRC)/base/ftwinfnt.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-ftxf86.ppc.o: $(FTSRC)/base/ftxf86.c
-	$(CC) -c $(CFLAGS) -o $@ $<
-
 #
 # FreeType2 library autofitting module
 #
@@ -269,11 +269,11 @@ gxvalid.ppc.o: $(FTSRC)/gxvalid/gxvalid.c
 otvalid.ppc.o: $(FTSRC)/otvalid/otvalid.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o   \
-	  ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o ftgxval.ppc.o            \
-	  ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o ftpatent.ppc.o ftpfr.ppc.o \
-	  ftstroke.ppc.o ftsynth.ppc.o fttype1.ppc.o ftwinfnt.ppc.o          \
-	  ftxf86.ppc.o
+BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \
+	  ftfntfmt.ppc.oftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o          \
+	  ftgxval.ppc.o ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o            \
+	  ftpatent.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o          \
+	  fttype1.ppc.o ftwinfnt.ppc.o
 
 DEBUGPPC = ftdebug.ppc.o ftdebugpure.ppc.o
 
diff --git a/builds/amiga/makefile.os4 b/builds/amiga/makefile.os4
index f602e730e..481fe5950 100644
--- a/builds/amiga/makefile.os4
+++ b/builds/amiga/makefile.os4
@@ -99,6 +99,9 @@ ftdebug.ppc.o: FT:src/base/ftdebug.c
 ftdebugpure.ppc.o: src/base/ftdebug.c
 	$(CC) -c $(CFLAGS) -o $@ src/base/ftdebug.c
 
+ftfntfmt.ppc.o: FT:src/base/ftfntfmt.c
+	$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftfntfmt.c
+
 ftfstype.ppc.o: FT:src/base/ftfstype.c
 	$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftfstype.c
 
@@ -138,9 +141,6 @@ fttype1.ppc.o: FT:src/base/fttype1.c
 ftwinfnt.ppc.o: FT:src/base/ftwinfnt.c
 	$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftwinfnt.c
 
-ftxf86.ppc.o: FT:src/base/ftxf86.c
-	$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftxf86.c
-
 #
 # FreeType2 library autofitting module
 #
@@ -273,11 +273,11 @@ gxvalid.ppc.o: FT:src/gxvalid/gxvalid.c
 otvalid.ppc.o: FT:src/otvalid/otvalid.c
 	$(CC) -c $(CFLAGS) -o $@ /FT/src/otvalid/otvalid.c
 
-BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o   \
-       ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o ftgxval.ppc.o            \
-       ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o ftpatent.ppc.o ftpfr.ppc.o \
-       ftstroke.ppc.o ftsynth.ppc.o fttype1.ppc.o ftwinfnt.ppc.o          \
-       ftxf86.ppc.o
+BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \
+       ftfntfmt.ppc.o ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o         \
+       ftgxval.ppc.o ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o            \
+       ftpatent.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o          \
+       fttype1.ppc.o ftwinfnt.ppc.o
 
 DEBUG = ftdebug.ppc.o ftdebugpure.ppc.o
 
diff --git a/builds/amiga/smakefile b/builds/amiga/smakefile
index 2b82ac6f0..156beb29f 100644
--- a/builds/amiga/smakefile
+++ b/builds/amiga/smakefile
@@ -42,9 +42,9 @@
 # (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or
 # FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).
 
-OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfstype.o ftgasp.o   \
-	  ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o ftpatent.o ftpfr.o \
-	  ftstroke.o ftsynth.o fttype1.o ftwinfnt.o ftxf86.o
+OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfntfmt.o ftfstype.o \
+	  ftgasp.o ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o           \
+	  ftpatent.o ftpfr.o ftstroke.o ftsynth.o fttype1.o ftwinfnt.o
 
 OBJSYSTEM = ftsystem.o ftsystempure.o
 
@@ -133,6 +133,8 @@ ftbitmap.o: $(CORE)base/ftbitmap.c
 	sc $(SCFLAGS) objname=$@ $<
 ftcid.o: $(CORE)base/ftcid.c
 	sc $(SCFLAGS) objname=$@ $<
+ftfntfmt.o: $(CORE)base/ftfntfmt.c
+	sc $(SCFLAGS) objname=$@ $<
 ftfstype.o: $(CORE)base/ftfstype.c
 	sc $(SCFLAGS) objname=$@ $<
 ftgasp.o: $(CORE)base/ftgasp.c
@@ -159,8 +161,6 @@ fttype1.o: $(CORE)base/fttype1.c
 	sc $(SCFLAGS) objname=$@ $<
 ftwinfnt.o: $(CORE)base/ftwinfnt.c
 	sc $(SCFLAGS) objname=$@ $<
-ftxf86.o: $(CORE)base/ftxf86.c
-	sc $(SCFLAGS) objname=$@ $<
 
 #
 # freetype library autofitter module
diff --git a/builds/mac/FreeType.m68k_cfm.make.txt b/builds/mac/FreeType.m68k_cfm.make.txt
index 425f9f9ce..c0a55f510 100644
--- a/builds/mac/FreeType.m68k_cfm.make.txt
+++ b/builds/mac/FreeType.m68k_cfm.make.txt
@@ -38,6 +38,7 @@ SrcFiles        =  \xB6
 				  :src:base:ftbdf.c \xB6
 				  :src:base:ftbitmap.c \xB6
 				  :src:base:ftdebug.c \xB6
+				  :src:base:ftfntfmt.c \xB6
 				  :src:base:ftfstype.c \xB6
 				  :src:base:ftglyph.c \xB6
 				  :src:base:ftgxval.c \xB6
@@ -50,7 +51,6 @@ SrcFiles        =  \xB6
 				  :src:base:ftsystem.c \xB6
 				  :src:base:fttype1.c \xB6
 				  :src:base:ftwinfnt.c \xB6
-				  :src:base:ftxf86.c \xB6
 				  :src:cache:ftcache.c \xB6
 				  :src:bdf:bdf.c \xB6
 				  :src:cff:cff.c \xB6
@@ -83,6 +83,7 @@ ObjFiles-68K    =  \xB6
 				  "{ObjDir}ftbdf.c.o" \xB6
 				  "{ObjDir}ftbitmap.c.o" \xB6
 				  "{ObjDir}ftdebug.c.o" \xB6
+				  "{ObjDir}ftfntfmt.c.o" \xB6
 				  "{ObjDir}ftfstype.c.o" \xB6
 				  "{ObjDir}ftglyph.c.o" \xB6
 				  "{ObjDir}ftgxval.c.o" \xB6
@@ -95,7 +96,6 @@ ObjFiles-68K    =  \xB6
 				  "{ObjDir}ftsystem.c.o" \xB6
 				  "{ObjDir}fttype1.c.o" \xB6
 				  "{ObjDir}ftwinfnt.c.o" \xB6
-				  "{ObjDir}ftxf86.c.o" \xB6
 				  "{ObjDir}ftcache.c.o" \xB6
 				  "{ObjDir}bdf.c.o" \xB6
 				  "{ObjDir}cff.c.o" \xB6
@@ -161,6 +161,7 @@ FreeType.m68k_cfm.o  \xC4\xC4  {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5
 "{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c
 "{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c
 "{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c
+"{ObjDir}ftfntfmt.c.o" \xC4 :src:base:ftfntfmt.c
 "{ObjDir}ftfstype.c.o" \xC4 :src:base:ftfstype.c
 "{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c
 "{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c
@@ -173,7 +174,6 @@ FreeType.m68k_cfm.o  \xC4\xC4  {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5
 "{ObjDir}ftsystem.c.o" \xC4 :src:base:ftsystem.c
 "{ObjDir}fttype1.c.o" \xC4 :src:base:fttype1.c
 "{ObjDir}ftwinfnt.c.o" \xC4 :src:base:ftwinfnt.c
-"{ObjDir}ftxf86.c.o" \xC4 :src:base:ftxf86.c
 "{ObjDir}ftcache.c.o" \xC4 :src:cache:ftcache.c
 "{ObjDir}bdf.c.o" \xC4 :src:bdf:bdf.c
 "{ObjDir}cff.c.o" \xC4 :src:cff:cff.c
diff --git a/builds/mac/FreeType.m68k_far.make.txt b/builds/mac/FreeType.m68k_far.make.txt
index ebf5a1b56..e9b7f6f5f 100644
--- a/builds/mac/FreeType.m68k_far.make.txt
+++ b/builds/mac/FreeType.m68k_far.make.txt
@@ -37,6 +37,7 @@ SrcFiles        =  \xB6
 				  :src:base:ftbdf.c \xB6
 				  :src:base:ftbitmap.c \xB6
 				  :src:base:ftdebug.c \xB6
+				  :src:base:ftfntfmt.c \xB6
 				  :src:base:ftfstype.c \xB6
 				  :src:base:ftglyph.c \xB6
 				  :src:base:ftgxval.c \xB6
@@ -49,7 +50,6 @@ SrcFiles        =  \xB6
 				  :src:base:ftsystem.c \xB6
 				  :src:base:fttype1.c \xB6
 				  :src:base:ftwinfnt.c \xB6
-				  :src:base:ftxf86.c \xB6
 				  :src:cache:ftcache.c \xB6
 				  :src:bdf:bdf.c \xB6
 				  :src:cff:cff.c \xB6
@@ -82,6 +82,7 @@ ObjFiles-68K    =  \xB6
 				  "{ObjDir}ftbdf.c.o" \xB6
 				  "{ObjDir}ftbitmap.c.o" \xB6
 				  "{ObjDir}ftdebug.c.o" \xB6
+				  "{ObjDir}ftfntfmt.c.o" \xB6
 				  "{ObjDir}ftfstype.c.o" \xB6
 				  "{ObjDir}ftglyph.c.o" \xB6
 				  "{ObjDir}ftgxval.c.o" \xB6
@@ -94,7 +95,6 @@ ObjFiles-68K    =  \xB6
 				  "{ObjDir}ftsystem.c.o" \xB6
 				  "{ObjDir}fttype1.c.o" \xB6
 				  "{ObjDir}ftwinfnt.c.o" \xB6
-				  "{ObjDir}ftxf86.c.o" \xB6
 				  "{ObjDir}ftcache.c.o" \xB6
 				  "{ObjDir}bdf.c.o" \xB6
 				  "{ObjDir}cff.c.o" \xB6
@@ -160,6 +160,7 @@ FreeType.m68k_far.o  \xC4\xC4  {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5
 "{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c
 "{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c
 "{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c
+"{ObjDir}ftfntfmt.c.o" \xC4 :src:base:ftfntfmt.c
 "{ObjDir}ftfstype.c.o" \xC4 :src:base:ftfstype.c
 "{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c
 "{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c
@@ -172,7 +173,6 @@ FreeType.m68k_far.o  \xC4\xC4  {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5
 "{ObjDir}ftsystem.c.o" \xC4 :src:base:ftsystem.c
 "{ObjDir}fttype1.c.o" \xC4 :src:base:fttype1.c
 "{ObjDir}ftwinfnt.c.o" \xC4 :src:base:ftwinfnt.c
-"{ObjDir}ftxf86.c.o" \xC4 :src:base:ftxf86.c
 "{ObjDir}ftcache.c.o" \xC4 :src:cache:ftcache.c
 "{ObjDir}bdf.c.o" \xC4 :src:bdf:bdf.c
 "{ObjDir}cff.c.o" \xC4 :src:cff:cff.c
diff --git a/builds/mac/FreeType.ppc_carbon.make.txt b/builds/mac/FreeType.ppc_carbon.make.txt
index 2926413f3..9eb1dac4e 100644
--- a/builds/mac/FreeType.ppc_carbon.make.txt
+++ b/builds/mac/FreeType.ppc_carbon.make.txt
@@ -38,6 +38,7 @@ SrcFiles        =  \xB6
 				  :src:base:ftbdf.c \xB6
 				  :src:base:ftbitmap.c \xB6
 				  :src:base:ftdebug.c \xB6
+				  :src:base:ftfntfmt.c \xB6
 				  :src:base:ftfstype.c \xB6
 				  :src:base:ftglyph.c \xB6
 				  :src:base:ftgxval.c \xB6
@@ -50,7 +51,6 @@ SrcFiles        =  \xB6
 				  :src:base:ftsystem.c \xB6
 				  :src:base:fttype1.c \xB6
 				  :src:base:ftwinfnt.c \xB6
-				  :src:base:ftxf86.c \xB6
 				  :src:cache:ftcache.c \xB6
 				  :src:bdf:bdf.c \xB6
 				  :src:cff:cff.c \xB6
@@ -83,6 +83,7 @@ ObjFiles-PPC    =  \xB6
 				  "{ObjDir}ftbdf.c.x" \xB6
 				  "{ObjDir}ftbitmap.c.x" \xB6
 				  "{ObjDir}ftdebug.c.x" \xB6
+				  "{ObjDir}ftfntfmt.c.x" \xB6
 				  "{ObjDir}ftfstype.c.x" \xB6
 				  "{ObjDir}ftglyph.c.x" \xB6
 				  "{ObjDir}ftgxval.c.x" \xB6
@@ -95,7 +96,6 @@ ObjFiles-PPC    =  \xB6
 				  "{ObjDir}ftsystem.c.x" \xB6
 				  "{ObjDir}fttype1.c.x" \xB6
 				  "{ObjDir}ftwinfnt.c.x" \xB6
-				  "{ObjDir}ftxf86.c.x" \xB6
 				  "{ObjDir}ftcache.c.x" \xB6
 				  "{ObjDir}bdf.c.x" \xB6
 				  "{ObjDir}cff.c.x" \xB6
@@ -164,6 +164,7 @@ FreeType.ppc_carbon.o  \xC4\xC4  {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\x
 "{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c
 "{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c
 "{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c
+"{ObjDir}ftfntfmt.c.x" \xC4 :src:base:ftfntfmt.c
 "{ObjDir}ftfstype.c.x" \xC4 :src:base:ftfstype.c
 "{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c
 "{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c
@@ -176,7 +177,6 @@ FreeType.ppc_carbon.o  \xC4\xC4  {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\x
 "{ObjDir}ftsystem.c.x" \xC4 :src:base:ftsystem.c
 "{ObjDir}fttype1.c.x" \xC4 :src:base:fttype1.c
 "{ObjDir}ftwinfnt.c.x" \xC4 :src:base:ftwinfnt.c
-"{ObjDir}ftxf86.c.x" \xC4 :src:base:ftxf86.c
 "{ObjDir}ftcache.c.x" \xC4 :src:cache:ftcache.c
 "{ObjDir}bdf.c.x" \xC4 :src:bdf:bdf.c
 "{ObjDir}cff.c.x" \xC4 :src:cff:cff.c
diff --git a/builds/mac/FreeType.ppc_classic.make.txt b/builds/mac/FreeType.ppc_classic.make.txt
index 377de9ab9..0627eeaa9 100644
--- a/builds/mac/FreeType.ppc_classic.make.txt
+++ b/builds/mac/FreeType.ppc_classic.make.txt
@@ -38,6 +38,7 @@ SrcFiles        =  \xB6
 				  :src:base:ftbdf.c \xB6
 				  :src:base:ftbitmap.c \xB6
 				  :src:base:ftdebug.c \xB6
+				  :src:base:ftfntfmt.c \xB6
 				  :src:base:ftfstype.c \xB6
 				  :src:base:ftglyph.c \xB6
 				  :src:base:ftgxval.c \xB6
@@ -50,7 +51,6 @@ SrcFiles        =  \xB6
 				  :src:base:ftsystem.c \xB6
 				  :src:base:fttype1.c \xB6
 				  :src:base:ftwinfnt.c \xB6
-				  :src:base:ftxf86.c \xB6
 				  :src:cache:ftcache.c \xB6
 				  :src:bdf:bdf.c \xB6
 				  :src:cff:cff.c \xB6
@@ -83,6 +83,7 @@ ObjFiles-PPC    =  \xB6
 				  "{ObjDir}ftbdf.c.x" \xB6
 				  "{ObjDir}ftbitmap.c.x" \xB6
 				  "{ObjDir}ftdebug.c.x" \xB6
+				  "{ObjDir}ftfntfmt.c.x" \xB6
 				  "{ObjDir}ftfstype.c.x" \xB6
 				  "{ObjDir}ftglyph.c.x" \xB6
 				  "{ObjDir}ftgxval.c.x" \xB6
@@ -95,7 +96,6 @@ ObjFiles-PPC    =  \xB6
 				  "{ObjDir}ftsystem.c.x" \xB6
 				  "{ObjDir}fttype1.c.x" \xB6
 				  "{ObjDir}ftwinfnt.c.x" \xB6
-				  "{ObjDir}ftxf86.c.x" \xB6
 				  "{ObjDir}ftcache.c.x" \xB6
 				  "{ObjDir}bdf.c.x" \xB6
 				  "{ObjDir}cff.c.x" \xB6
@@ -164,6 +164,7 @@ FreeType.ppc_classic.o  \xC4\xC4  {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\
 "{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c
 "{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c
 "{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c
+"{ObjDir}ftfntfmt.c.x" \xC4 :src:base:ftfntfmt.c
 "{ObjDir}ftfstype.c.x" \xC4 :src:base:ftfstype.c
 "{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c
 "{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c
@@ -176,7 +177,6 @@ FreeType.ppc_classic.o  \xC4\xC4  {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\
 "{ObjDir}ftsystem.c.x" \xC4 :src:base:ftsystem.c
 "{ObjDir}fttype1.c.x" \xC4 :src:base:fttype1.c
 "{ObjDir}ftwinfnt.c.x" \xC4 :src:base:ftwinfnt.c
-"{ObjDir}ftxf86.c.x" \xC4 :src:base:ftxf86.c
 "{ObjDir}ftcache.c.x" \xC4 :src:cache:ftcache.c
 "{ObjDir}bdf.c.x" \xC4 :src:bdf:bdf.c
 "{ObjDir}cff.c.x" \xC4 :src:cff:cff.c
diff --git a/builds/symbian/bld.inf b/builds/symbian/bld.inf
index 2ab422801..d3637f238 100644
--- a/builds/symbian/bld.inf
+++ b/builds/symbian/bld.inf
@@ -32,6 +32,7 @@ PRJ_EXPORTS
 ../../include/ftcid.h		ftcid.h
 ../../include/fterrdef.h	fterrdef.h
 ../../include/fterrors.h	fterrors.h
+../../include/ftfntfmt.h	ftfntfmt.h
 ../../include/ftgasp.h		ftgasp.h
 ../../include/ftglyph.h		ftglyph.h
 ../../include/ftgxval.h		ftgxval.h
@@ -58,7 +59,6 @@ PRJ_EXPORTS
 ../../include/fttrigon.h	fttrigon.h
 ../../include/fttypes.h		fttypes.h
 ../../include/ftwinfnt.h	ftwinfnt.h
-../../include/ftxf86.h		ftxf86.h
 ../../include/t1tables.h	t1tables.h
 ../../include/ttnameid.h	ttnameid.h
 ../../include/tttables.h	tttables.h
diff --git a/builds/symbian/freetype.mmp b/builds/symbian/freetype.mmp
index 9ccdb68f7..b7691f07f 100644
--- a/builds/symbian/freetype.mmp
+++ b/builds/symbian/freetype.mmp
@@ -28,6 +28,7 @@ source ftbbox.c
 source ftbdf.c
 source ftbitmap.c
 source ftcid.c
+source ftfntfmt.c
 source ftfstype.c
 source ftgasp.c
 source ftglyph.c
diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj
index 5614235cb..2345df47b 100644
--- a/builds/wince/vc2005-ce/freetype.vcproj
+++ b/builds/wince/vc2005-ce/freetype.vcproj
@@ -2135,6 +2135,8 @@
         </File>

         <File RelativePath="..\..\..\src\base\ftcid.c">

         </File>

+        <File RelativePath="..\..\..\src\base\ftfntfmt.c">

+        </File>

         <File RelativePath="..\..\..\src\base\ftgxval.c">

         </File>

         <File RelativePath="..\..\..\src\base\ftlcdfil.c">

@@ -2279,8 +2281,6 @@
         </File>

         <File RelativePath="..\..\..\src\base\ftwinfnt.c">

         </File>

-        <File RelativePath="..\..\..\src\base\ftxf86.c">

-        </File>

         <File RelativePath="..\..\..\src\pcf\pcf.c">

           <FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)">

             <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj
index e36ccb059..ad0e695a0 100644
--- a/builds/wince/vc2008-ce/freetype.vcproj
+++ b/builds/wince/vc2008-ce/freetype.vcproj
@@ -7872,6 +7872,10 @@
 					>

 				</File>

 				<File

+					RelativePath="..\..\..\src\base\ftfntfmt.c"

+					>

+				</File>

+				<File

 					RelativePath="..\..\..\src\base\ftgxval.c"

 					>

 				</File>

@@ -8331,10 +8335,6 @@
 					>

 				</File>

 				<File

-					RelativePath="..\..\..\src\base\ftxf86.c"

-					>

-				</File>

-				<File

 					RelativePath="..\..\..\src\pcf\pcf.c"

 					>

 					<FileConfiguration

diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj
index 5880b7d27..b57965ca8 100644
--- a/builds/windows/vc2005/freetype.vcproj
+++ b/builds/windows/vc2005/freetype.vcproj
@@ -346,6 +346,8 @@
       <Filter Name="FT_MODULES">

         <File RelativePath="..\..\..\src\base\ftbbox.c">

         </File>

+        <File RelativePath="..\..\..\src\base\ftfntfmt.c">

+        </File>

         <File RelativePath="..\..\..\src\base\ftmm.c">

           <FileConfiguration Name="Release|Win32">

             <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

@@ -374,8 +376,6 @@
         </File>

         <File RelativePath="..\..\..\src\base\ftwinfnt.c">

         </File>

-        <File RelativePath="..\..\..\src\base\ftxf86.c">

-        </File>

         <File RelativePath="..\..\..\src\base\ftlcdfil.c">

         </File>

         <File RelativePath="..\..\..\src\base\ftgxval.c">

diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj
index 95d722b97..8ce4316f9 100644
--- a/builds/windows/vc2008/freetype.vcproj
+++ b/builds/windows/vc2008/freetype.vcproj
@@ -1237,6 +1237,10 @@
 					>

 				</File>

 				<File

+					RelativePath="..\..\..\src\base\ftfntfmt.c"

+					>

+				</File>

+				<File

 					RelativePath="..\..\..\src\base\ftmm.c"

 					>

 					<FileConfiguration

@@ -1320,10 +1324,6 @@
 					>

 				</File>

 				<File

-					RelativePath="..\..\..\src\base\ftxf86.c"

-					>

-				</File>

-				<File

 					RelativePath="..\..\..\src\base\ftlcdfil.c"

 					>

 				</File>

diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj
index 7cafe4539..640b4a080 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -1122,6 +1122,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

     <ClCompile Include="..\..\..\src\base\ftbbox.c" />

+    <ClCompile Include="..\..\..\src\base\ftfntfmt.c" />

     <ClCompile Include="..\..\..\src\base\ftmm.c">

       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>

       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>

@@ -1170,7 +1171,6 @@
     <ClCompile Include="..\..\..\src\base\ftsynth.c" />

     <ClCompile Include="..\..\..\src\base\fttype1.c" />

     <ClCompile Include="..\..\..\src\base\ftwinfnt.c" />

-    <ClCompile Include="..\..\..\src\base\ftxf86.c" />

     <ClCompile Include="..\..\..\src\base\ftlcdfil.c" />

     <ClCompile Include="..\..\..\src\base\ftgxval.c" />

     <ClCompile Include="..\..\..\src\base\ftotval.c" />

diff --git a/builds/windows/vc2010/freetype.vcxproj.filters b/builds/windows/vc2010/freetype.vcxproj.filters
index 99fc43f22..f762b0b54 100644
--- a/builds/windows/vc2010/freetype.vcxproj.filters
+++ b/builds/windows/vc2010/freetype.vcxproj.filters
@@ -65,6 +65,9 @@
     <ClCompile Include="..\..\..\src\base\ftbbox.c">

       <Filter>Source Files\FT_MODULES</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\src\base\ftfntfmt.c">

+      <Filter>Source Files\FT_MODULES</Filter>

+    </ClCompile>

     <ClCompile Include="..\..\..\src\base\ftmm.c">

       <Filter>Source Files\FT_MODULES</Filter>

     </ClCompile>

@@ -80,9 +83,6 @@
     <ClCompile Include="..\..\..\src\base\ftwinfnt.c">

       <Filter>Source Files\FT_MODULES</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\src\base\ftxf86.c">

-      <Filter>Source Files\FT_MODULES</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\src\base\ftlcdfil.c">

       <Filter>Source Files\FT_MODULES</Filter>

     </ClCompile>

diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp
index cf76f7c2d..fa5c52b5a 100644
--- a/builds/windows/visualc/freetype.dsp
+++ b/builds/windows/visualc/freetype.dsp
@@ -226,6 +226,10 @@ SOURCE=..\..\..\src\base\ftbitmap.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\base\ftfntfmt.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\base\ftfstype.c

 # End Source File

 # Begin Source File

@@ -301,10 +305,6 @@ SOURCE=..\..\..\src\base\ftwinfnt.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\src\base\ftxf86.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\..\src\pcf\pcf.c

 # SUBTRACT CPP /Fr

 # End Source File

diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj
index a71a0e978..8edb3ad67 100644
--- a/builds/windows/visualc/freetype.vcproj
+++ b/builds/windows/visualc/freetype.vcproj
@@ -1236,6 +1236,10 @@
 					>

 				</File>

 				<File

+					RelativePath="..\..\..\src\base\ftfntfmt.c"

+					>

+				</File>

+				<File

 					RelativePath="..\..\..\src\base\ftmm.c"

 					>

 					<FileConfiguration

@@ -1319,10 +1323,6 @@
 					>

 				</File>

 				<File

-					RelativePath="..\..\..\src\base\ftxf86.c"

-					>

-				</File>

-				<File

 					RelativePath="..\..\..\src\base\ftlcdfil.c"

 					>

 				</File>

diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp
index cf76f7c2d..fa5c52b5a 100644
--- a/builds/windows/visualce/freetype.dsp
+++ b/builds/windows/visualce/freetype.dsp
@@ -226,6 +226,10 @@ SOURCE=..\..\..\src\base\ftbitmap.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\base\ftfntfmt.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\base\ftfstype.c

 # End Source File

 # Begin Source File

@@ -301,10 +305,6 @@ SOURCE=..\..\..\src\base\ftwinfnt.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\src\base\ftxf86.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\..\src\pcf\pcf.c

 # SUBTRACT CPP /Fr

 # End Source File

diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj
index e4cddfb0d..137a02281 100644
--- a/builds/windows/visualce/freetype.vcproj
+++ b/builds/windows/visualce/freetype.vcproj
@@ -8262,6 +8262,10 @@
 					>

 				</File>

 				<File

+					RelativePath="..\..\..\src\base\ftfntfmt.c"

+					>

+				</File>

+				<File

 					RelativePath="..\..\..\src\base\ftmm.c"

 					>

 					<FileConfiguration

@@ -8705,10 +8709,6 @@
 					>

 				</File>

 				<File

-					RelativePath="..\..\..\src\base\ftxf86.c"

-					>

-				</File>

-				<File

 					RelativePath="..\..\..\src\base\ftlcdfil.c"

 					>

 				</File>