From 561fa3d093a1b43ddcea08ea46b323e38688e631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 21 Jan 2004 19:23:49 +0000
Subject: [PATCH] Update to FreeType 2.1.5

svn path=/trunk/; revision=7814
---
 reactos/lib/freetype/ChangeLog                | 1915 +++-
 reactos/lib/freetype/Doxyfile                 |  206 -
 reactos/lib/freetype/Jamfile                  |   83 +-
 reactos/lib/freetype/Jamfile.in               |   64 +-
 reactos/lib/freetype/Jamrules                 |    4 +-
 reactos/lib/freetype/README                   |   35 +-
 reactos/lib/freetype/README.ROS               |    5 +-
 reactos/lib/freetype/builds/ansi/ansi-def.mk  |   13 +-
 reactos/lib/freetype/builds/ansi/ansi.mk      |    1 +
 reactos/lib/freetype/builds/beos/beos-def.mk  |   13 +-
 reactos/lib/freetype/builds/beos/beos.mk      |    2 +-
 reactos/lib/freetype/builds/beos/detect.mk    |   11 +-
 .../lib/freetype/builds/compiler/ansi-cc.mk   |   11 +-
 .../lib/freetype/builds/compiler/bcc-dev.mk   |   12 +-
 reactos/lib/freetype/builds/compiler/bcc.mk   |   12 +-
 reactos/lib/freetype/builds/compiler/emx.mk   |   81 +
 .../lib/freetype/builds/compiler/gcc-dev.mk   |   10 +-
 reactos/lib/freetype/builds/compiler/gcc.mk   |   11 +-
 .../lib/freetype/builds/compiler/intelc.mk    |    8 +-
 .../lib/freetype/builds/compiler/unix-lcc.mk  |    8 +-
 .../lib/freetype/builds/compiler/visualage.mk |    8 +-
 .../lib/freetype/builds/compiler/visualc.mk   |    8 +-
 .../lib/freetype/builds/compiler/watcom.mk    |   12 +-
 .../lib/freetype/builds/compiler/win-lcc.mk   |    8 +-
 reactos/lib/freetype/builds/detect.mk         |   52 +-
 reactos/lib/freetype/builds/dos/detect.mk     |   22 +-
 reactos/lib/freetype/builds/dos/dos-def.mk    |   17 +-
 .../descrip.mms => builds/dos/dos-emx.mk}     |   12 +-
 reactos/lib/freetype/builds/dos/dos-gcc.mk    |    5 +-
 .../{vms/descrip.mms => dos/dos-wat.mk}       |   16 +-
 reactos/lib/freetype/builds/freetype.mk       |  105 +-
 reactos/lib/freetype/builds/link_dos.mk       |    1 +
 reactos/lib/freetype/builds/link_std.mk       |    1 +
 reactos/lib/freetype/builds/mac/freetype.make |  106 +
 reactos/lib/freetype/builds/modules.mk        |   11 +-
 reactos/lib/freetype/builds/os2/detect.mk     |   13 +-
 reactos/lib/freetype/builds/os2/os2-def.mk    |   18 +-
 reactos/lib/freetype/builds/os2/os2-dev.mk    |    6 +-
 reactos/lib/freetype/builds/os2/os2-gcc.mk    |    3 +-
 reactos/lib/freetype/builds/toplevel.mk       |    7 +-
 reactos/lib/freetype/builds/unix/aclocal.m4   |    2 +-
 reactos/lib/freetype/builds/unix/configure    |   34 +-
 reactos/lib/freetype/builds/unix/configure.ac |   26 +-
 reactos/lib/freetype/builds/unix/detect.mk    |   11 +-
 .../freetype/builds/unix/freetype-config.in   |    2 +-
 reactos/lib/freetype/builds/unix/freetype2.in |   11 +
 reactos/lib/freetype/builds/unix/install.mk   |   11 +-
 reactos/lib/freetype/builds/unix/ltmain.sh    |   31 +-
 reactos/lib/freetype/builds/unix/unix-cc.in   |   23 +-
 reactos/lib/freetype/builds/unix/unix-def.in  |   17 +-
 reactos/lib/freetype/builds/unix/unix-dev.mk  |    5 +-
 reactos/lib/freetype/builds/unix/unix-lcc.mk  |    1 +
 reactos/lib/freetype/builds/unix/unixddef.mk  |   11 +-
 reactos/lib/freetype/builds/win32/detect.mk   |   96 +-
 reactos/lib/freetype/builds/win32/w32-bcc.mk  |    4 +-
 reactos/lib/freetype/builds/win32/w32-bccd.mk |    7 +-
 reactos/lib/freetype/builds/win32/w32-dev.mk  |    7 +-
 reactos/lib/freetype/builds/win32/w32-gcc.mk  |    7 +-
 reactos/lib/freetype/builds/win32/w32-icc.mk  |    1 +
 reactos/lib/freetype/builds/win32/w32-intl.mk |    4 +-
 .../lib/freetype/builds/win32/w32-mingw32.mk  |    7 +-
 reactos/lib/freetype/builds/win32/w32-vcc.mk  |    4 +-
 reactos/lib/freetype/builds/win32/w32-wat.mk  |    7 +-
 .../lib/freetype/builds/win32/win32-def.mk    |   20 +-
 reactos/lib/freetype/config.mk                |    7 +-
 reactos/lib/freetype/configure                |   12 +-
 reactos/lib/freetype/descrip.mms              |   73 -
 reactos/lib/freetype/devel/ft2build.h         |   14 +-
 reactos/lib/freetype/devel/ftoption.h         |  106 +-
 reactos/lib/freetype/docs/CHANGES             |  221 +-
 reactos/lib/freetype/docs/CUSTOMIZE           |  134 +-
 reactos/lib/freetype/docs/DEBUG               |   76 +-
 reactos/lib/freetype/docs/INSTALL             |   73 +-
 reactos/lib/freetype/docs/INSTALL.ANY         |  119 +-
 reactos/lib/freetype/docs/INSTALL.GNU         |  159 +-
 reactos/lib/freetype/docs/INSTALL.UNX         |  193 +-
 reactos/lib/freetype/docs/INSTALL.VMS         |   15 +-
 reactos/lib/freetype/docs/TODO                |   22 +-
 reactos/lib/freetype/docs/TRUETYPE            |   17 +-
 reactos/lib/freetype/docs/UPGRADE.UNX         |  111 +-
 reactos/lib/freetype/docs/VERSION.DLL         |  140 +-
 reactos/lib/freetype/docs/license.txt         |   45 +-
 reactos/lib/freetype/docs/reference/README    |    2 +
 reactos/lib/freetype/docs/release             |   18 +
 reactos/lib/freetype/freetype.def             |    5 +-
 .../freetype/include/freetype/cache/ftccmap.h |   12 +-
 .../include/freetype/cache/ftcglyph.h         |   14 +-
 .../include/freetype/cache/ftcimage.h         |    7 +-
 .../include/freetype/config/ftconfig.h        |   11 +-
 .../include/freetype/config/ftheader.h        |    4 +-
 .../include/freetype/config/ftoption.h        |  102 +-
 .../include/freetype/config/ftstdlib.h        |    1 +
 .../lib/freetype/include/freetype/freetype.h  |  355 +-
 reactos/lib/freetype/include/freetype/ftbdf.h |   78 +-
 .../lib/freetype/include/freetype/ftcache.h   |   11 +-
 .../lib/freetype/include/freetype/ftglyph.h   |   92 +-
 .../lib/freetype/include/freetype/ftgzip.h    |   49 +-
 .../lib/freetype/include/freetype/ftimage.h   |   57 +-
 .../lib/freetype/include/freetype/ftincrem.h  |   15 +-
 .../lib/freetype/include/freetype/ftmoderr.h  |   40 +-
 .../lib/freetype/include/freetype/ftmodule.h  |   35 +-
 .../lib/freetype/include/freetype/ftoutln.h   |    2 +-
 reactos/lib/freetype/include/freetype/ftpfr.h |   96 +-
 .../freetype/{ftstroker.h => ftstroke.h}      |   27 +-
 .../lib/freetype/include/freetype/fttrigon.h  |   18 +-
 .../lib/freetype/include/freetype/ftwinfnt.h  |   16 +-
 .../include/freetype/internal/cfftypes.h      |    6 +-
 .../include/freetype/internal/fnttypes.h      |   14 +-
 .../include/freetype/internal/ftdriver.h      |    8 +-
 .../include/freetype/internal/ftgloadr.h      |    8 +-
 .../include/freetype/internal/ftmemory.h      |    9 +-
 .../include/freetype/internal/ftobjs.h        |   68 +-
 .../include/freetype/internal/pcftypes.h      |    2 +-
 .../freetype/include/freetype/internal/pfr.h  |   40 +-
 .../include/freetype/internal/psaux.h         |   27 +-
 .../include/freetype/internal/pshints.h       |   18 +-
 .../freetype/include/freetype/internal/sfnt.h |   15 +-
 .../include/freetype/internal/t1types.h       |    6 +-
 .../include/freetype/internal/tttypes.h       |    7 +
 .../lib/freetype/include/freetype/t1tables.h  |    6 +-
 .../lib/freetype/include/freetype/ttnameid.h  |   31 +-
 .../lib/freetype/include/freetype/tttables.h  |   63 +-
 .../lib/freetype/include/freetype/ttunpat.h   |   53 +
 reactos/lib/freetype/src/autohint/ahglobal.c  |   20 +-
 reactos/lib/freetype/src/autohint/ahglobal.h  |   16 +-
 reactos/lib/freetype/src/autohint/ahglyph.c   |  310 +-
 reactos/lib/freetype/src/autohint/ahhint.c    |  321 +-
 reactos/lib/freetype/src/autohint/ahmodule.c  |    4 +-
 reactos/lib/freetype/src/autohint/ahoptim.c   |  882 --
 reactos/lib/freetype/src/autohint/ahoptim.h   |  137 -
 reactos/lib/freetype/src/autohint/ahtypes.h   |  173 +-
 reactos/lib/freetype/src/autohint/descrip.mms |   25 -
 reactos/lib/freetype/src/autohint/rules.mk    |   35 +-
 reactos/lib/freetype/src/base/Jamfile         |    4 +-
 reactos/lib/freetype/src/base/descrip.mms     |    4 +-
 reactos/lib/freetype/src/base/ftbase.c        |    3 +
 reactos/lib/freetype/src/base/ftbbox.c        |    6 +-
 reactos/lib/freetype/src/base/ftbdf.c         |   28 +-
 reactos/lib/freetype/src/base/ftcalc.c        |   10 +-
 reactos/lib/freetype/src/base/ftdbgmem.c      |    2 +-
 reactos/lib/freetype/src/base/ftglyph.c       |   43 +-
 reactos/lib/freetype/src/base/ftmac.c         |   44 +-
 reactos/lib/freetype/src/base/ftobjs.c        |  740 +-
 reactos/lib/freetype/src/base/ftpfr.c         |   34 +-
 .../src/base/{ftstroker.c => ftstroke.c}      |  722 +-
 reactos/lib/freetype/src/base/ftsynth.c       |   10 +-
 reactos/lib/freetype/src/base/fttrigon.c      |   23 +-
 reactos/lib/freetype/src/base/ftwinfnt.c      |   20 +-
 reactos/lib/freetype/src/base/ftxf86.c        |    2 +-
 reactos/lib/freetype/src/base/rules.mk        |   57 +-
 reactos/lib/freetype/src/bdf/bdf.h            |    8 +-
 reactos/lib/freetype/src/bdf/bdfdrivr.c       |  162 +-
 reactos/lib/freetype/src/bdf/bdfdrivr.h       |    4 +-
 reactos/lib/freetype/src/bdf/bdflib.c         |   27 +-
 reactos/lib/freetype/src/bdf/rules.mk         |   27 +-
 reactos/lib/freetype/src/cache/ftccache.c     |   54 +-
 reactos/lib/freetype/src/cache/ftccmap.c      |   33 +-
 reactos/lib/freetype/src/cache/ftcsbits.c     |   25 +-
 reactos/lib/freetype/src/cache/ftlru.c        |   66 +-
 reactos/lib/freetype/src/cache/rules.mk       |   59 +-
 reactos/lib/freetype/src/cff/cffcmap.c        |   14 +-
 reactos/lib/freetype/src/cff/cffcmap.h        |    3 +-
 reactos/lib/freetype/src/cff/cffdrivr.c       |   15 +-
 reactos/lib/freetype/src/cff/cffgload.c       |   30 +-
 reactos/lib/freetype/src/cff/cffgload.h       |    4 +-
 reactos/lib/freetype/src/cff/cffload.c        |   66 +-
 reactos/lib/freetype/src/cff/cffobjs.c        |   20 +-
 reactos/lib/freetype/src/cff/cffparse.c       |    9 +-
 reactos/lib/freetype/src/cff/cfftoken.h       |   46 +-
 reactos/lib/freetype/src/cff/rules.mk         |   36 +-
 reactos/lib/freetype/src/cid/cidgload.c       |   51 +-
 reactos/lib/freetype/src/cid/cidload.c        |   91 +-
 reactos/lib/freetype/src/cid/cidload.h        |    7 +-
 reactos/lib/freetype/src/cid/cidobjs.c        |  157 +-
 reactos/lib/freetype/src/cid/cidriver.c       |    8 +-
 reactos/lib/freetype/src/cid/cidtoken.h       |   33 +-
 reactos/lib/freetype/src/cid/rules.mk         |   34 +-
 reactos/lib/freetype/src/gzip/adler32.c       |    2 +-
 reactos/lib/freetype/src/gzip/ftgzip.c        |  263 +-
 reactos/lib/freetype/src/gzip/inftrees.c      |    2 +
 reactos/lib/freetype/src/gzip/infutil.h       |    2 +
 reactos/lib/freetype/src/gzip/rules.mk        |   27 +-
 reactos/lib/freetype/src/gzip/zconf.h         |    2 +-
 reactos/lib/freetype/src/gzip/zutil.c         |    2 +-
 reactos/lib/freetype/src/gzip/zutil.h         |    6 +-
 reactos/lib/freetype/src/otlayout/otlgsub.c   |    8 +-
 reactos/lib/freetype/src/pcf/Jamfile          |    4 +-
 reactos/lib/freetype/src/pcf/pcf.c            |    4 +-
 reactos/lib/freetype/src/pcf/pcf.h            |    8 +-
 .../src/pcf/{pcfdriver.c => pcfdrivr.c}       |   53 +-
 .../src/pcf/{pcfdriver.h => pcfdrivr.h}       |    8 +-
 reactos/lib/freetype/src/pcf/pcfread.c        |   99 +-
 reactos/lib/freetype/src/pcf/pcfread.h        |    4 +-
 reactos/lib/freetype/src/pcf/rules.mk         |   36 +-
 reactos/lib/freetype/src/pfr/Jamfile          |    2 +-
 reactos/lib/freetype/src/pfr/pfrdrivr.c       |   41 +-
 reactos/lib/freetype/src/pfr/pfrload.c        |  144 +-
 reactos/lib/freetype/src/pfr/pfrobjs.c        |  216 +-
 reactos/lib/freetype/src/pfr/pfrobjs.h        |   12 +-
 reactos/lib/freetype/src/pfr/pfrsbit.c        |   27 +-
 reactos/lib/freetype/src/pfr/pfrtypes.h       |    2 +-
 reactos/lib/freetype/src/pfr/rules.mk         |   34 +-
 reactos/lib/freetype/src/psaux/psauxmod.c     |    5 +-
 reactos/lib/freetype/src/psaux/psobjs.c       |  154 +-
 reactos/lib/freetype/src/psaux/psobjs.h       |   10 +-
 reactos/lib/freetype/src/psaux/rules.mk       |   29 +-
 reactos/lib/freetype/src/psaux/t1cmap.c       |    4 +-
 reactos/lib/freetype/src/psaux/t1decode.c     |   17 +-
 reactos/lib/freetype/src/pshinter/Jamfile     |    2 +-
 .../src/pshinter/{pshalgo3.c => pshalgo.c}    |  730 +-
 reactos/lib/freetype/src/pshinter/pshalgo.h   |  236 +-
 reactos/lib/freetype/src/pshinter/pshalgo1.c  |  785 --
 reactos/lib/freetype/src/pshinter/pshalgo1.h  |  110 -
 reactos/lib/freetype/src/pshinter/pshalgo2.c  | 1557 ---
 reactos/lib/freetype/src/pshinter/pshalgo2.h  |  203 -
 reactos/lib/freetype/src/pshinter/pshalgo3.h  |  255 -
 reactos/lib/freetype/src/pshinter/pshglob.c   |   14 +-
 reactos/lib/freetype/src/pshinter/pshglob.h   |   11 +-
 reactos/lib/freetype/src/pshinter/pshinter.c  |    6 +-
 reactos/lib/freetype/src/pshinter/pshnterr.h  |   40 +
 reactos/lib/freetype/src/pshinter/pshrec.c    |   29 +-
 reactos/lib/freetype/src/pshinter/pshrec.h    |    4 -
 reactos/lib/freetype/src/pshinter/rules.mk    |   32 +-
 reactos/lib/freetype/src/psnames/psmodule.c   |   49 +-
 reactos/lib/freetype/src/psnames/pstables.h   | 8842 ++++++++++++++---
 reactos/lib/freetype/src/psnames/rules.mk     |   25 +-
 reactos/lib/freetype/src/raster/ftraster.c    |   10 +-
 reactos/lib/freetype/src/raster/ftrend1.c     |   12 +-
 reactos/lib/freetype/src/raster/rules.mk      |   53 +-
 reactos/lib/freetype/src/sfnt/rules.mk        |   35 +-
 reactos/lib/freetype/src/sfnt/sfdriver.c      |   10 +-
 reactos/lib/freetype/src/sfnt/sfobjs.c        |   46 +-
 reactos/lib/freetype/src/sfnt/ttcmap0.c       |  146 +-
 reactos/lib/freetype/src/sfnt/ttload.c        |   37 +-
 reactos/lib/freetype/src/sfnt/ttsbit.c        |   10 +-
 reactos/lib/freetype/src/smooth/ftgrays.c     |   12 +-
 reactos/lib/freetype/src/smooth/ftsmooth.c    |   18 +-
 reactos/lib/freetype/src/smooth/rules.mk      |   27 +-
 .../freetype/src/tools/docmaker/sources.py    |    2 +-
 .../lib/freetype/src/tools/docmaker/tohtml.py |  101 +-
 reactos/lib/freetype/src/tools/glnames.py     | 5376 ++++++++--
 reactos/lib/freetype/src/truetype/rules.mk    |   32 +-
 reactos/lib/freetype/src/truetype/ttdriver.c  |   26 +-
 reactos/lib/freetype/src/truetype/ttgload.c   |  248 +-
 reactos/lib/freetype/src/truetype/ttgload.h   |    4 +-
 reactos/lib/freetype/src/truetype/ttinterp.c  |  367 +-
 reactos/lib/freetype/src/truetype/ttobjs.c    |   70 +-
 reactos/lib/freetype/src/truetype/ttobjs.h    |    8 +-
 reactos/lib/freetype/src/type1/rules.mk       |   36 +-
 reactos/lib/freetype/src/type1/t1afm.c        |    4 +-
 reactos/lib/freetype/src/type1/t1driver.c     |    8 +-
 reactos/lib/freetype/src/type1/t1gload.c      |   26 +-
 reactos/lib/freetype/src/type1/t1gload.h      |    4 +-
 reactos/lib/freetype/src/type1/t1load.c       |  137 +-
 reactos/lib/freetype/src/type1/t1objs.c       |  102 +-
 reactos/lib/freetype/src/type1/t1tokens.h     |   30 +-
 reactos/lib/freetype/src/type42/rules.mk      |   28 +-
 reactos/lib/freetype/src/type42/t42drivr.c    |    8 +-
 reactos/lib/freetype/src/type42/t42error.h    |    4 +-
 reactos/lib/freetype/src/type42/t42objs.c     |   71 +-
 reactos/lib/freetype/src/type42/t42parse.c    |  174 +-
 reactos/lib/freetype/src/type42/t42parse.h    |    4 +-
 reactos/lib/freetype/src/winfonts/rules.mk    |   24 +-
 reactos/lib/freetype/src/winfonts/winfnt.c    |  278 +-
 reactos/lib/freetype/tests/gview.c            |  770 +-
 265 files changed, 21469 insertions(+), 12080 deletions(-)
 delete mode 100644 reactos/lib/freetype/Doxyfile
 create mode 100644 reactos/lib/freetype/builds/compiler/emx.mk
 rename reactos/lib/freetype/{src/type1/descrip.mms => builds/dos/dos-emx.mk} (62%)
 rename reactos/lib/freetype/builds/{vms/descrip.mms => dos/dos-wat.mk} (50%)
 create mode 100644 reactos/lib/freetype/builds/unix/freetype2.in
 delete mode 100644 reactos/lib/freetype/descrip.mms
 create mode 100644 reactos/lib/freetype/docs/reference/README
 create mode 100644 reactos/lib/freetype/docs/release
 rename reactos/lib/freetype/include/freetype/{ftstroker.h => ftstroke.h} (72%)
 create mode 100644 reactos/lib/freetype/include/freetype/ttunpat.h
 delete mode 100644 reactos/lib/freetype/src/autohint/ahoptim.c
 delete mode 100644 reactos/lib/freetype/src/autohint/ahoptim.h
 delete mode 100644 reactos/lib/freetype/src/autohint/descrip.mms
 rename reactos/lib/freetype/src/base/{ftstroker.c => ftstroke.c} (69%)
 rename reactos/lib/freetype/src/pcf/{pcfdriver.c => pcfdrivr.c} (91%)
 rename reactos/lib/freetype/src/pcf/{pcfdriver.h => pcfdrivr.h} (93%)
 rename reactos/lib/freetype/src/pshinter/{pshalgo3.c => pshalgo.c} (68%)
 delete mode 100644 reactos/lib/freetype/src/pshinter/pshalgo1.c
 delete mode 100644 reactos/lib/freetype/src/pshinter/pshalgo1.h
 delete mode 100644 reactos/lib/freetype/src/pshinter/pshalgo2.c
 delete mode 100644 reactos/lib/freetype/src/pshinter/pshalgo2.h
 delete mode 100644 reactos/lib/freetype/src/pshinter/pshalgo3.h
 create mode 100644 reactos/lib/freetype/src/pshinter/pshnterr.h

diff --git a/reactos/lib/freetype/ChangeLog b/reactos/lib/freetype/ChangeLog
index 291703888ac..86c6fac670b 100644
--- a/reactos/lib/freetype/ChangeLog
+++ b/reactos/lib/freetype/ChangeLog
@@ -1,188 +1,1595 @@
+2003-09-02  David Turner  <david@freetype.org>
+
+        * include/freetype/config/ftoption.h: commenting out the
+        macro TT_CONFIG_OPTION_BYTECODE_INTERPRETER so that package
+        managers that define it with additionnal compilation command line
+        options (e.g. with -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER) still
+        work correctly.
+
+        Also added a note to indicate that TT_CONFIG_OPTION_UNPATENTED_HINTING
+        doesn't work as advertised yet.
+
+2003-08-31  Manish Singh  <yosh@gimp.org>
+
+	* src/bdf/bdflib.c (_bdf_readstream): Don't use FT_MEM_COPY but
+	FT_MEM_MOVE.
+
+2003-08-30  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/freetype.h (FT_ENCODING_SJIS, FT_ENCODING_GB2312,
+	FT_ENCODING_BIG5, FT_ENCODING_WANSUNG, FT_ENCODING_JOHAB): New
+	enumerations of FT_Encoding.  The FT_ENCODING_MS_* variants except
+	FT_ENCODING_MS_SYMBOL are now deprecated.
+	Updated all users.
+	* docs/CHANGES: Document it.
+
+2003-08-27  Werner Lemberg  <wl@gnu.org>
+
+	* src/bdf/bdfdrivr.c (BDF_Face_Init): Accept lowercase characters
+	for spacing.
+
+2003-08-27  Mike FABIAN  <mfabian@suse.de>
+
+	* src/pcf/pcfread.c (pcf_load_font), src/bdf/bdfdrivr.c
+	(BDF_Face_Init): Accept lowercase characters for slant and weight.
+
+2003-08-18  David Turner  <david@freetype.org>
+
+	* include/freetype/config/ftoption.h: Disabling TrueType bytecode
+	interpreter until the UNPATENTED_HINTING works as advertised.
+
+	* src/autohint/ahhint.c (ah_hinter_load_glyph): Use `|' for
+	setting `load_flags'.
+
+	* Jamfile: Adding the `refdoc' target to the Jamfile in order to
+	build the API Reference in `docs/reference' automatically.
+
+	* include/freetype/t1tables.h (PS_FontInfoRec), src/cid/cidtoken.h,
+	src/type1/t1tokens.h, src/type42/t42parse.c: Resetting the types of
+	`italic_angle', `underline_position', and `underline_thickness' to
+	their previous values (i.e., long, short, and ushort) in order to
+	avoid breaking binary compatibility.
+
+	* include/freetype/ttunpat.h: Fixing documentation comment.
+
+	* include/freetype/config/ftoption.h, devel/ftoption.h
+	(TT_CONFIG_OPTION_OPTION_COMPILE_UNPATENTED_HINTING): Replaced
+	with...
+	(TT_CONFIG_OPTION_UNPATENTED_HINTING): This.  Updated all users.
+	(TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING): Removed.
+
+	* include/freetype/internal/ftobjs.h (FT_DEBUG_HOOK_TYPE1): Removed.
+	(FT_DEBUG_HOOK_UNPATENTED_HINTING): New macro.  Use this with
+	`FT_Set_Debug_Hook' to get the same effect as the removed
+	TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING.
+
+	* src/truetype/ttobjs.c (tt_face_init): Use
+	`FT_DEBUG_HOOK_UNPATENTED_HINTING'.
+
+2003-08-06  Werner Lemberg  <wl@gnu.org>
+
+	* src/type1/t1gload.c (T1_Load_Glyph), src/cff/cffgload.c
+	(cff_slot_load), src/cid/cidgload.c (cid_slot_load_glyph): Fix
+	previous change.
+
+2003-08-05  Werner Lemberg  <wl@gnu.org>
+
+	* src/type1/t1gload.c (T1_Load_Glyph), src/cff/cffgload.c
+	(cff_slot_load), src/cid/cidgload.c (cid_slot_load_glyph): Apply
+	font matrix to advance width also.
+	* docs/CHANGES: Updated.
+
+2003-07-26  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/configure.ac (version_info): Set to 9:4:3.
+	* builds/unix/configure: Updated.
+	* docs/CHANGES, docs/VERSION.DLL: Updated.
+
+	* include/freetype/freetype.h (FT_GlyphSlot): Change 2003-06-16
+	also breaks binary compatibility.  Reintroduce an unsigned integer
+	at the old position of `flags' called `reserved'.
+
+2003-07-25  Werner Lemberg  <wl@gnu.org>
+
+	Make API reference valid HTML 4.01 transitional.
+
+	* src/tools/docmaker/tohtml.py (html_header_1): Add doctype
+	and charset.
+	(html_header_2): Fix style elements and add some more.
+	Fix syntax.
+	(block_header, block_footer, description_header, description_footer,
+	marker_header, marker_footer, source_header, source_footer,
+	chapter_header): Don't use <center>...</center> but `align=center'
+	table attribute.
+	(chapter_inter, chapter_footer): Add <li> and use special <ul>
+	class.
+	Use double quotes around table widths given in percent.
+	(keyword_prefix, keyword_suffix): Don't change font colour directly
+	but use a new <span> class.
+	(section_synopsis_header, section_synopsis_footer): Don't change
+	colour.
+	(code_header, code_footer): Don't change font colour directly but
+	use a special <pre> class.
+	(print_html_field): <tr> gets the `valign' attribute, not <table>.
+	(print_html_field_list): Ditto.
+	(index_exit): Don't use <center>...</center> but `align=center'
+	table attribute.
+	(section_enter): Ditto.
+	(toc_exit): Don't emit </table>.
+	(block_enter): Use <h4><a>, not <a><h4>.
+	(__init__): Fix tag order in self.html_footer.
+
+2003-07-25  David Turner  <david@freetype.org>
+
+	This change reimplements fix from 2003-05-30 without breaking
+	binary compatibility.
+
+	* include/freetype/t1tables.h (PS_FontInfoRec): `italic_angle',
+	`is_fixed_pitch', `underline_position', `underline_thickness' are
+	reverted to be normal values.
+
+	* include/freetype/internal/psaux.h (T1_FieldType): Remove
+	`T1_FIELD_TYPE_BOOL_P', `T1_FIELD_TYPE_INTEGER_P',
+	`T1_FIELD_TYPE_FIXED_P', `T1_FIELD_TYPE_FIXED_1000_P'.
+	(T1_FIELD_TYPE_BOOL_P, T1_FIELD_NUM_P, T1_FIELD_FIXED_P,
+	T1_FIELD_FIXED_1000_P): Removed.
+	(T1_FIELD_TYPE_BOOL): Renamed to...
+	(T1_FIELD_BOOL): New macro.  Updated all callers.
+
+	* src/type42/t42parse.c: `italic_angle', `is_fixed_pitch',
+	`underline_position', `underline_thickness', `paint_type',
+	`stroke_width' are reverted to be normal values.
+	(T42_KEYWORD_COUNT): New macro.
+	(t42_parse_dict): New array `keyword_flags' to mark that a value has
+	already been assigned to a dictionary entry.
+	* src/type42/t42objs.c (T42_Face_Init, T42_Face_Done): Updated.
+
+	* src/cid/cidtoken.h: `italic_angle', `is_fixed_pitch',
+	`underline_position', `underline_thickness' are reverted to be
+	normal values.
+	* src/cid/cidobjs.c (cid_face_done, cid_face_init): Updated.
+
+	* src/psaux/psobjs.c (ps_parser_load_field): Updated.
+
+	* src/type1/t1tokens.h: `italic_angle', `is_fixed_pitch',
+	`underline_position', `underline_thickness', `paint_type',
+	`stroke_width' are reverted to be normal values.
+	* src/type1/t1objs.c (T1_Face_Done, T1_Face_Init): Updated.
+	* src/type1/t1load.c (T1_FIELD_COUNT): New macro.
+	(parse_dict): Add parameter for keyword flags.
+	Record only first instance of a field.
+	(T1_Open_Face): New array `keyword_flags'.
+
+2003-07-24  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 5.
+	* builds/unix/configure.ac (version_info): Set to 10:0:3.
+	* builds/unix/configure: Updated.
+	* builds/freetype.mk (refdoc): Fix --title.
+
+	* docs/CHANGES, docs/VERSION.DLL, README: Updated.
+
+	* src/tools/docmaker/sources.py (re_crossref): Fix regular
+	expression to handle trailing punctuation characters.
+	* src/tools/docmaker/tohtml.py (make_html_word): Updated.
+
+	* docs/release: New file.
+
+2003-07-23  YAMANO-UCHI Hidetoshi  <mer@din.or.jp>
+
+	* include/freetype/internal/psaux.h (PS_Parser_FuncsRec): New
+	member function `to_bytes'.
+
+	* src/psaux/psauxmod.c (ps_parser_funcs): New member
+	`ps_parser_to_bytes'.
+	(psaux_module_class): Increase version to 0x20000L.
+
+	* src/psaux/psobjs.c (IS_T1_LINESPACE): Add \f.
+	(IS_T1_NULLSPACE): New macro.
+	(IS_T1_SPACE): Add it.
+	(skip_spaces, skip_alpha): New functions.
+	(ps_parser_skip_spaces, ps_parser_skip_alpha): Use them.
+	(ps_tobytes, ps_parser_to_bytes): New functions.
+
+2003-07-07  Werner Lemberg  <wl@gnu.org>
+
+	* builds/freetype.mk (DOC_DIR): New variable.
+	(refdoc): Use *_DIR variables.
+	(distclean): Remove documentation files.
+
+	* builds/detect.mk (std_setup, dos_setup): Mention `make refdoc'.
+
+	* configure: Set DOC_DIR variable.
+
+2003-07-07  Patrik Hägglund  <patrik.hagglund@bredband.net>
+
+	* builds/freetype.mk (refdoc): New target to build the
+	documentation.
+	(.PHONY): Updated.
+
+	* include/freetype/freetype.h: Improve documentation of FT_CharMap.
+	* include/freetype/ftimage,h: Fix documentation of FT_OUTLINE_FLAGS.
+	* include/freetype/tttables.h: Document FT_Sfnt_Tag.
+
+2003-07-06  Werner Lemberg  <wl@gnu.org>
+
+	* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfread.c
+	(pcf_load_font): Fix computation of height if PIXEL_SIZE property is
+	missing.
+
+2003-07-01  Werner Lemberg  <wl@gnu.org>
+
+	* src/cache/ftcsbits.c (ftc_sbit_node_compare): Only add `size' if
+	there is no error.  Reported by Knut St. Osmundsen
+	<bird-freetype@anduin.net>.
+
+2003-06-30  Werner Lemberg  <wl@gnu.org>
+
+	A new try to synchronize bitmap font access.
+
+	* include/freetype/freetype.h (FT_Bitmap_Size): `height' is now
+	defined to return the baseline-to-baseline distance.  This was
+	already the value returned by the BDF and PCF drivers.
+
+	The `width' field now gives the average width.  I wasn't able to
+	find something better.  It should be taken as informative only.
+
+	New fields `size', `x_ppem', and `y_ppem'.
+
+	* src/pcf/pcfread.c (pcf_load_font): Updated to properly fill
+	FT_Bitmap_Size.
+	Do proper rounding and conversion from 72.27 to 72 points.
+
+	* src/bdf/bdfdrivr.c (BDF_Face_Init): Updated to properly fill
+	FT_Bitmap_Size.
+	Do proper rounding and conversion from 72.27 to 72 points.
+
+	* src/sfnt/sfobjs.c (sfnt_load_face): Updated to properly fill
+	FT_Bitmap_Size.
+
+	* src/winfonts/winfnt.c (FNT_Face_Init): Updated to properly fill
+	FT_Bitmap_Size.
+
+2003-06-29  Werner Lemberg  <wl@gnu.org>
+
+	Redesigning the FNT driver to return multiple faces, not multiple
+	strikes.  At least one font (app850.fon from WinME) contains
+	different FNT charmaps for its subfonts.  Consequently, the previous
+	design of having multiple bitmap strikes in a single font face fails
+	since we have only one charmap per face.
+
+	* include/freetype/internal/fnttypes.h (FNT_Size_Rec): Removed.
+	(FNT_FaceRec): Remove `num_fonts' field and replace `fonts' with
+	`font'.
+
+	* src/base/ftwinfnt.c (FT_Get_WinFNT_Header): Updated.
+
+	* src/winfonts/winfnt.c (fnt_font_load): Don't set pixel_width equal
+	to pixel_height.
+	(fnt_face_done_fonts): Removed.
+	(fnt_face_get_dll_fonts): Renamed to...
+	(fnt_face_get_dll_font): This.  Add second function argument to
+	select face index.
+	Updated to load just one subfont.
+	(fnt_font_done, FNT_Face_Done): Updated.
+	(FNT_Face_Init): Handle `face_index'.
+	Updated.
+	(FNT_Size_Set_Pixels): Simplified; similar to BDF and PCF, the
+	bitmap width is now ignored.
+	(FNT_Load_Glyph): Updated.
+	Fix glyph index computation.
+	(winfnt_driver_class): Updated.
+
+2003-06-25  Owen Taylor  <otaylor@redhat.com>
+
+	* src/sfnt/ttload.c (tt_face_load_hdmx): Don't assign
+	num_records until we actually decide to load the table,
+	otherwise, we'll segfault in tt_face_free_hdmx.
+
+2003-06-24  Werner Lemberg  <wl@gnu.org>
+
+	* src/cff/cffdrivr.c (cff_get_glyph_name): Protect against zero
+	glyph name pointer.  Reported by Mikey Anbary <manbary@vizrt.com>.
+
+2003-06-23  Werner Lemberg  <wl@gnu.org>
+
+	* src/tools/glnames.py: Updated to AGL 2.0.
+	* src/psnames/pstables.h: Regenerated.
+
+2003-06-22  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/cache/ftcglyph.h, include/freetype/ttnameid.h,
+	src/base/ftcalc.c, src/base/fttrigon.c, src/cff/cffgload.c,
+	src/otlayout/otlgsub.c, src/pshinter/pshrec.c,
+	src/psnames/psmodule.c, src/sfnt/sfobjs.c, src/truetype/ttdriver.c:
+	Decorate constants with `U' and `L' if appropriate.
+
+	* include/freetype/ftmoderr.h: Updated to include recent module
+	additions.
+
+	* src/pshinter/pshnterr.h (FT_ERR_BASE): Define as
+	`FT_Mod_Err_PShinter'.
+	* src/type42/t42error.h (FT_ERR_BASE): Define as
+	`FT_Mod_Err_Type42'.
+
+	* src/pshinter/pshrec.h (PS_HINTS_MAGIC): Removed.  Not used.
+
+	* include/freetype/config/ftconfig.h [__MWERKS__]: Define FT_LONG64
+	and FT_INT64.
+
+2003-06-21  Werner Lemberg  <wl@gnu.org>
+
+	* src/winfonts/winfnt.c (FNT_Load_Glyph): Use first_char in
+	computation of glyph_index.
+	(FNT_Size_Set_Pixels): To find a strike, first check pixel_height
+	only, then try to find a better hit by comparing pixel_width also.
+	Without this fix it isn't possible to access all strikes.
+	Also compute metrics.max_advance to be in sync with other bitmap
+	drivers.
+
+	* src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code.
+	(FT_Set_Pixel_Size): Assign value to `metrics' after validation of
+	arguments.
+
+2003-06-20  Werner Lemberg  <wl@gnu.org>
+
+	Synchronize computation of height and width for bitmap strikes.  The
+	`width' field in the FT_Bitmap_Size structure is now only useful to
+	enumerate different strikes.  The `max_advance' field of the
+	FT_Size_Metrics structure should be used to get the (maximum) width
+	of a strike.
+
+	* src/bdf/bdfdrivr.c (BDF_Face_Init): Don't use AVERAGE_WIDTH for
+	computing `available_sizes->width' but make it always equal to
+	`available_sizes->height'.
+
+	* src/pcf/pcfread.c (pcf_load_font): Don't use RESOLUTION_X for
+	computing `available_sizes->width' but make it always equal to
+	`available_sizes->height'.
+
+	* src/truetype/ttdriver.c (Set_Pixel_Sizes): Pass only single
+	argument to function.
+
+	* src/psnames/psmodule.c (ps_unicode_value): Handle `.' after
+	`uniXXXX' and `uXXXX[X[X]]'.
+
+2003-06-19  Werner Lemberg  <wl@gnu.org>
+
+	* src/bdf/bdfdrivr.c: s/FT_Err_/BDF_Err/.
+	* src/cache/ftccache.c, src/cache/ftcsbits.c, src/cache/ftlru.c:
+	s/FT_Err_/FTC_Err_/.
+	* src/cff/cffcmap.c: s/FT_Err_/CFF_Err_/.
+	* src/pcf/pcfdrivr.c: s/FT_Err_/PCF_Err_/.
+	* src/psaux/t1cmap.c: Include psauxerr.h.
+	s/FT_Err_/PSaux_Err_/.
+	* src/pshinter/pshnterr.h: New file.
+	* src/pshinter/rules.mk: Updated.
+	* src/pshinter/pshalgo.c, src/pshinter/pshrec.c: Include pshnterr.h.
+	s/FT_Err_/PSH_Err_/.
+	* src/pfr/pfrdrivr.c, src/pfr/pfrobjs.c, src/pfr/pfrsbit.c:
+	s/FT_Err_/PFR_Err_/.
+	* src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c,
+	src/sfnt/ttload.c: s/FT_Err_/SFNT_Err_/.
+	* src/truetype/ttgload.c: s/FT_Err_/TT_Err_/.
+	* src/gzip/ftgzip.c: Load FT_MODULE_ERRORS_H and define
+	FT_ERR_PREFIX and FT_ERR_BASE.
+	s/FT_Err_/Gzip_Err_/.
+
+2003-06-19  Dirck Blaskey  <listtarget@danbala.com>
+
+	* src/cff/cffload (cff_encoding_load): `nleft' must be FT_UInt,
+	otherwise adding 1 might wrap the result.
+
+2003-06-18  Werner Lemberg  <wl@gnu.org>
+
+	* src/psnames/psmodule.c (ps_unicode_value): Add support to
+	recognize `uXXXX[X[X]]' glyph names.
+	Don't handle glyph names starting with `uni' which have more than
+	four digits.
+
+2003-06-16  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/freetype.h (FT_Open_Flags): Replaced with
+	#defines for the constants.
+	(FT_Open_Args): Change type of `flags' to FT_UInt.
+	(FT_GlyphSlot): Move `flags' to FT_Slot_Internal.
+
+	* include/freetype/ftimage.h (FT_Outline_Flags, FT_Raster_Flag):
+	Replaced with #defines for the constants.
+
+	* include/freetype/internal/ftobjs.h (FT_Slot_Internal): New
+	field `flags' (from FT_GlyphSlot).
+	Updated all affected source files.
+	(FT_GLYPH_OWN_BITMAP): New macro (from ftgloadr.h).
+
+	* include/freetype/internal/ftgloadr.h (FT_GLYPH_OWN_BITMAP): Moved
+	to ftobjs.h.
+
+	* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Use dummy
+	FT_GlyphSlot_Internal object.
+
+2003-06-15  Werner Lemberg  <wl@gnu.org>
+
+	* builds/compiler/gcc.mk, builds/compiler/gcc-dev.mk (CFLAGS):
+	Add -fno-strict-aliasing to get rid of zillion warnings from gcc
+	version 3.3.
+
+2003-06-14  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/ftglyph.h (ft_glyph_bbox_unscaled,
+	ft_glyph_bbox_subpixels, ft_glyph_bbox_gridfit,
+	ft_glyph_bbox_truncate, ft_glyph_bbox_pixels): Replaced with
+	FT_GLYPH_BBOX_UNSCALED, FT_GLYPH_BBOX_SUBPIXELS,
+	FT_GLYPH_BBIX_GRIDFIT, FT_GLYPH_BBOX_TRUNCATE, FT_GLYPH_BBOX_PIXELS.
+	The lowercase variants are now (deprecated aliases) to the uppercase
+	versions.
+	Updated all other files.
+
+	* include/freetype/ftmodule.h (ft_module_font_driver,
+	ft_module_renderer, ft_module_hinter, ft_module_styler,
+	ft_module_driver_scalable, ft_module_driver_no_outlines,
+	ft_module_driver_has_hinter): Replaced with FT_MODULE_FONT_DRIVER,
+	FT_MODULE_RENDERER, FT_MODULE_HINTER, FT_MODULE_STYLER,
+	FT_MODULE_DRIVER_SCALABLE, FT_MODULE_DRIVER_NO_OUTLINES,
+	FT_MODULE_DRIVER_HAS_HINTER.
+	The lowercase variants are now (deprecated aliases) to the uppercase
+	versions.
+	Updated all other files.
+
+	* src/base/ftglyph.c (FT_Glyph_Get_CBox): Handle bbox_mode better
+	as enumeration.
+
+	* src/pcf/pcfdrivr.c (pcf_driver_class), src/winfonts/winfnt.c
+	(winfnt_driver_class), src/bdf/bdfdrivr.c (bdf_driver_class): Add
+	the FT_MODULE_DRIVER_NO_OUTLINES flag.
+
+2003-06-13  Detlef Würkner  <TetiSoft@apg.lahn.de>
+
+	* src/pfr/pfrobjs.c (pfr_slot_load): Apply font matrix.
+
+2003-06-13  Werner Lemberg  <wl@gnu.org>
+
+	* builds/dos/detect.mk: Test not only for `Dos' but for `DOS' also.
+
+	* builds/dos/dos-emx.mk, builds/compiler/emx.mk: New files for
+	EMX gcc compiler.
+	* builds/dos/detect.mk: Add target `emx'.
+
+	* builds/compiler/watcom.mk (LINK_LIBRARY): GNU Make for DOS doesn't
+	like a trailing semicolon; add a dummy command.
+
+	* src/cid/cidload.c: Remove parse_font_bbox code (already enclosed
+	with #if 0 ... #endif).
+
+	* src/type1/t1tokens.h: Handle /FontName.
+	* src/type1/t1load.c (parse_font_name): Removed.
+	Remove parse_font_bbox code (already enclosed with #if 0 ...
+	#endif).
+
+	* src/type42/t42parse.c (t42_parse_font_name): Removed.
+	Remove t42_parse_font_bbox code (already enclosed with #if 0 ...
+	#endif).
+	(t42_keywords): Handle /FontName with T1_FIELD_KEY.
+
+2003-06-12  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/internal/psaux.h (T1_FieldType): Add
+	T1_FIELD_TYPE_KEY.
+	(T1_FIELD_KEY): New macro.
+	* src/psaux/psobjs.c (ps_parser_load_field): Handle
+	T1_FIELD_TYPE_KEY.
+
+	* src/cid/cidtoken.h: Use T1_FIELD_KEY for /CIDFontName.
+
+2003-06-11  Alexander Malmberg  <alexander@malmberg.org>
+
+	* src/cache/ftlru.c (FT_LruList_Remove_Selection): Decrease
+	number of nodes.
+	(FT_LruList_Lookup): Fix assertion for out-of-memory case.
+
+2003-06-11  Werner Lemberg  <wl@gnu.org>
+
+	* src/cid/cidload.c (cid_decrypt): Removed.
+	(cid_read_subrs): Use t1_decrypt from psaux module.
+	* src/cid/cidload.h: Updated.
+	* src/cid/cidgload.c (cid_load_glyph): Use t1_decrypt from psaux
+	module.
+
+2003-06-10  Werner Lemberg  <wl@gnu.org>
+
+	* src/cid/cidobjs.c: Apply change 2003-05-31 from <Ron.Dev@gmx.de>.
+	Compute style flags.
+	Fix computation of root->height.
+	* src/cid/cidtoken.h: Handle FontBBox.
+	* src/cid/cidload.c (cid_load_keyword): Handle
+	T1_FIELD_LOCATION_BBOX.
+	(parse_font_bbox): Commented out.
+	(cid_field_record): Comment out element for parsing FontBBox.
+
+	* src/type42/t42parse.c (t42_parse_font_bbox): Commented out.
+	(t42_keywords): Handle FontBBox with T1_FIELD_BBOX, not with
+	T1_FIELD_CALLBACK.
+	(t42_parse_font_bbox): Commented out.
+	(t42_load_keyword): Handle T1_FIELD_LOCATION_BBOX.
+	* src/type42/t42objs.c (T42_Face_Init): Apply change 2003-05-31
+	from <Ron.Dev@gmx.de>.
+
+2003-06-09  George Williams  <gww@silcom.com>
+
+	* src/truetype/ttinterp.c (SetSuperRound) <0x30>: Follow Apple's
+	TrueType specification.
+	(Ins_MDRP, Ins_MIRP): Fix single width cut-in test.
+
+2003-06-09  Detlef Würkner  <TetiSoft@apg.lahn.de>
+
+	* src/gzip/ftgzip.c: (inflate_mask): Replaced with...
+	(NO_INFLATE_MASK): This.
+	* src/gzip/infutil.h: Declare `inflate_mask' conditionally by
+	NO_INFLATE_MASK.
+
+2003-06-09  Alexis S. L. Carvalho  <alexis@cecm.usp.br>
+
+	* src/gzip/ftgzip.c (ft_gzip_file_fill_output): Handle Z_STREAM_END
+	correctly.
+
+2003-06-09  Wolfgang Domröse  <porthos.domroese@harz.de>
+
+	* src/pshinter/pshglob.c (psh_globals_new): Change calculation of
+	dim->stdw.count to avoid compiler problem.
+
+	* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Move the block
+	variables to the beginning of the function to avoid compiler
+	problems.
+	Add casts necessary for 16bit compilers.
+
+2003-06-09  Werner Lemberg  <wl@gnu.org>
+
+	* src/pfr/rules.mk (PFR_DRV_SRC): Add pfrsbit.c.
+	(PFR_DRV_H): Add pfrtypes.h.
+
+	* include/freetype/config/ftconfig.h: s/__MWKS__/__MWERKS__/.
+
+2003-06-08  Karl Schultz  <kschultz@rsinc.com>
+
+	* src/pfr/pfrsbit.c (pfr_bitwriter_init): Change type of third
+	argument to FT_Bool.
+	(pfr_lookup_bitmap_data): Change type of third and fourth argument
+	to FT_UInt.  Updated caller.
+	(pfr_load_bitmap_bits): Change type of fourth argument to FT_Bool.
+
+2003-06-08  Werner Lemberg  <wl@gnu.org>
+
+	Completely revised FreeType's make management.
+
+	. In all makefiles `/' is used as the path separator.  The
+	  conversion to the real path separators is done as late as
+	  possible using $(subst ...).
+
+	. $(HOSTSEP) no longer exists.  Now, $(SEP) gives the path separator
+	  for the operating system, and the new $(COMPILER_SEP) the path
+	  separator for the compiler tools.
+
+	. $(BUILD) has been renamed to $(BUILD_DIR).  In general, all
+	  directory variables end with `_DIR'.  The variants ending in `_'
+	  (like `BASE_' have been removed).
+
+	The following ChangeLog entries only describe changes which are
+	not related to the redesign.
+
+	* builds/beos/beos-def.mk (BUILD_DIR): Fix typo.
+	* builds/compiler/watcom.mk (LINK_LIBRARY): Fix linker call to avoid
+	overlong arguments as suggested by J. Ali Harlow
+	<ali@avrc.city.ac.uk>.
+	* builds/dos/dos-wat.mk: New file.
+	* builds/freetype.mk (FREETYPE_H): Include header files from the
+	`devel' subdirectory.
+
+	* builds/os2/os2-dev.mk, builds/unix/unixddef.mk,
+	builds/unix/unixddef.mk, builds/win32/w32-bccd.mk,
+	builds/win32/w32-dev.mk (BUILD_DIR): Fix path.
+
+	* builds/unix/configure.ac, builds/unic/configure: Updated.
+	* builds/unix/unix-def.in (DISTCLEAN): Add `freetype2.pc'.
+
+2003-06-07  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftmac.c (FT_New_Face_From_SFNT): s/rlen/sfnt_size/ to
+	make it compile.
+
+	* devel/ftoption.h: Updated.
+
+2003-06-07  Detlef Würkner  <TetiSoft@apg.lahn.de>
+
+	* include/freetype/internal/psaux.h, src/truetype/ttgload.h:
+	s/index/idx/ to fix compiler warnings.
+
+	* src/sfnt/ttcmap0.c (tt_face_build_cmaps): Use more `volatile' to
+	fix compiler warning.
+
+	* src/gzip/ftgzip.c (BUILDFIXED): Removed.
+	* src/gzip/inftrees.c (inflate_trees_fixed) [!BUILDFIXED]: Use
+	FT_UNUSED to remove compiler warning.
+
+2003-06-06  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/ftstroker.h: Renamed to...
+	* include/freetype/ftstroke.h: This.
+
+	* src/base/ftstroker.c: Renamed to...
+	* src/base/ftstroke.c: This.
+
+	* include/freetype/config/ftheader.h (FT_STROKER_H): Updated.
+
+	* src/base/descrip.mms, src/base/Jamfile, src/base/rules.mk:
+	Updated.
+
+	* src/pcf/pcfdriver.c: Renamed to...
+	* src/pcf/pcfdrivr.c: This.
+	* src/pcf/pcfdriver.h: Renamed to...
+	* src/pcf/pcfdrivr.h: This.
+
+	* src/pcf/Jamfile, src/pcf/rules.mk: Updated.
+
+2003-06-05  Wenlin Institute (Tom Bishop)  <wenlin@wenlin.com>
+
+	* src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]:
+	Add `#if !defined(__MWERKS__)'.
+
+2003-06-05  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/internal/psaux.h (T1_FieldType): Add
+	T1_FIELD_TYPE_FIXED_1000 and T1_FIELD_TYPE_FIXED_1000_P.
+	(T1_FIELD_FIXED_1000, T1_FIELD_FIXED_1000_P): New macros.
+	* src/psaux/psobjs.c (ps_parser_load_field): Handle
+	T1_FIELD_TYPE_FIXED_1000 and T1_FIELD_TYPE_FIXED_1000_P.
+
+	* src/cff/cffparse.c (cff_kind_fixed_thousand): New enumeration.
+	(CFF_FIELD_FIXED_1000): New macro.
+	(cff_parser_run): Handle cff_kind_fixed_thousand.
+	* src/cff/cfftoken.h: Use CFF_FIELD_FIXED_1000 for blue_scale.
+	* src/cff/cffload (cff_subfont_load): Fix default values of
+	expansion_factor and blue_scale.
+
+	* src/cif/cidtoken.h, src/type1/t1tokens.h: Use T1_FIELD_FIXED_1000
+	for blue_scale.
+
+	* src/pshinter/pshglob.c (psh_globals_new): Fix default value of
+	blue_scale.
+
+2003-06-04  Wolfgang Domröse  <porthos.domroese@harz.de>
+
+	* include/freetype/internal/ftdriver.h,
+	include/freetype/internal/ftobjs.h,
+	include/freetype/internal/psaux.h, src/cid/cidgload.c,
+	src/psaux/psobjs.c, src/psaux/t1decode.c, src/psaux/psobjs.h,
+	src/pshinter/pshrec.c, src/pshinter/pshalgo.c,
+	src/psnames/psmodule.c, src/raster/ftraster.c, src/sfnt/sfobjs.c,
+	src/smooth/ftgrays.c, src/smooth/ftsmooth.c, src/truetype/ttobjs.c,
+	src/truetype/ttdriver.c, src/truetype/ttgload.c, src/type1/t1afm.c,
+	src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1load.c,
+	src/type1/t1objs.c, src/type42/t42parse.c, src/type42/t42parse.h:
+	Many casts and slight argument type changes to make it work with
+	a 16bit compiler.
+
+2003-06-04  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/config/ftoption.h: Defining
+	TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING by default is a bad idea
+	since some fonts (e.g. Arial) produce worse results than without
+	hinting.  Reverted.
+
+2003-06-04  Werner Lemberg  <wl@gnu.org>
+
+	* src/truetype/ttgload.c (load_truetype_glyph)
+	[TT_CONFIG_OPTION_BYTECODE_INTERPRETER]: Call
+	FT_GlyphLoader_CheckPoints before adding phantom points.  This fixes
+	a segfault bug with fonts (e.g. htst3.ttf) which have nested
+	subglyphs more than one level deep.  Reported by Anthony Fok.
+
+	* include/freetype/config/ftoption.h: Define
+	TT_CONFIG_OPTION_BYTECODE_INTERPRETER,
+	TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING, and
+	TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING to make it the new
+	default.
+
+2003-06-03  Werner Lemberg  <wl@gnu.org>
+
+	* src/autohint/ahhint.c (ah_hinter_hint_edges): Removed.  Just a
+	wrapper for ah_hint_edges.
+	(ah_hint_edges): Renamed to...
+	(ah_hinter_hint_edges): This.
+
+	* src/base/ftobjs.c (FT_Set_Hint_Flags): Removed.  Unused.
+
+	* include/freetype/internal/ftobjs.h (FT_Face_InternalRec),
+	include/freetype/internal/psaux.h (T1_DecoderRec),
+	src/cff/cffgload.h (CFF_Builder): Remove `hint_flags' field.
+	Unused.
+
+	* src/cff/cffgload.c (cff_builder_init): Updated.
+	(cff_decoder_parse_charstrings) <cff_op_endchar>: Call hinter->apply
+	with decoder->hint_mode instead of builder->hint_flags.
+	* src/psaux/t1decode.c (t1_decoder_init): Updated.
+
+	* src/base/ftstroker.c (ft_stroke_border_export): s/index/idx/.
+
+	* src/sfnt/sfobjs.c (sfnt_load_face): Commented out code which
+	increased root->height by 15% if the line gap was zero.  There exist
+	fonts (containing e.g. form drawing characters) which intentionally
+	have a zero line gap value.
+
+	* src/truetype/ttinterp.c (Free_Project, CUR_Func_freeProj):
+	Removed.  Unused.
+	Updated all callers.
+
+2003-06-02  Werner Lemberg  <wl@gnu.org>
+
+	* src/cff/cffobjs.c (cff_face_init): Use symbolic names for
+	Adobe specific encoding IDs (there was a wrong EID value for custom
+	encoding).
+
+	* src/cff/cffcmap.h (CFF_CMapStdRec): Remove `count'.
+	* src/cff/cffcmap.c (cff_cmap_encoding_init,
+	cff_cmap_encoding_done): Updated.
+	(cff_cmap_encoding_char_index, cff_cmap_encoding_char_next): Use
+	256 as limit for character code.
+
+2003-06-01  Werner Lemberg  <wl@gnu.org>
+
+	* src/winfonts/winfnt.c (FNT_Load_Glyph): Revert change from
+	2003-03-20.
+
+2003-05-31  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/fttrigon.h (FT_Vector_Normalize): Removed.
+
+2003-05-31    <Ron.Dev@gmx.de>
+
+	* src/type1/t1objs.c (T1_Face_Init): Improve algorithm for guessing
+	the font style by ignoring spaces and hyphens.
+
+	* builds/unix/freetype2.in: Fix `Version' field.
+
+2003-05-30  Werner Lemberg  <wl@gnu.org>
+
+	Avoid overwriting of numeric font dictionary entries for synthetic
+	fonts.  Additionally, some entries were handled as `integer' instead
+	of `number'.
+
+	* include/freetype/internal/psaux.h (T1_FieldType): Add
+	T1_FIELD_TYPE_BOOL_P, T1_FIELD_TYPE_INTEGER_P, and
+	T1_FIELD_TYPE_FIXED_P.
+	(T1_FIELD_BOOL_P, T1_FIELD_NUM_P, T1_FIELD_FIXED_P): New macros.
+	* src/psaux/psobjs.c (ps_parser_load_field): Handle new field types.
+
+	* include/freetype/internal/cfftypes.h (CFF_FontRecDict),
+	src/cff/cfftoken.h: Change type of underline_position and
+	underline_thickness to FT_Fixed.
+	* src/cff/cffload.c (cff_subfont_load): Fix default values of
+	underline_position and underline_thickness.
+	* src/cff/cffobjs.c (cff_face_init): Set underline_position
+	and underline_thickness in `root'.
+
+	* include/freetype/internal/t1types.h (T1_Font): Change point_type
+	and stroke_width to pointers.
+	* include/freetype/t1tables.h (PS_FontInfo): Change italic_angle,
+	is_fixed_pitch, underline_position, and underline_thickness to
+	pointers.
+	* src/type1/t1tokens.h: Change italic_angle, is_fixed_pitch,
+	underline_position, and underline_thickness to pointers.  Change
+	the type of the latter two to `fixed'.
+	Change type of stroke_width to `fixed' and make it a pointer.
+	Change paint_type to pointer.
+	* src/type1/t1objs.c (T1_Face_Done): Updated.
+	(T1_Face_Init): Updated.
+	Fix assignment of underline_position and underline_thickness.
+
+	* src/cid/cidtoken.h: Change italic_angle, is_fixed_pitch,
+	underline_position, and underline_thickness to pointers.  Change
+	the type of the latter two to `fixed'.
+	Change type of stroke_width to `fixed'.
+	* src/cid/cidobjs.c (cid_face_done): Updated.
+	(cid_face_init): Updated.
+	Fix assignment of underline_position and underline_thickness.
+
+	* src/type42/t42parse.c: Change italic_angle, is_fixed_pitch,
+	underline_position, and underline_thickness to pointers.  Change the
+	type of the latter two to `fixed'.
+	Change type of stroke_width to `fixed' and make it a pointer.
+	Change paint_type to pointer.
+	* src/type42/t42objs.c (T42_Face_Init): Updated.
+	Fix assignment of underline_position and underline_thickness.
+	(T42_Face_Done): Updated.
+
+	* src/base/ftobjs.c (open_face_from_buffer): Fix compiler warning.
+	* src/pshinter/pshglob.c, src/pshinter/pshglob.h
+	(psh_globals_set_scale): Make it a local function.
+
+	* test/gview.c: Fix renaming ps3->ps typo.
+	Formatting.
+
+2003-05-29  Werner Lemberg  <wl@gnu.org>
+
+	* src/pshinter/pshalgo1.[ch], src/pshinter/pshalgo2.[ch]: Removed.
+	* src/pshinter/pshalgo.h: Removed.
+
+	* src/pshinter/pshalgo3.[ch]: Renamed to...
+	* src/pshinter/pshalgo.[ch]: New files.
+	s/PSH3/PSH/.
+	s/psh3/psh/.
+	s/ps3/ps/.
+
+	* src/pshinter/pshrec.c, src/pshinter/pshinter.c: Updated.
+	* src/pshinter/rules.mk, src/pshinter/Jamfile: Updated.
+
+	* src/pshinter/pshglob.[ch] (psh_dimension_snap_width): Commented
+	out.
+
+	* tests/gview.c: Remove code for pshalgo1 and pshalgo2.
+	Updated.
+
+2003-05-28  Martin Zinser  <zinser@decus.de>
+
+	* vms_make.com: Reworked support for shareable images on VMS.  The
+	first version was kind of a hack; the current implementation of the
+	procedure to extract the required symbols is much cleaner.
+
+	Reworked creation of MMS files, avoiding a number of temporary files
+	which were created in the previous version.
+
+	Further work on creating descrip.mms files on the fly.
+
+	* builds/vms/descrip.mms, src/autohint/descrip.mms,
+	src/type1/descrip.mms: Removed.
+
+2003-05-28  Werner Lemberg  <wl@gnu.org>
+
+	* src/pshinter/pshalgo3.c (psh3_glyph_compute_extrema): Skip
+	contours with only a single point to avoid segfault.
+
+	* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Activate code for
+	handling `origin'.
+
+2003-05-24  Werner Lemberg  <wl@gnu.org>
+
+	* src/autohint/ahtypes.h (AH_OPTION_NO_STRONG_INTERPOLATION):
+	Removed since unused.
+
+2003-05-21  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/config/ftstdlib.h (ft_strcat): New wrapper macro
+	for strcat.
+
+	* src/base/ftmac.c (create_lwfn_name): s/isupper/ft_isupper/.
+	(parse_font): s/memcpy/ft_memcpy/.
+	(is_dfont) [TARGET_API_MAC_CARBON]: s/memcmp/ft_memcmp/.
+	* src/base/ftobjs.c (load_mac_face) [FT_MACINTOSH]:
+	s/strlen/ft_strlen/.
+	s/strcat/ft_strcat/.
+	s/strcpy/ft_strcpy/.
+	* src/gzip/zutil.h: s/memset/ft_memset/.
+	s/memcmp/ft_memcmp/.
+
+	* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdriver.c
+	(PCF_Face_Init): Test for charset registry case-insensitively.
+
+	* src/gzip/ftgzip.c (ft_gzip_fil_io): Revert change from yesterday;
+	it has already been fixed differently.
+
+	* src/truetype/ttinterp.c (DO_SFVTL): Add missing braces around
+	if-clause.
+
+2003-05-21  Martin Zinser  <zinser@decus.de>
+
+	* t1load.c (parse_blend_axis_types): Fix compiler warning.
+
+	* descrip.mms: Removed.  Now created by...
+
+	* vms_make.com: New file.
+
+2003-05-21  Weiqi Gao  <weiqigao@networkusa.net>
+
+	* src/gzip/ftgzip.c (ft_gzip_file_io): Avoid zero value of `delta'
+	to prevent infinite loop.
+
+2003-05-21  Lars Clausen  <lrclause@cs.uiuc.edu>
+
+	* docs/VERSION.DLL: Provide better autoconf snippet to check
+	FreeType version.
+
+2003-05-21  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftobjs.c (open_face): Free `internal' not
+	`face->internal' in case of error to avoid possible segfault.
+
+	* src/pshinter/pshalgo3.c (ps3_hints_apply): Check whether we
+	actually have an outline.
+
+2003-05-20  David Chester  <davidchester@qmx.net>
+
+	* src/pshinter/pshalgo3.c (ps3_hints_apply): Try to optimize
+	y_scale so that the top of non-capital letters is aligned on a pixel
+	boundary whenever possible.
+
+	* src/autohint/ahhint.c (ah_hint_edges): Make sure that lowercase
+	m's maintain their symmetry.
+
+2003-05-20  Werner Lemberg  <wl@gnu.org>
+
+	* src/autohint/ahhint.c (ah_hinter_load_glyph): Oops!  David's
+	patch from yesterday has been resolved already in a different
+	way.  Reverted.
+
+2003-05-19  David Chester  <davidchester@qmx.net>
+
+	* src/autohint/ahhint.c (ah_hinter_load_glyph): Don't scale
+	y_scale locally but face->size->metrics.y_scale.
+
+2003-05-19  David Turner  <david@freetype.org>
+
+	* src/sfnt/ttcmap0.c (tt_cmap4_char_next): Select proper start
+	value for `hi' to avoid infinite loop.
+
+2003-05-18  Yong Sun  <sunyong@njstar.com>
+
+	* src/raster/ftraster.c (Insert_Y_Turn): Fix overflow test.
+
+2003-05-18  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/config/ftoption.h [FT_CONFIG_OPTION_MAC_FONTS]:
+	New macro.
+	* src/base/ftobjs.c: Use it to control mac font support on non-mac
+	platforms.
+
+2003-05-17  George Williams  <gww@silcom.com>
+
+	Implement partial support of Mac fonts on non-Mac platforms.
+
+	* src/base/ftobjs.c (memory_stream_close, new_memory_stream,
+	open_face_from_buffer, Mac_Read_POST_Resource,
+	Mac_Read_sfnt_Resource, IsMacResource, IsMacBinary, load_mac_face)
+	[!FT_MACINTOSH]: New functions.
+	(FT_Open_Face) [!FT_MACINTOSH]: Use load_mac_face.
+
+2003-05-17  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftobjs.c (FT_Load_Glyph): Scale linear advance width only
+	if FT_FACE_FLAG_SCALABLE is set (otherwise we have a division by
+	zero since FNT and friends don't define `face->units_per_EM').
+
+2003-05-15  David Turner  <david@freetype.org>
+
+	* src/base/fttrigon.c (FT_Vector_Rotate): Avoid rounding errors
+	for small values.
+
+2003-05-15  Werner Lemberg  <wl@gnu.org>
+
+	* src/autohint/ahtypes.h (AH_PointRec): Remove unused `in_angle'
+	and `out_angle' fields.
+
+2003-05-14  George Williams  <gww@silcom.com>
+
+	* src/base/ftmac.c (FT_New_Face_From_SFNT): Handle CFF files also.
+
+2003-05-14  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/freetype.h: Fix typo in comment
+	(FT_HAS_FIXED_SIZES).
+
+2003-05-10  Dan Williams  <dan@bigw.org>
+
+	* builds/unix/aclocal.m4: Comment out definition of
+	`allow_undefined_flag' for Darwin 1.3.
+	* builds/unix/configure.ac: Add option --with-old-mac-fonts.
+	* builds/unix/ltmain.sh: Fix version numbering for Darwin 1.3.
+	* builds/unix/configure: Regenerated.
+
+	* include/freetype/config/ftconfig.h: Fix conditions for defining
+	`FT_MACINTOSH'.
+	* src/base/ftbase.c: Include `ftmac.c' conditionally.
+	* src/base/ftmac.c: Handle __GNUC__.
+
+2003-05-07  YAMANO-UCHI Hidetoshi  <mer@din.or.jp>
+
+	* src/cid/cidload.c (is_alpha): Removed.
+	(cid_parse_dict): Use `cid_parser_skip_alpha' instead of `is_alpha'.
+
+2003-05-07  Werner Lemberg  <wl@gnu.org>
+
+	* src/autohint/ahoptim.c, src/autohint/ahoptim.h: Obsolete, removed.
+
+2003-05-07  David Turner  <david@freetype.org>
+
+	* src/autohint/ahglyph.c (ah_setup_uv): Exchange `for' loop and
+	`switch' statement to make it run faster.
+	(ah_outline_compute_segments): Reset `segment->score' and
+	`segment->link'.
+	(ah_outline_link_segments): Provide alternative code which does
+	the same but runs much faster.
+	Handle major direction also.
+	(ah_outline_compute_edges): Scale `edge_distance_threshold' down
+	after rounding instead of scaling comparison value in loop.
+
+	* src/autohint/ahhint.c (ah_hinter_align_stong_points): Provide
+	alternative code which runs faster.
+	Handle `before->scale == 0'.
+
+	* src/autohint/ahtypes.h (AH_SegmentRec): Move some fields down.
+	(AH_EdgeRec): Move some fields in structure.
+	New field `scale'.
+
+	* src/sfnt/ttcmap0.c (tt_cmap4_char_next): Use binary search.
+
+2003-05-02  Werner Lemberg  <wl@gnu.org>
+
+	* src/autohint/ahoptim.c (LOG): Renamed to...
+	(AH_OPTIM_LOG): This.
+	(AH_Dump_Springs): Fix log message format.
+
+	* src/autohint/ahhint.c (ah_hint_edges_3): Renamed to...
+	(ah_hint_edges): This.
+
+2002-05-02  Keith Packard  <keithp@keithp.com>
+
+	* src/bdf/bdfdrivr.c (BDF_Set_Pixel_Size): Initialize `max_advance'.
+
+2003-05-01  Werner Lemberg  <wl@gnu.org>
+
+	* src/autohint/ahglyph.c (ah_test_extrema): Renamed to...
+	(ah_test_extremum): This.
+
+2003-04-28  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/configure.ac: Generate `freetype.pc' from
+	`freetype.in'.
+	* builds/unix/configure: Regenerated.
+	* builds/unix/install.mk (install, uninstall): Handle `freetype.pc'.
+
+2003-04-28  Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
+
+	* builds/unix/freetype2.in: New file.  Contains building information
+	for the `pkg-config' package.
+
+2003-04-28  David Turner  <david@freetype.org>
+
+	* src/base/ftobjs.c (FT_Load_Glyph): Fix boundary check for
+	`glyph_index'.
+
+2003-04-25:  Graham Asher  <graham.asher@btinternet.com>
+
+	Added the optional unpatented hinting system for TrueType.  It
+	allows typefaces which need hinting to produce correct glyph forms
+	(e.g., Chinese typefaces from Dynalab) to work acceptably without
+	infringing Apple patents.  This system is compiled only if
+	TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING is defined in
+	ftoption.h.
+
+	* include/freetype/ttunpat.h: New file.  Defines
+	FT_PARAM_TAG_UNPATENTED_HINTING.
+
+	* include/freetype/config/ftheader.h (FT_TRUETYPE_UNPATENTED_H): New
+	macro to use when including ttunpat.h.
+
+	* include/freetype/config/ftoption.h
+	(TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING,
+	TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING): New configuration macros
+	(not defined, but in comments) for the unpatented hinting system.
+
+	* include/freetype/internal/tttypes.h (TT_FaceRec)
+	[TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]: New element "FT_Bool
+	unpatented_hinting".
+
+	* src/truetype/ttinterp.c (NO_APPLE_PATENT, APPLE_THRESHOLD):
+	Removed.
+	(GUESS_VECTOR): New macro.
+	(TT_Run_Context) [TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]:
+	Set `both_x_axis'.
+	(tt_default_graphics_state)
+	[TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]: Updated.
+	(Current_Ratio) [TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]:
+	Handle `unpatented_hinting'.
+	(Direct_Move) [NO_APPLE_PATENT]: Removed.
+	[TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]: Insert assertion.
+	(Project, FreeProject)
+	[TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]: Insert assertion.
+	(Compute_Funcs) [TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]:
+	Implement unpatented hinting.
+	(DO_SPVTCA, DO_SFVTCA, DO_SPVTL, DO_SFVTL, DO_SPVFS, DO_SFVFS,
+	Ins_SDPVTL): Call `GUESS_VECTOR'.
+	(DO_GPV, DO_GFV) [TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]:
+	Handle `unpatented_hinting'.
+	(Compute_Point_Displacement) [NO_APPLE_PATENT]: Removed.
+	[TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]: Implement unpatented
+	hinting.
+	(Move_Zp2_Point, Ins_SHPIX, Ins_DELTAP, Ins_DELTAC)
+	[TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]: Implement unpatented
+	hinting.
+	(TT_RunIns): Updated.
+
+	* src/truetype/ttobjs.c
+	[TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]: Include
+	FT_TRUETYPE_UNPATENTED_H.
+	(tt_face_init) [TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING,
+	TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING]: Check
+	FT_PARAM_TAG_UNPATENTED_HINTING.
+
+	* src/truetype/ttobjs.h (TT_GraphicsState)
+	[TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING]: Add `both_x_axis'.
+
+2003-04-25  Werner Lemberg  <wl@gnu.org>
+
+	* src/bdf/bdflib.c (hash_bucket, hash_lookup): Use `const' for first
+	argument.
+	(bdf_get_font_property): Use `const' for third argument.
+	Updated all callers.
+	* src/bdf/bdfdrivr.c (BDF_Face_Init): Set pixel width and height
+	similar to the PCF driver.
+	* src/bdf/bdf.h (_hashnode): Use `const' for `key'.
+	Updated.
+
+	* src/gzip/ftgzip.c: C++ doesn't like that the array `inflate_mask'
+	is declared twice.  It is perhaps better to modify the zlib source
+	files directly instead of this hack.
+	(zcalloc, zfree, ft_gzip_stream_close, ft_gzip_stream_io): Add casts
+	to make build with g++ successful.
+
+2003-04-24  Manish Singh  <yosh@gimp.org>
+
+	* src/cid/cidobjs.c (cid_face_init), src/type1/t1objs.c
+	(T1_Face_Init), src/type42/t42objs.c (T42_Face_Init): Split on `-'
+	also for searching the style name.
+
+2003-04-24  David Turner  <david@freetype.org>
+
+	* src/pcf/pcfread.c (pcf_load_font): Fixed the computation of
+	face->num_glyphs.  We must increase the value by 1 to respect the
+	convention that glyph index 0 always corresponds to the "missing
+	glyph".
+
+2003-04-24  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/unix-cc.in (CFLAGS): Add @CPPFLAGS@.
+
+2003-04-24  Dieter Baron  <dillo@netbsd.org>
+
+	* builds/unix/freetype-config.in (cflags): Emit FreeType 2's include
+	files first.  Otherwise there are conflicts with FreeType 1
+	installed simultaneously.
+
+2003-04-23  Werner Lemberg  <wl@gnu.org>
+
+	Fixing bugs reported by Nelson Beebe.
+
+	* src/base/ftstroker.c (FT_Stroker_ParseOutline): Remove unused
+	variable `in_path'.
+
+	* src/base/ftobjs (ft_glyphslot_set_bitmap): Change type of
+	second argument to `FT_Byte*'.
+	* include/freetype/internal/ftobjs.h: Updated.
+
+	* src/bdf/bdflib.c (_bdf_readstream): Remove unused variable `res'.
+	(_bdf_parse_glyphs): Remove unused variable `next'.
+	Mark `call_data' as unused.
+
+	* src/cache/ftlru.c (FT_LruList_Lookup): Remove unused variable
+	`plast'.
+
+	* src/pcf/pcfread.c (pcf_seek_to_table_type): Slight recoding to
+	actually use `error'.
+	(pcf_load_font): Remove unused variable `avgw'.
+
+	* src/pfr/pfrobjs.c (pfr_face_get_kerning): Change return type
+	to `void'.
+	Mark `error' as unused.
+	* src/pfr/pfrobjs.h: Updated.
+	* src/pfr/pfrdrivr.c (pfr_get_kerning): Updated.
+
+	* src/sfnt/ttload.c (sfnt_dir_check): Remove unused variable
+	`format_tag'.
+
+	* src/sfnt/ttcmap0.c (tt_cmap6_validate, tt_cmap10_validate): Remove
+	unused variable `start'.
+	(tt_cmap10_char_next): Remove unused variable `result'
+
+	* src/sfnt/sfobjs.c (tt_face_get_name): Mark `error' as unused.
+
+	* src/sfnt/sfdriver.c (get_sfnt_postscript_name): Mark `error' as
+	unused.
+
+	* src/type1/t1objs.c (T1_Face_Init): Remove unused variable
+	`pshinter'.
+
+	* src/type1/t1gload.c (T1_Load_Glyph): Use `glyph_data_loaded'
+	only for FT_CONFIG_OPTION_INCREMENTAL.
+
+2003-04-23  Akito Hirai  <akito@kde.gr.jp>
+
+	* src/sfnt/ttcmap0.c (tt_cmap4_validate): Provide a weak variant
+	of the glyph ID bounding check if FT_VALIDATE_TIGHT is not active.
+	Without this change, many CJK fonts from Dynalab are rejected.
+
+2003-04-23  Joe Marcus Clarke  <marcus@FreeBSD.org>
+
+	* src/base/ftbdf.c (FT_Get_BDF_Property): Check for valid
+	`get_interface'.
+
+2003-04-23  Paul Miller  <paulm@profoundeffects.com>
+
+	* src/base/ftmac.c (parse_fond): Fix handling of style names.
+
+2003-04-23  Werner Lemberg  <wl@gnu.org>
+
+	* src/pfr/pfrload.c (pfr_extra_item_load_font_id): Use FT_PtrDist
+	instead of FT_Uint for `len'.
+
+2003-04-22  Werner Lemberg  <wl@gnu.org>
+
+	* src/gzip/ftgzip.c (zcalloc) [!FT_CONFIG_OPTION_SYSTEM_ZLIB]:
+	Convert K&R format to modern C usage.
+	(FT_Stream_OpenGzip): Use long constant.
+
+2003-04-21  Werner Lemberg  <wl@gnu.org>
+
+	* src/cache/ftccache.c (ftc_cache_lookup): Remove shadow declaration
+	of `manager'.
+
+2003-04-20  Werner Lemberg  <wl@gnu.org>
+
+	* doc/INSTALL.UNX: Cleaned up.
+
+2003-04-09  Torrey Lyons  <torrey@mrcla.com>
+
+	* src/base/ftmac.c (open_face_from_buffer): Removed a double-free
+	bug that had nasty consequences when trying to open an "invalid"
+	font on a Mac.
+
+2003-04-09  Mike Fabian  <mfabian@suse.de>
+
+	* src/bdf/bdfdrivr.h (BDF_encoding_el), src/pcf/pcf.h
+	(PCF_EncodingRec): Changed FT_Short to FT_UShort in order to be able
+	to access more than 32768 glyphs in fonts.
+
+2003-04-08  David Turner  <david@freetype.org>
+
+
+	* Version 2.1.4 is released.
+	============================
+
+
+2003-04-03  Martin Muskens  <mmuskens@aurelon.com>
+
+	* src/type1/t1load.c (T1_Open_Face): Fixed the code to make it
+	handle special cases where a font only contains a ".notdef" glyph
+	(happens in PDF-embedded fonts).  Otherwise, FT_Panic was called.
+
 2003-03-27  David Turner  <david@freetype.org>
 
-   * README: udpated
+	* README: Udpated.
 
-   * README.UNX: removed (now replaced by docs/INSTALL.UNX)
+	* README.UNX: Removed (now replaced by docs/INSTALL.UNX).
 
-   * src/pshinter/pshalgo3.c: the hinter now performs as in 2.1.3 and
-   will ignore stem quantization only when FT_LOAD_TARGET_SMOOTH is used
+	* src/pshinter/pshalgo3.c: The hinter now performs as in 2.1.3 and
+	will ignore stem quantization only when FT_LOAD_TARGET_SMOOTH is
+	used.
+	(psh3_dimension_quantize_len): Enabled.
+	(psh3_hint_align): Enable commented code.
+	(psh3_hint_align_light): Commented out.
 
-   * src/base/ftobjs.c: changed the default computations to include rounding
-   in all cases, this is required to provide accurate kerning data when
-   native TrueType hinting is enabled.
+	* src/base/ftobjs.c (FT_Set_Char_Size): Changed the default
+	computations to include rounding in all cases; this is required to
+	provide accurate kerning data when native TrueType hinting is
+	enabled.
 
-   * src/type1/t1load.c: the Type 1 loader now accepts more general names
-   according to the Postscript spec (the previous one was too restrictive)
+	* src/type1/t1load.c (is_name_char): The Type 1 loader now accepts
+	more general names according to the PostScript specification (the
+	previous one was too restrictive).
+	(parse_font_name, parse_encoding, parse_charstrings, parse_dict):
+	Use `is_name_char'.
+	(parse_subrs): Handle empty arrays.
 
 2003-03-20  David Turner  <david@freetype.org>
 
-    * docs/*: serious rewriting of the documentation
+	Serious rewriting of the documentation.
 
-    * include/freetype/internal/ftobjs.h, src/base/ftobjs.c, src/bdf/bdfdrivr.c,
-    src/pcf/pcfdriver.c, src/pfr/pfrsbit.c, src/sfnt/ttsbit.c,
-    src/type42/t42objs.c, src/winfonts/winfnt.c: introduced three new functions
-    to deal with glyph bitmaps within FT_GlyphSlot objects. these are:
+	* docs/BUGS, docs/BUILD: Removed.
+	* docs/DEBUG.TXT: Renamed to...
+	* docs/DEBUG: This.
+	* docs/CUSTOMIZE, docs/TRUETYPE, docs/UPGRADE.UNX: New files.
+	* docs/INSTALL.ANY, docs/INSTALL.UNX, docs/INSTALL.GNU New files,
+	containing platform specific information previously in INSTALL.
+	* docs/readme.vms: Renamed to...
+	* docs/INSTALL.VMS: This.
 
-      ft_glyphslot_free_bitmap
-      ft_glyphslot_alloc_bitmap
-      ft_glyphslot_set_bitmap
+	* docs/*: Updated.
 
-    these are much more convenient to use than managing the FT_GLYPH_OWN_BITMAP
-    flag manually. the font drivers have been modified to use them as well.
+	Introduced three new functions to deal with glyph bitmaps within
+	FT_GlyphSlot objects:
 
-    * src/cache/ftlru.c: fixed an invalid assertion check
+	  ft_glyphslot_free_bitmap
+	  ft_glyphslot_alloc_bitmap
+	  ft_glyphslot_set_bitmap
 
-    * src/autohint/ahglyph.h, src/autohint/ahglyph.c, src/autohint/ahglobal.c,
-    src/autohint/ahhint.c: fixed blue-scale problem
+	These functions are much more convenient to use than managing the
+	FT_GLYPH_OWN_BITMAP flag manually.
 
-    * src/cache/ftccache.c: fixed small bug that could crash the cache
-    in rare circumstances (mostly with broken fonts)
+	* include/freetype/internal/ftobjs.h (ft_glyphslot_free_bitmap,
+	ft_glyphslot_alloc_bitmap, ft_glyphslot_set_bitmap): New functions.
+	* src/base/ftobjs.c: Implement them.
+	(ft_glyphslot_done): Use ft_glyphslot_free_bitmap.
 
+	* src/bdf/bdfdrivr.c (BDF_Glyph_Load), src/pcf/pcfdriver.c
+	(PCF_Glyph_Load): Remove unused variable `memory'.
+	Use `ft_glyphslot_*' functions.
+	Don't set `FT_GLYPH_OWN_BITMAP'.
+
+	* src/pfr/pfrsbit.c (pfr_slot_load_bitmap): Use
+	`ft_glyphslot_alloc_bitmap'.
+
+	* src/sfnt/ttsbit.c (Load_SBit_Image): Change 5th argument to type
+	`FT_GlyphSlot'.
+	Adding argument `depth' to handle recursive calls.
+	Use `ft_glyphslot_alloc_bitmap'.
+	(tt_face_load_sbit_image): Remove unused variable `memory'.
+	Don't handle `FT_GLYPH_OWN_BITMAP'.
+	Update call to Load_SBit_Image.
+
+	* src/type42/t42objs.c (ft_glyphslot_clear): Renamed to...
+	(t42_glyphslot_clear): This.  Updated caller.
+	Call `ft_glyphslot_free_bitmap'.
+
+	* src/winfonts/winfnt.c (FNT_Load_Glyph): Use
+	`ft_glyphslot_set_bitmap'.
+	Don't handle `FT_GLYPH_OWN_BITMAP'.
+
+	* src/cache/ftlru.c (FT_LruList_Lookup): Fixed an invalid assertion
+	check.
+
+	* src/autohint/ahglyph.c (ah_outline_load): Add two scaling
+	arguments.
+	* src/autohint/ahglyph.h: Updated.
+	* src/autohint/ahhint.c (ah_hinter_load): Updated.
+	* src/autohint/ahglobal.c (ah_hinter_compute_widths): Updated.
+
+	* src/cache/ftccache.c (ftc_family_done): Fixed small bug that could
+	crash the cache in rare circumstances (mostly with broken fonts).
 
 2003-03-15  David Turner  <david@freetype.org>
 
-    * src/truetyoe/ttdriver.c (Set_Char_Sizes): fixed a small rounding bug.
-    Actually, it seems that previous versions of FreeType didn't perform
-    TrueType rounding exactly as appropriate.
+	* src/truetype/ttdriver.c (Set_Char_Sizes): Fixed a small rounding
+	bug.  Actually, it seems that previous versions of FreeType didn't
+	perform TrueType rounding exactly as appropriate.
 
 2003-03-14  David Turner  <david@freetype.org>
 
-    * src/truetype/ttdriver.c: fixing the small TrueType native rendering
-    glitches, they came from a small rounding error.
+	* src/truetype/ttdriver.c (Set_Char_Sizes): Fixing the small
+	TrueType native rendering glitches; they came from a small rounding
+	error.
 
 2003-03-13  David Turner  <david@freetype.org>
 
-    * src/base/ftdbgmem.c, docs/DEBUG.TXT: added new environment variables
-    to control memory debugging with FreeType. See the description of
-    "FT2_DEBUG_MEMORY", "FT2_ALLOC_TOTAL_MAX" and "FT2_ALLOC_COUNT_MAX"
-    in DEBUG.TXT
+	Added new environment variables to control memory debugging with
+	FreeType.  See the description of "FT2_DEBUG_MEMORY",
+	"FT2_ALLOC_TOTAL_MAX" and "FT2_ALLOC_COUNT_MAX" in DEBUG.TXT.
 
-    * src/cache/ftccache.c, src/cache/ftccmap.c, src/cache/ftcsbits.c,
-    ftlru.c: fixed the cache sub-system to correctly deal with out-of-memory
-    conditions.
+	* src/base/ftdbgmem.c (FT_MemTableRec): Add `alloc_count',
+	`bound_total', `alloc_total_max', `bound_count', `alloc_count_max'.
+	(ft_mem_debug_alloc): Handle new variables.
+	(ft_mem_debug_init): s/FT_DEBUG_MEMORY/FT2_DEBUG_MEMORY/.
+	Handle new environment variables.
+	* docs/DEBUG.TXT: Updated.
 
-    * src/pfr/pfrobjs.c, src/pfr/pfrsbits.c: fixing compiler warnings and a
-    small memory leak
+	Fixed the cache sub-system to correctly deal with out-of-memory
+	conditions.
 
-    * src/psaux/psobjs.c (t1_reallocate_table): fixed a bug (memory leak) that
-    only happened when trying to resize an array would end in an OOM.
+	* src/cache/ftccache.c (ftc_node_destroy): Comment out generic
+	check.
+	(ftc_cache_lookup): Implement loop.
+	* src/cache/ftccmap.c: Define FT_COMPONENT.
+	* src/cache/ftcsbits.c (ftc_sbit_node_load): Handle
+	FT_Err_Out_Of_Memory.
+	* src/cache/ftlru.c: Include FT_INTERNAL_DEBUG_H.
+	(FT_LruList_Lookup): Implement loop.
 
-    * src/smooth/ftgrays.c: removed compiler warnings / volatile bug
+	* src/pfr/pfrobjs.c (pfr_face_done): Fix memory leak.
+	(pfr_face_init): Fixing compiler warnings.
 
-    * src/truetype/ttobjs.c: removed segmentation fault that happened in
-    tight memory environments.
+	* src/psaux/psobjs.c (reallocate_t1_table): Fixed a bug (memory
+	leak) that only happened when a try to resize an array would end in
+	an out-of-memory condition.
+
+	* src/smooth/ftgrays.c (gray_convert_glyph): Removed compiler
+	warnings / volatile bug.
+
+	* src/truetype/ttobjs.c (tt_glyphzone_done): Removed segmentation
+	fault that happened in tight memory environments.
 
 2003-02-28  Pixel  <pixel@mandrakesoft.com>
 
-    * src/gzip/ftgzip.c (ft_gzip_file_done): fixed memory leak, the ZLib
-    stream was not properly finalized
+	* src/gzip/ftgzip.c (ft_gzip_file_done): Fixed memory leak: The ZLib
+	stream was not properly finalized.
 
 2003-02-25  Anthony Fok  <anthony@thizlinux.com>
 
-    * src/cache/ftccmap.c: the cmap cache now supports UCS-4 charmaps
-    when available in Asian fonts
+	* src/cache/ftccmap.c: Include FT_TRUETYPE_IDS_H.
+	(ftc_cmap_family_init): The cmap cache now
+	supports UCS-4 charmaps when available in Asian fonts.
 
-    * src/sfnt/ttload.c, src/base/ftobjs.c: changed "asian" to "Asian" in
-    comments
+	* src/sfnt/ttload.c, src/base/ftobjs.c: Changed "asian" to "Asian"
+	in comments.
 
 2003-02-25  David Turner  <david@freetype.org>
 
-    * src/gzip/ftgzip.c: fixed a bug that caused FreeType to loop endlessly
-    when trying to read certain compressed gzip files. The following test
-    could be used to reveal the bug:
+	* src/gzip/ftgzip.c (ft_gzip_file_fill_output): Fixed a bug that
+	caused FreeType to loop endlessly when trying to read certain
+	compressed gzip files.  The following test reveals the bug:
 
-       touch 0123456789 ; gzip 0123456789 ; ftdump 0123456789.gz
+	  touch 0123456789 ; gzip 0123456789 ; ftdump 0123456789.gz
 
+	Several fixes to the PFR font driver:
 
-    * src/pfr/pfrobjs.c, src/pfr/pfrload.c, src/pfr/pfrtypes.h: several
-    fixes to the PFR font driver:
+	- The list of available embedded bitmaps was not correctly set in
+	  the root FT_FaceRec structure describing the face.
 
-      - the list of available embedded bitmaps was not correctly set
-        in the root FT_FaceRec structure describing the face
+	- The glyph loader always tried to load the outlines when
+	  FT_LOAD_SBITS_ONLY was specified.
 
-      - the glyph loader always tried to load the outlines when
-        FT_LOAD_SBITS_ONLY was specified
+	- The table loaded now scans for *undocumented* elements of a
+	  physical font's auxiliary data record.  This is necessary to
+	  retrieve the "real" family and style names.
 
-      - the table loaded now scans for *undocumented* elements of a
-        physical font's auxiliary data record, this is necessary to
-        retrieve the "real" family and style names.
+	NOTE THAT THESE CHANGES THE FAMILY NAME OF MANY PFR FONTS!
 
-        NOTE THAT THIS CHANGES THE FAMILY NAME OF MANY PFR FONTS !!
+	* src/pfr/pfrload.c (pfr_aux_name_load): New function.
+	(pfr_phy_font_done): Free `family_name' and `style_name' also.
+	Remove unused variables.
+	(pfr_phy_font_load): Extract useful information from the auxiliary
+	bytes.
 
-    * src/truetype/ttdriver.c (Set_Char_Sizes): fixed a rounding bug when
-    computing the scale factors for a given character size in points with
-    resolution.
+	* src/pfr/pfrobjs.c (pfr_face_done): Set pointers to NULL.
+	(pfr_face_init): Provide fallback values for `family_name' and
+	`style_name'.
+	Handle strikes.
+	(pfr_slot_load): Handle FT_LOAD_SBITS_ONLY.
+	* src/pfr/pfrtypes.h (PFR_PhyFontRec): Add fields `ascent',
+	`descent', `leading', `family_name', and `style_name'.
 
+	* src/truetype/ttdriver.c (Set_Char_Sizes): Fixed a rounding bug
+	when computing the scale factors for a given character size in
+	points with resolution.
+
+	* devel/ft2build.h, devel/ftoption.h: New files (in a new directory)
+	which are special development versions of include/ft2build.h and
+	include/freetype/config/ftoption.h, respectively.
 
 2003-02-18  David Turner  <david@freetype.org>
 
-    * src/truetype/ttdriver.c, src/truetype/ttobjs.h, src/truetype/ttobjs.c,
-    src/truetype/ttinterp.c, src/base/ftobjs.c: fixing the slight distortion
-    problem that occured due to the latest auto-hinter changes
+	Fixing the slight distortion problem that occurred due to the latest
+	auto-hinter changes.
 
+	* src/base/ftobjs.c (ft_recompute_scaled_metrics): Fix rounding.
 
-    * src/autohint/ahhint.c: disabled the advance width "correction" which
-    seemed to provide more trouble than benefits..
+	* src/truetype/ttdriver.c (Set_Char_Sizes): New variable `metrics2'.
+	[!TT_CONFIG_OPTION_BYTECODE_INTERPRETER]: Removed.
+
+	* src/truetype/ttobjs.h (TT_SizeRec): New field `metrics'.
+	* src/truetype/ttobjs.c (Reset_Outline_Size): Fix initialization of
+	`metrics'.
+	[FT_CONFIG_CHESTER_ASCENDER]: Code removed.
+	(Reset_SBit_Size): Fix initialization of `metrics'.
+
+	* src/truetype/ttinterp.c (TT_Load_Context): Fix initialization of
+	`exec->metrics'.
+
+	* src/autohint/ahhint.c (ah_hinter_load): Disabled the advance width
+	"correction" which seemed to provide more trouble than benefits.
 
 2003-02-13  Graham Asher  <graham.asher@btinternet.com>
 
-    * include/freetype/ftincrem.h, src/cff/cffgload.c, src/cid/cidgload.c,
-    src/truetype/ttgload.c, src/type1/t1gload.c
-    [FT_CONFIG_OPTION_INCREMENTAL]: I have changed the incremental loading
-    interface in a way that makes it simpler and allows glyph metrics to
-    be changed (e.g., by adding a constant, as required by CFF fonts)
-    rather than just overridden. This was required to make the GhsotScript-
-    to-FreeType bridge work.
+	Changed the incremental loading interface in a way that makes it
+	simpler and allows glyph metrics to be changed (e.g., by adding a
+	constant, as required by CFF fonts) rather than just overridden.
+	This was required to make the GhostScript-to-FreeType bridge work.
+
+	* src/cff/cffgload.c (cff_slot_load) [FT_CONFIG_OPTION_INCREMENTAL]:
+	Allow metrics to be overridden.
+	* src/cid/cidgload.c (cid_load_glyph) [FT_CONFIG_OPTION_INCREMENTAL]:
+	Ditto.
+
+	* src/truetype/ttgload.c (load_truetype_glyph)
+	[FT_CONFIG_OPTION_INCREMENTAL]: Simplify.
+	(compute_glyph_metrics) [FT_CONFIG_OPTION_INCREMENTAL]: Code block
+	moved down.
+
+	* src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String)
+	[FT_CONFIG_OPTION_INCREMENTAL]: Updated.
+
+	* include/freetype/ftincrem.h: Updated.
 
 2003-01-31  David Turner  <david@freetype.org>
 
-    * docs/CHANGES, docs/VERSION.DLL, docs/TODO: updating documentation for
-    the 2.1.4 release
+	* docs/CHANGES, docs/VERSION.DLL, docs/TODO: Updating documentation
+	for the 2.1.4 release.
 
-    * builds/win32/visualc/freetype.dsp, builds/win32/visualc/index.html:
-    updating the project file for 2.1.4
+	* builds/win32/visualc/freetype.dsp,
+	builds/win32/visualc/index.html: Updating the project file for
+	2.1.4.
 
-    * src/gzip/adler32.c, src/gzip/ftgzip.c, src/gzip/infblock.c,
-    src/gzip/infcodes.c, src/gzip/inflate.c, src/gzip/inftrees.c,
-    src/gzip/infutil.c: removed old-style (K&R)function definitions. This
-    avoids warnings with Visual C++ at its most pedantic mode.
+	* src/gzip/adler32.c, src/gzip/ftgzip.c, src/gzip/infblock.c,
+	src/gzip/infcodes.c, src/gzip/inflate.c, src/gzip/inftrees.c,
+	src/gzip/infutil.c: Removed old-style (K&R)function definitions.
+	This avoids warnings with Visual C++ at its most pedantic mode.
 
-    * src/pfr/pfrsbit.c: removed compiler warnings
+	* src/pfr/pfrsbit.c: Removed compiler warnings.
 
-    * src/cache/ftccmap.c: changed a FT_ERROR into a FT_TRACE1 since the
-    it caused "ftview" and others to dump too much junk when trying to
-    display a waterfall with a font without a Unicode charmap (e.g.
-    SYMBOL.TTF)
+	* src/cache/ftccmap.c (ftc_cmap_family_init): Changed an FT_ERROR
+	into an FT_TRACE1 since it caused "ftview" and others to dump too
+	much junk when trying to display a waterfall with a font without a
+	Unicode charmap (e.g.  SYMBOL.TTF).
 
-    * src/autohint/ahtypes.h, src/autohint/ahhint.c, src/base/ftobjs.c,
-    src/truetype/ttobjs.c: implemented FT_CONFIG_CHESTER_BLUE_SCALE,
-    corresponding to the last patch from David Chester, but with a
-    much simpler (and saner) implementation.
+	Implemented FT_CONFIG_CHESTER_BLUE_SCALE, corresponding to the last
+	patch from David Chester, but with a much simpler (and saner)
+	implementation.
 
-    * src/pshinter/pshalgo3.c: improved the Postscript hinter. Getting rid
-    of stem snapping seems to work well here (though the stems are still
-    slightly moved to increase contrast).
+	* src/autohint/ahhint.c (ah_hinter_load_glyph)
+	[FT_CONFIG_CHESTER_BLUE_SCALE]: Try to optimize the y_scale so that
+	the top of non-capital letters is aligned on a pixel boundary
+	whenever possible.
 
-    THIS IMPROVES ANTI-ALIASED RENDERING, BUT MONOCHROME AND LCD MODES
-    STILL SUCK... I need to work this a bit
+	* src/base/ftobjs.c (FT_Set_Char_Size)
+	[FT_CONFIG_CHESTER_BLUE_SCALE]: Round differently.
+	* src/truetype/ttdriver.c (Set_Char_Sizes)
+	[TT_CONFIG_OPTION_BYTECODE_INTERPRETER]: Do some rounding only
+	if this macro is defined.
+
+	* src/truetype/ttobjs.c (Reset_Outline_Size)
+	[FT_CONFIG_CHESTER_ASCENDER]: Round differently.
+
+	* src/pshinter/pshalgo3.c: Improved the Postscript hinter.  Getting
+	rid of stem snapping seems to work well here (though the stems are
+	still slightly moved to increase contrast).
+	(psh3_dimension_quantize_len): Commented out.
+	(psh3_hint_align_light): New function.
+	(psh3_hint_align): Comment out some code.
+
+	THIS IMPROVES ANTI-ALIASED RENDERING, BUT MONOCHROME AND LCD MODES
+	STILL SUCK.
 
 2003-01-22  David Chester  <davidchester@qmx.net>
 
-    * src/autohint/ahhint.c: small fix to the stem width optimisation
+	* src/autohint/ahhint.c (ah_compute_stem_width): Small fix to the
+	stem width optimization.
 
 2003-01-22  David Turner  <david@freetype.org>
 
-    * include/freetype/ftbdf.h, include/freetype/internal/bdftypes.h,
-    src/base/ftbdf.c, src/bdf/bdfdrivr.c, src/pcf/pcfdrivr.c,
-    src/pcf/pcfread.h:
+	Adding a new API `FT_Get_BDF_Property' to retrieve the BDF
+	properties of a given PCF or BDF font.
 
-      adding a new API, named FT_Get_BDF_Property to retrieve the BDF
-      properties of a given PCF or BDF font
+	* include/freetype/ftbdf.h (FT_PropertyType): New enumeration.
+	(BDF_Property, BDF_PropertyRec): New structure.
+	FT_Get_BDF_Property): New function.
+	* include/freetype/internal/bdftypes.h: Include FT_BDF_H.
+	(BDF_GetPropertyFunc): New function pointer.
 
-    * src/sfnt/ttload.c (sfnt_dir_check): relaxed the "head" table size
-    verification to accept a few broken fonts who pad the size incorrectly
-    (the table should be padded, but its "size" field shouldn't per se
-     the spec)
+	* src/base/ftbdf.c (test_font_type): New helper function.
+	(FT_Get_BDF_Charset_ID): Use `test_font_type'.
+	(FT_Get_BDF_Property): New function.
+
+	* src/bdf/bdfdrivr.c: Include FT_BDF_H.
+	(bdf_get_bdf_property, bdf_driver_requester): New functions.
+	(bdf_driver_class): Use `bdf_driver_requester'.
+
+	* src/pcf/pcfdrivr.c: Include FT_BDF_H.
+	(pcf_get_bdf_property, pdc_driver_requester): New functions
+	(pcf_driver_class): Use `pcf_driver_requester'.
+
+	* src/pcf/pcfread.c: Include `pcfread.h'.
+	(pcf_find_property): Decorate it with FT_LOCAL_DEF.
+	* src/pcf/pcfread.h: New file, providing `pcf_find_property'.
+
+	* src/sfnt/ttload.c (sfnt_dir_check): Relaxed the "head" table size
+	verification to accept a few broken fonts who pad the size
+	incorrectly (the table should be padded, but its "size" field
+	shouldn't according to the specification).
 
 2003-01-18  Werner Lemberg  <wl@gnu.org>
 
@@ -203,17 +1610,29 @@
 
 2003-01-15  James Su  <suzhe@turbolinux.com.cn>
 
-	* src/gzip/ftgzip.c: Bugfix: couldn't read certain gzip-ed font
-	files.
+	* src/gzip/ftgzip.c (ft_gzip_check_header): Bugfix: couldn't read
+	certain gzip-ed font files (typo: `&&' -> `&').
 
-2003-01-15  Huw D M Davies <h.davies1@physics.ox.ac.uk>
+2003-01-15  Huw D M Davies  <h.davies1@physics.ox.ac.uk>
 
-	* include/freetype/config/ftheader.h,
-	include/freetype/internal/fnttypes.h, include/freetype/ftwinfnt.h,
-	src/base/winfnt.c, src/winfonts/winfnt.c, src/base/Jamfile,
-	src/base/rules.mk, src/base/descrip.mms: Added a Windows .FNT
-	specific API (mostly for Wine).  Also fixed a nasty bug in the
-	header loader which would cause invalid memory overwrites.
+	Added a Windows .FNT specific API (mostly for Wine).  Also fixed a
+	nasty bug in the header loader which would cause invalid memory
+	overwrites.
+
+	* include/freetype/config/ftheader.h (FT_WINFONTS_H): New macro
+	for ftwinfnt.h.
+	* include/freetype/internal/fnttypes.h: Include FT_WINFONTS_H.
+	(FNT_FontRec): Updated.
+	Move Windows FNT definition to...
+	* include/freetype/ftwinfnt.h: This new file.
+	(FT_WinFNT_HeaderRec): Rename `reserved2' to `reserved1'.
+	* src/base/ftwinfnt.c: New file, providing `FT_Get_WinFNT_Header'.
+	* src/winfonts/winfnt.c (winfnt_header_fields): Updated.
+	Rename `reserved2' to `reserved1'.
+	(fnt_font_load): Updated.
+
+	* src/base/Jamfile, src/base/descrip.mms, src/base/rules.mk:
+	Updated.
 
 2003-01-14  Graham Asher  <graham.asher@btinternet.com>
 
@@ -233,42 +1652,84 @@
 
 2003-01-11  David Chester  <davidchester@qmx.net>
 
-	* include/freetype/config/ftoption.h, src/autohint/ahglobal.h,
-	src/autohint/ahglobal.c, src/autohint/ahglyph.c,
-	src/autohint/ahtypes.h: Patches to the auto-hinter in order to
-	slightly improve the output.  Note that everything is controlled
-	through the new FT_CONFIG_OPTION_CHESTER_HINTS defined at the end of
-	"ftoption.h".  There are also individual FT_CONFIG_CHESTER_XXX
-	macros to control individual "features".
+	Patches to the auto-hinter in order to slightly improve the output.
+	Note that everything is controlled through the new
+	FT_CONFIG_OPTION_CHESTER_HINTS defined in "ftoption.h".  There are
+	also individual FT_CONFIG_CHESTER_XXX macros to control individual
+	"features".
 
 	Note that all improvements are enabled by default, but can be
 	tweaked for optimization and testing purposes.  The configuration
 	macros will most likely disappear in the short future.
 
+	* include/freetype/config/ftoption.h
+	(FT_CONFIG_OPTION_CHESTER_HINTS): New macro.
+	(FT_CONFIG_CHESTER_{SMALL_F,ASCENDER,SERIF,STEM,BLUE_SCALE})
+	[FT_CONFIG_OPTION_CHESTER_HINTS]: New macros to control individual
+	features.
+
+	* src/autohint/ahglobal.c (blue_chars) [FT_CONFIG_CHESTER_SMALL_F]:
+	Add blue zone for `fijkdbh'.
+	* src/autohint/ahglobal.h (AH_IS_TOP_BLUE)
+	[FT_CONFIG_CHESTER_SMALL_F]: Use `AH_BLUE_SMALL_F_TOP'.
+	* src/autohint/ahglyph.c (ah_outline_compute_edges)
+	[FT_CONFIG_CHESTER_SERIF]: Use `AH_EDGE_SERIF'.
+	(ah_outline_compute_blue_edges) [FT_CONFIG_CHESTER_SMALL_F]:
+	Increase threshold for `best_dist'.
+	* src/autohint/ahhint.c (ah_compute_stem_width)
+	[FT_CONFIG_CHESTER_SERIF]: Provide new version for improved serif
+	handling.
+	(ah_align_linked_edge) [FT_CONFIG_CHESTER_SERIF]: Use special
+	version of `ah_compute_stem_width'.
+	(ah_hint_edges_3) [FT_CONFIG_CHESTER_STEM]: A new algorithm for stem
+	alignment when stem widths are less than 1.5 pixels wide centers the
+	stem slightly off-center of the center of a pixel (this increases
+	sharpness and consistency).
+	[FT_CONFIG_CHESTER_SERIF]: Use special version of
+	`ah_compute_stem_width'.
+	* src/autohint/ahtypes.h [FT_CONFIG_CHESTER_SMALL_F]: Add
+	`AH_BLUE_SMALL_F_TOP'.
+
 2003-01-11  David Turner  <david@freetype.org>
 
-	* include/freetype/internal/fnttypes.h: Fixed a structure field
-	definition to avoid memory overwrites.
+	* include/freetype/internal/fnttypes.h (WinFNT_HeaderRec): Increase
+	size of `reserved2' to avoid memory overwrites.
 
 2003-01-08  Huw Dawies  <huw@codeweavers.com>
 
-	* src/winfonts/winfnt.c: Read 16 bytes into "reserved2", not
-	"reserved".
+	* src/winfonts/winfnt.c (winfnt_header_fields): Read 16 bytes into
+	"reserved2", not "reserved".
 
 	* src/base/ftobjs.c (find_unicode_charmap): Fixed the error code
 	returned when the font doesn't contain a Unicode charmap.  This
 	allows FT2 to load "symbol.ttf" and a few others correctly since the
 	last release.
+	(open_face): Fix return value.
 
 2003-01-08  Owen Taylor  <owen@redhat.com>
 
-	* src/autohint/ahtypes.h, src/autohint/ahhint.c,
-	src/pshinter/pshalgo3.h, src/pshinter/pshalgo3.c: Implemented the
-	FT_RENDER_MODE_LIGHT hinting mode in the auto and postscript
-	hinters.
+	Implemented the FT_RENDER_MODE_LIGHT hinting mode in the auto and
+	postscript hinters.
+
+	* src/autohint/ahtypes.h (AH_HinterRec): Add `do_stem_adjust'.
+	* src/autohint/ahhint.c (ah_compute_stem_width): Handle
+	hinter->do_stem_adjust.
+	(ah_hinter_load_glyph): Set hinter->do_stem_adjust.
+
+	* src/pshinter/pshalgo3.h (PSH3_GlyphRec): Add `do_stem_adjust'.
+	* src/pshinter/pshalgo3.c (psh3_hint_align): Use `do_stem_adjust'.
+	(ps3_hints_apply): Handle FT_RENDER_MODE_LIGHT.
+
+	* include/freetype/freetype.h (FT_Render_Mode): Add
+	FT_RENDER_MODE_LIGHT.
 
 	* src/truetype/ttgload.c: Fixing the TrueType loader to handle
 	invalid composites correctly by limiting the recursion depth.
+	(TT_MAX_COMPOSITE_RECURSE): New macro.
+	(load_truetype_glyph): Add argument `recurse_count'.
+	Load a composite only if the numbers of contours is -1, emit error
+	otherwise.
+	(TT_Load_Glyph): Updated.
 
 2003-01-08  David Turner  <david@freetype.org>
 
@@ -280,16 +1741,21 @@
 
 	* src/base/ftstroker.c: Probably the last bug-fixes to the stroker;
 	the API is likely to change, however.
+	(ft_stroke_border_close): Don't record empty paths.
+	(ft_stroke_border_get_counts): Increase `num_points' also in for loop.
+	(ft_stroke_border_export): Don't increase `write' twice in for loops.
+	(ft_stroker_outside): Handle `phi' together with `theta'.
+	(FT_Stroker_ParseOutline): New function.
 
 	* src/base/fttrigon.c (FT_Angle_Diff): Fixing function: It returned
 	invalid values for large negative angle differences (resulting in
 	incorrect stroker computations, among other things).
 
-	* src/cache/ftccache.c (ftc_node_unlink): Removing incorrect
+	* src/cache/ftccache.c (ftc_node_hash_unlink): Removing incorrect
 	assertion, and changing code to avoid hash table size contraction.
 
 	* src/base/Jamfile, src/base/rules.mk, src/base/descrip.mms: Adding
-	"ftstroker.obj" to default build, as optional component.
+	"ftstroker" to default build, as optional component.
 
 2002-12-26  David Turner  <david@freetype.org>
 
@@ -298,26 +1764,41 @@
 	src/gzip/zutil.h: Updates to allow compilation without compiler
 	warnings with LCC-Win32.
 
-	* include/freetype/freetype.h, docs/VERSION.DLL,
-	builds/unix/configure.ac, builds/unix/configure: Updates for the
-	upcoming 2.1.4 release.
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 4.
+	* builds/unix/configure.ac (version_info): Increased to 9:3:3.
+	* builds/unix/configure: Regenerated.
+	* docs/VERSION.DLL: Updated.
 
 2002-12-23  Anthony Fok  <anthony@thizlinux.com>
 
-	* builds/unix/configure.ac, builds/unix/unix-cc.in,
-	builds/unix/unix-def.in: Small fix to configure sub-system on Unix
-	to allow other programs to correctly link with zlib when needed.
+	* builds/unix/configure.ac, builds/unix/unix-cc.in (LINK_LIBRARY),
+	builds/unix/unix-def.in (SYSTEM_ZLIB): Small fix to configure
+	sub-system on Unix to allow other programs to correctly link with
+	zlib when needed.
+
+2002-12-19  David Turner  <david@freetype.org>
+
+	* include/freetype/internal/sfnt.h (SFNT_Load_Table_Func): New
+	function pointer.
+
+	* include/freetype/tttables.h (FT_Load_Sfnt_Table): New function.
+	* src/base/ftobjs.c: Implement it.
+
+	* src/sfnt/sfdriver.c (sfnt_get_interface): Handle `load_sfnt'
+	module request.
 
 2002-12-17  David Turner  <david@freetype.org>
 
 	* src/base/ftobjs.c (find_unicode_charmap): Added some comments to
 	better explain what's happening there.
-
-	* src/base/ftobjs.c (open_face): Included Graham Asher's fix to
-	prevent faces without Unicode charmaps from loading.
+	(open_face): Included Graham Asher's fix to prevent faces without
+	Unicode charmaps from loading.
 
 	* src/winfonts/winfnt.c: Included George Williams's fix to support
 	version 2 fonts correctly.
+	(winfnt_header_fields): Updated.
+	(fnt_font_load): Handle version 2 fonts.
+	(FNT_Load_Glyph): Updated.
 
 2002-12-16  David Turner  <david@freetype.org>
 
@@ -333,28 +1814,33 @@
 
 	* src/base/ftobjs.c: Modified the logic to get Unicode charmaps.
 	Now it loads UCS-4 charmaps when there is one.
-	* src/base/ftobjs.c (find_unicode_charmap): New function.
-	* src/base/ftobjs.c (open_face): Refer to the above one.
-	* src/base/ftobjs.c (FT_Select_Charmap): Idem.
+	(find_unicode_charmap): New function.
+	(open_face): Refer to the above one.
+	(FT_Select_Charmap): Idem.
 
 2002-11-29  Antoine Leca  <Antoine-Freetype@Leca-Marti.org>
 
 	* include/freetype/ftgzip.h: Correct the name of the controlling
 	macro (was __FTXF86_H__ ...).
 
-2002-11-27  Vincent Caron <v.caron@zerodeux.net>
+2002-11-27  Vincent Caron  <v.caron@zerodeux.net>
 
 	* builds/unix/unix-def.in, builds/unix/freetype-config.in,
-	builds/unix/configure.ac, src/gzip/rules.mk, src/gzip/ftgzip.c:
-	Adding support for system zlib installations if available on the
-	target platform (Unix only).
+	builds/unix/configure.ac, src/gzip/rules.mk, src/gzip/ftgzip.c
+	[FT_CONFIG_OPTION_SYSTEM_ZLIB]: Adding support for system zlib
+	installations if available on the target platform (Unix only).
 
 2002-11-23  David Turner  <david@freetype.org>
 
-	* src/cff/cffload.c (cff_charser_load): Modified charset loader to
-	accept pre-defined charsets, even when the font contains fewer
-	glyphs.  Also enforced more checks to ensure that we never overflow
-	the character codes array in the encoding.
+	* src/cff/cffload.c (cff_charset_load, cff_encoding_load): Modified
+	charset loader to accept pre-defined charsets, even when the font
+	contains fewer glyphs.  Also enforced more checks to ensure that we
+	never overflow the character codes array in the encoding.
+
+2002-11-22  Antoine Leca  <Antoine-Freetype@Leca-Marti.org>
+
+	* include/freetype/ttnameid.h: Updated to latest OpenType
+	specification.
 
 2002-11-18  David Turner  <david@freetype.org>
 
@@ -375,9 +1861,18 @@
 	support fot the first GSUB lookups.  Nothing that really compiles
 	for now though.
 
-	* src/autohint/ahhint.c: Disabled serif stem width quantization.  It
-	produces slightly better shapes though this is not distinguishable
-	with many fonts.
+	* src/autohint/ahhint.c (ah_align_serif_edge): Disabled serif stem
+	width quantization.  It produces slightly better shapes though this
+	is not distinguishable with many fonts.
+	Remove other dead code.
+
+	* src/Jamfile, src/*/Jamfile: Simplified.
+	Use $(FT2_SRC_DIR).
+
+2002-11-06  David Turner  <david@freetype.org>
+
+	* include/freetype/freetype.h (FT_LOAD_TARGET_LIGHT): New macro.
+	(FT_LOAD_TARGET, FT_LOAD_TARGET_MODE): Use `& 15' instead of `& 7'.
 
 2002-11-05  David Turner  <david@freetype.org>
 
@@ -393,7 +1888,7 @@
 	* src/sfnt/ttcmap0.c (tt_face_build_cmaps): Removed compiler
 	warnings in optimized mode relative to the "volatile" local
 	variables.  This was not a compiler bug after all, but the fact that
-	a pointer to a volatile variable is not the same than a volatile
+	a pointer to a volatile variable is not the same as a volatile
 	pointer to a variable :-)
 
 	The fix was to change
@@ -401,8 +1896,9 @@
 	into
 	  `FT_Byte* volatile p'.
 
-	* src/pfr/pfrload.c, src/pfr/pfrdrivr.c, src/gzip/inftrees.c:
-	Removed compiler warnings in optimized modes.
+	* src/pfr/pfrload.c (pfr_phy_font_load), src/pfr/pfrdrivr.c
+	(pfr_get_metrics), src/gzip/inftrees.c: Removed compiler warnings in
+	optimized modes.
 
 	* src/gzip/*.[hc]: Modified our zlib copy in order to prevent
 	exporting any zlib function names outside of the component.  This
@@ -414,24 +1910,75 @@
 	* src/psaux/psobjs.c (ps_table_add): Modified increment loop in
 	order to implement exponential behaviour.
 
+2002-11-01  David Turner  <david@freetype.org>
+
+	Added PFR-specific public API. Fixed the kerning retrievel routine
+        (it returned invalid values when the outline and metrics resolution
+        differ).
+
+	* include/freetype/ftpfr.h, include/freetype/internal/pfr.h: New
+	files.
+
+	* include/freetype/internal/internal.h (FT_INTERNAL_PFR_H): New
+	macro for pfr.h.
+
+	* src/base/ftpfr.c: New file.
+	* src/base/Jamfile, src/base/descrip.mms: Updated.
+
+	* src/pfr/pfrdrivr.c: Include FT_INTERNAL_PFR_H.
+	(pfr_get_kerning, pfr_get_advance, pfr_get_metrics): New functions.
+	(pfr_service_rec): New format interface.
+	(pfr_driver_class): Use `pfr_service_rec'.
+	Replace `pfr_face_get_kerning' with `pfr_get_kerning'.
+	* src/pfr/pfrobjs.c: Remove dead code.
+
+	* src/base/ftobjs.c (ft_glyphslot_clear): Small internal fix to
+	better support bitmap-based font formats.
+
+	* src/base/ftsynth.c (FT_GlyphSlot_Embolden): Fix handling of
+	`scale'.
+	Fix arguments to `FT_Vector_From_Polar'.
+
 2002-10-31  David Turner  <david@freetype.org>
 
-	* include/freetype/ftgzip.h, src/gzip/ftgzip.c: Adding support for
-	gzip compressed streams.
+	Add support for automatic handling of gzip-compressed PCF files.
 
-	* src/pcf/pcfdriver.c: Adding automatic support for gzip-compressed
-	PCF files.
+	* src/gzip/*: New files, taken from the zlib package (except
+	ftgzip.c).
+
+	* include/freetype/ftgzip.h, src/gzip/ftgzip.c: New files.
+	* include/freetype/config/ftheader.h (FT_GZIP_H): New macro for
+	`ftgzip.h'.
+
+	* src/pcf/pcfdriver.c: Include FT_GZIP_H and FT_ERRORS_H.
+	(PCF_Face_Init): If normal open fails, try to open gzip stream.
+	(PCF_Face_Done): Close gzip stream.
+
+	* include/freetype/internal/pcftypes.h (PCF_Public_FaceRec),
+	src/pcf/pcf.h (PCF_FaceRec): Add `gzip_stream' and `gzip_source'.
+
+	* include/freetype/config/ftoption.h (FT_CONFIG_OPTION_USE_ZLIB):
+	New macro.
+	(T1_CONFIG_OPTION_DISABLE_HINTER, FT_CONFIG_OPTION_USE_CMAPS
+	FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS,
+	FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS): Removed.
+
+	(FT_EXPORT, FT_EXPORT_DEF, FT_DEBUG_LEVEL_ERROR,
+	FT_DEBUG_LEVEL_TRACE, FT_DEBUG_MEMORY): Comment out definitions so
+	that platform specific configuration file can override.
+
+	* include/freetype/internal/ftstream.h: Include FT_SYSTEM_H.
 
 2002-10-30  David Turner  <david@freetype.org>
 
-	* FreeType 2.1.3rc3 released
+	* FreeType 2.1.3rc3 released.
 
 2002-10-25  David Turner  <david@freetype.org>
 
 	* include/freetype/ftcache.h (FT_POINTER_TO_ULONG): New macro.
 	(FTC_FACE_ID_HASH): Rewritten, using FT_POINTER_TO_ULONG.
 
-2002-10-22  Giuseppe Ghibò <ghibo@mandrakesoft.com>
+2002-10-22  Giuseppe Ghibò  <ghibo@mandrakesoft.com>
 
 	* include/freetype/freetype.h (FT_Encoding): Fix entry for latin-2.
 
@@ -1202,7 +2749,7 @@
 	interface is hidden in an internal part of the face record, and all
 	the definitions are in ftincrem.h.
 
-	* include/freetype/freeetype.h [FT_CONFIG_OPTION_INCREMENTAL]:
+	* include/freetype/freetype.h [FT_CONFIG_OPTION_INCREMENTAL]:
 	Removed.
 	* include/freetype/internal/ftobjs.h [FT_CONFIG_OPTION_INCREMENTAL]:
 	Include FT_INCREMENTAL_H.
@@ -3503,7 +5050,7 @@
 	computation of auto-hinted glyphs.  This noticeably improves the
 	spacing of letters in KDE and Gnome.
 
-2001-12-25  Antoine Leca <Antoine-Freetype@Leca-Marti.org>
+2001-12-25  Antoine Leca  <Antoine-Freetype@Leca-Marti.org>
 
 	* builds/dos/detect.mk: Correcting the order for Borland compilers:
 	16-bit bcc was never selected, always overridden by 32-bit bcc32.
@@ -3706,7 +5253,7 @@
 	* src/truetype/ttgload.c (load_truetype_glyph): Fixing crash when
 	dealing with invalid fonts (i.e. glyph size < 10 bytes).
 
-2001-12-14  Sam Latinga <slouken@devolution.com>
+2001-12-14  Sam Latinga  <slouken@devolution.com>
 
 	* builds/mac/freetype.make: A new Makefile to build with MPW on
 	MacOS classic.
@@ -3725,10 +5272,10 @@
 
 2001-12-12  David Turner  <david@freetype.org>
 
-	* src/pshint/pshglob.c (psh_blues_scale_zones, psh_blues_snap_stem
+	* src/pshinter/pshglob.c (psh_blues_scale_zones, psh_blues_snap_stem
 	psh_globals_new): Adding correct BlueScale/BlueShift support, plus
 	family blues processing.
-	* src/pshint/pshglob.h (PSH_BluesRec): Updated.
+	* src/pshinter/pshglob.h (PSH_BluesRec): Updated.
 
 	Started adding support for the Postscript hinter in the CFF module.
 
@@ -3969,7 +5516,7 @@
 
 	* include/freetype/internal/ftmemory.h, src/base/ftdbgmem.c:
 	Improvements to the memory debugger to report more information in
-	case of errors.  Also, some allocations that occured through REALLOC
+	case of errors.  Also, some allocations that occurred through REALLOC
 	couldn't be previously catched correctly.
 
 	* src/autohint/ahglyph.c (ah_outline_compute_segments,
@@ -4043,7 +5590,7 @@
 	* src/type1/t1load.c (parse_font_name, parse_subrs): Added a test
 	for when loading synthetic fonts to make sure that the font name
 	and subrotuines are not loaded twice.  This is to remove a memory
-	leak that occured because the original memory blocks for these
+	leak that occurred because the original memory blocks for these
 	objects were not deallocated when the objects were parsed the
 	second time.
 
@@ -4385,7 +5932,7 @@
 	* src/psaux/psobjs.c (T1_Decrypt): Ditto.
 	* src/type1/t1parse.c (T1_Get_Private_Dict): Ditto.
 
-2001-06-28  David Turner <david@freetype.org>
+2001-06-28  David Turner  <david@freetype.org>
 
 	* include/internal/ftstream.h: Modified the definitions
 	of the FT_GET_XXXX and NEXT_XXXX macros for 16-bit correctness.
@@ -4406,7 +5953,7 @@
 	=========================
 
 
-2001-06-27  David Turner <david@freetype.org>
+2001-06-27  David Turner  <david@freetype.org>
 
 	* builds/unix/ftconfig.in: Changed the definition of the
 	FT_CALLBACK_DEF macro.
@@ -4435,7 +5982,7 @@
 
 	* debian/*: Added Debian package build directory for 2.0.4.
 
-2001-06-22  David Turner <david@freetype.org>
+2001-06-22  David Turner  <david@freetype.org>
 
 	* docs/PATENTS: Added patents disclaimer.  This one was missing!
 
@@ -4919,13 +6466,13 @@
 2001-04-02  Tom Kacvinsky  <tkacvins@freetype.org>
 
 	* src/sfnt/ttload.c (TT_Load_Metrics): Fix an improper pointer
-	dereference.  Submitted by Herbert Duerr <duerr@sun.com>
+	dereference.  Submitted by Herbert Duerr <duerr@sun.com>.
 
 2001-03-26  Tom Kacvinsky  <tkacvins@freetype.org>
 
 	* include/freetype/config/ftconfig.h: Changed hexadecimal
 	constants to use suffix U to avoid problems with HP-UX's c89
-	compiler.  Submitted by G.W. Lucas <glucas@sonalysts.com>
+	compiler.  Submitted by G.W. Lucas <glucas@sonalysts.com>.
 
 2001-03-24  David Turner  <david.turner@freetype.org>
 
@@ -5014,17 +6561,17 @@
 	(cff_get_interface): Added support for getting a glyph name via the
 	"glyph_name" module interface.  Uses the new function
 	get_cff_glyph_name().
-	Submitted by Sander van der Wal <svdwal@xs4all.nl>
+	Submitted by Sander van der Wal <svdwal@xs4all.nl>.
 
 	* src/cff/cffobjs.c (CFF_Init_Face): Logical or the face flags with
 	FT_FACE_FLAG_GLYPH_NAMES only if FT_CONFIG_OPTION_NO_GLYPH_NAMES is
 	not defined.  This is to add support for getting a glyph name from a
 	glyph index via FT_Get_Glyph_Name().
-	Submitted by Sander van der Wal <svdwal@xs4all.nl>
+	Submitted by Sander van der Wal <svdwal@xs4all.nl>.
 
 	* src/cff/cffgload.c (CFF_Parse_CharStrings): Added support for
 	deprecated operator "dotsection".
-	Submitted by Sander van der Wal <svdwal@xs4all.nl>
+	Submitted by Sander van der Wal <svdwal@xs4all.nl>.
 
 2001-03-12  Werner Lemberg  <wl@gnu.org>
 
@@ -5294,7 +6841,7 @@
 	* src/cff/cffobjs.c, src/cff/cffobjs.h, src/cff/cffparse.c,
 	src/cff/cffdrivr.c, src/cff/cff.c, src/cff/cffload.c,
 	src/cff/cffgload.c, src/cff/cffgload.h: Changed to use
-	cffgload.{c,h} instead of t2gload.{c,h}.  All occurences of t2_
+	cffgload.{c,h} instead of t2gload.{c,h}.  All occurrences of t2_
 	(T2_) were replaced with cff_ (CFF_, respectively).
 
 	* src/cff/t2gload.h: Renamed cffgload.h.
diff --git a/reactos/lib/freetype/Doxyfile b/reactos/lib/freetype/Doxyfile
deleted file mode 100644
index f8624c0eff1..00000000000
--- a/reactos/lib/freetype/Doxyfile
+++ /dev/null
@@ -1,206 +0,0 @@
-# Doxyfile 1.3.5
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "ReactOS Freetype"
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = doxy-doc
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = YES
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = ../..
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = YES
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = NO
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = YES
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-HAVE_DOT               = YES
-WARN_IF_UNDOCUMENTED   = NO
-WARN_IF_DOC_ERROR      = YES
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = .
-FILE_PATTERNS          = *.c \
-                         *.h
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = YES
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = YES
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-VERBATIM_HEADERS       = NO
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = YES
-TREEVIEW_WIDTH         = 200
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = YES
-RTF_HYPERLINKS         = YES
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = NO
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = ../../include
-INCLUDE_FILE_PATTERNS  = *.h
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = NO
-HAVE_DOT               = YES
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = YES
-GRAPHICAL_HIERARCHY    = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 0
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = YES
diff --git a/reactos/lib/freetype/Jamfile b/reactos/lib/freetype/Jamfile
index 3ba645f6b37..6d944669fc3 100644
--- a/reactos/lib/freetype/Jamfile
+++ b/reactos/lib/freetype/Jamfile
@@ -1,21 +1,22 @@
-# FreeType 2 top Jamfile (c) 2001-2002 David Turner
+# FreeType 2 top Jamfile (c) 2001, 2002, 2003 David Turner
 #
 
 # The HDRMACRO is already defined in FTJam and is used to add
 # the content of certain macros to the list of included header
 # files.
 #
-# we can compile FreeType 2 with classic Jam however thanks to
+# We can compile FreeType 2 with classic Jam however thanks to
 # the following code
 #
 if ! $(JAM_TOOLSET)
 {
   rule HDRMACRO
   {
-    # nothing !!
+    # nothing
   }
 }
 
+
 # We need to invoke a SubDir rule if the FT2 source directory top is not the
 # current directory.  This allows us to build FreeType 2 as part of a larger
 # project easily.
@@ -25,71 +26,83 @@ if $(FT2_TOP) != $(DOT)
   SubDir  FT2_TOP ;
 }
 
-#
-# The following macros define the include directory, the source directory
-# and the final library name (without library extensions). They can be
+
+# The following macros define the include directory, the source directory,
+# and the final library name (without library extensions).  They can be
 # replaced by other definitions when the library is compiled as part of
 # a larger project.
 #
 
-# name of FreeType include directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType include directory during compilation.
+# This is relative to FT2_TOP.
 #
 FT2_INCLUDE_DIR ?= include ;
 
-# name of FreeType source directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType source directory during compilation.
+# This is relative to FT2_TOP.
 #
 FT2_SRC_DIR ?= src ;
 
-# name of final library, without extension
+# Name of final library, without extension.
 #
 FT2_LIB ?= $(LIBPREFIX)freetype ;
 
 
-# define FT2_BUILD_INCLUDE to point to your build-specific directory
-# this is prepended to FT2_INCLUDE_DIR. This can be used to specify
+# Define FT2_BUILD_INCLUDE to point to your build-specific directory.
+# This is prepended to FT2_INCLUDE_DIR.  It can be used to specify
 # the location of a custom <ft2build.h> which will point to custom
-# versions of "ftmodule.h" and "ftoption.h", for example
+# versions of "ftmodule.h" and "ftoption.h", for example.
 #
 FT2_BUILD_INCLUDE ?= ;
 
-# the list of modules to compile on any given build of the library
-# by default, this will contain _all_ modules defined in FT2_SRC_DIR
+# The list of modules to compile on any given build of the library.
+# By default, this will contain _all_ modules defined in FT2_SRC_DIR.
 #
 # IMPORTANT: You'll need to change the content of "ftmodule.h" as well
 #            if you modify this list or provide your own.
 #
-FT2_COMPONENTS ?= gzip       # support for gzip-compressed files.
+FT2_COMPONENTS ?= gzip       # support for gzip-compressed files
                   autohint   # auto-hinter
                   base       # base component (public APIs)
                   bdf        # BDF font driver
                   cache      # cache sub-system
                   cff        # CFF/CEF font driver
-                  cid        # Postscript CID-keyed font driver
+                  cid        # PostScript CID-keyed font driver
                   pcf        # PCF font driver
                   pfr        # PFR/TrueDoc font driver
-                  psaux      # Common Postscript routines module
-                  pshinter   # Postscript hinter module
-                  psnames    # Postscript names handling
-                  raster     # Monochrome rasterizer
-                  smooth     # Anti-aliased rasterizer
+                  psaux      # common PostScript routines module
+                  pshinter   # PostScript hinter module
+                  psnames    # PostScript names handling
+                  raster     # monochrome rasterizer
+                  smooth     # anti-aliased rasterizer
                   sfnt       # SFNT-based format support routines
                   truetype   # TrueType font driver
-                  type1      # Postscript Type 1 font driver
-                  type42     # Postscript Type 42 (embedded TrueType) driver
+                  type1      # PostScript Type 1 font driver
+                  type42     # PostScript Type 42 (embedded TrueType) driver
                   winfonts   # Windows FON/FNT font driver
                   ;
 
 
-# don't touch
+# Don't touch.
 #
 FT2_INCLUDE  = $(FT2_BUILD_INCLUDE)
                [ FT2_SubDir $(FT2_INCLUDE_DIR) ] ;
 
 FT2_SRC      = [ FT2_SubDir $(FT2_SRC_DIR) ] ;
 
-# only used by FreeType developers
+# Location of API Reference Documentation
+#
+if $(DOC_DIR)
+{
+  DOC_DIR = $(DOCDIR:T) ;
+}
+else
+{
+  DOC_DIR = docs/reference ;
+}
+
+
+# Only used by FreeType developers.
 #
 if $(DEBUG_HINTER)
 {
@@ -104,11 +117,12 @@ HDRS += $(FT2_INCLUDE) ;
 
 
 # Uncomment the following line if you want to build individual source files
-# for each FreeType 2 module. this is only useful during development, and
-# is better defined as an environment variable anyway !
+# for each FreeType 2 module.  This is only useful during development, and
+# is better defined as an environment variable anyway!
 #
 # FT2_MULTI = true ;
 
+
 # The file <freetype/config/ftheader.h> is used to define macros that are
 # later used in #include statements.  It needs to be parsed in order to
 # record these definitions.
@@ -116,17 +130,26 @@ HDRS += $(FT2_INCLUDE) ;
 HDRMACRO  [ FT2_SubDir  include freetype config ftheader.h ] ;
 HDRMACRO  [ FT2_SubDir  include freetype internal internal.h ] ;
 
+
 # Now include the Jamfile in "freetype2/src", used to drive the compilation
 # of each FreeType 2 component and/or module.
 #
 SubInclude  FT2_TOP $(FT2_SRC_DIR) ;
 
 
-# tests files (hinter debugging). only used by FreeType developers
+# Test files (hinter debugging).  Only used by FreeType developers.
 #
 if $(DEBUG_HINTER)
 {
   SubInclude FT2_TOP tests ;
 }
 
+actions RefDoc
+{
+  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.1.5 --output=$(DOC_DIR)  $(FT2_INCLUDE)/freetype/*.h  $(FT2_INCLUDE)/freetype/config/*.h  $(FT2_INCLUDE)/freetype/cache/*.h
+}
+
+RefDoc  refdoc ;
+
+
 # end of top Jamfile
diff --git a/reactos/lib/freetype/Jamfile.in b/reactos/lib/freetype/Jamfile.in
index 2ba53bd660d..c933cd92de6 100644
--- a/reactos/lib/freetype/Jamfile.in
+++ b/reactos/lib/freetype/Jamfile.in
@@ -1,21 +1,22 @@
-# FreeType 2 top Jamfile (c) 2001-2002 David Turner
+# FreeType 2 top Jamfile (c) 2001, 2002, 2003 David Turner
 #
 
 # The HDRMACRO is already defined in FTJam and is used to add
 # the content of certain macros to the list of included header
 # files.
 #
-# we can compile FreeType 2 with classic Jam however thanks to
+# We can compile FreeType 2 with classic Jam however thanks to
 # the following code
 #
 if ! $(JAM_TOOLSET)
 {
   rule HDRMACRO
   {
-    # nothing !!
+    # nothing
   }
 }
 
+
 # We need to invoke a SubDir rule if the FT2 source directory top is not the
 # current directory.  This allows us to build FreeType 2 as part of a larger
 # project easily.
@@ -25,71 +26,71 @@ if $(FT2_TOP) != $(DOT)
   SubDir  FT2_TOP ;
 }
 
-#
-# The following macros define the include directory, the source directory
-# and the final library name (without library extensions). They can be
+
+# The following macros define the include directory, the source directory,
+# and the final library name (without library extensions).  They can be
 # replaced by other definitions when the library is compiled as part of
 # a larger project.
 #
 
-# name of FreeType include directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType include directory during compilation.
+# This is relative to FT2_TOP.
 #
 FT2_INCLUDE_DIR ?= include ;
 
-# name of FreeType source directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType source directory during compilation.
+# This is relative to FT2_TOP.
 #
 FT2_SRC_DIR ?= src ;
 
-# name of final library, without extension
+# Name of final library, without extension.
 #
 FT2_LIB ?= $(LIBPREFIX)freetype ;
 
 
-# define FT2_BUILD_INCLUDE to point to your build-specific directory
-# this is prepended to FT2_INCLUDE_DIR. This can be used to specify
+# Define FT2_BUILD_INCLUDE to point to your build-specific directory.
+# This is prepended to FT2_INCLUDE_DIR.  It can be used to specify
 # the location of a custom <ft2build.h> which will point to custom
-# versions of "ftmodule.h" and "ftoption.h", for example
+# versions of "ftmodule.h" and "ftoption.h", for example.
 #
 FT2_BUILD_INCLUDE ?= ;
 
-# the list of modules to compile on any given build of the library
-# by default, this will contain _all_ modules defined in FT2_SRC_DIR
+# The list of modules to compile on any given build of the library.
+# By default, this will contain _all_ modules defined in FT2_SRC_DIR.
 #
 # IMPORTANT: You'll need to change the content of "ftmodule.h" as well
 #            if you modify this list or provide your own.
 #
-FT2_COMPONENTS ?= gzip       # support for gzip-compressed files.
+FT2_COMPONENTS ?= gzip       # support for gzip-compressed files
                   autohint   # auto-hinter
                   base       # base component (public APIs)
                   bdf        # BDF font driver
                   cache      # cache sub-system
                   cff        # CFF/CEF font driver
-                  cid        # Postscript CID-keyed font driver
+                  cid        # PostScript CID-keyed font driver
                   pcf        # PCF font driver
                   pfr        # PFR/TrueDoc font driver
-                  psaux      # Common Postscript routines module
-                  pshinter   # Postscript hinter module
-                  psnames    # Postscript names handling
-                  raster     # Monochrome rasterizer
-                  smooth     # Anti-aliased rasterizer
+                  psaux      # common PostScript routines module
+                  pshinter   # PostScript hinter module
+                  psnames    # PostScript names handling
+                  raster     # monochrome rasterizer
+                  smooth     # anti-aliased rasterizer
                   sfnt       # SFNT-based format support routines
                   truetype   # TrueType font driver
-                  type1      # Postscript Type 1 font driver
-                  type42     # Postscript Type 42 (embedded TrueType) driver
+                  type1      # PostScript Type 1 font driver
+                  type42     # PostScript Type 42 (embedded TrueType) driver
                   winfonts   # Windows FON/FNT font driver
                   ;
 
 
-# don't touch
+# Don't touch.
 #
 FT2_INCLUDE  = $(FT2_BUILD_INCLUDE)
                [ FT2_SubDir $(FT2_INCLUDE_DIR) ] ;
 
 FT2_SRC      = [ FT2_SubDir $(FT2_SRC_DIR) ] ;
 
-# only used by FreeType developers
+# Only used by FreeType developers.
 #
 if $(DEBUG_HINTER)
 {
@@ -103,13 +104,13 @@ if $(DEBUG_HINTER)
 HDRS += $(FT2_INCLUDE) ;
 
 
-#SubDirHdr += $(FT2_INCLUDE) ;
-
 # Uncomment the following line if you want to build individual source files
-# for each FreeType 2 module.
+# for each FreeType 2 module.  This is only useful during development, and
+# is better defined as an environment variable anyway!
 #
 # FT2_MULTI = true ;
 
+
 # The file <freetype/config/ftheader.h> is used to define macros that are
 # later used in #include statements.  It needs to be parsed in order to
 # record these definitions.
@@ -117,13 +118,14 @@ HDRS += $(FT2_INCLUDE) ;
 HDRMACRO  [ FT2_SubDir  include freetype config ftheader.h ] ;
 HDRMACRO  [ FT2_SubDir  include freetype internal internal.h ] ;
 
+
 # Now include the Jamfile in "freetype2/src", used to drive the compilation
 # of each FreeType 2 component and/or module.
 #
 SubInclude  FT2_TOP $(FT2_SRC_DIR) ;
 
 
-# tests files (hinter debugging). only used by FreeType developers
+# Test files (hinter debugging).  Only used by FreeType developers.
 #
 if $(DEBUG_HINTER)
 {
diff --git a/reactos/lib/freetype/Jamrules b/reactos/lib/freetype/Jamrules
index c05e508545e..0b68597d064 100644
--- a/reactos/lib/freetype/Jamrules
+++ b/reactos/lib/freetype/Jamrules
@@ -1,4 +1,4 @@
-# FreeType 2 JamRules (c) 2001 David Turner
+# FreeType 2 JamRules (c) 2001, 2002, 2003 David Turner
 #
 # This file contains the Jam rules needed to build the FreeType 2 library.
 # It is shared by all Jamfiles and is included only once in the build
@@ -6,7 +6,7 @@
 #
 
 
-# call SubDirHdrs on a list of directories
+# Call SubDirHdrs on a list of directories.
 #
 rule AddSubDirHdrs
 {
diff --git a/reactos/lib/freetype/README b/reactos/lib/freetype/README
index 13445c7a578..b50dd0c5769 100644
--- a/reactos/lib/freetype/README
+++ b/reactos/lib/freetype/README
@@ -1,39 +1,36 @@
-
   Special notes to Unix users
   ===========================
 
-  Please   read  the  file   "docs/UPGRADE.UNX",  it   contains  important
-  information  regarding  the  installation  of  FreeType on Unix systems,
+  Please  read  the file  "docs/UPGRADE.UNX".   It contains  important
+  information regarding the installation  of FreeType on Unix systems,
   especially GNU based operating systems like GNU/Linux.
 
-  FreeType 2's library is called `libfreetype', FreeType 1's library
+  FreeType 2's  library is called `libfreetype',  FreeType 1's library
   is called `libttf'.  They are *not* compatible!
 
 
-  FreeType 2.1.4
+  FreeType 2.1.5
   ==============
 
-  Please   read  the  docs/CHANGES   file,  it   contains  IMPORTANT
-  INFORMATION.
+  Please read the docs/CHANGES file, it contains IMPORTANT INFORMATION.
 
-  Read  the  files "docs/INSTALL"  for installation instructions.
+  Read the files "docs/INSTALL" for installation instructions.
 
-  Note  that the  FreeType 2  documentation  is now  available as  a
+  Note  that  the FreeType  2  documentation  is  now available  as  a
   separate package from our sites.  See:
 
-    ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.4.tar.bz2
-    ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.4.tar.gz
-    ftp://ftp.freetype.org/pub/freetype2/ftdoc214.zip
+    ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.5.tar.bz2
+    ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.5.tar.gz
+    ftp://ftp.freetype.org/pub/freetype2/ftdoc215.zip
 
 
-  Reports
-  =======
-
-  Please  report  bugs  by  e-mail to  `devel@freetype.org'.   Don't
-  forget to send  a detailed explanation of the  problem -- there is
-  nothing worse  than receiving a  terse message that only  says "it
-  doesn't work".
+  Bugs
+  ====
 
+  Please report bugs by  e-mail to `devel@freetype.org'.  Don't forget
+  to send  a detailed explanation of  the problem --  there is nothing
+  worse  than receiving  a terse  message that  only says  "it doesn't
+  work".
 
 
   Enjoy!
diff --git a/reactos/lib/freetype/README.ROS b/reactos/lib/freetype/README.ROS
index 9e9ff09eef6..5c330a932e2 100644
--- a/reactos/lib/freetype/README.ROS
+++ b/reactos/lib/freetype/README.ROS
@@ -1,7 +1,7 @@
 CREDITS
 
 The code in this tree is based (it is actually an exact copy with some
-ReactOS specific extra files) on the FreeType library, version 2.1.3.
+ReactOS specific extra files) on the FreeType library, version 2.1.5.
 It was written and is being maintained by the FreeType team. The projects
 website is http://www.freetype.org.
 
@@ -47,6 +47,7 @@ copy lib\freetype.old\rosglue.c lib\freetype
 copy lib\freetype.old\i386\setjmplongjmp.s lib\freetype\i386
 copy lib\freetype.old\Makefile lib\freetype
 copy lib\freetype.old\README.ROS lib\freetype
+copy lib\freetype.old\Doxyfile lib\freetype
 copy lib\freetype.old\.cvsignore lib\freetype
 copy lib\freetype.old\objs\.cvsignore lib\freetype\objs
 copy lib\freetype.old\i386\.cvsignore lib\freetype\i386
@@ -65,4 +66,4 @@ file, so it is obvious to everyone which FreeType version we're using.
 After testing, you can commit the new/changed files to CVS. ALthough files
 config.mk and freetype.def are generated, they should be included in CVS.
 
-$Id: README.ROS,v 1.3 2003/04/18 10:48:12 gvg Exp $
+$Id: README.ROS,v 1.4 2004/01/21 19:23:45 gvg Exp $
diff --git a/reactos/lib/freetype/builds/ansi/ansi-def.mk b/reactos/lib/freetype/builds/ansi/ansi-def.mk
index 032a7b80250..bf2aa36f133 100644
--- a/reactos/lib/freetype/builds/ansi/ansi-def.mk
+++ b/reactos/lib/freetype/builds/ansi/ansi-def.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -17,11 +17,10 @@ ifndef TOP_DIR
   TOP_DIR := .
 endif
 
-DELETE   := rm -f
-SEP      := /
-HOSTSEP  := $(SEP)
-BUILD    := $(TOP_DIR)/builds/ansi
-PLATFORM := ansi
+DELETE    := rm -f
+SEP       := /
+BUILD_DIR := $(TOP_DIR)/builds/ansi
+PLATFORM  := ansi
 
 
 # The directory where all object files are placed.
@@ -34,7 +33,7 @@ PLATFORM := ansi
 #   make -f $TOP_DIR/Makefile
 #
 ifndef OBJ_DIR
-  OBJ_DIR := $(TOP_DIR)$(SEP)objs
+  OBJ_DIR := $(TOP_DIR)/objs
 endif
 
 
diff --git a/reactos/lib/freetype/builds/ansi/ansi.mk b/reactos/lib/freetype/builds/ansi/ansi.mk
index 739d48591e9..32b3bac3e3a 100644
--- a/reactos/lib/freetype/builds/ansi/ansi.mk
+++ b/reactos/lib/freetype/builds/ansi/ansi.mk
@@ -17,4 +17,5 @@ include $(TOP_DIR)/builds/ansi/ansi-def.mk
 include $(TOP_DIR)/builds/compiler/ansi-cc.mk
 include $(TOP_DIR)/builds/link_std.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/beos/beos-def.mk b/reactos/lib/freetype/builds/beos/beos-def.mk
index eb55db94bb6..b569fe62c96 100644
--- a/reactos/lib/freetype/builds/beos/beos-def.mk
+++ b/reactos/lib/freetype/builds/beos/beos-def.mk
@@ -5,7 +5,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -19,11 +19,10 @@ ifndef TOP_DIR
   TOP_DIR := .
 endif
 
-DELETE   := rm -f
-SEP      := /
-HOSTSEP  := $(SEP)
-BUILD    := $(TOP_DIR)/builds/neos
-PLATFORM := beos
+DELETE    := rm -f
+SEP       := /
+BUILD_DIR := $(TOP_DIR)/builds/beos
+PLATFORM  := beos
 
 
 # The directory where all object files are placed.
@@ -36,7 +35,7 @@ PLATFORM := beos
 #   make -f $TOP_DIR/Makefile
 #
 ifndef OBJ_DIR
-  OBJ_DIR := $(TOP_DIR)$(SEP)objs
+  OBJ_DIR := $(TOP_DIR)/objs
 endif
 
 
diff --git a/reactos/lib/freetype/builds/beos/beos.mk b/reactos/lib/freetype/builds/beos/beos.mk
index 1ccf8cea004..1bc8e3ae394 100644
--- a/reactos/lib/freetype/builds/beos/beos.mk
+++ b/reactos/lib/freetype/builds/beos/beos.mk
@@ -15,5 +15,5 @@ include $(TOP_DIR)/builds/compiler/ansi-cc.mk
 include $(TOP_DIR)/builds/beos/beos-def.mk
 include $(TOP_DIR)/builds/link_std.mk
 
-# EOF
 
+# EOF
diff --git a/reactos/lib/freetype/builds/beos/detect.mk b/reactos/lib/freetype/builds/beos/detect.mk
index 89b3f685e29..8333aba4f16 100644
--- a/reactos/lib/freetype/builds/beos/detect.mk
+++ b/reactos/lib/freetype/builds/beos/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -27,15 +27,14 @@ endif
 
 ifeq ($(PLATFORM),beos)
 
-  DELETE   := rm -f
-  SEP      := /
-  HOSTSEP  := $(SEP)
-  BUILD    := $(TOP_DIR)/builds/beos
+  DELETE      := rm -f
+  SEP         := /
+  BUILD_DIR   := $(TOP_DIR)/builds/beos
   CONFIG_FILE := beos.mk
 
   setup: std_setup
 
 endif   # test PLATFORM beos
 
-# EOF
 
+# EOF
diff --git a/reactos/lib/freetype/builds/compiler/ansi-cc.mk b/reactos/lib/freetype/builds/compiler/ansi-cc.mk
index 0309e39fc23..c52c12fccbe 100644
--- a/reactos/lib/freetype/builds/compiler/ansi-cc.mk
+++ b/reactos/lib/freetype/builds/compiler/ansi-cc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
 
 # Compiler command line name
 #
-CC := cc
+CC           := cc
+COMPILER_SEP := $(SEP)
+
 
 # The object file extension (for standard and static libraries).  This can be
 # .o, .tco, .obj, etc., depending on the platform.
@@ -74,8 +76,9 @@ ANSIFLAGS :=
 # Library linking
 #
 ifndef CLEAN_LIBRARY
-  CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+  CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
 endif
-LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
+LINK_LIBRARY = $(AR) -r $@ $(subst /,$(COMPILER_SEP),$(OBJECTS_LIST))
+
 
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/bcc-dev.mk b/reactos/lib/freetype/builds/compiler/bcc-dev.mk
index aa5c369d822..446fd4e62e0 100644
--- a/reactos/lib/freetype/builds/compiler/bcc-dev.mk
+++ b/reactos/lib/freetype/builds/compiler/bcc-dev.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
 
 # Compiler command line name
 #
-CC := bcc32
+CC           := bcc32
+COMPILER_SEP := $(SEP)
+
 
 # The object file extension (for standard and static libraries).  This can be
 # .o, .tco, .obj, etc., depending on the platform.
@@ -72,9 +74,9 @@ ANSIFLAGS := -A
 # Library linking
 #
 ifndef CLEAN_LIBRARY
-  CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+  CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
 endif
-TARGET_OBJECTS = $(subst $(SEP),\\,$(OBJECTS_LIST))
-LINK_LIBRARY   = tlib /u $(subst $(SEP),\\,$@) $(TARGET_OBJECTS:%=+%)
+LINK_LIBRARY = tlib /u $(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST:%=+%))
+
 
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/bcc.mk b/reactos/lib/freetype/builds/compiler/bcc.mk
index 938eceeac71..eedfa10fba8 100644
--- a/reactos/lib/freetype/builds/compiler/bcc.mk
+++ b/reactos/lib/freetype/builds/compiler/bcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
 
 # Compiler command line name
 #
-CC := bcc32
+CC           := bcc32
+COMPILER_SEP := $(SEP)
+
 
 # The object file extension (for standard and static libraries).  This can be
 # .o, .tco, .obj, etc., depending on the platform.
@@ -72,9 +74,9 @@ ANSIFLAGS := -A
 # Library linking
 #
 ifndef CLEAN_LIBRARY
-  CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+  CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
 endif
-TARGET_OBJECTS = $(subst $(SEP),\\,$(OBJECTS_LIST))
-LINK_LIBRARY   = tlib /u $(subst $(SEP),\\,$@) $(TARGET_OBJECTS:%=+%)
+LINK_LIBRARY = tlib /u $(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST:%=+%))
+
 
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/emx.mk b/reactos/lib/freetype/builds/compiler/emx.mk
new file mode 100644
index 00000000000..f2be13ca66d
--- /dev/null
+++ b/reactos/lib/freetype/builds/compiler/emx.mk
@@ -0,0 +1,81 @@
+#
+# FreeType 2 emx-specific definitions
+#
+
+
+# Copyright 2003 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
+# Compiler command line name
+#
+CC           := set GCCOPT="-ansi -pedantic"; gcc
+COMPILER_SEP := /
+
+
+# The object file extension (for standard and static libraries).  This can be
+# .o, .tco, .obj, etc., depending on the platform.
+#
+O  := o
+SO := o
+
+# The library file extension (for standard and static libraries).  This can
+# be .a, .lib, etc., depending on the platform.
+#
+A  := a
+SA := a
+
+
+# Path inclusion flag.  Some compilers use a different flag than `-I' to
+# specify an additional include path.  Examples are `/i=' or `-J'.
+#
+I := -I
+
+
+# C flag used to define a macro before the compilation of a given source
+# object.  Usually it is `-D' like in `-DDEBUG'.
+#
+D := -D
+
+
+# The link flag used to specify a given library file on link.  Note that
+# this is only used to compile the demo programs, not the library itself.
+#
+L := -l
+
+
+# Target flag.
+#
+T := -o$(space)
+
+# C flags
+#
+#   These should concern: debug output, optimization & warnings.
+#
+#   Use the ANSIFLAGS variable to define the compiler flags used to enfore
+#   ANSI compliance.
+#
+ifndef CFLAGS
+  CFLAGS := -c -g -O6 -Wall
+endif
+
+# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+#
+ANSIFLAGS :=
+
+
+# Library linking
+#
+ifndef CLEAN_LIBRARY
+  CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
+endif
+LINK_LIBRARY = $(foreach m,$(OBJECTS_LIST),$(AR) -r $@ $(m);) echo > nul
+
+
+# EOF
diff --git a/reactos/lib/freetype/builds/compiler/gcc-dev.mk b/reactos/lib/freetype/builds/compiler/gcc-dev.mk
index 76d0ba0b543..15879f85b3b 100644
--- a/reactos/lib/freetype/builds/compiler/gcc-dev.mk
+++ b/reactos/lib/freetype/builds/compiler/gcc-dev.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
 
 # Compiler command line name
 #
-CC := gcc
+CC           := gcc
+COMPILER_SEP := /
+
 
 # The object file extension (for standard and static libraries).  This can be
 # .o, .tco, .obj, etc., depending on the platform.
@@ -62,6 +64,7 @@ T := -o$(space)
 #
 ifndef CFLAGS
   CFLAGS := -c -g -O0 \
+            -fno-strict-aliasing \
             -Wall \
             -W \
             -Wundef \
@@ -82,8 +85,9 @@ ANSIFLAGS := -ansi -pedantic
 # Library linking
 #
 ifndef CLEAN_LIBRARY
-  CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+  CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
 endif
 LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/gcc.mk b/reactos/lib/freetype/builds/compiler/gcc.mk
index f2c94de3bc3..d51f642d02e 100644
--- a/reactos/lib/freetype/builds/compiler/gcc.mk
+++ b/reactos/lib/freetype/builds/compiler/gcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
 
 # Compiler command line name
 #
-CC := gcc
+CC           := gcc
+COMPILER_SEP := /
+
 
 # The object file extension (for standard and static libraries).  This can be
 # .o, .tco, .obj, etc., depending on the platform.
@@ -60,7 +62,7 @@ T := -o$(space)
 #   ANSI compliance.
 #
 ifndef CFLAGS
-  CFLAGS := -c -g -O6 -Wall
+  CFLAGS := -c -g -O6 -Wall -fno-strict-aliasing
 endif
 
 # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
@@ -71,8 +73,9 @@ ANSIFLAGS := -ansi -pedantic
 # Library linking
 #
 ifndef CLEAN_LIBRARY
-  CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+  CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
 endif
 LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/intelc.mk b/reactos/lib/freetype/builds/compiler/intelc.mk
index 0c3088a73d4..954dcf64c31 100644
--- a/reactos/lib/freetype/builds/compiler/intelc.mk
+++ b/reactos/lib/freetype/builds/compiler/intelc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
 
 # compiler command line name
 #
-CC := icl
+CC           := icl
+COMPILER_SEP := $(SEP)
 
 
 # The object file extension (for standard and static libraries).  This can be
@@ -79,6 +80,7 @@ ANSIFLAGS := /Qansi /Za
 # Library linking
 #
 #CLEAN_LIBRARY =
-LINK_LIBRARY  = lib /nologo /out:$@ $(OBJECTS_LIST)
+LINK_LIBRARY = lib /nologo /out:$(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST))
+
 
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/unix-lcc.mk b/reactos/lib/freetype/builds/compiler/unix-lcc.mk
index fd8c7fbd9dd..cf4ef5a0054 100644
--- a/reactos/lib/freetype/builds/compiler/unix-lcc.mk
+++ b/reactos/lib/freetype/builds/compiler/unix-lcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
 
 # Command line name
 #
-CC := lcc
+CC           := lcc
+COMPILER_SEP := $(SEP)
 
 
 # The object file extension (for standard and static libraries).  This can be
@@ -78,8 +79,9 @@ ANSIFLAGS := -A
 # library linking
 #
 ifndef CLEAN_LIBRARY
-  CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+  CLEAN_LIBRARY = $(DELETE) $(PROJECT_LIBRARY)
 endif
 LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/visualage.mk b/reactos/lib/freetype/builds/compiler/visualage.mk
index 3d07ac6eca2..21ef12b2770 100644
--- a/reactos/lib/freetype/builds/compiler/visualage.mk
+++ b/reactos/lib/freetype/builds/compiler/visualage.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
 
 # command line compiler name
 #
-CC := icc
+CC           := icc
+COMPILER_SEP := $(SEP)
 
 
 # The object file extension (for standard and static libraries).  This can be
@@ -71,6 +72,7 @@ ANSI_FLAGS := /Sa
 # Library linking
 #
 #CLEAN_LIBRARY :=
-LINK_LIBRARY   = lib /nologo /out:$@ $(OBJECTS_LIST)
+LINK_LIBRARY = lib /nologo /out:$(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST))
+
 
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/visualc.mk b/reactos/lib/freetype/builds/compiler/visualc.mk
index 235a4df0679..92d71a9740c 100644
--- a/reactos/lib/freetype/builds/compiler/visualc.mk
+++ b/reactos/lib/freetype/builds/compiler/visualc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
 
 # compiler command line name
 #
-CC := cl
+CC           := cl
+COMPILER_SEP := $(SEP)
 
 
 # The object file extension (for standard and static libraries).  This can be
@@ -74,6 +75,7 @@ ANSIFLAGS := /Za
 # Library linking
 #
 #CLEAN_LIBRARY =
-LINK_LIBRARY  = lib /nologo /out:$@ $(OBJECTS_LIST)
+LINK_LIBRARY  = lib /nologo /out:$(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST))
+
 
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/watcom.mk b/reactos/lib/freetype/builds/compiler/watcom.mk
index 7669ed62096..12394be4bb8 100644
--- a/reactos/lib/freetype/builds/compiler/watcom.mk
+++ b/reactos/lib/freetype/builds/compiler/watcom.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
 
 # Compiler command line name
 #
-CC := wcc386
+CC           := wcc386
+COMPILER_SEP := $(SEP)
 
 
 # The object file extension (for standard and static libraries).  This can be
@@ -74,8 +75,11 @@ ANSIFLAGS := -za
 # Library linking
 #
 ifndef CLEAN_LIBRARY
-  CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+  CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
 endif
-LINK_LIBRARY = wlib -q -o = $@ $(OBJECTS_LIST)
+LINK_LIBRARY = $(subst /,$(COMPILER_SEP), \
+                 wlib -q -n $@; \
+                 $(foreach m, $(OBJECTS_LIST), wlib -q $@ +$(m);) \
+                 echo > nul)
 
 # EOF
diff --git a/reactos/lib/freetype/builds/compiler/win-lcc.mk b/reactos/lib/freetype/builds/compiler/win-lcc.mk
index 6e9512ae53d..c500d82cf42 100644
--- a/reactos/lib/freetype/builds/compiler/win-lcc.mk
+++ b/reactos/lib/freetype/builds/compiler/win-lcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
 
 # Command line name
 #
-CC := lcc
+CC           := lcc
+COMPILER_SEP := $(SEP)
 
 
 # The object file extension (for standard and static libraries).  This can be
@@ -76,6 +77,7 @@ ANSIFLAGS :=
 # library linking
 #
 #CLEAN_LIBRARY :=
-LINK_LIBRARY = lcclib /out:$(subst $(SEP),\\,$@) $(subst $(SEP),\\,$(OBJECTS_LIST))
+LINK_LIBRARY = lcclib /out:$(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST))
+
 
 # EOF
diff --git a/reactos/lib/freetype/builds/detect.mk b/reactos/lib/freetype/builds/detect.mk
index 5c7b74cbb26..eeb1300bcba 100644
--- a/reactos/lib/freetype/builds/detect.mk
+++ b/reactos/lib/freetype/builds/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2001, 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -16,7 +16,7 @@
 # This sub-Makefile is in charge of detecting the current platform.  It sets
 # the following variables:
 #
-#   BUILD        The configuration and system-specific directory.  Usually
+#   BUILD_DIR    The configuration and system-specific directory.  Usually
 #                `freetype/builds/$(PLATFORM)' but can be different for
 #                custom builds of the library.
 #
@@ -30,6 +30,7 @@
 #   DELETE       The shell command used to remove a given file.
 #   COPY         The shell command used to copy one file.
 #   SEP          The platform-specific directory separator.
+#   COMPILER_SEP The separator used in arguments of the compilation tools.
 #   CC           The compiler to use.
 #
 # You need to set the following variable(s) before calling it:
@@ -44,17 +45,17 @@ ifndef TOP_DIR
 endif
 
 # Set auto-detection default to `ansi' resp. UNIX-like operating systems.
-# Note that we delay evaluation of $(BUILD_CONFIG_), $(BUILD), and
-# $(CONFIG_RULES).
 #
-PLATFORM := ansi
-DELETE   := $(RM)
-COPY     := cp
-SEP      := /
+PLATFORM     := ansi
+DELETE       := $(RM)
+COPY         := cp
+SEP          := /
 
-BUILD_CONFIG_ = $(TOP_DIR)$(SEP)builds$(SEP)
-BUILD         = $(BUILD_CONFIG_)$(PLATFORM)
-CONFIG_RULES  = $(BUILD)$(SEP)$(CONFIG_FILE)
+BUILD_CONFIG := $(TOP_DIR)/builds
+
+# These two assignments must be delayed.
+BUILD_DIR    = $(BUILD_CONFIG)/$(PLATFORM)
+CONFIG_RULES = $(BUILD_DIR)/$(CONFIG_FILE)
 
 # We define the BACKSLASH variable to hold a single back-slash character.
 # This is needed because a line like
@@ -72,12 +73,12 @@ BACKSLASH := $(strip \ )
 
 # Find all auto-detectable platforms.
 #
-PLATFORMS_ := $(notdir $(subst /detect.mk,,$(wildcard $(BUILD_CONFIG_)*/detect.mk)))
-.PHONY: $(PLATFORMS_) ansi
+PLATFORMS := $(notdir $(subst /detect.mk,,$(wildcard $(BUILD_CONFIG)/*/detect.mk)))
+.PHONY: $(PLATFORMS) ansi
 
 # Filter out platform specified as setup target.
 #
-PLATFORM := $(firstword $(filter $(MAKECMDGOALS),$(PLATFORMS_)))
+PLATFORM := $(firstword $(filter $(MAKECMDGOALS),$(PLATFORMS)))
 
 # If no setup target platform was specified, enable auto-detection/
 # default platform.
@@ -94,7 +95,7 @@ ifeq ($(findstring ansi,$(MAKECMDGOALS)),)
   # directories.  Note that the calling order of the various `detect.mk'
   # files isn't predictable.
   #
-  include $(wildcard $(BUILD_CONFIG_)*/detect.mk)
+  include $(wildcard $(BUILD_CONFIG)/*/detect.mk)
 endif
 
 # In case no detection rule file was successful, use the default.
@@ -121,13 +122,14 @@ std_setup:
 	@echo ""
 	@echo "  platform                    $(PLATFORM)"
 	@echo "  compiler                    $(CC)"
-	@echo "  configuration directory     $(BUILD)"
+	@echo "  configuration directory     $(BUILD_DIR)"
 	@echo "  configuration rules         $(CONFIG_RULES)"
 	@echo ""
 	@echo "If this does not correspond to your system or settings please remove the file"
 	@echo "\`$(CONFIG_MK)' from this directory then read the INSTALL file for help."
 	@echo ""
-	@echo "Otherwise, simply type \`$(MAKE)' again to build the library."
+	@echo "Otherwise, simply type \`$(MAKE)' again to build the library,"
+	@echo "or \`$(MAKE) refdoc' to build the API reference (the latter needs python)."
 	@echo ""
 	@$(COPY) $(CONFIG_RULES) $(CONFIG_MK)
 
@@ -140,4 +142,18 @@ dos_setup:
 	@type builds\newline
 	@echo The following settings are used:
 	@type builds\newline
-	@echo   platform
\ No newline at end of file
+	@echo   platformÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(PLATFORM)
+	@echo   compilerÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(CC)
+	@echo   configuration directoryÿÿÿÿÿÿ$(subst /,\,$(BUILD_DIR))
+	@echo   configuration rulesÿÿÿÿÿÿÿÿÿÿ$(subst /,\,$(CONFIG_RULES))
+	@type builds\newline
+	@echo If this does not correspond to your system or settings please remove the file
+	@echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help.
+	@type builds\newline
+	@echo Otherwise, simply type 'make' again to build the library.
+	@echo or 'make refdoc' to build the API reference (the latter needs python).
+	@type builds\newline
+	@$(COPY) $(subst /,\,$(CONFIG_RULES) $(CONFIG_MK)) > nul
+
+
+# EOF
diff --git a/reactos/lib/freetype/builds/dos/detect.mk b/reactos/lib/freetype/builds/dos/detect.mk
index 046784887d8..b80686ce52f 100644
--- a/reactos/lib/freetype/builds/dos/detect.mk
+++ b/reactos/lib/freetype/builds/dos/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -23,7 +23,8 @@ ifeq ($(PLATFORM),ansi)
   # `make' utility is run).
   #
   # We test for the COMSPEC environment variable, then run the `ver'
-  # command-line program to see if its output contains the word `Dos'.
+  # command-line program to see if its output contains the word `Dos' or
+  # `DOS'.
   #
   # If this is true, we are running a Dos-ish platform (or an emulation).
   #
@@ -31,7 +32,7 @@ ifeq ($(PLATFORM),ansi)
     PLATFORM := dos
   else
     ifdef COMSPEC
-      is_dos := $(findstring Dos,$(shell ver))
+      is_dos := $(findstring DOS,$(subst Dos,DOS,$(shell ver)))
 
       # We try to recognize a Dos session under OS/2.  The `ver' command
       # returns `Operating System/2 ...' there, so `is_dos' should be empty.
@@ -57,16 +58,21 @@ ifeq ($(PLATFORM),dos)
   # Use DJGPP (i.e. gcc) by default.
   #
   CONFIG_FILE := dos-gcc.mk
-  SEP         := /
   ifndef CC
     CC        := gcc
   endif
 
   # additionally, we provide hooks for various other compilers
   #
+  ifneq ($(findstring emx,$(MAKECMDGOALS)),)        # EMX gcc
+    CONFIG_FILE := dos-emx.mk
+    CC          := gcc
+    emx: setup
+    .PHONY: emx
+  endif
+
   ifneq ($(findstring turboc,$(MAKECMDGOALS)),)     # Turbo C
     CONFIG_FILE := dos-tcc.mk
-    SEP         := $(BACKSLASH)
     CC          := tcc
     turboc: setup
     .PHONY: turboc
@@ -74,7 +80,6 @@ ifeq ($(PLATFORM),dos)
 
   ifneq ($(findstring watcom,$(MAKECMDGOALS)),)     # Watcom C/C++
     CONFIG_FILE := dos-wat.mk
-    SEP         := $(BACKSLASH)
     CC          := wcc386
     watcom: setup
     .PHONY: watcom
@@ -82,7 +87,6 @@ ifeq ($(PLATFORM),dos)
 
   ifneq ($(findstring borlandc,$(MAKECMDGOALS)),)   # Borland C/C++ 32-bit
     CONFIG_FILE := dos-bcc.mk
-    SEP         := $(BACKSLASH)
     CC          := bcc32
     borlandc: setup
     .PHONY: borlandc
@@ -90,17 +94,18 @@ ifeq ($(PLATFORM),dos)
 
   ifneq ($(findstring borlandc16,$(MAKECMDGOALS)),) # Borland C/C++ 16-bit
     CONFIG_FILE := dos-bcc.mk
-    SEP         := $(BACKSLASH)
     CC          := bcc
     borlandc16: setup
     .PHONY: borlandc16
   endif
 
   ifneq ($(findstring bash,$(SHELL)),)              # check for bash
+    SEP    := /
     DELETE := rm
     COPY   := cp
     setup: std_setup
   else
+    SEP    := $(BACKSLASH)
     DELETE := del
     COPY   := copy
     setup: dos_setup
@@ -108,4 +113,5 @@ ifeq ($(PLATFORM),dos)
 
 endif     # test PLATFORM dos
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/dos/dos-def.mk b/reactos/lib/freetype/builds/dos/dos-def.mk
index d2bcbd437e5..d6bc72e7b29 100644
--- a/reactos/lib/freetype/builds/dos/dos-def.mk
+++ b/reactos/lib/freetype/builds/dos/dos-def.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,15 +13,10 @@
 # fully.
 
 
-DELETE   := del
-HOSTSEP  := $(strip \ )
-BUILD    := $(TOP_DIR)$(SEP)builds$(SEP)dos
-PLATFORM := dos
-
-# except for DJGPP/GCC on Dos
-ifndef SEP
-SEP      := $(HOSTSEP)
-endif
+DELETE    := del
+SEP       := $(strip \ )
+BUILD_DIR := $(TOP_DIR)/builds/dos
+PLATFORM  := dos
 
 
 # The directory where all object files are placed.
@@ -34,7 +29,7 @@ endif
 #   make -f %TOP_DIR%/Makefile
 #
 ifndef OBJ_DIR
-  OBJ_DIR := $(TOP_DIR)$(SEP)objs
+  OBJ_DIR := $(TOP_DIR)/objs
 endif
 
 
diff --git a/reactos/lib/freetype/src/type1/descrip.mms b/reactos/lib/freetype/builds/dos/dos-emx.mk
similarity index 62%
rename from reactos/lib/freetype/src/type1/descrip.mms
rename to reactos/lib/freetype/builds/dos/dos-emx.mk
index 8f028f6ff46..6ea8f6d872f 100644
--- a/reactos/lib/freetype/src/type1/descrip.mms
+++ b/reactos/lib/freetype/builds/dos/dos-emx.mk
@@ -1,9 +1,9 @@
 #
-# FreeType 2 Type1 driver compilation rules for VMS
+# FreeType 2 configuration rules for the EMX gcc compiler
 #
 
 
-# Copyright 1996-2000, 2002 by
+# Copyright 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,11 +13,9 @@
 # fully.
 
 
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type1])
+include $(TOP_DIR)/builds/dos/dos-def.mk
+include $(TOP_DIR)/builds/compiler/emx.mk
+include $(TOP_DIR)/builds/link_dos.mk
 
-OBJS=type1.obj
-
-all : $(OBJS)
-        library [--.lib]freetype.olb $(OBJS)
 
 # EOF
diff --git a/reactos/lib/freetype/builds/dos/dos-gcc.mk b/reactos/lib/freetype/builds/dos/dos-gcc.mk
index 14a9d38dd6e..e14255c1f27 100644
--- a/reactos/lib/freetype/builds/dos/dos-gcc.mk
+++ b/reactos/lib/freetype/builds/dos/dos-gcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,10 +13,9 @@
 # fully.
 
 
-SEP := /
-
 include $(TOP_DIR)/builds/dos/dos-def.mk
 include $(TOP_DIR)/builds/compiler/gcc.mk
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/vms/descrip.mms b/reactos/lib/freetype/builds/dos/dos-wat.mk
similarity index 50%
rename from reactos/lib/freetype/builds/vms/descrip.mms
rename to reactos/lib/freetype/builds/dos/dos-wat.mk
index 54392d1099d..0c39e4979c5 100644
--- a/reactos/lib/freetype/builds/vms/descrip.mms
+++ b/reactos/lib/freetype/builds/dos/dos-wat.mk
@@ -1,25 +1,17 @@
 #
-# FreeType 2 system rules for VMS
+# FreeType 2 configuration rules for the Watcom C/C++ compiler
 #
 
 
-# Copyright 2001 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
 # This file is part of the FreeType project, and may only be used, modified,
 # and distributed under the terms of the FreeType project license,
 # LICENSE.TXT.  By continuing to use, modify, or distribute this file you
 # indicate that you have read the license and understand and accept it
 # fully.
 
+include $(TOP_DIR)/builds/dos/dos-def.mk
+include $(TOP_DIR)/builds/compiler/watcom.mk
+include $(TOP_DIR)/builds/link_dos.mk
 
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([],[--.include],[--.src.base])
-
-OBJS=ftsystem.obj
-
-all : $(OBJS)
-        library/create [--.lib]freetype.olb $(OBJS)
-
-ftsystem.obj : ftsystem.c ftconfig.h
 
 # EOF
diff --git a/reactos/lib/freetype/builds/freetype.mk b/reactos/lib/freetype/builds/freetype.mk
index 9b5921cc90e..b9e553ba46f 100644
--- a/reactos/lib/freetype/builds/freetype.mk
+++ b/reactos/lib/freetype/builds/freetype.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2002 by
+# Copyright 1996-2000, 2001, 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -20,13 +20,15 @@
 # The following variables (set by other Makefile components, in the
 # environment, or on the command line) are used:
 #
-#   BUILD          The architecture dependent directory,
+#   BUILD_DIR      The architecture dependent directory,
 #                  e.g. `$(TOP_DIR)/builds/unix'.
 #
 #   OBJ_DIR        The directory in which object files are created.
 #
 #   LIB_DIR        The directory in which the library is created.
 #
+#   DOC_DIR        The directory in which the API reference is created.
+#
 #   INCLUDES       A list of directories to be included additionally.
 #                  Usually empty.
 #
@@ -63,6 +65,7 @@
 #                  `distclean' target.
 #
 #   TOP_DIR, SEP,
+#   COMPILER_SEP,
 #   LIBRARY, CC,
 #   A, I, O, T     Check `config.mk' for details.
 
@@ -70,7 +73,7 @@
 # The targets `objects' and `library' are defined at the end of this
 # Makefile after all other rules have been included.
 #
-.PHONY: single multi objects library
+.PHONY: single multi objects library refdoc
 
 # default target -- build single objects and library
 #
@@ -83,43 +86,29 @@ multi: objects library
 
 # The FreeType source directory, usually `./src'.
 #
-SRC := $(TOP_DIR)$(SEP)src
-
+SRC_DIR := $(TOP_DIR)/src
 
 # The directory where the base layer components are placed, usually
 # `./src/base'.
 #
-BASE_DIR := $(SRC)$(SEP)base
+BASE_DIR := $(SRC_DIR)/base
 
-# The build header file used to define all public header file names
-# as macro.
+# Other derived directories.
 #
-ifndef FT_BUILD_H
-  FT_BUILD_H  := $(TOP_DIR)$(SEP)include$(SEP)ft2build.h
-  FTBUILD_CMD :=
-else
-  FTBUILD_CMD = $(D)FT_BUILD_H=$(FT_BUILD_H)
+PUBLIC_DIR   := $(TOP_DIR)/include/freetype
+INTERNAL_DIR := $(PUBLIC_DIR)/internal
+CONFIG_DIR   := $(PUBLIC_DIR)/config
+CACHE_DIR    := $(PUBLIC_DIR)/cache
+
+# The documentation directory.
+#
+ifndef DOC_DIR
+  DOC_DIR := $(TOP_DIR)/docs/reference
 endif
 
-# A few short-cuts in order to avoid typing $(SEP) all the time for the
-# directory separator.
-#
-# For example: $(SRC_) equals to `./src/' where `.' is $(TOP_DIR).
-#
-#
-SRC_      := $(SRC)$(SEP)
-BASE_     := $(BASE_DIR)$(SEP)
-OBJ_      := $(OBJ_DIR)$(SEP)
-LIB_      := $(LIB_DIR)$(SEP)
-PUBLIC_   := $(TOP_DIR)$(SEP)include$(SEP)freetype$(SEP)
-INTERNAL_ := $(PUBLIC_)internal$(SEP)
-CONFIG_   := $(PUBLIC_)config$(SEP)
-CACHE_    := $(PUBLIC_)cache$(SEP)
-
-
 # The final name of the library file.
 #
-PROJECT_LIBRARY := $(LIB_)$(LIBRARY).$A
+PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A
 
 
 # include paths
@@ -130,7 +119,8 @@ PROJECT_LIBRARY := $(LIB_)$(LIBRARY).$A
 #                 in the `freetype/builds/<system>' directory, as these
 #                 files will override the default sources.
 #
-INCLUDES := $(OBJ_DIR) $(BUILD) $(TOP_DIR)$(SEP)include
+INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) $(BUILD_DIR) \
+                                      $(TOP_DIR)/include)
 
 INCLUDE_FLAGS = $(INCLUDES:%=$I%)
 
@@ -164,46 +154,47 @@ OBJECTS_LIST :=
 # This is used to simplify the dependency rules -- if one of these files
 # changes, the whole library is recompiled.
 #
-PUBLIC_H   := $(wildcard $(PUBLIC_)*.h)
-BASE_H     := $(wildcard $(INTERNAL_)*.h)
-CONFIG_H   := $(wildcard $(CONFIG_)*.h) \
-              $(wildcard $(BUILD)$(SEP)freetype$(SEP)config$(SEP)*.h)
-CACHE_H    := $(wildcard $(CACHE_)*.h)
+PUBLIC_H   := $(wildcard $(PUBLIC_DIR)/*.h)
+BASE_H     := $(wildcard $(INTERNAL_DIR)/*.h)
+CONFIG_H   := $(wildcard $(CONFIG_DIR)/*.h) \
+              $(wildcard $(BUILD_DIR)/freetype/config/*.h)
+CACHE_H    := $(wildcard $(CACHE_DIR)/*.h)
+DEVEL_H    := $(wildcard $(TOP_DIR)/devel/*.h)
 
-FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(CACHE_H)
+FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(CACHE_H) $(DEVEL_H)
 
 
 # ftsystem component
 #
 ifndef FTSYS_SRC
-  FTSYS_SRC = $(BASE_)ftsystem.c
+  FTSYS_SRC = $(BASE_DIR)/ftsystem.c
 endif
 
-FTSYS_OBJ = $(OBJ_)ftsystem.$O
+FTSYS_OBJ = $(OBJ_DIR)/ftsystem.$O
 
 OBJECTS_LIST += $(FTSYS_OBJ)
 
 $(FTSYS_OBJ): $(FTSYS_SRC) $(FREETYPE_H)
-	$(FT_COMPILE) $T$@ $<
+	$(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # ftdebug component
 #
 ifndef FTDEBUG_SRC
-  FTDEBUG_SRC = $(BASE_)ftdebug.c
+  FTDEBUG_SRC = $(BASE_DIR)/ftdebug.c
 endif
 
-FTDEBUG_OBJ = $(OBJ_)ftdebug.$O
+FTDEBUG_OBJ = $(OBJ_DIR)/ftdebug.$O
 
 OBJECTS_LIST += $(FTDEBUG_OBJ)
 
 $(FTDEBUG_OBJ): $(FTDEBUG_SRC) $(FREETYPE_H)
-	$(FT_COMPILE) $T$@ $<
+	$(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # Include all rule files from FreeType components.
 #
-include $(wildcard $(SRC)/*/rules.mk)
+include $(wildcard $(SRC_DIR)/*/rules.mk)
 
 
 # ftinit component
@@ -217,13 +208,13 @@ include $(wildcard $(SRC)/*/rules.mk)
 #   which contain additional include paths and macros used to compile the
 #   single `ftinit.c' source.
 #
-FTINIT_SRC := $(BASE_)ftinit.c
-FTINIT_OBJ := $(OBJ_)ftinit.$O
+FTINIT_SRC := $(BASE_DIR)/ftinit.c
+FTINIT_OBJ := $(OBJ_DIR)/ftinit.$O
 
 OBJECTS_LIST += $(FTINIT_OBJ)
 
 $(FTINIT_OBJ): $(FTINIT_SRC) $(FREETYPE_H) $(FT_MODULE_LIST)
-	$(FT_COMPILE) $T$@ $<
+	$(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # All FreeType library objects
@@ -255,7 +246,17 @@ objects: $(OBJECTS_LIST)
 library: $(PROJECT_LIBRARY)
 
 .c.$O:
-	$(FT_COMPILE) $T$@ $<
+	$(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
+
+
+refdoc:
+	python $(SRC_DIR)/tools/docmaker/docmaker.py \
+               --prefix=ft2                          \
+               --title=FreeType-2.1.5                \
+               --output=$(DOC_DIR)                   \
+               $(PUBLIC_DIR)/*.h                     \
+               $(PUBLIC_DIR)/config/*.h              \
+               $(PUBLIC_DIR)/cache/*.h
 
 
 .PHONY: clean_project_std distclean_project_std
@@ -280,10 +281,10 @@ distclean_project_std: clean_project_std
 # working correctly on Win9x.
 #
 clean_project_dos:
-	-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(OBJ_))*.$O $(CLEAN) $(NO_OUTPUT)
+	-$(DELETE) $(subst /,\,$(OBJ)/*.$O $(CLEAN) $(NO_OUTPUT))
 
 distclean_project_dos: clean_project_dos
-	-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) $(DISTCLEAN) $(NO_OUTPUT)
+	-$(DELETE) $(subst /,\,$(PROJECT_LIBRARY) $(DISTCLEAN) $(NO_OUTPUT))
 
 
 .PHONY: remove_config_mk
@@ -291,7 +292,7 @@ distclean_project_dos: clean_project_dos
 # Remove configuration file (used for distclean).
 #
 remove_config_mk:
-	-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(CONFIG_MK)) $(NO_OUTPUT)
+	-$(DELETE) $(subst /,$(SEP),$(CONFIG_MK) $(NO_OUTPUT))
 
 
 .PHONY: clean distclean
@@ -303,5 +304,7 @@ remove_config_mk:
 #
 clean: clean_project
 distclean: distclean_project remove_config_mk
+	-$(DELETE) $(subst /,$(SEP),$(DOC_DIR)/*.html $(NO_OUTPUT))
+
 
 # EOF
diff --git a/reactos/lib/freetype/builds/link_dos.mk b/reactos/lib/freetype/builds/link_dos.mk
index bc36ed0ad6b..c37ac7e52c1 100644
--- a/reactos/lib/freetype/builds/link_dos.mk
+++ b/reactos/lib/freetype/builds/link_dos.mk
@@ -38,4 +38,5 @@ ifdef BUILD_PROJECT
 
 endif
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/link_std.mk b/reactos/lib/freetype/builds/link_std.mk
index d59f2c3a315..0bd2163bb19 100644
--- a/reactos/lib/freetype/builds/link_std.mk
+++ b/reactos/lib/freetype/builds/link_std.mk
@@ -38,4 +38,5 @@ ifdef BUILD_PROJECT
 
 endif
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/mac/freetype.make b/reactos/lib/freetype/builds/mac/freetype.make
index 0767ada6fe8..085c2600f72 100644
--- a/reactos/lib/freetype/builds/mac/freetype.make
+++ b/reactos/lib/freetype/builds/mac/freetype.make
@@ -1,3 +1,109 @@
 # Makefile for Apple MPW build environment (currently PPC only)
 
 MAKEFILE     = Makefile
+ÿMondoBuildÿ = #{MAKEFILE}  # Make blank to avoid rebuilds when makefile is modified
+SymÿPPC      = #-sym on
+ObjDirÿPPC   = :obj:
+
+CFLAGS  = -i :include -i :src -includes unix {SymÿPPC}
+
+OBJS  = ÿ
+		"{ObjDirÿPPC}ftsystem.c.x" ÿ
+		"{ObjDirÿPPC}ftdebug.c.x" ÿ
+		"{ObjDirÿPPC}ftinit.c.x" ÿ
+		"{ObjDirÿPPC}ftbase.c.x" ÿ
+		"{ObjDirÿPPC}ftglyph.c.x" ÿ
+		"{ObjDirÿPPC}ftmm.c.x" ÿ
+		"{ObjDirÿPPC}ftbbox.c.x" ÿ
+		"{ObjDirÿPPC}autohint.c.x" ÿ
+		"{ObjDirÿPPC}ftcache.c.x" ÿ
+		"{ObjDirÿPPC}cff.c.x" ÿ
+		"{ObjDirÿPPC}type1cid.c.x" ÿ
+		"{ObjDirÿPPC}pcf.c.x" ÿ
+		"{ObjDirÿPPC}psaux.c.x" ÿ
+		"{ObjDirÿPPC}psmodule.c.x" ÿ
+		"{ObjDirÿPPC}raster.c.x" ÿ
+		"{ObjDirÿPPC}sfnt.c.x" ÿ
+		"{ObjDirÿPPC}smooth.c.x" ÿ
+		"{ObjDirÿPPC}truetype.c.x" ÿ
+		"{ObjDirÿPPC}type1.c.x" ÿ
+		"{ObjDirÿPPC}winfnt.c.x" ÿ
+		"{ObjDirÿPPC}ftmac.c.x" ÿ
+
+# Main target - build a library
+freetype ÿÿ {ÿMondoBuildÿ} directories freetype.o
+
+# This is used to build the library
+freetype.o ÿÿ {ÿMondoBuildÿ} {OBJS}
+	PPCLink ÿ
+		-o :lib:{Targ} {SymÿPPC} ÿ
+		{OBJS} -c '????' -xm l
+
+# This is used to create the directories needed for build
+directories ÿ
+	if !`Exists obj` ; NewFolder obj ; end
+	if !`Exists lib` ; NewFolder lib ; end
+
+
+"{ObjDirÿPPC}ftsystem.c.x" ÿ {ÿMondoBuildÿ} ":src:base:ftsystem.c"
+	{PPCC} ":src:base:ftsystem.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}ftdebug.c.x" ÿ {ÿMondoBuildÿ} ":src:base:ftdebug.c"
+	{PPCC} ":src:base:ftdebug.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}ftinit.c.x" ÿ {ÿMondoBuildÿ} ":src:base:ftinit.c"
+	{PPCC} ":src:base:ftinit.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}ftbase.c.x" ÿ {ÿMondoBuildÿ} ":src:base:ftbase.c"
+	{PPCC} ":src:base:ftbase.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}ftglyph.c.x" ÿ {ÿMondoBuildÿ} ":src:base:ftglyph.c"
+	{PPCC} ":src:base:ftglyph.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}ftmm.c.x" ÿ {ÿMondoBuildÿ} ":src:base:ftmm.c"
+	{PPCC} ":src:base:ftmm.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}ftbbox.c.x" ÿ {ÿMondoBuildÿ} ":src:base:ftbbox.c"
+	{PPCC} ":src:base:ftbbox.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}autohint.c.x" ÿ {ÿMondoBuildÿ} ":src:autohint:autohint.c"
+	{PPCC} ":src:autohint:autohint.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}ftcache.c.x" ÿ {ÿMondoBuildÿ} ":src:cache:ftcache.c"
+	{PPCC} ":src:cache:ftcache.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}cff.c.x" ÿ {ÿMondoBuildÿ} ":src:cff:cff.c"
+	{PPCC} ":src:cff:cff.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}type1cid.c.x" ÿ {ÿMondoBuildÿ} ":src:cid:type1cid.c"
+	{PPCC} ":src:cid:type1cid.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}pcf.c.x" ÿ {ÿMondoBuildÿ} ":src:pcf:pcf.c"
+	{PPCC} ":src:pcf:pcf.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}psaux.c.x" ÿ {ÿMondoBuildÿ} ":src:psaux:psaux.c"
+	{PPCC} ":src:psaux:psaux.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}psmodule.c.x" ÿ {ÿMondoBuildÿ} ":src:psnames:psmodule.c"
+	{PPCC} ":src:psnames:psmodule.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}raster.c.x" ÿ {ÿMondoBuildÿ} ":src:raster:raster.c"
+	{PPCC} ":src:raster:raster.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}sfnt.c.x" ÿ {ÿMondoBuildÿ} ":src:sfnt:sfnt.c"
+	{PPCC} ":src:sfnt:sfnt.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}smooth.c.x" ÿ {ÿMondoBuildÿ} ":src:smooth:smooth.c"
+	{PPCC} ":src:smooth:smooth.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}truetype.c.x" ÿ {ÿMondoBuildÿ} ":src:truetype:truetype.c"
+	{PPCC} ":src:truetype:truetype.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}type1.c.x" ÿ {ÿMondoBuildÿ} ":src:type1:type1.c"
+	{PPCC} ":src:type1:type1.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}winfnt.c.x" ÿ {ÿMondoBuildÿ} ":src:winfonts:winfnt.c"
+	{PPCC} ":src:winfonts:winfnt.c" -o {Targ} {CFLAGS}
+
+"{ObjDirÿPPC}ftmac.c.x" ÿ {ÿMondoBuildÿ} ":src:base:ftmac.c"
+	{PPCC} ":src:base:ftmac.c" -o {Targ} {CFLAGS}
\ No newline at end of file
diff --git a/reactos/lib/freetype/builds/modules.mk b/reactos/lib/freetype/builds/modules.mk
index 536ca5462ff..5102dc0601d 100644
--- a/reactos/lib/freetype/builds/modules.mk
+++ b/reactos/lib/freetype/builds/modules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -26,7 +26,7 @@
 # resides.  For now, it is in `include/freetype/config/ftmodule.h'.
 #
 ifndef MODULE_LIST
-  MODULE_LIST := $(TOP_DIR)$(SEP)include$(SEP)$(PROJECT)$(SEP)config$(SEP)ftmodule.h
+  MODULE_LIST := $(TOP_DIR)/include/$(PROJECT)/config/ftmodule.h
 endif
 
 # To build the modules list, we invoke the `make_module_list' target.
@@ -39,8 +39,8 @@ endif
 
 ifneq ($(findstring $(PLATFORM),dos win32 win16 os2),)
   OPEN_MODULE   := @echo$(space)
-  CLOSE_MODULE  :=  >> $(subst $(SEP),$(HOSTSEP),$(MODULE_LIST))
-  REMOVE_MODULE := @-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(MODULE_LIST))
+  CLOSE_MODULE  :=  >> $(subst /,\,$(MODULE_LIST))
+  REMOVE_MODULE := @-$(DELETE) $(subst /,\,$(MODULE_LIST))
 else
   OPEN_MODULE   := @echo "
   CLOSE_MODULE  := " >> $(MODULE_LIST)
@@ -53,7 +53,7 @@ endif
 #
 clean_module_list:
 	$(REMOVE_MODULE)
-	@-echo Regenerating the modules list in $(MODULE_LIST)...
+	@-echo Regenerating modules list in $(MODULE_LIST)...
 
 make_module_list: clean_module_list
 	@echo done.
@@ -73,4 +73,5 @@ ECHO_DRIVER_DONE := )"
 #
 include $(wildcard $(TOP_DIR)/src/*/module.mk)
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/os2/detect.mk b/reactos/lib/freetype/builds/os2/detect.mk
index d332be7f48e..97e4bc972d5 100644
--- a/reactos/lib/freetype/builds/os2/detect.mk
+++ b/reactos/lib/freetype/builds/os2/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -27,18 +27,17 @@ endif
 
 ifeq ($(PLATFORM),os2)
 
-  COPY     := copy
-  DELETE   := del
+  COPY   := copy
+  DELETE := del
+  SEP    := $(BACKSLASH)
 
   # gcc-emx by default
   CONFIG_FILE := os2-gcc.mk
-  SEP         := /
 
   # additionally, we provide hooks for various other compilers
   #
   ifneq ($(findstring visualage,$(MAKECMDGOALS)),)     # Visual Age C++
     CONFIG_FILE := os2-icc.mk
-    SEP         := $(BACKSLASH)
     CC          := icc
     visualage: setup
     .PHONY: visualage
@@ -46,7 +45,6 @@ ifeq ($(PLATFORM),os2)
 
   ifneq ($(findstring watcom,$(MAKECMDGOALS)),)        # Watcom C/C++
     CONFIG_FILE := os2-wat.mk
-    SEP         := $(BACKSLASH)
     CC          := wcc386
     watcom: setup
     .PHONY: watcom
@@ -54,7 +52,6 @@ ifeq ($(PLATFORM),os2)
 
   ifneq ($(findstring borlandc,$(MAKECMDGOALS)),)      # Borland C++ 32-bit
     CONFIG_FILE := os2-bcc.mk
-    SEP         := $(BACKSLASH)
     CC          := bcc32
     borlandc: setup
     .PHONY: borlandc
@@ -63,7 +60,6 @@ ifeq ($(PLATFORM),os2)
   ifneq ($(findstring devel,$(MAKECMDGOALS)),)         # development target
     CONFIG_FILE := os2-dev.mk
     CC          := gcc
-    SEP         := /
     devel: setup
     .PHONY: devel
   endif
@@ -72,4 +68,5 @@ ifeq ($(PLATFORM),os2)
 
 endif   # test PLATFORM os2
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/os2/os2-def.mk b/reactos/lib/freetype/builds/os2/os2-def.mk
index ef4b8115d9d..26bf6a9139a 100644
--- a/reactos/lib/freetype/builds/os2/os2-def.mk
+++ b/reactos/lib/freetype/builds/os2/os2-def.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,15 +13,10 @@
 # fully.
 
 
-DELETE   := del
-HOSTSEP  := $(strip \ )
-BUILD    := $(TOP_DIR)$(SEP)builds$(SEP)os2
-PLATFORM := os2
-
-# except for GCC+emx on OS/2
-ifndef SEP
-  SEP    := $(HOSTSEP)
-endif
+DELETE    := del
+SEP       := $(strip \ )
+BUILD_DIR := $(TOP_DIR)/builds/os2
+PLATFORM  := os2
 
 
 # The directory where all object files are placed.
@@ -34,7 +29,7 @@ endif
 #   make -f %TOP_DIR%/Makefile
 #
 ifndef OBJ_DIR
-  OBJ_DIR := $(TOP_DIR)$(SEP)objs
+  OBJ_DIR := $(TOP_DIR)/objs
 endif
 
 
@@ -55,4 +50,5 @@ LIBRARY := $(PROJECT)
 #
 NO_OUTPUT = 2> nul
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/os2/os2-dev.mk b/reactos/lib/freetype/builds/os2/os2-dev.mk
index 6527b79eead..96890fa0b70 100644
--- a/reactos/lib/freetype/builds/os2/os2-dev.mk
+++ b/reactos/lib/freetype/builds/os2/os2-dev.mk
@@ -5,7 +5,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -19,10 +19,8 @@ ifndef TOP_DIR
   TOP_DIR := .
 endif
 
-SEP   := /
-
 include $(TOP_DIR)/builds/os2/os2-def.mk
-BUILD := $(TOP_DIR)/builds/devel
+BUILD_DIR := $(TOP_DIR)/devel
 
 include $(TOP_DIR)/builds/compiler/gcc-dev.mk
 
diff --git a/reactos/lib/freetype/builds/os2/os2-gcc.mk b/reactos/lib/freetype/builds/os2/os2-gcc.mk
index 5853862f061..446073e4f56 100644
--- a/reactos/lib/freetype/builds/os2/os2-gcc.mk
+++ b/reactos/lib/freetype/builds/os2/os2-gcc.mk
@@ -13,8 +13,6 @@
 # fully.
 
 
-SEP := /
-
 # include OS/2-specific definitions
 include $(TOP_DIR)/builds/os2/os2-def.mk
 
@@ -24,4 +22,5 @@ include $(TOP_DIR)/builds/compiler/gcc.mk
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/toplevel.mk b/reactos/lib/freetype/builds/toplevel.mk
index 2e9fbd08283..08f50b42e08 100644
--- a/reactos/lib/freetype/builds/toplevel.mk
+++ b/reactos/lib/freetype/builds/toplevel.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -99,7 +99,9 @@ ifdef check_platform
   #
   # note: This test is duplicated in "builds/toplevel.mk".
   #
-  is_unix := $(strip $(wildcard /sbin/init) $(wildcard /usr/sbin/init) $(wildcard /hurd/auth))
+  is_unix := $(strip $(wildcard /sbin/init) \
+                     $(wildcard /usr/sbin/init) \
+                     $(wildcard /hurd/auth))
   ifneq ($(is_unix),)
 
     distclean:
@@ -132,4 +134,5 @@ else
 
 endif # test check_platform
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/unix/aclocal.m4 b/reactos/lib/freetype/builds/unix/aclocal.m4
index bb44b8ddcde..e63092a429f 100644
--- a/reactos/lib/freetype/builds/unix/aclocal.m4
+++ b/reactos/lib/freetype/builds/unix/aclocal.m4
@@ -1574,7 +1574,7 @@ else
       allow_undefined_flag='-undefined suppress'
       ;;
     *) # Darwin 1.3 on
-      allow_undefined_flag='-flat_namespace -undefined suppress'
+#      allow_undefined_flag='-undefined suppress'
       ;;
     esac
     # FIXME: Relying on posixy $() will cause problems for
diff --git a/reactos/lib/freetype/builds/unix/configure b/reactos/lib/freetype/builds/unix/configure
index 92c16963e68..cfcf8bdcf1d 100644
--- a/reactos/lib/freetype/builds/unix/configure
+++ b/reactos/lib/freetype/builds/unix/configure
@@ -1009,6 +1009,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --without-zlib          use internal zlib instead of system-wide
+  --with-old-mac-fonts    allow Mac resource-based fonts to be used
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-pic              try to use only PIC/non-PIC objects default=use both
 
@@ -1402,7 +1403,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
           ac_config_headers="$ac_config_headers ftconfig.h:ftconfig.in"
 
 
-version_info='9:3:3'
+version_info='9:4:3'
 
 ft_version=`echo $version_info | tr : .`
 
@@ -4125,9 +4126,9 @@ fi
 rm -f conftest.mmap
 
 if test "$ac_cv_func_mmap_fixed_mapped" != yes; then
-  FTSYS_SRC='$(BASE_)ftsystem.c'
+  FTSYS_SRC='$(BASE_DIR)/ftsystem.c'
 else
-  FTSYS_SRC='$(BUILD)/ftsystem.c'
+  FTSYS_SRC='$(BUILD_DIR)/ftsystem.c'
 
   echo "$as_me:$LINENO: checking whether munmap must be declared" >&5
 echo $ECHO_N "checking whether munmap must be declared... $ECHO_C" >&6
@@ -4299,7 +4300,6 @@ done
 
 
 
-
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
   withval="$with_zlib"
@@ -4472,6 +4472,19 @@ if test x$with_zlib != xno && test -n "$LIBZ"; then
 fi
 
 
+# Check whether --with-old-mac-fonts or --without-old-mac-fonts was given.
+if test "${with_old_mac_fonts+set}" = set; then
+  withval="$with_old_mac_fonts"
+
+fi;
+if test x$with_old_mac_fonts = xyes; then
+  CFLAGS="$CFLAGS -DTARGET_API_MAC_CARBON"
+  LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
+                    -Xlinker -framework -Xlinker ApplicationServices"
+else
+  CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"
+fi
+
 
 
 
@@ -5625,7 +5638,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5628 "configure"' > conftest.$ac_ext
+  echo '#line 5641 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6139,7 +6152,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:6142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:6155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -6701,7 +6714,7 @@ else
       allow_undefined_flag='-undefined suppress'
       ;;
     *) # Darwin 1.3 on
-      allow_undefined_flag='-flat_namespace -undefined suppress'
+#      allow_undefined_flag='-undefined suppress'
       ;;
     esac
     # FIXME: Relying on posixy $() will cause problems for
@@ -7913,7 +7926,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7916 "configure"
+#line 7929 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8011,7 +8024,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8014 "configure"
+#line 8027 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8739,7 +8752,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
-                              ac_config_files="$ac_config_files unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config"
+                                        ac_config_files="$ac_config_files unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config freetype2.pc:freetype2.in"
 
 
 
@@ -9250,6 +9263,7 @@ do
   "unix-cc.mk" ) CONFIG_FILES="$CONFIG_FILES unix-cc.mk:unix-cc.in" ;;
   "unix-def.mk" ) CONFIG_FILES="$CONFIG_FILES unix-def.mk:unix-def.in" ;;
   "freetype-config" ) CONFIG_FILES="$CONFIG_FILES freetype-config" ;;
+  "freetype2.pc" ) CONFIG_FILES="$CONFIG_FILES freetype2.pc:freetype2.in" ;;
   "ftconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ftconfig.h:ftconfig.in" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff --git a/reactos/lib/freetype/builds/unix/configure.ac b/reactos/lib/freetype/builds/unix/configure.ac
index a90200a7f58..5f4d7ef82ab 100644
--- a/reactos/lib/freetype/builds/unix/configure.ac
+++ b/reactos/lib/freetype/builds/unix/configure.ac
@@ -10,7 +10,7 @@ dnl configuration file -- stay in 8.3 limit
 AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)
 
 dnl Don't forget to update VERSION.DLL!
-version_info='9:3:3'
+version_info='9:4:3'
 AC_SUBST(version_info)
 ft_version=`echo $version_info | tr : .`
 AC_SUBST(ft_version)
@@ -70,9 +70,9 @@ dnl checks for library functions
 dnl Here we check whether we can use our mmap file component.
 AC_FUNC_MMAP
 if test "$ac_cv_func_mmap_fixed_mapped" != yes; then
-  FTSYS_SRC='$(BASE_)ftsystem.c'
+  FTSYS_SRC='$(BASE_DIR)/ftsystem.c'
 else
-  FTSYS_SRC='$(BUILD)/ftsystem.c'
+  FTSYS_SRC='$(BUILD_DIR)/ftsystem.c'
 
   FT_MUNMAP_DECL
   FT_MUNMAP_PARAM
@@ -81,7 +81,6 @@ AC_SUBST(FTSYS_SRC)
 
 AC_CHECK_FUNCS(memcpy memmove)
 
-
 dnl Check for system zlib
 AC_ARG_WITH(zlib,
   [  --without-zlib          use internal zlib instead of system-wide])
@@ -93,19 +92,32 @@ if test x$with_zlib != xno && test -n "$LIBZ"; then
   LDFLAGS="$LDFLAGS $LIBZ"
   SYSTEM_ZLIB=yes
 fi
+
+dnl Whether to use Mac OS resource-based fonts or not
+AC_ARG_WITH(old-mac-fonts,
+  [  --with-old-mac-fonts    allow Mac resource-based fonts to be used])
+if test x$with_old_mac_fonts = xyes; then
+  CFLAGS="$CFLAGS -DTARGET_API_MAC_CARBON"
+  LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
+                    -Xlinker -framework -Xlinker ApplicationServices"
+else
+  CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"
+fi
+
 AC_SUBST(LIBZ)
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(SYSTEM_ZLIB)
 
-
-
 AC_PROG_LIBTOOL
 
 dnl create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk'
 dnl and 'builds/unix/unix-cc.mk' that will be used by the build system
 dnl
-AC_CONFIG_FILES([unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config])
+AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
+                 unix-def.mk:unix-def.in
+                 freetype-config
+                 freetype2.pc:freetype2.in])
 
 dnl re-generate the Jamfile to use libtool now
 dnl
diff --git a/reactos/lib/freetype/builds/unix/detect.mk b/reactos/lib/freetype/builds/unix/detect.mk
index 516f8ffd8dd..9fc9d601d17 100644
--- a/reactos/lib/freetype/builds/unix/detect.mk
+++ b/reactos/lib/freetype/builds/unix/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2002 by
+# Copyright 1996-2000, 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -18,7 +18,9 @@ ifeq ($(PLATFORM),ansi)
 
   # Note: this test is duplicated in "builds/toplevel.mk".
   #
-  is_unix := $(strip $(wildcard /sbin/init) $(wildcard /usr/sbin/init) $(wildcard /hurd/auth))
+  is_unix := $(strip $(wildcard /sbin/init) \
+                     $(wildcard /usr/sbin/init) \
+                     $(wildcard /hurd/auth))
   ifneq ($(is_unix),)
 
     PLATFORM := unix
@@ -27,8 +29,8 @@ ifeq ($(PLATFORM),ansi)
 endif # test PLATFORM ansi
 
 ifeq ($(PLATFORM),unix)
-  COPY     := cp
-  DELETE   := rm -f
+  COPY   := cp
+  DELETE := rm -f
 
   # If `devel' is the requested target, we use a special configuration
   # file named `unix-dev.mk'.  It disables optimization and libtool.
@@ -84,4 +86,5 @@ ifeq ($(PLATFORM),unix)
 
 endif   # test PLATFORM unix
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/unix/freetype-config.in b/reactos/lib/freetype/builds/unix/freetype-config.in
index c5a3e5abc65..5091723a579 100644
--- a/reactos/lib/freetype/builds/unix/freetype-config.in
+++ b/reactos/lib/freetype/builds/unix/freetype-config.in
@@ -81,7 +81,7 @@ fi
 if test "$echo_cflags" = "yes" ; then
  cflags="-I@includedir@/freetype2"
  if test "@includedir@" != "/usr/include" ; then
-  echo -I@includedir@ $cflags
+  echo $cflags -I@includedir@
  else
   echo $cflags
  fi
diff --git a/reactos/lib/freetype/builds/unix/freetype2.in b/reactos/lib/freetype/builds/unix/freetype2.in
new file mode 100644
index 00000000000..0bc22d1bae1
--- /dev/null
+++ b/reactos/lib/freetype/builds/unix/freetype2.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: FreeType 2
+Description: A free, high-quality, and portable font engine.
+Version: @ft_version@
+Requires:
+Libs: -L${libdir} -lfreetype @LIBZ@
+Cflags: -I${includedir}/freetype2
diff --git a/reactos/lib/freetype/builds/unix/install.mk b/reactos/lib/freetype/builds/unix/install.mk
index cfd24f89e7d..935005edb49 100644
--- a/reactos/lib/freetype/builds/unix/install.mk
+++ b/reactos/lib/freetype/builds/unix/install.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2002 by
+# Copyright 1996-2000, 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -25,6 +25,7 @@
 # Unix installation and deinstallation targets.
 install: $(PROJECT_LIBRARY)
 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)                                 \
+                         $(DESTDIR)$(libdir)/pkgconfig                       \
                          $(DESTDIR)$(includedir)/freetype2/freetype/config   \
                          $(DESTDIR)$(includedir)/freetype2/freetype/internal \
                          $(DESTDIR)$(includedir)/freetype2/freetype/cache    \
@@ -48,11 +49,14 @@ install: $(PROJECT_LIBRARY)
           $(INSTALL_DATA)                                          \
             $$P $(DESTDIR)$(includedir)/freetype2/freetype/cache ; \
         done
-	$(INSTALL_DATA) $(BUILD)/ft2unix.h $(DESTDIR)$(includedir)/ft2build.h
+	$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
+          $(DESTDIR)$(includedir)/ft2build.h
 	$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \
           $(DESTDIR)$(bindir)/freetype-config
-	$(INSTALL_SCRIPT) -m 644 $(BUILD)/freetype2.m4 \
+	$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
           $(DESTDIR)$(datadir)/aclocal/freetype2.m4
+	$(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \
+          $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
 
 
 uninstall:
@@ -69,6 +73,7 @@ uninstall:
 	-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
 	-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
 	-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
+	-$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
 
 
 check:
diff --git a/reactos/lib/freetype/builds/unix/ltmain.sh b/reactos/lib/freetype/builds/unix/ltmain.sh
index 7e0c9f487c8..8b50e531910 100644
--- a/reactos/lib/freetype/builds/unix/ltmain.sh
+++ b/reactos/lib/freetype/builds/unix/ltmain.sh
@@ -2275,15 +2275,28 @@ compiler."
 	case $version_type in
 	none) ;;
 
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
+     darwin* | rhapsody*)
+         case "$host_os" in
+             darwin1.[012])
+                # Like Linux, but with the current version available in
+                # verstring for coding it into the library header
+                major=.`expr $current - $age`
+                versuffix="$major.$age.$revision"
+                # Darwin ld doesn't like 0 for these options...
+                minor_current=`expr $current + 1`
+                verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                ;;
+	        *)
+                # Like Linux, but with the current version available in
+                # verstring for coding it into the library header
+                major=`expr $current - $age`
+                versuffix="$major.$age.$revision"
+                compatage=`expr $age - 1`
+                compatver="$major.$compatage.0"
+                verstring="-compatibility_version $compatver -current_version $versuffix"
+                ;;
+         esac
+     ;;
 
 	freebsd-aout)
 	  major=".$current"
diff --git a/reactos/lib/freetype/builds/unix/unix-cc.in b/reactos/lib/freetype/builds/unix/unix-cc.in
index 9de770db170..50df267842b 100644
--- a/reactos/lib/freetype/builds/unix/unix-cc.in
+++ b/reactos/lib/freetype/builds/unix/unix-cc.in
@@ -1,10 +1,22 @@
-# template for Unix-specific compiler definitions
+#
+# FreeType 2 template for Unix-specific compiler definitions
 #
 
-CC      := @CC@
+# Copyright 1996-2000, 2002, 2003 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
+CC           := @CC@
+COMPILER_SEP := $(SEP)
 
 ifndef LIBTOOL
-  LIBTOOL := $(BUILD)/libtool
+  LIBTOOL := $(BUILD_DIR)/libtool
 endif
 
 
@@ -48,7 +60,7 @@ L := -l
 
 # Target flag.
 #
-T := -o # Don't remove this comment line!  We need the space after `-o'.
+T := -o$(space)
 
 
 # C flags
@@ -58,7 +70,7 @@ T := -o # Don't remove this comment line!  We need the space after `-o'.
 #   Use the ANSIFLAGS variable to define the compiler flags used to enfore
 #   ANSI compliance.
 #
-CFLAGS := -c @XX_CFLAGS@ @CFLAGS@
+CFLAGS := -c @XX_CFLAGS@ @CPPFLAGS@ @CFLAGS@
 
 # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
 #
@@ -81,4 +93,5 @@ LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
                           -rpath $(libdir) -version-info $(version_info) \
                           $(LDFLAGS)
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/unix/unix-def.in b/reactos/lib/freetype/builds/unix/unix-def.in
index 790bf897672..a9c1160c186 100644
--- a/reactos/lib/freetype/builds/unix/unix-def.in
+++ b/reactos/lib/freetype/builds/unix/unix-def.in
@@ -18,16 +18,15 @@ ifndef TOP_DIR
 endif
 TOP_DIR := $(shell cd $(TOP_DIR); pwd)
 
-DELETE   := @RMF@
-DELDIR   := @RMDIR@
-SEP      := /
-HOSTSEP  := $(SEP)
-BUILD    := $(TOP_DIR)/builds/unix
-PLATFORM := unix
+DELETE    := @RMF@
+DELDIR    := @RMDIR@
+SEP       := /
+BUILD_DIR := $(TOP_DIR)/builds/unix
+PLATFORM  := unix
 
 # this is used for `make distclean' and `make install'
 ifndef OBJ_BUILD
-  OBJ_BUILD := $(BUILD)
+  OBJ_BUILD := $(BUILD_DIR)
 endif
 
 # don't use `:=' here since the path stuff will be included after this file
@@ -38,7 +37,7 @@ INSTALL         := @INSTALL@
 INSTALL_DATA    := @INSTALL_DATA@
 INSTALL_PROGRAM := @INSTALL_PROGRAM@
 INSTALL_SCRIPT  := @INSTALL_SCRIPT@
-MKINSTALLDIRS   := $(BUILD)/mkinstalldirs
+MKINSTALLDIRS   := $(BUILD_DIR)/mkinstalldirs
 
 DISTCLEAN += $(OBJ_BUILD)/config.cache    \
              $(OBJ_BUILD)/config.log      \
@@ -47,6 +46,7 @@ DISTCLEAN += $(OBJ_BUILD)/config.cache    \
              $(OBJ_BUILD)/unix-cc.mk      \
              $(OBJ_BUILD)/ftconfig.h      \
              $(OBJ_BUILD)/freetype-config \
+             $(OBJ_BUILD)/freetype2.pc    \
              $(LIBTOOL)                   \
              $(OBJ_BUILD)/Makefile
 
@@ -96,4 +96,5 @@ SYSTEM_ZLIB := @SYSTEM_ZLIB@
 #
 NO_OUTPUT := 2> /dev/null
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/unix/unix-dev.mk b/reactos/lib/freetype/builds/unix/unix-dev.mk
index 2f10734f1d1..12c641af248 100644
--- a/reactos/lib/freetype/builds/unix/unix-dev.mk
+++ b/reactos/lib/freetype/builds/unix/unix-dev.mk
@@ -6,7 +6,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -17,9 +17,10 @@
 
 
 include $(TOP_DIR)/builds/unix/unixddef.mk
-BUILD := $(TOP_DIR)/builds/devel
+BUILD_DIR := $(TOP_DIR)/devel
 
 include $(TOP_DIR)/builds/compiler/gcc-dev.mk
 include $(TOP_DIR)/builds/link_std.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/unix/unix-lcc.mk b/reactos/lib/freetype/builds/unix/unix-lcc.mk
index 4ade02c3afb..6038e523921 100644
--- a/reactos/lib/freetype/builds/unix/unix-lcc.mk
+++ b/reactos/lib/freetype/builds/unix/unix-lcc.mk
@@ -20,4 +20,5 @@ include $(TOP_DIR)/builds/unix/unixddef.mk
 include $(TOP_DIR)/builds/compiler/unix-lcc.mk
 include $(TOP_DIR)/builds/link_std.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/unix/unixddef.mk b/reactos/lib/freetype/builds/unix/unixddef.mk
index 1ea1543ac55..803ce755a1a 100644
--- a/reactos/lib/freetype/builds/unix/unixddef.mk
+++ b/reactos/lib/freetype/builds/unix/unixddef.mk
@@ -4,7 +4,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -19,12 +19,11 @@ ifndef TOP_DIR
 endif
 TOP_DIR := $(shell cd $(TOP_DIR); pwd)
 
-DELETE   := rm -f
-SEP      := /
-HOSTSEP  := $(SEP)
+DELETE := rm -f
+SEP    := /
 
 # we use a special devel ftoption.h
-BUILD    := $(TOP_DIR)/builds/devel
+BUILD_DIR := $(TOP_DIR)/devel
 
 # do not set the platform to `unix', or libtool will trick you
 PLATFORM := unixdev
@@ -50,7 +49,7 @@ LIBRARY := lib$(PROJECT)
 LIB_DIR := $(OBJ_DIR)
 
 
-#
 NO_OUTPUT := 2> /dev/null
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/win32/detect.mk b/reactos/lib/freetype/builds/win32/detect.mk
index d7fc029d80a..f24538fdb04 100644
--- a/reactos/lib/freetype/builds/win32/detect.mk
+++ b/reactos/lib/freetype/builds/win32/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -46,16 +46,102 @@ endif # test PLATFORM ansi
 
 ifeq ($(PLATFORM),win32)
 
-  DELETE   := del
-  COPY     := copy
+  DELETE := del
+  COPY   := copy
+  SEP    := $(BACKSLASH)
 
   # gcc Makefile by default
   CONFIG_FILE := w32-gcc.mk
-  SEP         := /
   ifeq ($(firstword $(CC)),cc)
     CC        := gcc
   endif
 
   ifneq ($(findstring list,$(MAKECMDGOALS)),)  # test for the "list" target
     dump_target_list:
-	    @echo 
\ No newline at end of file
+	    @echo ÿ
+	    @echo $(PROJECT_TITLE) build system -- supported compilers
+	    @echo ÿ
+	    @echo Several command-line compilers are supported on Win32:
+	    @echo ÿ
+	    @echo ÿÿmake setupÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿgcc (with Mingw)
+	    @echo ÿÿmake setup visualcÿÿÿÿÿÿÿÿÿÿÿÿÿMicrosoft Visual C++
+	    @echo ÿÿmake setup bcc32ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿBorland C/C++
+	    @echo ÿÿmake setup lccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿWin32-LCC
+	    @echo ÿÿmake setup intelcÿÿÿÿÿÿÿÿÿÿÿÿÿÿIntel C/C++
+	    @echo ÿ
+
+    setup: dump_target_list
+    .PHONY: dump_target_list list
+  else
+    setup: dos_setup
+  endif
+
+  # additionally, we provide hooks for various other compilers
+  #
+  ifneq ($(findstring visualc,$(MAKECMDGOALS)),)     # Visual C/C++
+    CONFIG_FILE := w32-vcc.mk
+    CC          := cl
+    visualc: setup
+    .PHONY: visualc
+  endif
+
+  ifneq ($(findstring intelc,$(MAKECMDGOALS)),)      # Intel C/C++
+    CONFIG_FILE := w32-intl.mk
+    CC          := cl
+    visualc: setup
+    .PHONY: intelc
+  endif
+
+  ifneq ($(findstring watcom,$(MAKECMDGOALS)),)      # Watcom C/C++
+    CONFIG_FILE := w32-wat.mk
+    CC          := wcc386
+    watcom: setup
+    .PHONY: watcom
+  endif
+
+  ifneq ($(findstring visualage,$(MAKECMDGOALS)),)   # Visual Age C++
+    CONFIG_FILE := w32-icc.mk
+    CC          := icc
+    visualage: setup
+    .PHONY: visualage
+  endif
+
+  ifneq ($(findstring lcc,$(MAKECMDGOALS)),)         # LCC-Win32
+    CONFIG_FILE := w32-lcc.mk
+    CC          := lcc
+    lcc: setup
+    .PHONY: lcc
+  endif
+
+  ifneq ($(findstring mingw32,$(MAKECMDGOALS)),)     # mingw32
+    CONFIG_FILE := w32-mingw32.mk
+    CC          := gcc
+    mingw32: setup
+    .PHONY: mingw32
+  endif
+
+  ifneq ($(findstring bcc32,$(MAKECMDGOALS)),)       # Borland C++
+    CONFIG_FILE := w32-bcc.mk
+    CC          := bcc32
+    bcc32: setup
+    .PHONY: bcc32
+  endif
+
+  ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),)   # development target
+    CONFIG_FILE := w32-bccd.mk
+    CC          := bcc32
+    devel-bcc: setup
+    .PHONY: devel-bcc
+  endif
+
+  ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),)   # development target
+    CONFIG_FILE := w32-dev.mk
+    CC          := gcc
+    devel-gcc: setup
+    .PHONY: devel-gcc
+  endif
+
+endif   # test PLATFORM win32
+
+
+# EOF
diff --git a/reactos/lib/freetype/builds/win32/w32-bcc.mk b/reactos/lib/freetype/builds/win32/w32-bcc.mk
index 5c247247913..522d6b37854 100644
--- a/reactos/lib/freetype/builds/win32/w32-bcc.mk
+++ b/reactos/lib/freetype/builds/win32/w32-bcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,11 +13,11 @@
 # fully.
 
 
-SEP := /
 include $(TOP_DIR)/builds/win32/win32-def.mk
 include $(TOP_DIR)/builds/compiler/bcc.mk
 
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/win32/w32-bccd.mk b/reactos/lib/freetype/builds/win32/w32-bccd.mk
index 80e44ffa893..29519995abe 100644
--- a/reactos/lib/freetype/builds/win32/w32-bccd.mk
+++ b/reactos/lib/freetype/builds/win32/w32-bccd.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,14 +13,13 @@
 # fully.
 
 
-SEP   := /
-
 include $(TOP_DIR)/builds/win32/win32-def.mk
-BUILD := $(TOP_DIR)/builds/devel
+BUILD_DIR := $(TOP_DIR)/devel
 
 include $(TOP_DIR)/builds/compiler/bcc-dev.mk
 
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/win32/w32-dev.mk b/reactos/lib/freetype/builds/win32/w32-dev.mk
index 17aa0aa4b6e..0b665dee5c1 100644
--- a/reactos/lib/freetype/builds/win32/w32-dev.mk
+++ b/reactos/lib/freetype/builds/win32/w32-dev.mk
@@ -5,7 +5,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -23,10 +23,8 @@ ifndef TOP_DIR
   TOP_DIR := .
 endif
 
-SEP   := /
-
 include $(TOP_DIR)/builds/win32/win32-def.mk
-BUILD := $(TOP_DIR)/builds/devel
+BUILD_DIR := $(TOP_DIR)/devel
 
 include $(TOP_DIR)/builds/compiler/gcc-dev.mk
 
@@ -34,5 +32,4 @@ include $(TOP_DIR)/builds/compiler/gcc-dev.mk
 include $(TOP_DIR)/builds/link_dos.mk
 
 
-
 # EOF
diff --git a/reactos/lib/freetype/builds/win32/w32-gcc.mk b/reactos/lib/freetype/builds/win32/w32-gcc.mk
index 86f6dddaa54..91d11338d30 100644
--- a/reactos/lib/freetype/builds/win32/w32-gcc.mk
+++ b/reactos/lib/freetype/builds/win32/w32-gcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,10 +13,6 @@
 # fully.
 
 
-# the separator must be set before including win32-def
-# as it defaults to "\" on Win32
-SEP := /
-
 # include Win32-specific definitions
 include $(TOP_DIR)/builds/win32/win32-def.mk
 
@@ -26,4 +22,5 @@ include $(TOP_DIR)/builds/compiler/gcc.mk
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/win32/w32-icc.mk b/reactos/lib/freetype/builds/win32/w32-icc.mk
index 8b63ce0efb5..1e18202ce5e 100644
--- a/reactos/lib/freetype/builds/win32/w32-icc.mk
+++ b/reactos/lib/freetype/builds/win32/w32-icc.mk
@@ -19,4 +19,5 @@ include $(TOP_DIR)/builds/compiler/visualage.mk
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/win32/w32-intl.mk b/reactos/lib/freetype/builds/win32/w32-intl.mk
index 4f6a0342de4..5c42ad3c481 100644
--- a/reactos/lib/freetype/builds/win32/w32-intl.mk
+++ b/reactos/lib/freetype/builds/win32/w32-intl.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,11 +13,11 @@
 # fully.
 
 
-SEP := /
 include $(TOP_DIR)/builds/win32/win32-def.mk
 include $(TOP_DIR)/builds/compiler/intelc.mk
 
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/win32/w32-mingw32.mk b/reactos/lib/freetype/builds/win32/w32-mingw32.mk
index 236e8100158..01f71b34333 100644
--- a/reactos/lib/freetype/builds/win32/w32-mingw32.mk
+++ b/reactos/lib/freetype/builds/win32/w32-mingw32.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,10 +13,6 @@
 # fully.
 
 
-# the separator must be set before including win32-def
-# as it defaults to "\" on Win32
-SEP := /
-
 # include Win32-specific definitions
 include $(TOP_DIR)/builds/win32/win32-def.mk
 
@@ -28,4 +24,5 @@ include $(TOP_DIR)/builds/compiler/gcc.mk
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/win32/w32-vcc.mk b/reactos/lib/freetype/builds/win32/w32-vcc.mk
index 459e187d14e..37bfec30b5b 100644
--- a/reactos/lib/freetype/builds/win32/w32-vcc.mk
+++ b/reactos/lib/freetype/builds/win32/w32-vcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,11 +13,11 @@
 # fully.
 
 
-SEP := /
 include $(TOP_DIR)/builds/win32/win32-def.mk
 include $(TOP_DIR)/builds/compiler/visualc.mk
 
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/builds/win32/w32-wat.mk b/reactos/lib/freetype/builds/win32/w32-wat.mk
index ab250dc9b86..accafc52f3b 100644
--- a/reactos/lib/freetype/builds/win32/w32-wat.mk
+++ b/reactos/lib/freetype/builds/win32/w32-wat.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,14 +13,11 @@
 # fully.
 
 
-SEP  := /
-ISEP := $(strip \ )
-
 include $(TOP_DIR)/builds/win32/win32-def.mk
 include $(TOP_DIR)/builds/compiler/watcom.mk
 
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
-# EOF
 
+# EOF
diff --git a/reactos/lib/freetype/builds/win32/win32-def.mk b/reactos/lib/freetype/builds/win32/win32-def.mk
index 9b43a039b07..a9db459e88b 100644
--- a/reactos/lib/freetype/builds/win32/win32-def.mk
+++ b/reactos/lib/freetype/builds/win32/win32-def.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,17 +13,10 @@
 # fully.
 
 
-DELETE   := del
-HOSTSEP  := $(strip \ )
-BUILD    := $(TOP_DIR)$(SEP)builds$(SEP)win32
-PLATFORM := win32
-
-# by default, we use "\" as a separator on Win32
-# but certain compilers accept "/" as well
-#
-ifndef SEP
-  SEP    := $(HOSTSEP)
-endif
+DELETE    := del
+SEP       := $(strip \ )
+BUILD_DIR := $(TOP_DIR)/builds/win32
+PLATFORM  := win32
 
 
 # The directory where all object files are placed.
@@ -36,7 +29,7 @@ endif
 #   make -f %TOP_DIR%/Makefile
 #
 ifndef OBJ_DIR
-  OBJ_DIR := $(TOP_DIR)$(SEP)objs
+  OBJ_DIR := $(TOP_DIR)/objs
 endif
 
 
@@ -58,4 +51,5 @@ LIBRARY := $(PROJECT)
 #
 NO_OUTPUT = 2> nul
 
+
 # EOF
diff --git a/reactos/lib/freetype/config.mk b/reactos/lib/freetype/config.mk
index 236e8100158..01f71b34333 100644
--- a/reactos/lib/freetype/config.mk
+++ b/reactos/lib/freetype/config.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,10 +13,6 @@
 # fully.
 
 
-# the separator must be set before including win32-def
-# as it defaults to "\" on Win32
-SEP := /
-
 # include Win32-specific definitions
 include $(TOP_DIR)/builds/win32/win32-def.mk
 
@@ -28,4 +24,5 @@ include $(TOP_DIR)/builds/compiler/gcc.mk
 # include linking instructions
 include $(TOP_DIR)/builds/link_dos.mk
 
+
 # EOF
diff --git a/reactos/lib/freetype/configure b/reactos/lib/freetype/configure
index 1198380dfa2..c8a56577d6a 100644
--- a/reactos/lib/freetype/configure
+++ b/reactos/lib/freetype/configure
@@ -46,11 +46,13 @@ abs_ft2_dir=`cd "$ft2_dir" && pwd`
 # build a dummy Makefile if we are not building in the source tree
 
 if test "$abs_curr_dir" != "$abs_ft2_dir"; then
-  echo "OBJ_DIR=$abs_curr_dir"          > Makefile
-  echo "TOP_DIR=$abs_ft2_dir"          >> Makefile
-  echo "OBJ_BUILD=$abs_curr_dir"       >> Makefile
-  echo "LIBTOOL=$abs_curr_dir/libtool" >> Makefile
-  echo "include $abs_ft2_dir/Makefile" >> Makefile
+  mkdir reference
+  echo "TOP_DIR=$abs_ft2_dir"             > Makefile
+  echo "OBJ_DIR=$abs_curr_dir"           >> Makefile
+  echo "OBJ_BUILD=$abs_curr_dir"         >> Makefile
+  echo "DOC_DIR=$abs_curr_dir/reference" >> Makefile
+  echo "LIBTOOL=$abs_curr_dir/libtool"   >> Makefile
+  echo "include $abs_ft2_dir/Makefile"   >> Makefile
 fi
 
 # call make
diff --git a/reactos/lib/freetype/descrip.mms b/reactos/lib/freetype/descrip.mms
deleted file mode 100644
index 06924433788..00000000000
--- a/reactos/lib/freetype/descrip.mms
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# FreeType 2 build system -- top-level Makefile for OpenVMS
-#
-
-
-# Copyright 2001 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-
-all :
-        define freetype [--.include.freetype] 
-        define psaux [-.psaux] 
-        define autohint [-.autohint] 
-        define base [-.base] 
-        define cache [-.cache] 
-        define cff [-.cff] 
-        define cid [-.cid] 
-        define pcf [-.pcf] 
-        define psnames [-.psnames] 
-        define raster [-.raster] 
-        define sfnt [-.sfnt] 
-        define smooth [-.smooth] 
-        define truetype [-.truetype] 
-        define type1 [-.type1] 
-        define winfonts [-.winfonts] 
-        if f$search("lib.dir") .eqs. "" then create/directory [.lib]
-        set default [.builds.vms]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [--.src.autohint]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.base]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.bdf]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.cache]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.cff]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.cid]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.pcf]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.pfr]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.psaux]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.pshinter]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.psnames]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.raster]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.sfnt]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.smooth]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.truetype]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.type1]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.type42]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [-.winfonts]
-        $(MMS)$(MMSQUALIFIERS)
-        set default [--]
-
-# EOF
diff --git a/reactos/lib/freetype/devel/ft2build.h b/reactos/lib/freetype/devel/ft2build.h
index da8b655555c..ff0e0031aae 100644
--- a/reactos/lib/freetype/devel/ft2build.h
+++ b/reactos/lib/freetype/devel/ft2build.h
@@ -5,7 +5,7 @@
 /*    FreeType 2 build and setup macros.                                   */
 /*    (Generic version)                                                    */
 /*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
+/*  Copyright 1996-2001, 2003 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -18,14 +18,14 @@
 
 
  /*
-  *  this is a development version of <ft2build.h> that is used
-  *  to build the library in debug mode. Its only difference with
-  *  the reference is that is forces the use of the local "ftoption.h"
-  *  which contains different settings for all configuration macros
+  *  This is a development version of <ft2build.h> that is used
+  *  to build the library in debug mode.  Its only difference with
+  *  the reference is that it forces the use of the local "ftoption.h"
+  *  which contains different settings for all configuration macros.
   *
-  *  to use it, you must define the environment variable FT2_BUILD_INCLUDE
+  *  To use it, you must define the environment variable FT2_BUILD_INCLUDE
   *  to point to the directory containing these two files ("ft2build.h" and
-  *  "ftoption.h"), then invoke Jam as usual
+  *  "ftoption.h"), then invoke Jam as usual.
   */
 
 #ifndef __FT2_BUILD_GENERIC_H__
diff --git a/reactos/lib/freetype/devel/ftoption.h b/reactos/lib/freetype/devel/ftoption.h
index df14c5a6427..3d806c9926b 100644
--- a/reactos/lib/freetype/devel/ftoption.h
+++ b/reactos/lib/freetype/devel/ftoption.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    User-selectable configuration macros (specification only).           */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -22,11 +22,6 @@
 
 #include <ft2build.h>
 
-  /*
-   * this is a special developer version of "ftoption.h", it is used
-   * to define all debugging options, as well as the TrueType bytecode
-   * interpreter
-   */
 
 FT_BEGIN_HEADER
 
@@ -86,16 +81,16 @@ FT_BEGIN_HEADER
   /* by FreeType to speed up some computations.  However, this will create */
   /* some problems when compiling the library in strict ANSI mode.         */
   /*                                                                       */
-  /* For this reason, the use of 64-bit ints is normally disabled when     */
+  /* For this reason, the use of 64-bit integers is normally disabled when */
   /* the __STDC__ macro is defined.  You can however disable this by       */
-  /* defining here the macro FT_CONFIG_OPTION_FORCE_INT64.                 */
+  /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here.                 */
   /*                                                                       */
-  /* For most compilers, this will only create compilation warnings        */
-  /* when building the library.                                            */
+  /* For most compilers, this will only create compilation warnings when   */
+  /* building the library.                                                 */
   /*                                                                       */
   /* ObNote: The compiler-specific 64-bit integers are detected in the     */
-  /*         file "ftconfig.h" either statically, or through Autoconf      */
-  /*         on platforms that support it.                                 */
+  /*         file "ftconfig.h" either statically or through the            */
+  /*         `configure' script on supported platforms.                    */
   /*                                                                       */
 #undef  FT_CONFIG_OPTION_FORCE_INT64
 
@@ -105,11 +100,11 @@ FT_BEGIN_HEADER
   /* Gzip-compressed file support.                                         */
   /*                                                                       */
   /*   FreeType now handles font files that have been compressed with the  */
-  /*   'gzip' program. This is mostly used to parse many of the PCF files  */
-  /*   that come with XFree86. The implementation uses 'zlib' to           */
+  /*   'gzip' program.  This is mostly used to parse many of the PCF files */
+  /*   that come with XFree86.  The implementation uses `zlib' to          */
   /*   partially uncompress the file on the fly (see src/base/ftgzip.c).   */
   /*                                                                       */
-  /*   Define this macro if you want to enable this "feature". Note that   */
+  /*   Define this macro if you want to enable this "feature".  Note that  */
   /*   this will however force you to link the zlib to any program that    */
   /*   also uses FreeType.                                                 */
   /*                                                                       */
@@ -122,17 +117,17 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*   This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined.  */
   /*   It allows FreeType's "ftgzip" component to link to the system's     */
-  /*   installation of the ZLib library. This is useful on systems like    */
+  /*   installation of the ZLib library.  This is useful on systems like   */
   /*   Unix or VMS where it generally is already available.                */
   /*                                                                       */
   /*   If you let it undefined, the component will use its own copy        */
-  /*   of the zlib sources instead. These have been modified to be         */
+  /*   of the zlib sources instead.  These have been modified to be        */
   /*   included directly within the component and *not* export external    */
-  /*   function names. This allows you to link any program with FreeType   */
+  /*   function names.  This allows you to link any program with FreeType  */
   /*   _and_ ZLib without linking conflicts.                               */
   /*                                                                       */
-  /*   do not #undef this macro here, since the build system might         */
-  /*   define for certain configurations                                   */
+  /*   Do not #undef this macro here since the build system might define   */
+  /*   it for certain configurations only.                                 */
   /*                                                                       */
 /* #define  FT_CONFIG_OPTION_SYSTEM_ZLIB */
 
@@ -172,6 +167,9 @@ FT_BEGIN_HEADER
   /*   will be later automatically defined as `extern return_type' to      */
   /*   allow normal compilation.                                           */
   /*                                                                       */
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
 /* #define  FT_EXPORT(x)       extern x */
 /* #define  FT_EXPORT_DEF(x)   x */
 
@@ -219,6 +217,19 @@ FT_BEGIN_HEADER
 #define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* Support for Mac fonts                                                 */
+  /*                                                                       */
+  /*   Define this macro if you want support for outline fonts in Mac      */
+  /*   format (mac dfont, mac resource, macbinary containing a mac         */
+  /*   resource) on non-Mac platforms.                                     */
+  /*                                                                       */
+  /*   Note that the `FOND' resource isn't checked.                        */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_MAC_FONTS
+
+
   /*************************************************************************/
   /*                                                                       */
   /* Allow the use of FT_Incremental_Interface to load typefaces that      */
@@ -226,7 +237,7 @@ FT_BEGIN_HEADER
   /* This allows FreeType to be used with the PostScript language, using   */
   /* the GhostScript interpreter.                                          */
   /*                                                                       */
-/* #define  FT_CONFIG_OPTION_INCREMENTAL */
+/* #define FT_CONFIG_OPTION_INCREMENTAL */
 
 
   /*************************************************************************/
@@ -234,7 +245,7 @@ FT_BEGIN_HEADER
   /* The size in bytes of the render pool used by the scan-line converter  */
   /* to do all of its work.                                                */
   /*                                                                       */
-  /* This must be greater than 4kByte.                                     */
+  /* This must be greater than 4KByte.                                     */
   /*                                                                       */
 #define FT_RENDER_POOL_SIZE  16384L
 
@@ -263,8 +274,11 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*   Don't define any of these macros to compile in `release' mode!      */
   /*                                                                       */
-#define  FT_DEBUG_LEVEL_ERROR
-#define  FT_DEBUG_LEVEL_TRACE
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
+#define FT_DEBUG_LEVEL_ERROR
+#define FT_DEBUG_LEVEL_TRACE
 
 
   /*************************************************************************/
@@ -277,10 +291,12 @@ FT_BEGIN_HEADER
   /*   should define FT_DEBUG_MEMORY here.                                 */
   /*                                                                       */
   /*   Note that the memory debugger is only activated at runtime when     */
-  /*   when the _environment_ variable "FT_DEBUG_MEMORY" is also defined!  */
+  /*   when the _environment_ variable "FT2_DEBUG_MEMORY" is defined also! */
   /*                                                                       */
-#define  FT_DEBUG_MEMORY
-
+  /*   Do not #undef this macro here since the build system might define   */
+  /*   it for certain configurations only.                                 */
+  /*                                                                       */
+/* #define FT_DEBUG_MEMORY */
 
 
   /*************************************************************************/
@@ -380,10 +396,22 @@ FT_BEGIN_HEADER
   /* By undefining this, you will only compile the code necessary to load  */
   /* TrueType glyphs without hinting.                                      */
   /*                                                                       */
-  /*   do not #undef this macro here, since the build system might         */
-  /*   define for certain configurations                                   */
+  /*   Do not #undef this macro here, since the build system might         */
+  /*   define it for certain configurations only.                          */
   /*                                                                       */
-#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_UNPATENTED_HINTING (in addition to            */
+  /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER) to compile the unpatented      */
+  /* work-around hinting system.  Note that for the moment, the algorithm  */
+  /* is only used when selected at runtime through the parameter tag       */
+  /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook               */
+  /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally actived                  */
+  /*                                                                       */
+#define TT_CONFIG_OPTION_UNPATENTED_HINTING
 
 
   /*************************************************************************/
@@ -475,21 +503,21 @@ FT_BEGIN_HEADER
  /* */
 
 /*
- * the FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
- * improvements to the auto-hinter contributed by David Chester. They will
- * most likely disappear completely in the next release. For now, you should
- * always keep them defined
+ * The FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
+ * improvements to the auto-hinter contributed by David Chester.  They will
+ * most likely disappear completely in the next release.  For now, you
+ * should always keep them defined.
  *
  */
 #define  FT_CONFIG_OPTION_CHESTER_HINTS
 
 #ifdef   FT_CONFIG_OPTION_CHESTER_HINTS
 
-#  define  FT_CONFIG_CHESTER_SMALL_F
-#  define  FT_CONFIG_CHESTER_ASCENDER
-#  define  FT_CONFIG_CHESTER_SERIF
-#  define  FT_CONFIG_CHESTER_STEM
-#  define  FT_CONFIG_CHESTER_BLUE_SCALE
+#define  FT_CONFIG_CHESTER_SMALL_F
+#define  FT_CONFIG_CHESTER_ASCENDER
+#define  FT_CONFIG_CHESTER_SERIF
+#define  FT_CONFIG_CHESTER_STEM
+#define  FT_CONFIG_CHESTER_BLUE_SCALE
 
 #endif /* FT_CONFIG_OPTION_CHESTER_HINTS */
 
diff --git a/reactos/lib/freetype/docs/CHANGES b/reactos/lib/freetype/docs/CHANGES
index 0a8e3f8c09c..42afa8b0071 100644
--- a/reactos/lib/freetype/docs/CHANGES
+++ b/reactos/lib/freetype/docs/CHANGES
@@ -1,86 +1,196 @@
+
+LATEST CHANGES BETWEEN 2.1.5 and 2.1.4
+
+
+  I. IMPORTANT BUG FIXES
+
+    - Parsing the /CIDFontName field now removes the leading slash to
+      be in sync with other font drivers.
+
+    - gzip support was buggy. Some fonts could not be read.
+
+    - Fonts which have nested subglyphs more than one level deep no
+      longer cause a segfault.
+
+    - Creation of synthetic cmaps for fonts in CFF format was broken
+      partially.
+
+    - Numeric font dictionary entries for synthetic fonts are no longer
+      overwritten.
+
+    - The font matrix wasn't applied to the advance width for Type1, CID,
+      and CFF fonts. This caused problem when loading certain synthetic
+      Type 1 fonts like "Helvetica Narrow"
+
+    - The test for the charset registry in BDF and PCF fonts is now
+      case-insensitive.
+
+    - FT_Vector_Rotate rotating sometimes returned strange values due to
+      rounding errors.
+
+    - The PCF driver now returns the correct number of glyphs (including
+      an artificial `notdef' glyph at index 0).
+
+    - FreeType now supports buggy CMaps which are contained in many CJK
+      fonts from Dynalab.
+
+    - Opening an invalid font on a Mac caused a segfault due to
+      double-freeing memory.
+
+    - BDF fonts with more than 32768 glyphs weren't supported properly.
+
+
+  II. IMPORTANT CHANGES
+
+    - Accessing bitmap font formats has been synchronized.  To do that
+      the FT_Bitmap_Size structure has been extended to contain new
+      fields `size', `x_ppem', and `y_ppem'.
+
+    - The FNT driver now returns multiple faces, not multiple strikes.
+
+    - The `psnames' module has been updated to the Adobe Glyph List
+      version 2.0.
+
+    - The `psnames' module now understands `uXXXX[X[X]]' glyph names.
+
+    - The algorithm for guessing the font style has been improved.
+
+    - For fonts in sfnt format, root->height is no longer increased if
+      the line gap is zero.  There exist fonts (containing e.g. form
+      drawing characters) which intentionally have a zero line gap value.
+
+    - ft_glyph_bbox_xxx flags are now deprecated in favour of
+      FT_GLYPH_BBOX_XXX.
+
+    - ft_module_xxx flags are now deprecated in favour of FT_MODULE_XXX.
+
+    - FT_ENCODING_MS_{SJIS,GB2312,BIG5,WANSUNG,JOHAB} are now deprecated
+      in favour of FT_ENCODING_{SJIS,GB2312,GIB5,WANSONG,JOHAB} -- those
+      encodings are not specific to Microsoft.
+
+
+  III. MISCELLANEOUS
+
+    - The autohinter has been further improved; for example, `m' glyphs
+      now retain its vertical symmetry.
+
+    - Partial support of Mac fonts on non-Mac platforms.
+
+    - `make refdoc' (after first `make') builds the HTML documentation.
+      You need Python for this.
+
+    - The make build system should now work more reliably on DOS-like
+      platforms.
+
+    - Support for EMX gcc and Watson C/C++ compilers on MS-DOS has been
+      added.
+
+    - Better VMS build support.
+
+    - Support for the pkg-config package by providing a `freetype.pc'
+      file.
+
+    - New configure option --with-old-mac-fonts for Darwin.
+
+    - Some source files have been renamed (mainly to fit into the 8.3
+      naming scheme).
+
+
+==============================================================================
+
 LATEST CHANGES BETWEEN 2.1.4 and 2.1.3
 
   I. IMPORTANT BUG FIXES
 
-    - updated to newest libtool version, fixes build problems on various
+    - Updated to newest libtool version, fixing build problems on various
       platforms.
 
-    - a fix in the Gzip stream reader, it couldn't read certain .gz files
-      properly due to a small typo. In certain cases, FreeType could also
+    - A fix in the Gzip stream reader: It couldn't read certain .gz files
+      properly due to a small typo.  In certain cases, FreeType could also
       loop endlessly when trying to load tiny gzipped files.
 
-    - the configure script now tries to use the system-wide zlib when
-      it finds one (instead of the copy found in src/gzip). And
+    - The configure script now tries to use the system-wide zlib when
+      it finds one (instead of the copy found in src/gzip).  And
       "freetype-config" has been updated to return relevant flags in this
-      case when invoked with "--libs" (e.g. "-lzlib")
+      case when invoked with "--libs" (e.g. "-lzlib").
 
-    - certain fonts couldn't be loaded by 2.1.3 because they lacked a
-      Unicode charmap (e.g. SYMBOL.TTF). FreeType erroneously rejected
+    - Certain fonts couldn't be loaded by 2.1.3 because they lacked a
+      Unicode charmap (e.g. SYMBOL.TTF).  FreeType erroneously rejected
       them.
 
-    - the CFF loader was modified to accept fonts which only
-      contain a subset of their reference charset. This prevented the
-      correct use of PDF-embedded fonts.
+    - The CFF loader was modified to accept fonts which only contain a
+      subset of their reference charset.  This prevented the correct use
+      of PDF-embedded fonts.
 
-    - the logic to detect Unicode charmaps has been modified. this is required
-      to support fonts which include both 16-bit and 32-bit charmaps (like
-      very recent asian ones) using the new 10 and 12 SFNT formats.
+    - The logic to detect Unicode charmaps has been modified.  This is
+      required to support fonts which include both 16-bit and 32-bit
+      charmaps (like very recent asian ones) using the new 10 and 12 SFNT
+      formats.
 
-    - the TrueType loader now limits the depth of composite glyphs. This is
+    - The TrueType loader now limits the depth of composite glyphs.  This is
       necessary to prevent broken fonts to break the engine by blowing the
       stack with recursive glyph definitions.
 
-    - the CMap cache is now capable of managing UCS-4 character codes that
-      are mapped through extended charmaps in recent TrueType/OpenType fonts
+    - The CMap cache is now capable of managing UCS-4 character codes that
+      are mapped through extended charmaps in recent TrueType/OpenType
+      fonts.
 
-    - the cache sub-system now properly manages out-of-memory conditions,
-      instead of blindly reporting them to the caller. This means that it
+    - The cache sub-system now properly manages out-of-memory conditions
+      instead of blindly reporting them to the caller.  This means that it
       will try to empty the cache before restarting its allocations to see
       if that can help.
 
-    - the PFR driver didn't return the list of available embedded bitmaps
+    - The PFR driver didn't return the list of available embedded bitmaps
       properly.
 
+    - There was a nasty memory leak when using embedded bitmaps in certain
+      font formats.
+
+
   II. IMPORTANT CHANGES
 
     - David Chester contributed some enhancements to the auto-hinter that
-      significantly increase the quality of its output. The Postscript hinter
-      was also improved in several ways..
+      significantly increase the quality of its output.  The Postscript
+      hinter was also improved in several ways.
 
-    - the FT_RENDER_MODE_LIGHT render mode was implemented
+    - The FT_RENDER_MODE_LIGHT render mode was implemented.
 
-    - a new API, called FT_Get_BDF_Property has been added to FT_BDF_H to
-      retrieve BDF properties from BDF _and_ PCF font files. THIS IS STILL
-      EXPERIMENTAL, since it hasn't been properly tested yet.
+    - A new API function called `FT_Get_BDF_Property' has been added to
+      FT_BDF_H to retrieve BDF properties from BDF _and_ PCF font files.
+      THIS IS STILL EXPERIMENTAL, since it hasn't been properly tested yet.
 
-    - a Windows FNT specific API has been added, mostly to access font
-      headers. This is used by Wine
+    - A Windows FNT specific API has been added, mostly to access font
+      headers.  This is used by Wine.
 
-    - TrueType tables without a "hmtx" table are now tolerated when an
-      incremental interface is used. This happens for certain Type42 fonts
+    - TrueType tables without an "hmtx" table are now tolerated when an
+      incremental interface is used.  This happens for certain Type42 fonts
       passed from Ghostscript to FreeType.
 
-    - the PFR font driver is now capable of returning the font family and
-      style names when they're available (instead of the sole "FontID"). This
-      is performed by parsing an *undocumented* portion of the font file !!
+    - The PFR font driver is now capable of returning the font family and
+      style names when they are available (instead of the sole "FontID").
+      This is performed by parsing an *undocumented* portion of the font
+      file!
+
 
   III. MISCELLANEOUS
 
-    - the path stroker in FT_STROKER_H has entered beta stage. It now works
-      very well, but it's interface might change a bit in the future. More
-      on this in later releases
+    - The path stroker in FT_STROKER_H has entered beta stage.  It now works
+      very well, but its interface might change a bit in the future.  More
+      on this in later releases.
 
-    - the documentation for FT_Size_Metrics didn't appear properly in the
-      API reference
+    - The documentation for FT_Size_Metrics didn't appear properly in the
+      API reference.
 
-    - the file docs/VERSION.DLL has been updated to explain versioning
-      with FreeType (i.e. comparing release/libtool/so numbers, and how
-      to use them in Autoconf scripts)
+    - The file docs/VERSION.DLL has been updated to explain versioning
+      with FreeType (i.e., comparing release/libtool/so numbers, and how to
+      use them in autoconf scripts).
+
+    - The installation documentation has been seriously revamped.
+      Everything is now in the "docs" directory.
 
-    - the installation documentation has been seriously revamped. Everything
-      is now in the "docs" directory.
 
 ==============================================================================
+
 LATEST CHANGES BETWEEN 2.1.3 and 2.1.2
 
   I. IMPORTANT BUG FIXES
@@ -111,17 +221,19 @@ LATEST CHANGES BETWEEN 2.1.3 and 2.1.2
       precisely, when trying to apply hints to an empty glyph outline).
 
     - The TrueType glyph loader now supports composites in "Apple format"
-      (they differ slightly from Microsoft/OpenType ones in the way transform
-      offsets are computed).
+      (they differ slightly from Microsoft/OpenType ones in the way
+      transformation offsets are computed).
 
     - FreeType was very slow at opening certain asian CID/CFF fonts, due
-      to fixed increment in dynamic array re-allocations. This has been
-      changed to exponential behaviour to get acceptable performance
+      to fixed increment in dynamic array re-allocations.  This has been
+      changed to exponential behaviour to get acceptable performance.
+
+
 
   II. IMPORTANT CHANGES
 
-    - the PCF driver now supports gzip-compressed font files natively. This
-      means that you'll be able to use all these bitmap fonts that come
+    - The PCF driver now supports gzip-compressed font files natively.  This
+      means that you will be able to use all these bitmap fonts that come
       with XFree86 with FreeType (and libXft/libXft2, by extension).
 
     - The automatic and postscript hinters have both been updated.  This
@@ -160,10 +272,10 @@ LATEST CHANGES BETWEEN 2.1.3 and 2.1.2
 
       Note that the 'ftview' demo program available in the 'ft2demos' package
       has been updated to support LCD-optimized display on non-paletted
-      displays (under Win32 and X11)
+      displays (under Win32 and X11).
 
     - The PFR driver now supports embedded bitmaps (all formats supported),
-      and returns correct kerning metrics for all glyphs
+      and returns correct kerning metrics for all glyphs.
 
     - The TrueType charmap loader now supports certain "broken" fonts that
       load under Windows without problems.
@@ -184,9 +296,10 @@ LATEST CHANGES BETWEEN 2.1.3 and 2.1.2
     - Added support for the DESTDIR variable during "make install".  This
       simplifies packaging of FreeType.
 
-    - included modified copies of the ZLib sources in 'src/gzip' in order
-      to support gzip-compressed PCF fonts. We do not use the system-provided
-      zlib for now, though this is a probable enhancement for future releases
+    - Included modified copies of the ZLib sources in 'src/gzip' in order to
+      support gzip-compressed PCF fonts.  We do not use the system-provided
+      zlib for now, though this is a probable enhancement for future
+      releases.
 
     - The DocMaker tool used to generate the on-line API reference has been
       completely rewritten.  It is now located in
diff --git a/reactos/lib/freetype/docs/CUSTOMIZE b/reactos/lib/freetype/docs/CUSTOMIZE
index 397c2c33f41..2961d174e63 100644
--- a/reactos/lib/freetype/docs/CUSTOMIZE
+++ b/reactos/lib/freetype/docs/CUSTOMIZE
@@ -1,79 +1,85 @@
 How to customize the compilation of the library:
 ================================================
 
- FreeType is highly customizable to fit various needs, and this document
- details how it is possible to select options and components at compilation
- time.
+  FreeType  is  highly  customizable  to  fit various  needs,  and  this
+  document describes how it is possible to select options and components
+  at compilation time.
 
 
-I. Configuration macros:
+I. Configuration macros
 
-  the file found in "include/freetype/config/ftoption.h" contains a list
+  The file found in "include/freetype/config/ftoption.h" contains a list
   of commented configuration macros that can be toggled by developers to
-  indicate which features to activate in their build of the library.
+  indicate which features should be active while building the library.
   
-  these options range from debug level to availability of certain
+  These  options  range from  debug  level  to  availability of  certain
   features, like native TrueType hinting through a bytecode interpreter.
   
-  we invite you to read this file for more information. You can change
-  the file's content to suit your needs, or override it with one of the
-  techniques described below..
+  We invite you to read this  file for more information.  You can change
+  the file's content to suit your  needs, or override it with one of the
+  techniques described below.
 
   
-II. Modules list:
+II. Modules list
 
-  the file found in "include/freetype/config/ftmodule.h" contains a list
-  of names corresponding to the modules / font drivers to be statically
-  compiled in the FreeType library during the build.
+  The file found in "include/freetype/config/ftmodule.h" contains a list
+  of  names  corresponding  to  the  modules  and  font  drivers  to  be
+  statically compiled in the FreeType library during the build.
 
-  you can change it to suit your own preferences. Be aware that certain
-  modules depend on others, as described by the file "modules.txt" in
+  You can change it to suit your own preferences.  Be aware that certain
+  modules depend  on others, as  described by the file  "modules.txt" in
   this directory.
 
-  you can modify the file's content to suit your needs, or override it
-  at compile time with one of the methods described below
+  You can modify  the file's content to suit your  needs, or override it
+  at compile time with one of the methods described below.
 
 
-III. System interface:
+III. System interface
 
-  FreeType's default interface to the system (i.e. the parts that deal with
-  memory management and i/o streams) is located in "src/base/ftsystem.c".
+  FreeType's default interface to the  system (i.e., the parts that deal
+  with   memory   management   and    i/o   streams)   is   located   in
+  "src/base/ftsystem.c".
   
-  the current implementation uses standard C library calls to manage
-  memory and read font files. It is however possible to write custom
+  The  current implementation uses  standard C  library calls  to manage
+  memory and to read font files.  It is however possible to write custom
   implementations to suit specific systems.
 
-  to tell the GNU Make-based build system to use a custom system interface,
-  you'll need to define the environment variable FTSYS_SRC to point to
-  the relevant implementation, like in:
+  To  tell  the GNU  Make-based  build system  to  use  a custom  system
+  interface, you  have to define  the environment variable  FTSYS_SRC to
+  point to the relevant implementation:
   
-      on Unix:
-        ./configure <youroptions>
-        export FTSYS_SRC=foo/my_ftsystem.c
-        make
-        make install
+    on Unix:
+
+      ./configure <your options>
+      export FTSYS_SRC=foo/my_ftsystem.c
+      make
+      make install
    
-      on Windows:
-        make setup <compiler>
-        set FTSYS_SRC=foo/my_ftsystem.c
-        make
+    on Windows:
+
+      make setup <compiler>
+      set FTSYS_SRC=foo/my_ftsystem.c
+      make
      
      
-IV. Overriding default  configuration and module headers:
+IV. Overriding default configuration and module headers
 
-  it is possible to over-ride the default configuration and module headers
-  without changing the original files. There are two ways to do that:
+  It  is  possible to  override  the  default  configuration and  module
+  headers without changing the original files.  There are two ways to do
+  that:
 
-  1. Using the C include path:
+
+  1. Using the C include path
   
-    use the C include path to ensure that your own versions of the
-    files are used at compile time when the lines:
+    Use the C include path to ensure that your own versions of the files
+    are used at compile time when the lines
     
        #include FT_CONFIG_OPTIONS_H
        #include FT_CONFIG_MODULES_H
 
-    are compiled. Their default values being <freetype/config/ftoption.h>
-    and <freetype/config/ftmodule.h>, you can do something like:
+    are       compiled.       Their      default       values      being
+    <freetype/config/ftoption.h>  and  <freetype/config/ftmodule.h>, you
+    can do something like:
 
        custom/
          freetype/
@@ -82,36 +88,38 @@ IV. Overriding default  configuration and module headers:
              ftmodule.h    => custom modules list
              
        include/            => normal FreeType 2 include
-          freetype/
-            ...
+         freetype/
+           ...
 
-   then change the C include path to always give the path to "custom"
-   before the FreeType 2 "include"
+    then change the  C include path to always give  the path to "custom"
+    before the FreeType 2 "include".
 
 
   2. Re-defining FT_CONFIG_OPTIONS_H and FT_CONFIG_MODULES_H
   
-   another way to do the same thing is to re-define the macros used
-   to name the configuration headers. To do so, you'll need a custom
-   "ft2build.h", whose content can be as simple as:
+    Another way to  do the same thing is to redefine  the macros used to
+    name  the  configuration headers.   To  do  so,  you need  a  custom
+    "ft2build.h" whose content can be as simple as:
    
-          #ifndef __FT2_BUILD_GENERIC_H__
-          #define __FT2_BUILD_GENERIC_H__
+      #ifndef __FT2_BUILD_GENERIC_H__
+      #define __FT2_BUILD_GENERIC_H__
 
-          #define  FT_CONFIG_OPTIONS_H   <custom/my-ftoption.h>
-          #define  FT_CONFIG_MACROS_H    <custom/my-ftmodule.h>
+      #define  FT_CONFIG_OPTIONS_H   <custom/my-ftoption.h>
+      #define  FT_CONFIG_MACROS_H    <custom/my-ftmodule.h>
 
-          #include <freetype/config/ftheader.h>
+      #include <freetype/config/ftheader.h>
 
-          #endif /* __FT2_BUILD_GENERIC_H__ */
+      #endif /* __FT2_BUILD_GENERIC_H__ */
    
-   place them in:
+    Place those files in a separate directory, e.g.:
    
-       custom/
-          ft2build.h           => custom version described above
-          my-ftoption.h        => custom options header
-          my-ftmodule.h        => custom modules list header
+      custom/
+        ft2build.h           => custom version described above
+        my-ftoption.h        => custom options header
+        my-ftmodule.h        => custom modules list header
 
-   and change the C include path to ensure that "custom" is always placed
-   before the FT2 "include" during compilation.
+    and  change the C  include path  to ensure  that "custom"  is always
+    placed before the FT2 "include" during compilation.
 
+
+--- end of CUSTOMIZE ---
diff --git a/reactos/lib/freetype/docs/DEBUG b/reactos/lib/freetype/docs/DEBUG
index 03ed70311e7..c85ef3cb116 100644
--- a/reactos/lib/freetype/docs/DEBUG
+++ b/reactos/lib/freetype/docs/DEBUG
@@ -1,5 +1,5 @@
-Debugging within the FreeType sources:
-======================================
+Debugging within the FreeType sources
+=====================================
 
 I. Configuration macros
 -----------------------
@@ -12,15 +12,15 @@ located in the file "ftoptions.h".  The macros are:
   FT_DEBUG_LEVEL_ERROR
 
     #define this macro  if you want to compile  the FT_ERROR macro calls
-    used to  print error messages  during program execution.   This will
-    not  stop the  program, but  is very  useful to  spot  invalid fonts
-    during development and code workarounds for them.
+    to  print error messages  during program  execution.  This  will not
+    stop  the  program.   Very  useful  to  spot  invalid  fonts  during
+    development and to code workarounds for them.
 
   FT_DEBUG_LEVEL_TRACE
 
-    #define this  macro if you want  to compile both  the FT_ERROR macro
-    and the  FT_TRACE one.  This  also includes the  variants FT_TRACE0,
-    FT_TRACE1, FT_TRACE2, ..., FT_TRACE6.
+    #define this macro  if you want to compile  both macros FT_ERROR and
+    FT_TRACE.   This also  includes the  variants  FT_TRACE0, FT_TRACE1,
+    FT_TRACE2, ..., FT_TRACE6.
 
     The  trace  macros are  used  to  send  debugging messages  when  an
     appropriate  "debug  level" is  configured  at  runtime through  the
@@ -28,21 +28,21 @@ located in the file "ftoptions.h".  The macros are:
 
   FT_DEBUG_MEMORY
 
-    If this  macro is  #defined, the FreeType  engines is linked  with a
+    If  this macro is  #defined, the  FreeType engine  is linked  with a
     small  but  effective  debugging  memory  manager  that  tracks  all
     allocations and frees that are performed within the font engine.
 
     When  the  FT2_DEBUG_MEMORY   environment  variable  is  defined  at
     runtime,  a call  to FT_Done_FreeType  will dump  memory statistics,
     including the list of leaked memory blocks with the source locations
-    where these were allocated.  It's  always a very good idea to define
+    where these were allocated.  It is always a very good idea to define
     this in development builds.  This works with _any_ program linked to
     FreeType, but  requires a big  deal of memory (the  debugging memory
     manager never frees the blocks to the heap in order to detect double
     frees).
 
     When FT2_DEBUG_MEMORY isn't defined at runtime, the debugging memory
-    manager is ignored, and performance is un-affected.
+    manager is ignored, and performance is unaffected.
 
 
 II. Debugging macros
@@ -59,7 +59,7 @@ its code:
     either FT_DEBUG_LEVEL_ERROR  or FT_DEBUG_LEVEL_TRACE are  defined in
     "ftoption.h".
 
-    Note that you must use with a printf-like signature, but with double
+    Note that you  have to use a printf-like  signature, but with double
     parentheses, like in:
 
       FT_ERROR(( "your %s is not %s\n", "foo", "bar" ));
@@ -93,9 +93,9 @@ its code:
     trace_XXXX where XXXX  is one of the component  names defined in the
     internal file <freetype/internal/fttrace.h>.
 
-    Each such component is assigned a "debug level", ranging from 0 to 6
-    when a program  linked with FreeType starts, through  the use of the
-    FT2_DEBUG environment variable, described later.
+    Each  such component  is assigned  a "debug  level", ranging  from 0
+    to 6,  through  the  use   of  the  FT2_DEBUG  environment  variable
+    (described below) when a program linked with FreeType starts.
 
     When FT_TRACE  is called, its  level is compared  to the one  of the
     corresponding component.   Messages with trace  levels *higher* than
@@ -106,7 +106,7 @@ its code:
     least* 2.
 
     The  second  parameter  to  FT_TRACE must  contain  parentheses  and
-    correspond to a print-like call, as in:
+    correspond to a printf-like call, as in:
 
       FT_TRACE( 2, ( "your %s is not %s\n", "foo", "bar" ) )
 
@@ -123,7 +123,6 @@ III. Environment variables
 The  following  environment   variables  control  debugging  output  and
 behaviour of FreeType at runtime:
 
-
   FT2_DEBUG
 
     This   variable  is   only  used   when  FreeType   is   built  with
@@ -133,51 +132,52 @@ behaviour of FreeType at runtime:
        component1:level1 component2:level2 component3:level3 ...
 
     where "componentX" is the name of a tracing component, as defined in
-    "fttrace.h", but  without the "trace_"  prefix, and "levelX"  is the
+    "fttrace.h",  but  without the  "trace_"  prefix.   "levelX" is  the
     corresponding level to use at runtime.
 
     "any"  is a  special  component  name that  will  be interpreted  as
     "any/all components".  For example, the following definitions
 
        set FT2_DEBUG=any:2 memory:5 io:4        (on Windows)
-       export FT2_DEBUG="any:2 memory:5 io:4"   (on Linux)
+       export FT2_DEBUG="any:2 memory:5 io:4"   (on Linux with bash)
 
     both stipulate that  all components should have level  2, except for
-    the memory and io components which will be set to trace levels 5 and
-    4 respectively.
+    the memory  and io components  which will be  set to trace  levels 5
+    and 4, respectively.
 
   FT2_DEBUG_MEMORY
 
     This  environment variable, when  defined, tells  FreeType to  use a
-    debugging  memory manager that  will track  leaked memory  blocks as
+    debugging memory  manager that will  track leaking memory  blocks as
     well as other  common errors like double frees.   It is also capable
-    of  reporting  _where_  the  leaked  blocks  were  allocated,  which
+    of  reporting  _where_  the  leaking blocks  were  allocated,  which
     considerably saves time when debugging new additions to the library.
 
     This  code  is  only  compiled  when  FreeType  is  built  with  the
     FT_DEBUG_MEMORY macro  #defined in  "ftoption.h" though, it  will be
     ignored in other builds.
 
-
   FT2_ALLOC_TOTAL_MAX
 
-    this variable is ignored if FT2_DEBUG_MEMORY is not defined. It allows
-    you to specify a maximum heap size for all memory allocations performed
-    by FreeType. This is very useful to test the robustness of the font
-    engine and programs that use it in tight memory conditions.
+    This  variable is ignored  if FT2_DEBUG_MEMORY  is not  defined.  It
+    allows you to specify a maximum heap size for all memory allocations
+    performed by FreeType.   This is very useful to  test the robustness
+    of  the  font  engine and  programs  that  use  it in  tight  memory
+    conditions.
     
-    If it is undefined, or if its value is not strictly positive, then no
-    allocation bounds are checked at runtime.
-
+    If it is  undefined, or if its value is  not strictly positive, then
+    no allocation bounds are checked at runtime.
 
   FT2_ALLOC_COUNT_MAX
   
-    this variable is ignored if FT2_DEBUG_MEMORY is not defined. It allows
-    you to sepcify a maximum number of memory allocations performed by
-    FreeType before returning the error FT_Err_Out_Of_Memory. This is
-    useful for debugging and testing the engine's robustness.
+    This  variable is ignored  if FT2_DEBUG_MEMORY  is not  defined.  It
+    allows  you  to  specify  a  maximum number  of  memory  allocations
+    performed    by     FreeType    before    returning     the    error
+    FT_Err_Out_Of_Memory.  This is useful  for debugging and testing the
+    engine's robustness.
     
-    If it is undefined, or if its value is not strictly positive, then no
-    allocation bounsd are checked at runtime.
+    If it is  undefined, or if its value is  not strictly positive, then
+    no allocation bounsd are checked at runtime.
 
-End of file
+
+--- end of DEBUG ---
diff --git a/reactos/lib/freetype/docs/INSTALL b/reactos/lib/freetype/docs/INSTALL
index 8f5bc320c57..93c8bd36d46 100644
--- a/reactos/lib/freetype/docs/INSTALL
+++ b/reactos/lib/freetype/docs/INSTALL
@@ -1,65 +1,66 @@
-Welcome
 
-There are several ways to build the FreeType library, depending on your
-system and the level of customization you need. Here's a short overview
-of the documentation available:
+There are several ways to  build the FreeType library, depending on your
+system  and  the level  of  customization you  need.   Here  is a  short
+overview of the documentation available:
 
-I. Normal installation and upgrades:
 
-  1. Native TrueType Hinting:
-  
-    Native TrueType hinting is disabled by default[1]. If you really need it,
-    read the file "TRUETYPE" for information.
+I. Normal installation and upgrades
+===================================
 
-      
-  2. Unix Systems (as well as Cygwin or MSys on Windows):
+  1. Native TrueType Hinting
+
+    Native TrueType  hinting is disabled  by default[1].  If  you really
+    need it, read the file "TRUETYPE" for information.
+
+  2. Unix Systems (as well as Cygwin or MSys on Windows)
 
     Please read *both* UPGRADE.UNX and INSTALL.UNX to install or upgrade
-    FreeType 2 on a Unix system. Note that you *will* need GNU Make, since
-    other make tools won't work (this includes BSD Make !!)
+    FreeType 2  on a Unix system.   Note that you *will*  need GNU Make,
+    since other make tools won't work (this includes BSD Make).
 
-  3. On VMS with the "mms" build tool:
+  3. On VMS with the "mms" build tool
   
-    see INSTALL.VMS for installation instructions on this platform
+    See INSTALL.VMS for installation instructions on this platform.
 
-  4. Other systems using GNU Make:
+  4. Other systems using GNU Make
   
-    on non-Unix platforms, it's possible to build the library using
-    GNU Make utility. Note that *NO OTHER MAKE TOOL WILL WORK* !!
-    This methods supports several compilers on Windows, OS/2 and BeOS,
+    On non-Unix platforms, it is possible to build the library using GNU
+    Make utility.   Note that  *NO OTHER MAKE  TOOL WILL  WORK*[2]! This
+    methods  supports  several compilers  on  Windows,  OS/2, and  BeOS,
     including Mingw, Visual C++, Borland C++, and more.
 
-    instructions are provided in the file "INSTALL.GNU"
+    Instructions are provided in the file "INSTALL.GNU".
 
-
-  5. With an IDE Project File  (e.g. for Visual Studio or CodeWarrior):
+  5. With an IDE Project File (e.g. for Visual Studio or CodeWarrior)
   
-    we provide a small number of "project files" for various IDEs to
-    automatically build the library as well. Note that these files are
-    not supported and sporadically maintained by FreeType developers,
-    so don't expect them to work in each release.
+    We provide  a small  number of "project  files" for various  IDEs to
+    automatically build the library as  well.  Note that these files are
+    not supported and sporadically maintained by FreeType developers, so
+    don't expect them to work in each release.
     
-    to find them, have a look at the content of the "builds/<system>"
+    To find  them, have a look  at the content  of the "builds/<system>"
     directory, where <system> stands for your OS or environment.
 
-
-  6. From you own IDE, or own Makefiles:
+  6. From you own IDE, or own Makefiles
   
     If you want to create your own project file, follow the instructions
     given in the "INSTALL.ANY" document of this directory.
 
 
-II. Custom builds of the library:
+II. Custom builds of the library
+================================
 
-  Customizing the compilation of FreeType is easy, and allows you to select
-  only the components of the font engine that you really need. For more details
-  read the file "CUSTOMIZE"
+  Customizing the  compilation of  FreeType is easy,  and allows  you to
+  select only  the components of the  font engine that  you really need.
+  For more details read the file "CUSTOMIZE".
 
 
---------------------------------------------------------------------
+------------------------------------------------------------------------
 
 [1] More details on:  http://www.freetype.org/patents.html
 
-End of file
+[2] make++, a  make tool written in Perl, has  sufficient support of GNU
+    make       extensions       to       build      FreeType.        See
+    http://makepp.sourceforge.net for more information.
 
-     
\ No newline at end of file
+--- end of INSTALL ---
diff --git a/reactos/lib/freetype/docs/INSTALL.ANY b/reactos/lib/freetype/docs/INSTALL.ANY
index 5e2cf0eea73..af3f6e7a311 100644
--- a/reactos/lib/freetype/docs/INSTALL.ANY
+++ b/reactos/lib/freetype/docs/INSTALL.ANY
@@ -1,96 +1,99 @@
-Instructions on how to build FreeType with your own build tool:
+Instructions on how to build FreeType with your own build tool
+==============================================================
 
-  see the file "CUSTOMIZE" to learn how to customize FreeType to
-  specific environments.
+See the file "CUSTOMIZE" to  learn how to customize FreeType to specific
+environments.
 
-  follow these simple steps:
 
-I. Normal way:
---------------
+I. Standard procedure
+---------------------
 
-  * DISABLE PRE-COMPILED HEADERS ! This is very important for Visual
+  * DISABLE  PRE-COMPILED HEADERS!   This is  very important  for Visual
     C++, because FreeType uses lines like:
     
-       #include FT_FREETYPE_H
+      #include FT_FREETYPE_H
     
-    which are not correctly supported by this compiler, while being
-    ISO C compliant !!
+    which are not correctly supported by this compiler while being ISO C
+    compliant!
 
   * You need to add  the directories "freetype2/include" to your include
     path when compiling the library.
 
-  * FreeType  2 is  made  of several  components;  each one  of them  is
-    located   in  a  subdirectory   of  "freetype2/src".   For  example,
+  * FreeType 2 is made of several components; each of them is located in
+    a     subdirectory     of     "freetype2/src".      For     example,
     'freetype2/src/truetype/' contains the TrueType font driver.
 
   * DO NOT COMPILE ALL C FILES!  Rather, compile the following ones:
 
-      -- base components (required)
+    -- base components (required)
 
-        src/base/ftsystem.c
-        src/base/ftinit.c
-        src/base/ftdebug.c
-        src/base/ftbase.c
-        src/base/ftglyph.c
-        src/base/ftbbox.c
-        src/base/ftmm.c
-        src/base/ftpfr.c        -- optional, see <freetype/ftpfr.h>
-        src/base/ftbdf.c        -- optional, see <freetype/ftbdf.h>
-        src/base/ftwinfnt.c     -- optional, see <freetype/ftwinfnt.h>
+      src/base/ftsystem.c
+      src/base/ftinit.c
+      src/base/ftdebug.c
+      src/base/ftbase.c
+      src/base/ftglyph.c
+      src/base/ftbbox.c
+      src/base/ftmm.c
+      src/base/ftpfr.c        -- optional, see <freetype/ftpfr.h>
+      src/base/ftbdf.c        -- optional, see <freetype/ftbdf.h>
+      src/base/ftwinfnt.c     -- optional, see <freetype/ftwinfnt.h>
 
-        src/base/ftmac.c        -- only on the Macintosh
+      src/base/ftmac.c        -- only on the Macintosh
 
-     -- other components are optional
+    -- other components (optional)
 
-        src/autohint/autohint.c -- auto hinting module
-        src/cache/ftcache.c     -- cache sub-system (in beta)
-        src/sfnt/sfnt.c         -- SFNT files support
-                                   (TrueType & OpenType)
-        src/cff/cff.c           -- CFF/OpenType font driver
-        src/pfr/pfr.c           -- PFR/TrueDoc font driver
-        src/bdf/bdf.c           -- BDF font driver
-        src/pcf/pcf.c           -- PCF font driver
-        src/psnames/psnames.c   -- Postscript glyph names support
-        src/psaux/psaux.c       -- Postscript Type 1 parsing
-        src/truetype/truetype.c -- TrueType font driver
-        src/type1/type1.c       -- Type 1 font driver
-        src/cid/type1cid.c      -- Type 1 CID-keyed font driver
-        src/winfonts/winfonts.c -- Windows FONT / FNT font driver
-        src/raster1/raster1.c   -- monochrome rasterizer
-        src/smooth/smooth.c     -- anti-aliasing rasterizer
+      src/autohint/autohint.c -- auto hinting module
+      src/cache/ftcache.c     -- cache sub-system (in beta)
+      src/sfnt/sfnt.c         -- SFNT files support
+                                 (TrueType & OpenType)
+      src/cff/cff.c           -- CFF/OpenType font driver
+      src/pfr/pfr.c           -- PFR/TrueDoc font driver
+      src/bdf/bdf.c           -- BDF font driver
+      src/pcf/pcf.c           -- PCF font driver
+      src/psnames/psnames.c   -- PostScript glyph names support
+      src/psaux/psaux.c       -- PostScript Type 1 parsing
+      src/truetype/truetype.c -- TrueType font driver
+      src/type1/type1.c       -- Type 1 font driver
+      src/cid/type1cid.c      -- Type 1 CID-keyed font driver
+      src/winfonts/winfonts.c -- Windows FONT / FNT font driver
+      src/raster1/raster1.c   -- monochrome rasterizer
+      src/smooth/smooth.c     -- anti-aliasing rasterizer
 
-    Note:
+    Notes:
 
       `truetype.c' needs `sfnt.c' and `psnames.c'
       `type1.c'    needs `psaux.c' and `psnames.c'
       `type1cid.c' needs `psaux.c' and `psnames.c'
       `cff.c'      needs `sfnt.c', `psaux.c', and `psnames.c'
 
-  that should be it ! in case of problems, see the archives of
-  the FreeType development mailing list.
+
+  You are done.   In case of problems, see the  archives of the FreeType
+  development mailing list.
 
 
 II. Support for flat-directory compilation
 ------------------------------------------
 
-  It is  possible to  put all  FreeType 2 source  files into  a single
+  It  is possible  to put  all  FreeType 2  source files  into a  single
   directory, with the *exception* of the `include' hierarchy.
 
-    1. Copy all files in current directory:
+  1. Copy all files in current directory
 
-        cp freetype2/src/base/*.[hc] .
-        cp freetype2/src/raster1/*.[hc] .
-        cp freetype2/src/smooth/*.[hc] .
-        etc.
+      cp freetype2/src/base/*.[hc] .
+      cp freetype2/src/raster1/*.[hc] .
+      cp freetype2/src/smooth/*.[hc] .
+      etc.
 
-    2. Compile sources:
+  2. Compile sources
 
-        cc -c -Ifreetype2/include ftsystem.c
-        cc -c -Ifreetype2/include ftinit.c
-        cc -c -Ifreetype2/include ftdebug.c
-        cc -c -Ifreetype2/include ftbase.c
-        etc.
+      cc -c -Ifreetype2/include ftsystem.c
+      cc -c -Ifreetype2/include ftinit.c
+      cc -c -Ifreetype2/include ftdebug.c
+      cc -c -Ifreetype2/include ftbase.c
+      etc.
 
-   You don't need to define the FT_FLAT_COMPILATION macro (as this was
-   required in previous releases of FreeType 2).
+    You don't need to define  the FT_FLAT_COMPILATION macro (as this was
+    required in previous releases of FreeType 2).
 
+
+--- end of INSTALL.ANY ---
diff --git a/reactos/lib/freetype/docs/INSTALL.GNU b/reactos/lib/freetype/docs/INSTALL.GNU
index df6f012e31f..d984789e54c 100644
--- a/reactos/lib/freetype/docs/INSTALL.GNU
+++ b/reactos/lib/freetype/docs/INSTALL.GNU
@@ -1,128 +1,139 @@
-This document contains instructions on how to build the FreeType library
-on non-Unix systems with the help of GNU Make. Note that if you're running
-Cygwin or MSys in Windows, you should follow the instructions of INSTALL.UNX
-instead.
+This document contains instructions how to build the FreeType library on
+non-Unix  systems with  the help  of  GNU Make.   Note that  if you  are
+running Cygwin or MSys in Windows, you should follow the instructions in
+the file INSTALL.UNX instead.
 
 
-  FreeType 2 includes a powerful and flexible build system that allows
-  you to  easily compile it on  a great variety of  platforms from the
+  FreeType 2 includes  a powerful and flexible build  system that allows
+  you to  easily compile  it on  a great variety  of platforms  from the
   command line.  To do so, just follow these simple instructions:
 
-  a. Install GNU Make
+  1. Install GNU Make
+  -------------------
 
-    Because  GNU Make  is  the  only Make  tool  supported to  compile
+    Because  GNU  Make  is  the  only Make  tool  supported  to  compile
     FreeType 2, you should install it on your machine.
 
-    The FreeType 2 build system relies on many features special to GNU
-    Make -- trying to build the  library with any other Make tool will
+    The FreeType 2  build system relies on many  features special to GNU
+    Make --  trying to build the  library with any other  Make tool will
     *fail*.
 
-    NEARLY ALL OTHER MAKE TOOLS WILL FAIL, INCLUDING "BSD MAKE", SO
+    NEARLY  ALL OTHER  MAKE TOOLS  WILL FAIL,  INCLUDING "BSD  MAKE", SO
     REALLY INSTALL A RECENT VERSION OF GNU MAKE ON YOUR SYSTEM!
 
-    Make sure that you are invoking GNU Make from the command line, by
+    Note  that make++,  a make  tool  written in  Perl, supports  enough
+    features    of    GNU     make    to    compile    FreeType.     See
+    http://makepp.sourceforge.net for more information.
+
+    Make sure that  you are invoking GNU Make from  the command line, by
     typing something like:
 
-        make -v
+      make -v
 
     to display its version number.
 
     VERSION 3.78.1 OR NEWER IS NEEDED!
 
 
+  2. Invoke 'make'
+  ----------------
 
-  b. Invoke 'make'
-
-    Go to  the root  directory of FreeType  2, then simply  invoke GNU
-    Make from the command line.   This will launch the FreeType 2 host
-    platform  detection routines.   A summary  will be  displayed, for
+    Go to the root directory of  FreeType 2, then simply invoke GNU Make
+    from  the  command line.   This  will  launch  the FreeType  2  host
+    platform  detection  routines.  A  summary  will  be displayed,  for
     example, on Win32:
 
 
-        ==============================================================
-        FreeType build system -- automatic system detection
+      ==============================================================
+      FreeType build system -- automatic system detection
 
-        The following settings are used:
+      The following settings are used:
 
-          platform                     win32
-          compiler                     gcc
-          configuration directory      ./builds/win32
-          configuration rules          ./builds/win32/w32-gcc.mk
+        platform                     win32
+        compiler                     gcc
+        configuration directory      ./builds/win32
+        configuration rules          ./builds/win32/w32-gcc.mk
 
-        If this does not correspond to your system or settings please
-        remove the file 'config.mk' from this directory then read the
-        INSTALL file for help.
+      If this does not correspond to your system or settings please
+      remove the file 'config.mk' from this directory then read the
+      INSTALL file for help.
 
-        Otherwise, simply type 'make' again to build the library.
-        =============================================================
+      Otherwise, simply type 'make' again to build the library.
+      =============================================================
 
 
-    If the detected settings correspond to your platform and compiler,
-    skip to step e.  Note that if your platform is completely alien to
+    If the  detected settings correspond to your  platform and compiler,
+    skip to step  5.  Note that if your platform  is completely alien to
     the build system, the detected platform will be 'ansi'.
 
 
-  c. Configure the build system for a different compiler
+  3. Configure the build system for a different compiler
+  ------------------------------------------------------
 
-    If the build system correctly detected your platform, but you want
-    to use a different compiler  than the one specified in the summary
-    (for most platforms, gcc is  the defaut compiler), invoke GNU Make
+    If the build  system correctly detected your platform,  but you want
+    to use  a different compiler than  the one specified  in the summary
+    (for most  platforms, gcc is  the defaut compiler), invoke  GNU Make
     with
 
-         make setup <compiler>
+      make setup <compiler>
 
-    For example:
+    Examples:
 
-        to use Visual C++ on Win32, type:  "make setup visualc"
-        to use Borland C++ on Win32, type  "make setup bcc32"
-        to use Watcom C++ on Win32, type   "make setup watcom"
-        to use Intel C++ on Win32, type    "make setup intelc"
-        to use LCC-Win32 on Win32, type:   "make setup lcc"
-        to use Watcom C++ on OS/2, type    "make setup watcom"
-        to use VisualAge C++ on OS/2, type "make setup visualage"
+      to use Visual C++ on Win32, type:  "make setup visualc"
+      to use Borland C++ on Win32, type  "make setup bcc32"
+      to use Watcom C++ on Win32, type   "make setup watcom"
+      to use Intel C++ on Win32, type    "make setup intelc"
+      to use LCC-Win32 on Win32, type:   "make setup lcc"
+      to use Watcom C++ on OS/2, type    "make setup watcom"
+      to use VisualAge C++ on OS/2, type "make setup visualage"
 
-    The  <compiler> name to  use is  platform-dependent.  The  list of
-    available  compilers for  your  system is  available  in the  file
+    The  <compiler> name  to  use is  platform-dependent.   The list  of
+    available  compilers  for  your  system  is available  in  the  file
     `builds/<system>/detect.mk'
 
-    If you  are satisfied  by the new  configuration summary,  skip to
-    step e.
+    If  you are  satisfied by  the  new configuration  summary, skip  to
+    step 5.
 
-  d. Configure the build system for an unknown platform/compiler
 
-    The auto-detection/setup  phase of the build system  copies a file
-    to the current directory under the name `config.mk'.
+  4. Configure the build system for an unknown platform/compiler
+  --------------------------------------------------------------
 
-    For    example,    on    OS/2+gcc,    it   would    simply    copy
+    The auto-detection/setup phase of the  build system copies a file to
+    the current directory under the name `config.mk'.
+
+    For    example,    on     OS/2+gcc,    it    would    simply    copy
     `builds/os2/os2-gcc.mk' to `./config.mk'.
 
-    If for  some reason your  platform isn't correctly  detected, copy
-    manually the configuration sub-makefile to `./config.mk' and go to
-    step e.
+    If  for some  reason your  platform isn't  correctly  detected, copy
+    manually the  configuration sub-makefile to `./config.mk'  and go to
+    step 5.
 
-    Note  that  this file  is  a  sub-Makefile  used to  specify  Make
-    variables  for compiler  and linker  invocation during  the build.
-    You can  easily create your own  version from one  of the existing
-    configuration files,  then copy it to the  current directory under
-    the name `./config.mk'.
+    Note that this file is a sub-Makefile used to specify Make variables
+    for compiler and linker invocation during the build.  You can easily
+    create  your own  version  from one  of  the existing  configuration
+    files,  then  copy  it  to  the current  directory  under  the  name
+    `./config.mk'.
 
-  e. Build the library
 
-    The auto-detection/setup  phase should have  copied a file  in the
-    current  directory,  called   `./config.mk'.  This  file  contains
-    definitions of various Make  variables used to invoke the compiler
+  5. Build the library
+  --------------------
+
+    The  auto-detection/setup phase  should have  copied a  file  in the
+    current  directory,   called  `./config.mk'.   This   file  contains
+    definitions of  various Make variables  used to invoke  the compiler
     and linker during the build.
 
-    To  launch  the build,  simply  invoke  GNU  Make again:  The  top
-    Makefile will detect the configuration file and run the build with
-    it.
+    To launch the build, simply  invoke GNU Make again: The top Makefile
+    will detect the configuration file and run the build with it.
 
 
-
-  Final note:
+  Final note
   
-    the build system builds a statically linked library of the font engine
-    in the "objs" directory. It does _not_ support the build of DLLs on
-    Windows and OS/2, if you need these, you'll have to either use
-    a IDE-specific project file, or follow the instructions in
+    The  build system  builds a  statically linked  library of  the font
+    engine in the "objs" directory.   It does _not_ support the build of
+    DLLs on Windows and OS/2.  If you need these, you have to either use
+    a  IDE-specific   project  file,  or  follow   the  instructions  in
     "INSTALL.ANY" to create your own Makefiles.
+
+
+--- end of INSTALL.GNU ---
diff --git a/reactos/lib/freetype/docs/INSTALL.UNX b/reactos/lib/freetype/docs/INSTALL.UNX
index 6af176dba6d..148338098f5 100644
--- a/reactos/lib/freetype/docs/INSTALL.UNX
+++ b/reactos/lib/freetype/docs/INSTALL.UNX
@@ -1,181 +1,64 @@
 This document contains instructions on how to build the FreeType library
-on Unix systems. This also works for emulations like Cygwin or MSys on
+on Unix systems.  This also works for emulations like  Cygwin or MSys on
 Win32:
 
 
-  I. Ensure that you are using GNU Make
+  1. Ensure that you are using GNU Make
   -------------------------------------
 
-    The FreeType build system  _exclusively_ works with GNU Make.  You
-    will  not be  able to  compile the  library with  the instructions
-    below using any other alternative (including BSD Make).
+    The FreeType  build system _exclusively_  works with GNU  Make.  You
+    will not be able to  compile the library with the instructions below
+    using any other alternative (including BSD Make).
 
-    Trying  to compile  the library  with a  different Make  tool will
-    print a message like:
+    [Well, this is not  really correct.  Recently, a perl implementation
+    of make called `makepp' has appeared which can also build FreeType 2
+    successfully  on Unix platforms.   See http://makepp.sourceforge.net
+    for more details.]
+
+    Trying to compile the library  with a different Make tool will print
+    a message like:
 
       Sorry, GNU make is required to build FreeType2.
 
-    and the build  process will be aborted.  If  this happens, install
-    GNU Make on your system,  and use the GNUMAKE environment variable
-    to name it.
+    and the build process will be aborted.  If this happens, install GNU
+    Make on  your system,  and use the  GNUMAKE environment  variable to
+    name it.
 
 
+  2. Build and install the library
+  --------------------------------
 
-  IV. Build and install the library
-  ---------------------------------
-
-    The following  should work  on all Unix  systems where  the 'make'
+    The  following should  work on  all  Unix systems  where the  `make'
     command invokes GNU Make:
 
-      ./configure --prefix=<yourprefix>
+      ./configure [options]
       make
       make install           (as root)
 
-    where "<yourprefix>"  must be replaced  by the prefix  returned by
-    the "freetype-config" command.
+    The default  installation path is  "/usr/local".  It can  be changed
+    with the `--prefix=<path>' option.  Example:
 
-    When using a different command to invoke GNU Make, use the GNUMAKE
-    variable.  For example,  if `gmake' is the command  to use on your
+      ./configure --prefix=/usr
+
+    When using a  different command to invoke GNU  Make, use the GNUMAKE
+    variable.  For  example, if  `gmake' is the  command to use  on your
     system, do something like:
 
-       GNUMAKE=gmake ./configure --prefix=<yourprefix>
+       GNUMAKE=gmake ./configure [options]
        gmake
        gmake install            (as root)
 
-    If  this  still  doesn't   work,  something's rotten on your system(
-    (e.g. you're using a very old version of GNU Make)
+    If  this  still  doesn't   work,  something's rotten on your system
+    (e.g. you are using a very old version of GNU Make).
+
+    It  is  possible  to  compile  FreeType in  a  different  directory.
+    Assuming the  FreeType source  files in directory  `/src/freetype' a
+    compilation in directory `foo' works as follows:
+
+      cd foo
+      /src/freetype/configure [options]
+      make
+      make install
 
 
-
-I. Unix systems
----------------
-
-  If you have GNU Make installed, simply type
-
-    ./configure
-    make
-    make install
-
-  on the command line to configure, build and install FreeType on your
-  system.  Note that the default installation path is "/usr/local".
-
-  Please read the file  README.UNX, it contains _critical_ information
-  regarding the installation of FreeType on many Unix systems.
-
-
-II. From the command line
--------------------------
-
-  If  you are  not using  Unix, there  are two  ways to  quickly build
-  FreeType 2 from the command line.
-
-  The first, and favorite one, is to use the "Jam" build tool.  Jam is
-  a highly  portable replacement for  Make whose control files  do not
-  depend on the current platform or compiler toolset.
-
-  For more information, please see:
-
-    http://www.freetype.org/jam/index.html
-
-  The second one is to use "GNU Make" (and NO OTHER MAKE TOOL).
-
-
-  1. Building FT2 with "Jam"
-  --------------------------
-
-    Once you've  got *our version* of  the Jam tool  installed on your
-    system, simply go to the top-level FT2 directory, then type
-
-      "jam"
-
-    on the command line.  This will  build the library and place it in
-    the "objs" directory.
-
-    By default,  a static  library is built.   On Unix systems,  it is
-    possible to  build a shared library through  the "libtool" script.
-    You need to have libtool  installed on your system, then re-define
-    a few environment variables before invoking Jam, as in
-
-       export CC="libtool --mode=compile cc"
-       export LINK="libtool --mode=link cc"
-       jam
-
-    In  later releases  of  FT2, building  shared  libraries with  Jam
-    should become automatic on Unix systems.
-
-
-  2. Building FT2 with "GNU Make"
-  -------------------------------
-
-  You need  to have  GNU Make (version  3.78.1 or newer)  installed on
-  your system to compile the library from the command line.  This will
-  _NOT_ work with other make tools (including BSD make)!
-
-  [Well, this is not  really correct.  Recently, a perl implementation
-  of make called `makepp' has appeared which can also build FreeType 2
-  successfully on  Unix platforms.   See http://makepp.sourceforge.net
-  for more details.]
-
-  - Go to the `freetype2' directory.
-
-  - Unix (any C compiler should work):
-
-      - make setup (don't worry, this will invoke a configure script)
-      - make
-      - make install
-
-    Alternatively,  you can  pass parameters  to the  configure script
-    within the CFG variable, as in:
-
-      - make setup CFG="--prefix=/usr"
-      - make
-      - make install
-
-    If the  configure script isn't run,  try to add `unix' as a target
-    on the command line, e.g.:
-
-      - make setup unix CFG="--prefix=/opt/experimental"
-
-
-  - Windows:
-
-    We provide a  version of GNU Make for Win32  on the FreeType site.
-    See http://www.freetype.org/download.html for details.
-
-    - gcc (Mingw, _not_ CygWin):
-
-        - make setup
-        - make
-
-
-    - Visual C++:
-
-        - make setup visualc
-        - make
-
-
-    - other compilers:
-
-        - make setup bcc32    -> Borland C++ 32 bits
-        - make setup intelc   -> Intel C++
-        - make setup watcom   -> Watcom C++
-        - make setup lcc      -> Win32-LCC
-
-
-  If you want  to build FreeType 2 in another  directory, you must set
-  two  environment  variables,  `OJB_DIR'  and  `TOP_DIR'.  The former
-  gives the directory where the object files and the library should  be
-  created (this directory must exist), the latter the top directory of
-  the FreeType 2 source tree.  Example:
-
-    OBJ_DIR=~/freetype2.compiled TOP_DIR=~/freetype2 \
-      make -f$TOP_DIR/Makefile setup ansi
-    OBJ_DIR=~/freetype2.compiled TOP_DIR=~/freetype2 \
-      make -f$TOP_DIR/Makefile
-
-  On  Unix boxes,  calling  `configure' from  the  build directory  is
-  sufficient;  it  will  build  a  small   Makefile  which  calls  the
-  FreeType 2 Makefile with the necessary parameters.
-
-
---- end of INSTALL --
+--- end of INSTALL.UNX --
diff --git a/reactos/lib/freetype/docs/INSTALL.VMS b/reactos/lib/freetype/docs/INSTALL.VMS
index a82b9fd0125..4d9d64ca2e9 100644
--- a/reactos/lib/freetype/docs/INSTALL.VMS
+++ b/reactos/lib/freetype/docs/INSTALL.VMS
@@ -1,8 +1,8 @@
 How to build the freetype2 library on VMS
 -----------------------------------------
 
-Just type one of the following depending on the type of external entries you
-want:
+Just type one of the following depending on the type of external entries
+you want:
 
   mms
 
@@ -14,22 +14,23 @@ The library is avalaible in the directory
 
   [.LIB]
 
-To compile applications using freetype2 you'll need to define the logical
+To compile applications using FreeType  2 you have to define the logical
 FREETYPE pointing to the directory
 
   [.INCLUDE.FREETYPE]
 
-(i.e., if the directory in which this README.VMS file is located is
+i.e.,  if the directory  in which  this INSTALL.VMS  file is  located is
 $disk:[freetype] then define the logical with
 
   define freetype $disk:[freetype.include.freetype]
 
-This version has been tested with Compaq C V6.2-006 on OpenVMS Alpha V7.2-1.
+This version  has been  tested with Compaq  C V6.2-006 on  OpenVMS Alpha
+V7.2-1.
 
 
   Any problems can be reported to
 
-    joukj@hrem.stm.tudelft.nl
+    Jouk Jansen <joukj@hrem.stm.tudelft.nl>
 
 
-      Jouk Jansen
+--- end of INSTALL.VMS ---
diff --git a/reactos/lib/freetype/docs/TODO b/reactos/lib/freetype/docs/TODO
index b0abb687574..592809acfcd 100644
--- a/reactos/lib/freetype/docs/TODO
+++ b/reactos/lib/freetype/docs/TODO
@@ -1,13 +1,23 @@
-Note that the list of known bugs for FreeType 2 is now located in the
-document "docs/BUGS".
-
 Here is a list of items that need to be addressed in FreeType 2; they are
 not exactly bugs, but should be considered though:
 
 * Implement stem3/counter hints properly in the Postscript hinter.
 
-* FInalize the cache sub-system. If has been in beta for too long :-)
+* Finalize the cache sub-system.  It has been in beta far too long :-)
 
 * The automatic and Postscript hinters have been improved to increase
-  the quality of AA text, but Monochrome and LCD hinting still suck. we
-  need to do something about that..
+  the quality of AA text, but Monochrome and LCD hinting still suck.  We
+  need to do something about that.
+
+* Add CIDCMap support to the CID driver.
+
+* Add track kerning support to the Type1 and PFR driver and the API
+  (The degree of kerning, e.g. light, normal or tight, and
+  the glyph size has to be passed as parameter).
+
+* Add kerning (AFM file) support to the CID driver.
+
+* Possibly add support for reading PFM files.
+
+
+--- end of TODO ---
diff --git a/reactos/lib/freetype/docs/TRUETYPE b/reactos/lib/freetype/docs/TRUETYPE
index 4ec4001b284..68ecf197149 100644
--- a/reactos/lib/freetype/docs/TRUETYPE
+++ b/reactos/lib/freetype/docs/TRUETYPE
@@ -1,14 +1,14 @@
 How to enable the TrueType native hinter if you need it
 --------------------------------------------------------
 
-  The  TrueType  bytecode  interpreter  is disabled  in  all  public
-  releases  of  the  FreeType  packages  for  patents  reasons  (see
+  The TrueType  bytecode interpreter is disabled in  all public releases
+  of    the    FreeType    packages    for    patents    reasons    (see
   http://www.freetype.org/patents.html for more details).
 
-  However, many Linux distributions do enable the interpreter in the
-  FreeType packages (DEB/RPM/etc.) they produce for their platforms.
-  If you are using TrueType  fonts on your system, you most probably
-  want to enable it manually by doing the following:
+  However,  many Linux distributions  do enable  the interpreter  in the
+  FreeType packages (DEB/RPM/etc.) they produce for their platforms.  If
+  you are using TrueType fonts on your system, you most probably want to
+  enable it manually by doing the following:
 
     - open the file "include/freetype/config/ftoption.h"
 
@@ -20,4 +20,7 @@ How to enable the TrueType native hinter if you need it
 
           #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
-    of course, this must be done _before_ compiling the library
+  These steps must be done _before_ compiling the library.
+
+
+--- end of TRUETYPE ---
diff --git a/reactos/lib/freetype/docs/UPGRADE.UNX b/reactos/lib/freetype/docs/UPGRADE.UNX
index 0e67f907709..0246b97c70c 100644
--- a/reactos/lib/freetype/docs/UPGRADE.UNX
+++ b/reactos/lib/freetype/docs/UPGRADE.UNX
@@ -2,87 +2,88 @@
 SPECIAL NOTE FOR UNIX USERS
 ===========================
 
-  If  you are installing  this release  of FreeType  on a  system that
-  already uses release  2.0.5 (or even an older  version), you have to
+  If  you are  installing  this release  of  FreeType on  a system  that
+  already uses  release 2.0.5  (or even an  older version), you  have to
   perform a few special steps to ensure that everything goes well.
 
 
-  I. Enable the TrueType bytecode hinter if you need it
+  1. Enable the TrueType bytecode hinter if you need it
   -----------------------------------------------------
 
     See the instructions in the file "TRUETYPE" of this directory.
    
-    Note that FreeType supports TrueType fonts without the bytecode
-    interpreter through its auto-hinter, which now generate relatively good
-    results with most fonts.
+    Note  that FreeType  supports  TrueType fonts  without the  bytecode
+    interpreter through its  auto-hinter, which now generates relatively
+    good results with most fonts.
 
 
-  II. Determine the correct installation path
-  --------------------------------------------
+  2. Determine the correct installation path
+  ------------------------------------------
 
-    By  default,  the  source  package  will install  the  library  in
-    "/usr/local".   However, many Unix  distributions now  install the
-    library in  "/usr", since FreeType  is becoming a  critical system
+    By  default,  the  configure  script  will install  the  library  in
+    "/usr/local".   However,  many Unix  distributions  now install  the
+    library  in "/usr",  since FreeType  is becoming  a  critical system
     component.
 
     If FreeType is already installed on your system, type
 
       freetype-config --prefix
 
-    on the command line.  This  should return the installation path to
-    use below  (e.g. "/usr"  or "/usr/local").  Otherwise,  simply use
-    "/usr" (or what you think is adequate for your installation).
+    on  the command  line.   This should  return  the installation  path
+    (e.g.,  "/usr"  or "/usr/local").   To  avoid  problems of  parallel
+    FreeType  versions, use  this path  for the  --prefix option  of the
+    configure script.
+
+    Otherwise, simply use "/usr" (or  whatever you think is adequate for
+    your installation).
 
 
+  3. Ensure that you are using GNU Make
+  -------------------------------------
 
-  III. Ensure that you are using GNU Make
-  ---------------------------------------
+    The FreeType build  system _exclusively_ works with GNU  Make (as an
+    exception you  can use make++ which emulates  GNU Make sufficiently;
+    see http://makepp.sourceforge.net).  You will not be able to compile
+    the library with the  instructions below using any other alternative
+    (including BSD Make).
 
-    The FreeType build system  _exclusively_ works with GNU Make.  You
-    will  not be  able to  compile the  library with  the instructions
-    below using any other alternative (including BSD Make).
-
-    Trying  to compile  the library  with a  different Make  tool will
-    print a message like:
+    Trying to compile the library  with a different Make tool will print
+    a message like:
 
       Sorry, GNU make is required to build FreeType2.
 
-    and the build  process will be aborted.  If  this happens, install
-    GNU Make on your system,  and use the GNUMAKE environment variable
-    to name it.
+    and the build process will be aborted.  If this happens, install GNU
+    Make on  your system,  and use the  GNUMAKE environment  variable to
+    name it.
 
 
+  4. Build and install the library
+  --------------------------------
 
-  IV. Build and install the library
-  ---------------------------------
-
-    The following  should work  on all Unix  systems where  the `make'
+    The  following should  work on  all  Unix systems  where the  `make'
     command invokes GNU Make:
 
       ./configure --prefix=<yourprefix>
       make
       make install           (as root)
 
-    where "<yourprefix>"  must be replaced  by the prefix  returned by
-    the "freetype-config" command.
+    where "<yourprefix>" must be replaced  by the prefix returned by the
+    "freetype-config" command.
 
-    When using a different command to invoke GNU Make, use the GNUMAKE
-    variable.  For example,  if `gmake' is the command  to use on your
+    When using a  different command to invoke GNU  Make, use the GNUMAKE
+    variable.  For  example, if  `gmake' is the  command to use  on your
     system, do something like:
 
        GNUMAKE=gmake ./configure --prefix=<yourprefix>
        gmake
        gmake install            (as root)
 
-    If  this  still  doesn't   work,  read  the  detailed  compilation
-    procedure available in the file "docs/BUILD" for troubleshooting.
 
-
-  V. Take care of XFree86 version 4
+  5. Take care of XFree86 version 4
   ---------------------------------
 
-    Certain recent Linux distributions will install _several_ versions
-    of FreeType on your system.   For example, on a fresh Mandrake 8.1
+    Certain recent  Linux distributions will  install _several_ versions
+    of FreeType  on your system.  For  example, on a  fresh Mandrake 8.1
     system, you can find the following files:
 
       /usr/lib/libfreetype.so             which links to
@@ -93,22 +94,21 @@ SPECIAL NOTE FOR UNIX USERS
       /usr/X11R6/lib/libfreetype.so       which links to
       /usr/X11R6/lib/libfreetype.6.0.so
 
-    Note that these  files correspond to two distinct  versions of the
-    library!   It seems  that  this  surprising issue  is  due to  the
-    install  scripts  of recent  XFree86  servers  (from 4.1.0)  which
-    irremediably install  their own (dated) version of  the library in
-    "/usr/X11R6/lib".
+    Note that  these files  correspond to two  distinct versions  of the
+    library!  It seems that this  surprising issue is due to the install
+    scripts of  recent XFree86 servers (from 4.1.0)  which install their
+    own (dated) version of the library in "/usr/X11R6/lib".
 
-    In certain _rare_  cases you may experience minor  problems if you
-    install this release  of the library in "/usr"  only, namely, that
-    certain  applications will  not  benefit from  the  bug fixes  and
-    rendering improvements you'd expect.
+    In certain  _rare_ cases  you may experience  minor problems  if you
+    install this  release of  the library in  "/usr" only,  namely, that
+    certain  applications  will  not  benefit  from the  bug  fixes  and
+    rendering improvements you would expect.
 
     There are two good ways to deal with this situation:
 
-      - Install  the library  _twice_, in  "/usr" and  in "/usr/X11R6"
-        (you  have to do  that each  time you  install a  new FreeType
-        release though).
+      - Install the library _twice_,  in "/usr" and in "/usr/X11R6" (you
+        have to  do that  each time you  install a new  FreeType release
+        though).
 
       - Change the link in /usr/X11R6/lib/libfreetype.so to point to
 
@@ -118,7 +118,10 @@ SPECIAL NOTE FOR UNIX USERS
 
           /usr/X11R6/lib/libfreetype.6.0.so
 
-    The FreeType Team  is not responsible for this  problem, so please
-    contact  either  the  XFree86   development  team  or  your  Linux
-    distributor to help clear this issue in case the information given
+    The FreeType  Team is  not responsible for  this problem,  so please
+    contact  either   the  XFree86   development  team  or   your  Linux
+    distributor to help  clear this issue in case  the information given
     here doesn't help.
+
+
+---- end of UPGRADE.UNX ---
diff --git a/reactos/lib/freetype/docs/VERSION.DLL b/reactos/lib/freetype/docs/VERSION.DLL
index ec4f4c61bf1..2e1f1af45d6 100644
--- a/reactos/lib/freetype/docs/VERSION.DLL
+++ b/reactos/lib/freetype/docs/VERSION.DLL
@@ -1,90 +1,104 @@
-Due to our use of "libtool" to generate and install the FreeType 2 libraries
-on Unix systems, as well as other historical events, it is generally very
-difficult to know precisely which release of the font engine is installed
-on a given system.
+Due  to our  use of  "libtool" to  generate and  install the  FreeType 2
+libraries on  Unix systems,  as well as  other historical events,  it is
+generally very  difficult to  know precisely which  release of  the font
+engine is installed on a given system.
 
-This file tries to explain why and to document ways to properly detect
+This file tries  to explain why and to document  ways to properly detect
 FreeType on Unix.
 
 
-I. Version & Release numbers:
+1. Version & Release numbers
+----------------------------
 
-For each new public release of FreeType 2, there are generally *three*
+For each new  public release of FreeType 2,  there are generally *three*
 distinct "version" numbers to consider:
 
-  * the official FT2 release number, like 2.0.9, or 2.1.3
+  * The official FT2 release number, like 2.0.9, or 2.1.3.
 
-  * the libtool (and Unix) specific version number, like "9.2.3". This
-    is what "freetype-config --version" will return
+  * The libtool (and Unix)  specific version number, like "9.2.3".  This
+    is what "freetype-config --version" will return.
 
-  * the platform-specific shared object number, used for example when
-    the library is installed as "/usr/lib/libfreetype.so.6.3.2"
+  * The platform-specific  shared object  number, used for  example when
+    the library is installed as "/usr/lib/libfreetype.so.6.3.2".
 
+The platform-specific  number is, unsurprisingly,  platform-specific and
+varies  with the  operating system  you are  using (several  variants of
+Linux, FreeBSD,  Solaris, etc.).  You  should thus _never_ use  it, even
+for simple tests.
 
-the platform-specific number is, unsurprisingly, platform-specific and varies
-with the operating system you're using (several variants of Linux, FreeBSD,
-Solaris, etc...). You should thus _never_ use it, even for simple tests.
+The libtool-specific  number does  not equal the  release number  but is
+tied to it.
 
-the libtool-specific number does not equal the release number but is tied
-to it.
-
-the release number is available at *compile* time through the following
+The release number is available  at *compile* time through the following
 macros defined in FT_FREETYPE_H:
 
   - FREETYPE_MAJOR : major release number
   - FREETYPE_MINOR : minor release number
   - FREETYPE_PATCH : patch release number
 
-see below for some Autoconf fragment to
+See below for a small autoconf fragment.
+
+The  release   number  is  also  available  at   *runtime*  through  the
+"FT_Library_Version" API.   Unfortunately, this one  wasn't available or
+working correctly before the 2.1.3 official release.
 
 
-the release number is also available at *runtime* through the
-"FT_Library_Version" API. Unfortunately, this one wasn't available or
-working correctly before the 2.1.3 official release !!
+2. History
+----------
+
+The following table gives,  for each official release, the corresponding
+libtool  number, as well  as the  shared object  number found  on _most_
+systems, but not all of them:
+
+    release    libtool      so
+  --------------------------------------------------------------------
+     2.1.5      9.4.3     6.3.4
+     2.1.4      9.3.3     6.3.3
+     2.1.3      9.2.3     6.3.2
+     2.1.2      9.1.3     6.3.1
+     2.1.1      9.0.3         ?
+     2.1.0      8.0.2         ?
+     2.0.9      9.0.3         ?
+     2.0.8      8.0.2         ?
+
+The libtool numbers are a bit inconsistent due to the library's history:
+
+  - 2.1.0 was created as a development branch from 2.0.8 (hence the same
+    libtool numbers).
+
+  - 2.0.9  was  a  bug-fix  release  of  the  "stable"  branch,  and  we
+    incorrectly increased its libtool number.
+
+  - 2.1.4 is  still in  the "development" branch,  however it  is stable
+    enough to be the basis of an upcoming 2.2.0 release.
 
 
-II. Table:
+3. Autoconf Code Fragment
+-------------------------
 
-the following is a simple table that gives, for each official release,
-the corresponding libtool number, as well as the shared object number
-found on _most_ systems, but not all of them:
-
-  release       libtool        so
--------------------------------------
-   2.1.4         9.3.3         6.3.3
-   2.1.3         9.2.3         6.3.2
-   2.1.2         9.1.3         6.3.1
-   2.1.1         9.0.3          ?
-   2.1.0         8.0.2          ?
-   2.0.9         9.0.3          ?
-   2.0.8         8.0.2          ?
-
-the libtool numbers are a bit inconsistent due to the library's history:
-
-  - 2.1.0 was created as a development branch from 2.0.8
-    (hence the same libtool numbers)
-
-  - 2.0.9 was a bug-fix release of the "stable" branch, we
-    apparently incorrectly increased its libtool number
-
-  - 2.1.4 is still in the "development" branch, however it's stable enough
-    to be the basis of an upcoming 2.2.0 release
+Lars Clausen contributed the following autoconf fragment to detect which
+version of  FreeType is  installed on  a system.  This  one tests  for a
+version that  is at least 2.0.9;  you should change  it to check against
+other release numbers.
 
 
+  AC_MSG_CHECKING([whether FreeType version is 2.0.9 or higher])
+  old_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS=`freetype-config --cflags`
+  AC_TRY_CPP([
+#include <freetype/freetype.h>
+#if (FREETYPE_MAJOR*1000 + FREETYPE_MINOR)*1000 + FREETYPE_PATCH < 2000009
+#error Freetype version too low.
+#endif
+  ],[
+    AC_MSG_RESULT(yes)
+    FREETYPE_LIBS=`freetype-config --libs`
+    AC_SUBST(FREETYPE_LIBS)
+    AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])
+    CPPFLAGS="$old_CPPFLAGS"
+  ],[
+    AC_MSG_ERROR([Need FreeType library version 2.0.9 or higher])
+  ])
 
-III. AutoConf Code Fragment:
-
-Lars Clausen contributed the following Autoconf fragment to detect at
-which version of FreeType is installed on your system. This one tests
-for a version that is at least 2.0.9, you should change the last line to
-check against other release numbers.
-
-    AC_MSG_CHECKING([for version of FreeType])
-    FREETYPE_INCLUDE=`freetype-config --cflags | cut -c3-`
-    FREETYPE_MAJOR=`grep '^#define FREETYPE_MAJOR' $FREETYPE_INCLUDE/freetype/freetype.h | cut -d' ' -f3`
-    FREETYPE_MINOR=`grep '^#define FREETYPE_MINOR' $FREETYPE_INCLUDE/freetype/freetype.h | cut -d' ' -f3`
-    FREETYPE_PATCH=`grep '^#define FREETYPE_PATCH' $FREETYPE_INCLUDE/freetype/freetype.h | cut -d' ' -f3`
-    FREETYPE_VERSION=`echo | awk "BEGIN { printf \"%d\", ($FREETYPE_MAJOR * 1000 + $FREETYPE_MINOR) * 1000 + $FREETYPE_PATCH;}"`
-    AC_MSG_RESULT([$FREETYPE_MAJOR.$FREETYPE_MINOR.$FREETYPE_PATCH])
-    if test "$FREETYPE_VERSION" -ge 2000009; then
 
+--- end of VERSION.DLL ---
diff --git a/reactos/lib/freetype/docs/license.txt b/reactos/lib/freetype/docs/license.txt
index 51b52bf87de..dc011d1d560 100644
--- a/reactos/lib/freetype/docs/license.txt
+++ b/reactos/lib/freetype/docs/license.txt
@@ -1,28 +1,25 @@
 
-   The FreeType   2 font   engine  is   copyrighted work,   and cannot   be
-   used  legally  without a   software license.   In order   to make   this
-   project  usable  to  a  vast majority  of developers,  we distribute  it
-   under two dual licenses.
+The  FreeType 2  font  engine is  copyrighted  work and  cannot be  used
+legally  without a  software license.   In  order to  make this  project
+usable  to a vast  majority of  developers, we  distribute it  under two
+mutually exclusive licenses.
 
-   What this  means is  that *you*  must choose  *one* license among  those
-   described below,  then obey  all  its  terms and  conditions when  using
-   FreeType 2 in any of your projects or products:
+This means  that *you*  must choose *one*  license of the  two described
+below, then obey  all its terms and conditions when  using FreeType 2 in
+any of your projects or products.
+
+  - The  FreeType License,  found in  the  file "FTL.TXT",  which is  an
+    BSD-style  open-source  license *with*  an  advertising clause  that
+    forces  you  to  explicitely  cite  the  FreeType  project  in  your
+    product's documentation.  All details are in the license file.
+
+  - The GNU  General Public  License, found in  "GPL.TXT", which  is the
+    traditionnal and "viral" GPL license that forces you to redistribute
+    the _complete_ sources of all your products that use FreeType 2.
+
+Note that  the contributed  PCF driver comes  with a license  similar to
+that of  X Window System which  is compatible to the  above two licenses
+(see file src/pcf/readme).
 
 
-     - The  FreeType License,  found in  the file  "FTL.TXT", which  is
-       an     BSD-style  open-source   license *with*  an   advertising
-       clause   that      forces   you   to   explicitely   cite    the
-       FreeType   project   in  your      product's  documentation. All
-       details are in the license file
-
-
-     - The GNU General Public   License, found in "GPL.TXT",  which  is
-       the      traditionnal   and    "viral"   GPL    license,    that
-       forces  you   to     redistribute the _complete_ sources of  all
-       your products that simply     use FreeType 2.
-
-
-   Note that  the contributed  PCF driver  comes with  a license similar to
-   that  of   X Window   System  which  is  compatible   to the  above  two
-   licenses (see file src/pcf/readme).
-
+--- end of licence.txt ---
diff --git a/reactos/lib/freetype/docs/reference/README b/reactos/lib/freetype/docs/reference/README
new file mode 100644
index 00000000000..7c3467b53a5
--- /dev/null
+++ b/reactos/lib/freetype/docs/reference/README
@@ -0,0 +1,2 @@
+After saying `make refdoc' this directory contains the FreeType API
+reference.  You need python to make this target.
diff --git a/reactos/lib/freetype/docs/release b/reactos/lib/freetype/docs/release
new file mode 100644
index 00000000000..df3ef5485c6
--- /dev/null
+++ b/reactos/lib/freetype/docs/release
@@ -0,0 +1,18 @@
+How to prepare a new release
+----------------------------
+
+. include/freetype/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR, and
+  FREETYPE_PATCH.
+
+. builds/unix/configure.ac (version_info): Update according to the libtool
+  rules, then regenerate the configure script.
+
+. builds/freetype.mk (refdoc): Update the --title option.
+
+. docs/CHANGES: Document differences to last release.
+
+. README: Update.
+
+. docs/VERSION.DLL: Document changed version_info.
+
+. ChangeLog: Announce new release.
diff --git a/reactos/lib/freetype/freetype.def b/reactos/lib/freetype/freetype.def
index f42930ce14e..6f1689ce818 100644
--- a/reactos/lib/freetype/freetype.def
+++ b/reactos/lib/freetype/freetype.def
@@ -97,7 +97,6 @@ FT_Select_Charmap
 FT_Set_Char_Size
 FT_Set_Charmap
 FT_Set_Debug_Hook
-FT_Set_Hint_Flags
 FT_Set_Pixel_Sizes
 FT_Set_Renderer
 FT_Set_Transform
@@ -245,9 +244,7 @@ t1_cmap_expert_class_rec
 t1_cmap_standard_class_rec
 t1_cmap_unicode_class_rec
 t1_decoder_funcs
-ps1_hints_apply
-ps2_hints_apply
-ps3_hints_apply
+ps_hints_apply
 pshinter_module_class
 psnames_module_class
 ft_raster1_renderer_class
diff --git a/reactos/lib/freetype/include/freetype/cache/ftccmap.h b/reactos/lib/freetype/include/freetype/cache/ftccmap.h
index 11f7b03b6d9..a41989b2822 100644
--- a/reactos/lib/freetype/include/freetype/cache/ftccmap.h
+++ b/reactos/lib/freetype/include/freetype/cache/ftccmap.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType charmap cache (specification).                              */
 /*                                                                         */
-/*  Copyright 2000-2001 by                                                 */
+/*  Copyright 2000-2001, 2003 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -36,7 +36,7 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* @type:                                                                */
-  /*    FTC_CmapCache                                                      */
+  /*    FTC_CMapCache                                                      */
   /*                                                                       */
   /* @description:                                                         */
   /*    An opaque handle used to manager a charmap cache.  This cache is   */
@@ -54,8 +54,8 @@ FT_BEGIN_HEADER
   /*    A handle to an @FTC_CMapDescRec structure used to describe a given */
   /*    charmap in a charmap cache.                                        */
   /*                                                                       */
-  /*    Each @FTC_CMapDesc describes which charmap (of which @FTC_Face) we */
-  /*    want to use in @FTC_CMapCache_Lookup.                              */
+  /*    Each @FTC_CMapDesc describes which charmap (of which @FTC_FaceID)  */
+  /*    we want to use in @FTC_CMapCache_Lookup.                           */
   /*                                                                       */
   typedef struct FTC_CMapDescRec_*  FTC_CMapDesc;
 
@@ -66,8 +66,8 @@ FT_BEGIN_HEADER
   /*    FTC_CMapType                                                       */
   /*                                                                       */
   /* @description:                                                         */
-  /*    The list of valid @FTC_CMap types.  They indicate how we want to   */
-  /*    address a charmap within an @FTC_FaceID.                           */
+  /*    The list of valid @FTC_CMapDesc types.  They indicate how we want  */
+  /*    to address a charmap within an @FTC_FaceID.                        */
   /*                                                                       */
   /* @values:                                                              */
   /*    FTC_CMAP_BY_INDEX ::                                               */
diff --git a/reactos/lib/freetype/include/freetype/cache/ftcglyph.h b/reactos/lib/freetype/include/freetype/cache/ftcglyph.h
index 3d14cf02445..8a2f0f3a7e2 100644
--- a/reactos/lib/freetype/include/freetype/cache/ftcglyph.h
+++ b/reactos/lib/freetype/include/freetype/cache/ftcglyph.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType abstract glyph cache (specification).                       */
 /*                                                                         */
-/*  Copyright 2000-2001 by                                                 */
+/*  Copyright 2000-2001, 2003 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -120,10 +120,10 @@ FT_BEGIN_HEADER
             FTC_GLYPH_FAMILY( gfam )->item_count )
 
   /* compute a glyph request's hash value */
-#define FTC_GLYPH_FAMILY_HASH( gfam, gindex )                         \
-          ( (FT_UFast)(                                               \
-              ( FTC_GLYPH_FAMILY( gfam )->hash << 16 ) |              \
-              ( FTC_GLYPH_FAMILY_CHUNK( gfam, gindex ) & 0xFFFF ) ) )
+#define FTC_GLYPH_FAMILY_HASH( gfam, gindex )                          \
+          ( (FT_UFast)(                                                \
+              ( FTC_GLYPH_FAMILY( gfam )->hash << 16 ) |               \
+              ( FTC_GLYPH_FAMILY_CHUNK( gfam, gindex ) & 0xFFFFU ) ) )
 
   /* must be called in an FTC_Family_CompareFunc to update the query */
   /* whenever a glyph set is matched in the lookup, or when it       */
@@ -138,8 +138,8 @@ FT_BEGIN_HEADER
           } while ( 0 )
 
   /* retrieve glyph index of glyph node */
-#define FTC_GLYPH_NODE_GINDEX( x )                                 \
-          ( (FT_UInt)( FTC_GLYPH_NODE( x )->node.hash & 0xFFFF ) )
+#define FTC_GLYPH_NODE_GINDEX( x )                                  \
+          ( (FT_UInt)( FTC_GLYPH_NODE( x )->node.hash & 0xFFFFU ) )
 
 
   /*************************************************************************/
diff --git a/reactos/lib/freetype/include/freetype/cache/ftcimage.h b/reactos/lib/freetype/include/freetype/cache/ftcimage.h
index 382d991d3a9..2d0b780e173 100644
--- a/reactos/lib/freetype/include/freetype/cache/ftcimage.h
+++ b/reactos/lib/freetype/include/freetype/cache/ftcimage.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType Image cache (specification).                                */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
+/*  Copyright 2000-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -202,18 +202,19 @@ FT_BEGIN_HEADER
   /* scaled outline */
 #define ftc_image_outline          ftc_image_format_outline
 
+
   /*************************************************************************/
   /*                                                                       */
   /* <Struct>                                                              */
   /*    FTC_Image_Desc                                                     */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    THIS TYPE IS DEPRECATED.  Use @FTC_ImageDesc instead.              */
+  /*    THIS TYPE IS DEPRECATED.  Use @FTC_ImageTypeRec instead.           */
   /*                                                                       */
   /*    A simple structure used to describe a given glyph image category.  */
   /*                                                                       */
   /* <Fields>                                                              */
-  /*    size       :: An @FTC_SizeRec used to describe the glyph's face    */
+  /*    font       :: An @FTC_FontRec used to describe the glyph's face    */
   /*                  and size.                                            */
   /*                                                                       */
   /*    image_type :: The glyph image's type.                              */
diff --git a/reactos/lib/freetype/include/freetype/config/ftconfig.h b/reactos/lib/freetype/include/freetype/config/ftconfig.h
index 72bee0cc5f9..4f5d7fe8e23 100644
--- a/reactos/lib/freetype/include/freetype/config/ftconfig.h
+++ b/reactos/lib/freetype/include/freetype/config/ftconfig.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    ANSI-specific configuration file (specification only).               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -108,7 +108,8 @@ FT_BEGIN_HEADER
   /*   This is the only necessary change, so it is defined here instead    */
   /*   providing a new configuration file.                                 */
   /*                                                                       */
-#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
+#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
+    ( defined( __MWERKS__ ) && defined( macintosh )        )
 #define FT_MACINTOSH 1
 #endif
 
@@ -177,10 +178,10 @@ FT_BEGIN_HEADER
 
   /* Watcom doesn't provide 64-bit data types */
 
-#elif defined( __MWKS__ )      /* Metrowerks CodeWarrior */
+#elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */
 
-  /* I don't know if it provides 64-bit data types, any suggestion */
-  /* is welcome.                                                   */
+#define FT_LONG64
+#define FT_INT64  long long int
 
 #elif defined( __GNUC__ )
 
diff --git a/reactos/lib/freetype/include/freetype/config/ftheader.h b/reactos/lib/freetype/include/freetype/config/ftheader.h
index e5ae7e46968..2bd5bd61c27 100644
--- a/reactos/lib/freetype/include/freetype/config/ftheader.h
+++ b/reactos/lib/freetype/include/freetype/config/ftheader.h
@@ -509,7 +509,7 @@
   /* */
 
 #define FT_TRIGONOMETRY_H          <freetype/fttrigon.h>
-#define FT_STROKER_H               <freetype/ftstroker.h>
+#define FT_STROKER_H               <freetype/ftstroke.h>
 #define FT_SYNTHESIS_H             <freetype/ftsynth.h>
 #define FT_ERROR_DEFINITIONS_H     <freetype/fterrdef.h>
 
@@ -523,6 +523,8 @@
 
 #define FT_INCREMENTAL_H           <freetype/ftincrem.h>
 
+#define FT_TRUETYPE_UNPATENTED_H   <freetype/ttunpat.h>
+
   /* now include internal headers definitions from <freetype/internal/...> */
 
 #define  FT_INTERNAL_INTERNAL_H    <freetype/internal/internal.h>
diff --git a/reactos/lib/freetype/include/freetype/config/ftoption.h b/reactos/lib/freetype/include/freetype/config/ftoption.h
index 4e3457f7339..0e02192c405 100644
--- a/reactos/lib/freetype/include/freetype/config/ftoption.h
+++ b/reactos/lib/freetype/include/freetype/config/ftoption.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    User-selectable configuration macros (specification only).           */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -81,16 +81,16 @@ FT_BEGIN_HEADER
   /* by FreeType to speed up some computations.  However, this will create */
   /* some problems when compiling the library in strict ANSI mode.         */
   /*                                                                       */
-  /* For this reason, the use of 64-bit ints is normally disabled when     */
+  /* For this reason, the use of 64-bit integers is normally disabled when */
   /* the __STDC__ macro is defined.  You can however disable this by       */
-  /* defining here the macro FT_CONFIG_OPTION_FORCE_INT64.                 */
+  /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here.                 */
   /*                                                                       */
-  /* For most compilers, this will only create compilation warnings        */
-  /* when building the library.                                            */
+  /* For most compilers, this will only create compilation warnings when   */
+  /* building the library.                                                 */
   /*                                                                       */
   /* ObNote: The compiler-specific 64-bit integers are detected in the     */
-  /*         file "ftconfig.h" either statically, or through Autoconf      */
-  /*         on platforms that support it.                                 */
+  /*         file "ftconfig.h" either statically or through the            */
+  /*         `configure' script on supported platforms.                    */
   /*                                                                       */
 #undef  FT_CONFIG_OPTION_FORCE_INT64
 
@@ -100,11 +100,11 @@ FT_BEGIN_HEADER
   /* Gzip-compressed file support.                                         */
   /*                                                                       */
   /*   FreeType now handles font files that have been compressed with the  */
-  /*   'gzip' program. This is mostly used to parse many of the PCF files  */
-  /*   that come with XFree86. The implementation uses 'zlib' to           */
+  /*   'gzip' program.  This is mostly used to parse many of the PCF files */
+  /*   that come with XFree86.  The implementation uses `zlib' to          */
   /*   partially uncompress the file on the fly (see src/base/ftgzip.c).   */
   /*                                                                       */
-  /*   Define this macro if you want to enable this "feature". Note that   */
+  /*   Define this macro if you want to enable this "feature".  Note that  */
   /*   this will however force you to link the zlib to any program that    */
   /*   also uses FreeType.                                                 */
   /*                                                                       */
@@ -117,17 +117,17 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*   This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined.  */
   /*   It allows FreeType's "ftgzip" component to link to the system's     */
-  /*   installation of the ZLib library. This is useful on systems like    */
+  /*   installation of the ZLib library.  This is useful on systems like   */
   /*   Unix or VMS where it generally is already available.                */
   /*                                                                       */
   /*   If you let it undefined, the component will use its own copy        */
-  /*   of the zlib sources instead. These have been modified to be         */
+  /*   of the zlib sources instead.  These have been modified to be        */
   /*   included directly within the component and *not* export external    */
-  /*   function names. This allows you to link any program with FreeType   */
+  /*   function names.  This allows you to link any program with FreeType  */
   /*   _and_ ZLib without linking conflicts.                               */
   /*                                                                       */
-  /*   do not #undef this macro here, since the build system might         */
-  /*   define for certain configurations                                   */
+  /*   Do not #undef this macro here since the build system might define   */
+  /*   it for certain configurations only.                                 */
   /*                                                                       */
 /* #define  FT_CONFIG_OPTION_SYSTEM_ZLIB */
 
@@ -167,6 +167,9 @@ FT_BEGIN_HEADER
   /*   will be later automatically defined as `extern return_type' to      */
   /*   allow normal compilation.                                           */
   /*                                                                       */
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
 /* #define  FT_EXPORT(x)       extern x */
 /* #define  FT_EXPORT_DEF(x)   x */
 
@@ -214,6 +217,19 @@ FT_BEGIN_HEADER
 #define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* Support for Mac fonts                                                 */
+  /*                                                                       */
+  /*   Define this macro if you want support for outline fonts in Mac      */
+  /*   format (mac dfont, mac resource, macbinary containing a mac         */
+  /*   resource) on non-Mac platforms.                                     */
+  /*                                                                       */
+  /*   Note that the `FOND' resource isn't checked.                        */
+  /*                                                                       */
+#define FT_CONFIG_OPTION_MAC_FONTS
+
+
   /*************************************************************************/
   /*                                                                       */
   /* Allow the use of FT_Incremental_Interface to load typefaces that      */
@@ -221,7 +237,7 @@ FT_BEGIN_HEADER
   /* This allows FreeType to be used with the PostScript language, using   */
   /* the GhostScript interpreter.                                          */
   /*                                                                       */
-/* #define  FT_CONFIG_OPTION_INCREMENTAL */
+/* #define FT_CONFIG_OPTION_INCREMENTAL */
 
 
   /*************************************************************************/
@@ -229,7 +245,7 @@ FT_BEGIN_HEADER
   /* The size in bytes of the render pool used by the scan-line converter  */
   /* to do all of its work.                                                */
   /*                                                                       */
-  /* This must be greater than 4kByte.                                     */
+  /* This must be greater than 4KByte.                                     */
   /*                                                                       */
 #define FT_RENDER_POOL_SIZE  16384L
 
@@ -258,8 +274,11 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*   Don't define any of these macros to compile in `release' mode!      */
   /*                                                                       */
-/* #define  FT_DEBUG_LEVEL_ERROR */
-/* #define  FT_DEBUG_LEVEL_TRACE */
+  /*   Do not #undef these macros here since the build system might define */
+  /*   them for certain configurations only.                               */
+  /*                                                                       */
+/* #define FT_DEBUG_LEVEL_ERROR */
+/* #define FT_DEBUG_LEVEL_TRACE */
 
 
   /*************************************************************************/
@@ -272,10 +291,12 @@ FT_BEGIN_HEADER
   /*   should define FT_DEBUG_MEMORY here.                                 */
   /*                                                                       */
   /*   Note that the memory debugger is only activated at runtime when     */
-  /*   when the _environment_ variable "FT_DEBUG_MEMORY" is also defined!  */
+  /*   when the _environment_ variable "FT2_DEBUG_MEMORY" is defined also! */
   /*                                                                       */
-/* #define  FT_DEBUG_MEMORY */
-
+  /*   Do not #undef this macro here since the build system might define   */
+  /*   it for certain configurations only.                                 */
+  /*                                                                       */
+/* #define FT_DEBUG_MEMORY */
 
 
   /*************************************************************************/
@@ -375,12 +396,27 @@ FT_BEGIN_HEADER
   /* By undefining this, you will only compile the code necessary to load  */
   /* TrueType glyphs without hinting.                                      */
   /*                                                                       */
-  /*   do not #undef this macro here, since the build system might         */
-  /*   define for certain configurations                                   */
+  /*   Do not #undef this macro here, since the build system might         */
+  /*   define it for certain configurations only.                          */
   /*                                                                       */
 /* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* Define TT_CONFIG_OPTION_UNPATENTED_HINTING (in addition to            */
+  /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER) to compile the unpatented      */
+  /* work-around hinting system.  Note that for the moment, the algorithm  */
+  /* is only used when selected at runtime through the parameter tag       */
+  /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook               */
+  /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally actived                  */
+  /*                                                                       */
+  /* XXX: WARNING: THIS DOESN'T WORK AS ADVERTISED YET. PLEASE DO NOT      */
+  /*      DEFINE FOR THE MOMENT..                                          */
+  /*                                                                       */
+/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
+
+
   /*************************************************************************/
   /*                                                                       */
   /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType    */
@@ -470,21 +506,21 @@ FT_BEGIN_HEADER
  /* */
 
 /*
- * the FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
- * improvements to the auto-hinter contributed by David Chester. They will
- * most likely disappear completely in the next release. For now, you should
- * always keep them defined
+ * The FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
+ * improvements to the auto-hinter contributed by David Chester.  They will
+ * most likely disappear completely in the next release.  For now, you
+ * should always keep them defined.
  *
  */
 #define  FT_CONFIG_OPTION_CHESTER_HINTS
 
 #ifdef   FT_CONFIG_OPTION_CHESTER_HINTS
 
-#  define  FT_CONFIG_CHESTER_SMALL_F
-#  define  FT_CONFIG_CHESTER_ASCENDER
-#  define  FT_CONFIG_CHESTER_SERIF
-#  define  FT_CONFIG_CHESTER_STEM
-#  define  FT_CONFIG_CHESTER_BLUE_SCALE
+#define  FT_CONFIG_CHESTER_SMALL_F
+#define  FT_CONFIG_CHESTER_ASCENDER
+#define  FT_CONFIG_CHESTER_SERIF
+#define  FT_CONFIG_CHESTER_STEM
+#define  FT_CONFIG_CHESTER_BLUE_SCALE
 
 #endif /* FT_CONFIG_OPTION_CHESTER_HINTS */
 
diff --git a/reactos/lib/freetype/include/freetype/config/ftstdlib.h b/reactos/lib/freetype/include/freetype/config/ftstdlib.h
index 6c060912d70..7868fd402a1 100644
--- a/reactos/lib/freetype/include/freetype/config/ftstdlib.h
+++ b/reactos/lib/freetype/include/freetype/config/ftstdlib.h
@@ -82,6 +82,7 @@
 #include <string.h>
 
 #define ft_strlen   strlen
+#define ft_strcat   strcat
 #define ft_strcmp   strcmp
 #define ft_strncmp  strncmp
 #define ft_memcpy   memcpy
diff --git a/reactos/lib/freetype/include/freetype/freetype.h b/reactos/lib/freetype/include/freetype/freetype.h
index 4d6c5a2cd2b..413e6c6b270 100644
--- a/reactos/lib/freetype/include/freetype/freetype.h
+++ b/reactos/lib/freetype/include/freetype/freetype.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType high-level API and common types (specification only).       */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -35,7 +35,7 @@
   /*                                                                       */
 #define FREETYPE_MAJOR 2
 #define FREETYPE_MINOR 1
-#define FREETYPE_PATCH 4
+#define FREETYPE_PATCH 5
 
 
 #include <ft2build.h>
@@ -113,7 +113,6 @@ FT_BEGIN_HEADER
   /*    FT_New_Memory_Face                                                 */
   /*    FT_Open_Face                                                       */
   /*    FT_Open_Args                                                       */
-  /*    FT_Open_Flags                                                      */
   /*    FT_Parameter                                                       */
   /*    FT_Attach_File                                                     */
   /*    FT_Attach_Stream                                                   */
@@ -126,6 +125,12 @@ FT_BEGIN_HEADER
   /*    FT_Get_Name_Index                                                  */
   /*    FT_Load_Char                                                       */
   /*                                                                       */
+  /*    FT_OPEN_MEMORY                                                     */
+  /*    FT_OPEN_STREAM                                                     */
+  /*    FT_OPEN_PATHNAME                                                   */
+  /*    FT_OPEN_DRIVER                                                     */
+  /*    FT_OPEN_PARAMS                                                     */
+  /*                                                                       */
   /*    FT_LOAD_DEFAULT                                                    */
   /*    FT_LOAD_RENDER                                                     */
   /*    FT_LOAD_MONOCHROME                                                 */
@@ -142,6 +147,12 @@ FT_BEGIN_HEADER
   /*    FT_LOAD_NO_RECURSE                                                 */
   /*    FT_LOAD_PEDANTIC                                                   */
   /*                                                                       */
+  /*    FT_LOAD_TARGET_NORMAL                                              */
+  /*    FT_LOAD_TARGET_LIGHT                                               */
+  /*    FT_LOAD_TARGET_MONO                                                */
+  /*    FT_LOAD_TARGET_LCD                                                 */
+  /*    FT_LOAD_TARGET_LCD_V                                               */
+  /*                                                                       */
   /*    FT_Render_Glyph                                                    */
   /*    FT_Render_Mode                                                     */
   /*    FT_Get_Kerning                                                     */
@@ -162,9 +173,10 @@ FT_BEGIN_HEADER
   /*    FT_Glyph_Metrics                                                   */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    A structure used to model the metrics of a single glyph.  Note     */
-  /*    that values are expressed in 26.6 fractional pixel format or in    */
-  /*    font units, depending on context.                                  */
+  /*    A structure used to model the metrics of a single glyph.  The      */
+  /*    values are expressed in 26.6 fractional pixel format; if the flag  */
+  /*    FT_LOAD_NO_SCALE is used, values are returned in font units        */
+  /*    instead.                                                           */
   /*                                                                       */
   /* <Fields>                                                              */
   /*    width        :: The glyph's width.                                 */
@@ -205,21 +217,62 @@ FT_BEGIN_HEADER
   /*    FT_Bitmap_Size                                                     */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    An extremely simple structure used to model the size of a bitmap   */
-  /*    strike (i.e., a bitmap instance of the font for a given            */
-  /*    resolution) in a fixed-size font face.  This is used for the       */
-  /*    `available_sizes' field of the FT_Face_Properties structure.       */
+  /*    This structure models the size of a bitmap strike (i.e., a bitmap  */
+  /*    instance of the font for a given resolution) in a fixed-size font  */
+  /*    face.  It is used for the `available_sizes' field of the           */
+  /*    @FT_FaceRec structure.                                             */
   /*                                                                       */
   /* <Fields>                                                              */
-  /*    height :: The character height in pixels.                          */
+  /*    height :: The (vertical) baseline-to-baseline distance in pixels.  */
+  /*              It makes most sense to define the height of a bitmap     */
+  /*              font in this way.                                        */
   /*                                                                       */
-  /*    width  :: The character width in pixels.                           */
+  /*    width  :: The average width of the font (in pixels).  Since the    */
+  /*              algorithms to compute this value are different for the   */
+  /*              various bitmap formats, it can only give an additional   */
+  /*              hint if the `height' value isn't sufficient to select    */
+  /*              the proper font.  For monospaced fonts the average width */
+  /*              is the same as the maximum width.                        */
+  /*                                                                       */
+  /*    size   :: The point size in 26.6 fractional format this font shall */
+  /*              represent (for a given vertical resolution).             */
+  /*                                                                       */
+  /*    x_ppem :: The horizontal ppem value (in 26.6 fractional format).   */
+  /*                                                                       */
+  /*    y_ppem :: The vertical ppem value (in 26.6 fractional format).     */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The values in this structure are taken from the bitmap font.  If   */
+  /*    the font doesn't provide a parameter it is set to zero to indicate */
+  /*    that the information is not available.                             */
+  /*                                                                       */
+  /*    The following formula converts from dpi to ppem:                   */
+  /*                                                                       */
+  /*      ppem = size * dpi / 72                                           */
+  /*                                                                       */
+  /*    where `size' is in points.                                         */
+  /*                                                                       */
+  /*    Windows FNT:                                                       */
+  /*      The `size', `x_ppem', and `y_ppem' parameters are not reliable:  */
+  /*      There exist fonts (e.g. app850.fon) which have a wrong size for  */
+  /*      some subfonts; since FNT files don't contain ppem but dpi values */
+  /*      the computed x_ppem and y_ppem numbers are thus wrong also.      */
+  /*                                                                       */
+  /*    TrueType embedded bitmaps:                                         */
+  /*      `size', `width', and `height' values are not contained in the    */
+  /*      bitmap strike itself.  They are computed from the global font    */
+  /*      parameters.                                                      */
   /*                                                                       */
   typedef struct  FT_Bitmap_Size_
   {
     FT_Short  height;
     FT_Short  width;
 
+    FT_Pos    size;
+
+    FT_Pos    x_ppem;
+    FT_Pos    y_ppem;
+
   } FT_Bitmap_Size;
 
 
@@ -386,6 +439,10 @@ FT_BEGIN_HEADER
   /*    @FT_Open_Face), the library looks for a Unicode charmap within     */
   /*    the list and automatically activates it.                           */
   /*                                                                       */
+  /* <Also>                                                                */
+  /*    The @FT_CharMapRec details the publicly accessible fields of a     */
+  /*    given character map.                                               */
+  /*                                                                       */
   typedef struct FT_CharMapRec_*  FT_CharMap;
 
 
@@ -452,30 +509,28 @@ FT_BEGIN_HEADER
   /*     mathematical symbols in the 32..255 character code range.  For    */
   /*     more information, see `http://www.ceviz.net/symbol.htm'.          */
   /*                                                                       */
-  /*   FT_ENCODING_MS_SJIS ::                                              */
-  /*     Corresponds to Microsoft's Japanese SJIS encoding.  More info     */
+  /*   FT_ENCODING_SJIS ::                                                 */
+  /*     Corresponds to Japanese SJIS encoding.  More info at              */
   /*     at `http://langsupport.japanreference.com/encoding.shtml'.        */
   /*     See note on multi-byte encodings below.                           */
   /*                                                                       */
-  /*   FT_ENCODING_MS_GB2312 ::                                            */
-  /*     Corresponds to the encoding system for Simplified Chinese, as     */
-  /*     used in China.  Only found in some TrueType fonts.                */
+  /*   FT_ENCODING_GB2312 ::                                               */
+  /*     Corresponds to an encoding system for Simplified Chinese as used  */
+  /*     used in mainland China.                                           */
   /*                                                                       */
-  /*   FT_ENCODING_MS_BIG5 ::                                              */
-  /*     Corresponds to the encoding system for Traditional Chinese, as    */
-  /*     used in Taiwan and Hong Kong.  Only found in some TrueType fonts. */
+  /*   FT_ENCODING_BIG5 ::                                                 */
+  /*     Corresponds to an encoding system for Traditional Chinese as used */
+  /*     in Taiwan and Hong Kong.                                          */
   /*                                                                       */
-  /*   FT_ENCODING_MS_WANSUNG ::                                           */
+  /*   FT_ENCODING_WANSUNG ::                                              */
   /*     Corresponds to the Korean encoding system known as Wansung.       */
-  /*     This is a Microsoft encoding that is only found in some TrueType  */
-  /*     fonts.  For more information, see                                 */
+  /*     For more information see                                          */
   /*     `http://www.microsoft.com/typography/unicode/949.txt'.            */
   /*                                                                       */
-  /*   FT_ENCODING_MS_JOHAB ::                                             */
+  /*   FT_ENCODING_JOHAB ::                                                */
   /*     The Korean standard character set (KS C-5601-1992), which         */
-  /*     corresponds to Windows code page 1361.  This character set        */
+  /*     corresponds to MS Windows code page 1361.  This character set     */
   /*     includes all possible Hangeul character combinations.             */
-  /*     Only found on some rare TrueType fonts.                           */
   /*                                                                       */
   /*   FT_ENCODING_ADOBE_LATIN_1 ::                                        */
   /*     Corresponds to a Latin-1 encoding as defined in a Type 1          */
@@ -483,7 +538,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*   FT_ENCODING_ADOBE_STANDARD ::                                       */
   /*     Corresponds to the Adobe Standard encoding, as found in Type 1,   */
-  /*     CFF, and OpenType/CFF fonts.  It is limited to 256character       */
+  /*     CFF, and OpenType/CFF fonts.  It is limited to 256 character      */
   /*     codes.                                                            */
   /*                                                                       */
   /*   FT_ENCODING_ADOBE_EXPERT ::                                         */
@@ -504,6 +559,21 @@ FT_BEGIN_HEADER
   /*     This value is deprecated and was never used nor reported by       */
   /*     FreeType.  Don't use or test for it.                              */
   /*                                                                       */
+  /*   FT_ENCODING_MS_SJIS ::                                              */
+  /*     Same as FT_ENCODING_SJIS.  Deprecated.                            */
+  /*                                                                       */
+  /*   FT_ENCODING_MS_GB2312 ::                                            */
+  /*     Same as FT_ENCODING_GB2312.  Deprecated.                          */
+  /*                                                                       */
+  /*   FT_ENCODING_MS_BIG5 ::                                              */
+  /*     Same as FT_ENCODING_BIG5.  Deprecated.                            */
+  /*                                                                       */
+  /*   FT_ENCODING_MS_WANSUNG ::                                           */
+  /*     Same as FT_ENCODING_WANSUNG.  Deprecated.                         */
+  /*                                                                       */
+  /*   FT_ENCODING_MS_JOHAB ::                                             */
+  /*     Same as FT_ENCODING_JOHAB.  Deprecated.                           */
+  /*                                                                       */
   /* <Note>                                                                */
   /*   By default, FreeType automatically synthetizes a Unicode charmap    */
   /*   for Postscript fonts, using their glyph names dictionaries.         */
@@ -518,11 +588,18 @@ FT_BEGIN_HEADER
     FT_ENC_TAG( FT_ENCODING_MS_SYMBOL,  's', 'y', 'm', 'b' ),
     FT_ENC_TAG( FT_ENCODING_UNICODE,    'u', 'n', 'i', 'c' ),
 
-    FT_ENC_TAG( FT_ENCODING_MS_SJIS,    's', 'j', 'i', 's' ),
-    FT_ENC_TAG( FT_ENCODING_MS_GB2312,  'g', 'b', ' ', ' ' ),
-    FT_ENC_TAG( FT_ENCODING_MS_BIG5,    'b', 'i', 'g', '5' ),
-    FT_ENC_TAG( FT_ENCODING_MS_WANSUNG, 'w', 'a', 'n', 's' ),
-    FT_ENC_TAG( FT_ENCODING_MS_JOHAB,   'j', 'o', 'h', 'a' ),
+    FT_ENC_TAG( FT_ENCODING_SJIS,    's', 'j', 'i', 's' ),
+    FT_ENC_TAG( FT_ENCODING_GB2312,  'g', 'b', ' ', ' ' ),
+    FT_ENC_TAG( FT_ENCODING_BIG5,    'b', 'i', 'g', '5' ),
+    FT_ENC_TAG( FT_ENCODING_WANSUNG, 'w', 'a', 'n', 's' ),
+    FT_ENC_TAG( FT_ENCODING_JOHAB,   'j', 'o', 'h', 'a' ),
+
+    /* for backwards compatibility */
+    FT_ENCODING_MS_SJIS    = FT_ENCODING_SJIS,
+    FT_ENCODING_MS_GB2312  = FT_ENCODING_GB2312,
+    FT_ENCODING_MS_BIG5    = FT_ENCODING_BIG5,
+    FT_ENCODING_MS_WANSUNG = FT_ENCODING_WANSUNG,
+    FT_ENCODING_MS_JOHAB   = FT_ENCODING_JOHAB,
 
     FT_ENC_TAG( FT_ENCODING_ADOBE_STANDARD, 'A', 'D', 'O', 'B' ),
     FT_ENC_TAG( FT_ENCODING_ADOBE_EXPERT,   'A', 'D', 'B', 'E' ),
@@ -550,11 +627,11 @@ FT_BEGIN_HEADER
   /*   ft_encoding_unicode :: see @FT_ENCODING_UNICODE                     */
   /*   ft_encoding_latin_2 :: see @FT_ENCODING_OLD_LATIN_2                 */
   /*   ft_encoding_symbol  :: see @FT_ENCODING_MS_SYMBOL                   */
-  /*   ft_encoding_sjis    :: see @FT_ENCODING_MS_SJIS                     */
-  /*   ft_encoding_gb2312  :: see @FT_ENCODING_MS_GB2312                   */
-  /*   ft_encoding_big5    :: see @FT_ENCODING_MS_BIG5                     */
-  /*   ft_encoding_wansung :: see @FT_ENCODING_MS_WANSUNG                  */
-  /*   ft_encoding_johab   :: see @FT_ENCODING_MS_JOHAB                    */
+  /*   ft_encoding_sjis    :: see @FT_ENCODING_SJIS                        */
+  /*   ft_encoding_gb2312  :: see @FT_ENCODING_GB2312                      */
+  /*   ft_encoding_big5    :: see @FT_ENCODING_BIG5                        */
+  /*   ft_encoding_wansung :: see @FT_ENCODING_WANSUNG                     */
+  /*   ft_encoding_johab   :: see @FT_ENCODING_JOHAB                       */
   /*                                                                       */
   /*   ft_encoding_adobe_standard :: see @FT_ENCODING_ADOBE_STANDARD       */
   /*   ft_encoding_adobe_expert   :: see @FT_ENCODING_ADOBE_EXPERT         */
@@ -563,21 +640,21 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*   ft_encoding_apple_roman    :: see @FT_ENCODING_APPLE_ROMAN          */
   /*                                                                       */
-#define  ft_encoding_none            FT_ENCODING_NONE
-#define  ft_encoding_unicode         FT_ENCODING_UNICODE
-#define  ft_encoding_symbol          FT_ENCODING_MS_SYMBOL
-#define  ft_encoding_latin_1         FT_ENCODING_ADOBE_LATIN_1
-#define  ft_encoding_latin_2         FT_ENCODING_OLD_LATIN_2
-#define  ft_encoding_sjis            FT_ENCODING_MS_SJIS
-#define  ft_encoding_gb2312          FT_ENCODING_MS_GB2312
-#define  ft_encoding_big5            FT_ENCODING_MS_BIG5
-#define  ft_encoding_wansung         FT_ENCODING_MS_WANSUNG
-#define  ft_encoding_johab           FT_ENCODING_MS_JOHAB
+#define ft_encoding_none            FT_ENCODING_NONE
+#define ft_encoding_unicode         FT_ENCODING_UNICODE
+#define ft_encoding_symbol          FT_ENCODING_MS_SYMBOL
+#define ft_encoding_latin_1         FT_ENCODING_ADOBE_LATIN_1
+#define ft_encoding_latin_2         FT_ENCODING_OLD_LATIN_2
+#define ft_encoding_sjis            FT_ENCODING_SJIS
+#define ft_encoding_gb2312          FT_ENCODING_GB2312
+#define ft_encoding_big5            FT_ENCODING_BIG5
+#define ft_encoding_wansung         FT_ENCODING_WANSUNG
+#define ft_encoding_johab           FT_ENCODING_JOHAB
 
-#define  ft_encoding_adobe_standard  FT_ENCODING_ADOBE_STANDARD
-#define  ft_encoding_adobe_expert    FT_ENCODING_ADOBE_EXPERT
-#define  ft_encoding_adobe_custom    FT_ENCODING_ADOBE_CUSTOM
-#define  ft_encoding_apple_roman     FT_ENCODING_APPLE_ROMAN
+#define ft_encoding_adobe_standard  FT_ENCODING_ADOBE_STANDARD
+#define ft_encoding_adobe_expert    FT_ENCODING_ADOBE_EXPERT
+#define ft_encoding_adobe_custom    FT_ENCODING_ADOBE_CUSTOM
+#define ft_encoding_apple_roman     FT_ENCODING_APPLE_ROMAN
 
 
   /*************************************************************************/
@@ -692,8 +769,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    num_fixed_sizes     :: The number of fixed sizes available in this */
   /*                           face.  This should be set to 0 for scalable */
-  /*                           fonts, unless its face includes a complete  */
-  /*                           set of glyphs (called a `strike') for the   */
+  /*                           fonts, unless its face includes a set of    */
+  /*                           glyphs (called a `strike') for the          */
   /*                           specified sizes.                            */
   /*                                                                       */
   /*    available_sizes     :: An array of sizes specifying the available  */
@@ -743,10 +820,11 @@ FT_BEGIN_HEADER
   /*    descender           :: The face's descender is the vertical        */
   /*                           distance from the baseline to the           */
   /*                           bottommost point of any glyph in the face.  */
-  /*                           This field's value is *negative*, expressed */
-  /*                           in font units.  Some font designs use a     */
-  /*                           value different from `bbox.yMin'.  Only     */
-  /*                           relevant for scalable formats.              */
+  /*                           This field's value is *negative* for values */
+  /*                           below the baseline.  It is expressed in     */
+  /*                           font units.  Some font designs use a value  */
+  /*                           different from `bbox.yMin'.  Only relevant  */
+  /*                           for scalable formats.                       */
   /*                                                                       */
   /*    height              :: The face's height is the vertical distance  */
   /*                           from one baseline to the next when writing  */
@@ -862,7 +940,7 @@ FT_BEGIN_HEADER
   /*    FT_FACE_FLAG_SCALABLE ::                                           */
   /*      Indicates that the face provides vectorial outlines.  This       */
   /*      doesn't prevent embedded bitmaps, i.e., a face can have both     */
-  /*      this bit and @FT_FACE_FLAG_FIXED_SIZES set                       */
+  /*      this bit and @FT_FACE_FLAG_FIXED_SIZES set.                      */
   /*                                                                       */
   /*    FT_FACE_FLAG_FIXED_SIZES ::                                        */
   /*      Indicates that the face contains `fixed sizes', i.e., bitmap     */
@@ -901,9 +979,9 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    FT_FACE_FLAG_GLYPH_NAMES ::                                        */
   /*      Indicates that the font contains glyph names that can be         */
-  /*      retrieved through @FT_Get_Glyph_Names.  Note that some TrueType  */
+  /*      retrieved through @FT_Get_Glyph_Name.  Note that some TrueType   */
   /*      fonts contain broken glyph name tables.  Use the function        */
-  /*      @FT_Has_PS_Glyph_Name when needed.                               */
+  /*      @FT_Has_PS_Glyph_Names when needed.                              */
   /*                                                                       */
   /*    FT_FACE_FLAG_EXTERNAL_STREAM ::                                    */
   /*      Used internally by FreeType to indicate that a face's stream was */
@@ -1016,12 +1094,12 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* @macro:                                                               */
-  /*    FT_IS_FIXED_SIZES( face )                                          */
+  /*    FT_HAS_FIXED_SIZES( face )                                         */
   /*                                                                       */
   /* @description:                                                         */
   /*    A macro that returns true whenever a face object contains some     */
-  /*    embedded bitmaps.  See the `fixed_sizes' field of the @FT_FaceRec  */
-  /*    structure.                                                         */
+  /*    embedded bitmaps.  See the `available_sizes' field of the          */
+  /*    @FT_FaceRec structure.                                             */
   /*                                                                       */
 #define FT_HAS_FIXED_SIZES( face ) \
           ( face->face_flags & FT_FACE_FLAG_FIXED_SIZES )
@@ -1050,7 +1128,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* @description:                                                         */
   /*    A macro that returns true whenever a face object contains some     */
-  /*    glyph names that can be accessed through @FT_Get_Glyph_Names.      */
+  /*    glyph names that can be accessed through @FT_Get_Glyph_Name.       */
   /*                                                                       */
 #define FT_HAS_GLYPH_NAMES( face ) \
           ( face->face_flags & FT_FACE_FLAG_GLYPH_NAMES )
@@ -1130,10 +1208,12 @@ FT_BEGIN_HEADER
   /*                    units to fractional (26.6) pixel coordinates.      */
   /*                                                                       */
   /*    ascender     :: The ascender, expressed in 26.6 fixed point        */
-  /*                    pixels.  Always positive.                          */
+  /*                    pixels.  Positive for ascenders above the          */
+  /*                    baseline.                                          */
   /*                                                                       */
   /*    descender    :: The descender, expressed in 26.6 fixed point       */
-  /*                    pixels.  Always negative.                          */
+  /*                    pixels.  Negative for descenders below the         */
+  /*                    baseline.                                          */
   /*                                                                       */
   /*    height       :: The text height, expressed in 26.6 fixed point     */
   /*                    pixels.  Always positive.                          */
@@ -1142,12 +1222,12 @@ FT_BEGIN_HEADER
   /*                    fixed point pixels.  Always positive.              */
   /*                                                                       */
   /* <Note>                                                                */
-  /*    The values of `ascender', `descender', and `height' are only the   */
-  /*    scaled versions of `face->ascender', `face->descender', and        */
-  /*    `face->height'.                                                    */
+  /*    For scalable fonts, the values of `ascender', `descender', and     */
+  /*    `height' are scaled versions of `face->ascender',                  */
+  /*    `face->descender', and `face->height', respectively.               */
   /*                                                                       */
   /*    Unfortunately, due to glyph hinting, these values might not be     */
-  /*    exact for certain fonts, they thus must be treated as unreliable   */
+  /*    exact for certain fonts.  They thus must be treated as unreliable  */
   /*    with an error margin of at least one pixel!                        */
   /*                                                                       */
   /*    Indeed, the only way to get the exact pixel ascender and descender */
@@ -1161,7 +1241,7 @@ FT_BEGIN_HEADER
     FT_UShort  y_ppem;      /* vertical pixels per EM                 */
 
     FT_Fixed   x_scale;     /* two scales used to convert font units  */
-    FT_Fixed   y_scale;     /* to 26.6 frac. pixel coordinates..      */
+    FT_Fixed   y_scale;     /* to 26.6 frac. pixel coordinates        */
 
     FT_Pos     ascender;    /* ascender in 26.6 frac. pixels          */
     FT_Pos     descender;   /* descender in 26.6 frac. pixels         */
@@ -1311,16 +1391,18 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    outline           :: The outline descriptor for the current glyph  */
   /*                         image if its format is                        */
-  /*                         ft_glyph_bitmap_outline.                      */
+  /*                         FT_GLYPH_FORMAT_OUTLINE.                      */
   /*                                                                       */
   /*    num_subglyphs     :: The number of subglyphs in a composite glyph. */
-  /*                         This format is only valid for the composite   */
-  /*                         glyph format, that should normally only be    */
-  /*                         loaded with the FT_LOAD_NO_RECURSE flag.      */
+  /*                         This field is only valid for the composite    */
+  /*                         glyph format that should normally only be     */
+  /*                         loaded with the @FT_LOAD_NO_RECURSE flag.     */
+  /*                         For now this is internal to FreeType.         */
   /*                                                                       */
   /*    subglyphs         :: An array of subglyph descriptors for          */
   /*                         composite glyphs.  There are `num_subglyphs'  */
-  /*                         elements in there.                            */
+  /*                         elements in there.  Currently internal to     */
+  /*                         FreeType.                                     */
   /*                                                                       */
   /*    control_data      :: Certain font drivers can also return the      */
   /*                         control data for a given glyph image (e.g.    */
@@ -1359,7 +1441,7 @@ FT_BEGIN_HEADER
     FT_Library        library;
     FT_Face           face;
     FT_GlyphSlot      next;
-    FT_UInt           flags;
+    FT_UInt           reserved;       /* retained for binary compatibility */
     FT_Generic        generic;
 
     FT_Glyph_Metrics  metrics;
@@ -1474,13 +1556,13 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* <Enum>                                                                */
-  /*    FT_Open_Flags                                                      */
+  /*    FT_OPEN_XXX                                                        */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    An enumeration used to list the bit flags used within the          */
-  /*    `flags' field of the @FT_Open_Args structure.                      */
+  /*    A list of bit-field constants used within the `flags' field of the */
+  /*    @FT_Open_Args structure.                                           */
   /*                                                                       */
-  /* <Fields>                                                              */
+  /* <Values>                                                              */
   /*    FT_OPEN_MEMORY      :: This is a memory-based stream.              */
   /*                                                                       */
   /*    FT_OPEN_STREAM      :: Copy the stream from the `stream' field.    */
@@ -1492,35 +1574,31 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    FT_OPEN_PARAMS      :: Use the `num_params' & `params' field.      */
   /*                                                                       */
-  /*    ft_open_memory :: deprecated. use @FT_OPEN_MEMORY instead          */
+  /*    ft_open_memory      :: Deprecated; use @FT_OPEN_MEMORY instead.    */
   /*                                                                       */
-  /*    ft_open_stream :: deprecated. use @FT_OPEN_STREAM instead          */
+  /*    ft_open_stream      :: Deprecated; use @FT_OPEN_STREAM instead.    */
   /*                                                                       */
-  /*    ft_open_pathname :: deprecated. use @FT_OPEN_PATHNAME instead      */
+  /*    ft_open_pathname    :: Deprecated; use @FT_OPEN_PATHNAME instead.  */
   /*                                                                       */
-  /*    ft_open_driver :: deprecated, use @FT_OPEN_DRIVER instead          */
+  /*    ft_open_driver      :: Deprecated; use @FT_OPEN_DRIVER instead.    */
   /*                                                                       */
-  /*    ft_open_params :: deprecated, use @FT_OPEN_PARAMS instead          */
+  /*    ft_open_params      :: Deprecated; use @FT_OPEN_PARAMS instead.    */
   /*                                                                       */
   /* <Note>                                                                */
   /*    The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME'     */
   /*    flags are mutually exclusive.                                      */
   /*                                                                       */
-  typedef enum
-  {
-    FT_OPEN_MEMORY   = 1,
-    FT_OPEN_STREAM   = 2,
-    FT_OPEN_PATHNAME = 4,
-    FT_OPEN_DRIVER   = 8,
-    FT_OPEN_PARAMS   = 16
+#define FT_OPEN_MEMORY    0x1
+#define FT_OPEN_STREAM    0x2
+#define FT_OPEN_PATHNAME  0x4
+#define FT_OPEN_DRIVER    0x8
+#define FT_OPEN_PARAMS    0x10
 
-  } FT_Open_Flags;
-
-#define  ft_open_memory    FT_OPEN_MEMORY     /* deprecated */
-#define  ft_open_stream    FT_OPEN_STREAM     /* deprecated */
-#define  ft_open_pathname  FT_OPEN_PATHNAME   /* deprecated */
-#define  ft_open_driver    FT_OPEN_DRIVER     /* deprecated */
-#define  ft_open_params    FT_OPEN_PARAMS     /* deprecated */
+#define ft_open_memory    FT_OPEN_MEMORY     /* deprecated */
+#define ft_open_stream    FT_OPEN_STREAM     /* deprecated */
+#define ft_open_pathname  FT_OPEN_PATHNAME   /* deprecated */
+#define ft_open_driver    FT_OPEN_DRIVER     /* deprecated */
+#define ft_open_params    FT_OPEN_PARAMS     /* deprecated */
 
 
   /*************************************************************************/
@@ -1602,14 +1680,14 @@ FT_BEGIN_HEADER
   /*                                                                       */
   typedef struct  FT_Open_Args_
   {
-    FT_Open_Flags              flags;
-    const FT_Byte*             memory_base;
-    FT_Long                    memory_size;
-    FT_String*                 pathname;
-    FT_Stream                  stream;
-    FT_Module                  driver;
-    FT_Int                     num_params;
-    FT_Parameter*              params;
+    FT_UInt         flags;
+    const FT_Byte*  memory_base;
+    FT_Long         memory_size;
+    FT_String*      pathname;
+    FT_Stream       stream;
+    FT_Module       driver;
+    FT_Int          num_params;
+    FT_Parameter*   params;
 
   } FT_Open_Args;
 
@@ -1853,7 +1931,7 @@ FT_BEGIN_HEADER
   /*    character dimensions is zero, its value is set equal to the other. */
   /*                                                                       */
   /* <InOut>                                                               */
-  /*    size            :: A handle to a target size object.               */
+  /*    face            :: A handle to a target face object.               */
   /*                                                                       */
   /* <Input>                                                               */
   /*    char_width      :: The character width, in 26.6 fractional points. */
@@ -1870,7 +1948,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Note>                                                                */
   /*    When dealing with fixed-size faces (i.e., non-scalable formats),   */
-  /*    use the function @FT_Set_Pixel_Sizes.                              */
+  /*    @FT_Set_Pixel_Sizes provides a more convenient interface.          */
   /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Set_Char_Size( FT_Face     face,
@@ -1903,7 +1981,6 @@ FT_BEGIN_HEADER
   /* <Return>                                                              */
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
-  /*                                                                       */
   /* <Note>                                                                */
   /*    The values of `pixel_width' and `pixel_height' correspond to the   */
   /*    pixel values of the _typographic_ character size, which are NOT    */
@@ -1919,6 +1996,11 @@ FT_BEGIN_HEADER
   /*    guarantee in any way that you will get glyph bitmaps that all fit  */
   /*    within an 8x8 cell (sometimes even far from it).                   */
   /*                                                                       */
+  /*    For bitmap fonts, `pixel_height' usually is a reliable value for   */
+  /*    the height of the bitmap cell.  Drivers for bitmap font formats    */
+  /*    which contain a single bitmap strike only (BDF, PCF, FNT) ignore   */
+  /*    `pixel_width'.                                                     */
+  /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Set_Pixel_Sizes( FT_Face  face,
                       FT_UInt  pixel_width,
@@ -2010,7 +2092,7 @@ FT_BEGIN_HEADER
                 FT_Int32  load_flags );
 
 
- /****************************************************************************
+ /***************************************************************************
   *
   * @enum:
   *   FT_LOAD_XXX
@@ -2131,6 +2213,7 @@ FT_BEGIN_HEADER
   *     being used.  This can be important for certain fonts where unhinted
   *     output is better than auto-hinted one.
   */
+#define FT_LOAD_DEFAULT                      0x0
 #define FT_LOAD_NO_SCALE                     0x1
 #define FT_LOAD_NO_HINTING                   0x2
 #define FT_LOAD_RENDER                       0x4
@@ -2151,16 +2234,43 @@ FT_BEGIN_HEADER
 
   /* */
 
+
 #define FT_LOAD_TARGET_( x )      ( (FT_Int32)( (x) & 15 ) << 16 )
 #define FT_LOAD_TARGET_MODE( x )  ( (FT_Render_Mode)( ( (x) >> 16 ) & 15 ) )
 
+
+ /***************************************************************************
+  *
+  * @enum:
+  *   FT_LOAD_TARGET_XXX
+  *
+  * @description:
+  *   A list of load targets.  XXX
+  *
+  * @values:
+  *   FT_LOAD_TARGET_NORMAL ::
+  *     XXX
+  *
+  *   FT_LOAD_TARGET_LIGHT ::
+  *     XXX
+  *
+  *   FT_LOAD_TARGET_MONO ::
+  *     XXX
+  *
+  *   FT_LOAD_TARGET_LCD ::
+  *     XXX
+  *
+  *   FT_LOAD_TARGET_LCD_V ::
+  *     XXX
+  */
+
 #define FT_LOAD_TARGET_NORMAL     FT_LOAD_TARGET_( FT_RENDER_MODE_NORMAL )
 #define FT_LOAD_TARGET_LIGHT      FT_LOAD_TARGET_( FT_RENDER_MODE_LIGHT  )
 #define FT_LOAD_TARGET_MONO       FT_LOAD_TARGET_( FT_RENDER_MODE_MONO   )
 #define FT_LOAD_TARGET_LCD        FT_LOAD_TARGET_( FT_RENDER_MODE_LCD    )
 #define FT_LOAD_TARGET_LCD_V      FT_LOAD_TARGET_( FT_RENDER_MODE_LCD_V  )
 
-#define FT_LOAD_DEFAULT           0x0
+  /* */
 
 
   /*************************************************************************/
@@ -2186,7 +2296,7 @@ FT_BEGIN_HEADER
   /*    The transformation is only applied to scalable image formats after */
   /*    the glyph has been loaded.  It means that hinting is unaltered by  */
   /*    the transformation and is performed on the character size given in */
-  /*    the last call to @FT_Set_Char_Sizes or @FT_Set_Pixel_Sizes.        */
+  /*    the last call to @FT_Set_Char_Size or @FT_Set_Pixel_Sizes.         */
   /*                                                                       */
   FT_EXPORT( void )
   FT_Set_Transform( FT_Face     face,
@@ -2205,6 +2315,10 @@ FT_BEGIN_HEADER
   /*    conversion performed on the outline, as well as specific           */
   /*    hinting optimizations.                                             */
   /*                                                                       */
+  /*    For bitmap fonts the `bitmap->pixel_mode' field in the             */
+  /*    @FT_GlyphSlotRec structure gives the format of the returned        */
+  /*    bitmap.                                                            */
+  /*                                                                       */
   /* <Values>                                                              */
   /*    FT_RENDER_MODE_NORMAL ::                                           */
   /*      This is the default render mode; it corresponds to 8-bit         */
@@ -2212,11 +2326,10 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    FT_RENDER_MODE_LIGHT ::                                            */
   /*      This is similar to @FT_RENDER_MODE_NORMAL, except that this      */
-  /*      changes the hinting to prevent stem width quantization. This     */
+  /*      changes the hinting to prevent stem width quantization.  This    */
   /*      results in glyph shapes that are more similar to the original,   */
   /*      while being a bit more fuzzy ("better shapes", instead of        */
-  /*      "better contrast" if you want :-) THIS IS STILL EXPERIMENTAL,    */
-  /*      FOR NOW, THIS WILL PRODUCE RESULTS SIMILAR TO NORMAL MODE !!     */
+  /*      "better contrast" if you want :-).                               */
   /*                                                                       */
   /*    FT_RENDER_MODE_MONO ::                                             */
   /*      This mode corresponds to 1-bit bitmaps.                          */
@@ -2225,8 +2338,7 @@ FT_BEGIN_HEADER
   /*      This mode corresponds to horizontal RGB/BGR sub-pixel displays,  */
   /*      like LCD-screens.  It produces 8-bit bitmaps that are 3 times    */
   /*      the width of the original glyph outline in pixels, and which use */
-  /*      the @FT_PIXEL_MODE_LCD mode. THIS IS STILL EXPERIMENTAL, DO NOT  */
-  /*      USE FOR NOW !!                                                   */
+  /*      the @FT_PIXEL_MODE_LCD mode.                                     */
   /*                                                                       */
   /*    FT_RENDER_MODE_LCD_V ::                                            */
   /*      This mode corresponds to vertical RGB/BGR sub-pixel displays     */
@@ -2237,8 +2349,7 @@ FT_BEGIN_HEADER
   /* <Note>                                                                */
   /*   The LCD-optimized glyph bitmaps produced by FT_Render_Glyph are     */
   /*   _not filtered_ to reduce color-fringes.  It is up to the caller to  */
-  /*   perform this pass. THIS IS STILL EXPERIMENTAL, DO NOT USE FOR NOW   */
-  /*   !!                                                                  */
+  /*   perform this pass.                                                  */
   /*                                                                       */
   typedef enum  FT_Render_Mode_
   {
@@ -2770,7 +2881,7 @@ FT_BEGIN_HEADER
   /* <Note>                                                                */
   /*    The optimization for FT_DivFix() is simple: If (a << 16) fits in   */
   /*    32 bits, then the division is computed directly.  Otherwise, we    */
-  /*    use a specialized version of the old @FT_MulDiv64.                 */
+  /*    use a specialized version of @FT_MulDiv.                           */
   /*                                                                       */
   FT_EXPORT( FT_Long )
   FT_DivFix( FT_Long  a,
diff --git a/reactos/lib/freetype/include/freetype/ftbdf.h b/reactos/lib/freetype/include/freetype/ftbdf.h
index 71735e3c6de..3d2d04b3dc1 100644
--- a/reactos/lib/freetype/include/freetype/ftbdf.h
+++ b/reactos/lib/freetype/include/freetype/ftbdf.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType API for accessing BDF-specific strings (specification).     */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -49,22 +49,22 @@ FT_BEGIN_HEADER
   *    FT_PropertyType
   *
   * @description:
-  *    list of BDF property types
+  *    A list of BDF property types.
   *
   * @values:
   *    BDF_PROPERTY_TYPE_NONE ::
-  *      value 0 is used to indicate a missing property
+  *      Value 0 is used to indicate a missing property.
   *
   *    BDF_PROPERTY_TYPE_ATOM ::
-  *      property is a string atom
+  *      Property is a string atom.
   *
   *    BDF_PROPERTY_TYPE_INTEGER ::
-  *      property is a 32-bit signed integer
+  *      Property is a 32-bit signed integer.
   *
   *    BDF_PROPERTY_TYPE_CARDINAL ::
-  *      property is a 32-bit unsigned integer
+  *      Property is a 32-bit unsigned integer.
   */
-  typedef enum
+  typedef enum  BDF_PropertyType_
   {
     BDF_PROPERTY_TYPE_NONE     = 0,
     BDF_PROPERTY_TYPE_ATOM     = 1,
@@ -76,34 +76,44 @@ FT_BEGIN_HEADER
 
  /**********************************************************************
   *
-  * @type:  BDF_Property
+  * @type:
+  *    BDF_Property
   *
   * @description:
-  *    handle to a @BDF_PropertyRec structure used to model a given
-  *    BDF/PCF property
+  *    A handle to a @BDF_PropertyRec structure to model a given
+  *    BDF/PCF property.
   */
-  typedef struct BDF_PropertyRec_*   BDF_Property;
+  typedef struct BDF_PropertyRec_*  BDF_Property;
+
 
  /**********************************************************************
   *
-  * @struct:  BDF_PropertyRec
+  * @struct:
+  *    BDF_PropertyRec
   *
   * @description:
-  *    models a given BDF/PCF property
+  *    This structure models a given BDF/PCF property.
   *
-  * @note:
-  *    type       :: property type
-  *    u.atom     :: atom string, when type is @BDF_PROPERTY_TYPE_ATOM
-  *    u.integer  :: signed integer, when type is @BDF_PROPERTY_TYPE_INTEGER
-  *    u.cardinal :: unsigned integer, when type is @BDF_PROPERTY_TYPE_CARDINAL
+  * @fields:
+  *    type ::
+  *      The property type.
+  *
+  *    u.atom ::
+  *      The atom string, if type is @BDF_PROPERTY_TYPE_ATOM.
+  *
+  *    u.integer ::
+  *      A signed integer, if type is @BDF_PROPERTY_TYPE_INTEGER.
+  *
+  *    u.cardinal ::
+  *      An unsigned integer, if type is @BDF_PROPERTY_TYPE_CARDINAL.
   */
-  typedef struct BDF_PropertyRec_
+  typedef struct  BDF_PropertyRec_
   {
-    BDF_PropertyType   type;
+    BDF_PropertyType  type;
     union {
-      const char*   atom;
-      FT_Int32      integer;
-      FT_UInt32     cardinal;
+      const char*     atom;
+      FT_Int32        integer;
+      FT_UInt32       cardinal;
 
     } u;
 
@@ -121,7 +131,7 @@ FT_BEGIN_HEADER
   *
   * @input:
   *    face ::
-  *       handle to input face
+  *       A handle to the input face.
   *
   * @output:
   *    acharset_encoding ::
@@ -131,7 +141,7 @@ FT_BEGIN_HEADER
   *       Charset registry, as a C string, owned by the face.
   *
   * @return:
-  *   FreeType rror code.  0 means success.
+  *   FreeType error code.  0 means success.
   *
   * @note:
   *   This function only works with BDF faces, returning an error otherwise.
@@ -141,31 +151,33 @@ FT_BEGIN_HEADER
                          const char*  *acharset_encoding,
                          const char*  *acharset_registry );
 
+
  /**********************************************************************
   *
   * @function:
   *    FT_Get_BDF_Property
   *
   * @description:
-  *    Retrieves a BDF property from a BDF or PCF font file
+  *    Retrieves a BDF property from a BDF or PCF font file.
   *
   * @input:
-  *    face :: handle to input face
-  *    name :: property name
+  *    face :: A handle to the input face.
+  *
+  *    name :: The property name.
   *
   * @output:
-  *    aproperty :: the property
+  *    aproperty :: The property.
   *
   * @return:
   *   FreeType error code.  0 means success.
   *
   * @note:
-  *   This function works with BDF _and_ PCF fonts. It returns an error
-  *   otherwise. it also returns an error when the property is not in the
+  *   This function works with BDF _and_ PCF fonts.  It returns an error
+  *   otherwise.  It also returns an error if the property is not in the
   *   font.
   *
-  *   in case of error, "aproperty->type" is always set to
-  *   @BDF_PROPERTY_TYPE_NONE
+  *   In case of error, "aproperty->type" is always set to
+  *   @BDF_PROPERTY_TYPE_NONE.
   */
   FT_EXPORT( FT_Error )
   FT_Get_BDF_Property( FT_Face           face,
diff --git a/reactos/lib/freetype/include/freetype/ftcache.h b/reactos/lib/freetype/include/freetype/ftcache.h
index 82af39142ad..fd13f5d0902 100644
--- a/reactos/lib/freetype/include/freetype/ftcache.h
+++ b/reactos/lib/freetype/include/freetype/ftcache.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType Cache subsystem (specification).                            */
 /*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -71,7 +71,6 @@ FT_BEGIN_HEADER
   /*   FTC_Node_Unref                                                      */
   /*                                                                       */
   /*   FTC_Font                                                            */
-  /*   FTC_ImageDesc                                                       */
   /*   FTC_ImageCache                                                      */
   /*   FTC_ImageCache_New                                                  */
   /*   FTC_ImageCache_Lookup                                               */
@@ -242,9 +241,9 @@ FT_BEGIN_HEADER
   /*    If you lookup nodes, you have the ability to "acquire" them, i.e., */
   /*    to increment their reference count.  This will prevent the node    */
   /*    from being flushed out of the cache until you explicitly "release" */
-  /*    it (see @FTC_Node_Release).                                        */
+  /*    it (see @FTC_Node_Unref).                                          */
   /*                                                                       */
-  /*    See also @FTC_BitsetCache_Lookup and @FTC_ImageCache_Lookup.       */
+  /*    See also @FTC_SBitCache_Lookup and @FTC_ImageCache_Lookup.         */
   /*                                                                       */
   typedef struct FTC_NodeRec_*  FTC_Node;
 
@@ -368,12 +367,12 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*    Retrieves the @FT_Face and @FT_Size objects that correspond to a   */
-  /*    given @FTC_SizeID.                                                 */
+  /*    given font.                                                        */
   /*                                                                       */
   /* <Input>                                                               */
   /*    manager :: A handle to the cache manager.                          */
   /*                                                                       */
-  /*    size_id :: The ID of the `font size' to use.                       */
+  /*    font    :: The font to use.                                        */
   /*                                                                       */
   /* <Output>                                                              */
   /*    aface   :: A pointer to the handle of the face object.  Set it to  */
diff --git a/reactos/lib/freetype/include/freetype/ftglyph.h b/reactos/lib/freetype/include/freetype/ftglyph.h
index e1acae7b832..9c2a999b964 100644
--- a/reactos/lib/freetype/include/freetype/ftglyph.h
+++ b/reactos/lib/freetype/include/freetype/ftglyph.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType convenience functions to handle glyphs (specification).     */
 /*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -282,7 +282,64 @@ FT_BEGIN_HEADER
                       FT_Matrix*  matrix,
                       FT_Vector*  delta );
 
-  /* */
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Glyph_BBox_Mode                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    The mode how the values of @FT_Glyph_Get_CBox are returned.        */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*    FT_GLYPH_BBOX_UNSCALED ::                                          */
+  /*      Return unscaled font units.                                      */
+  /*                                                                       */
+  /*    FT_GLYPH_BBOX_SUBPIXELS ::                                         */
+  /*      Return unfitted 26.6 coordinates.                                */
+  /*                                                                       */
+  /*    FT_GLYPH_BBOX_GRIDFIT ::                                           */
+  /*      Return grid-fitted 26.6 coordinates.                             */
+  /*                                                                       */
+  /*    FT_GLYPH_BBOX_TRUNCATE ::                                          */
+  /*      Return coordinates in integer pixels.                            */
+  /*                                                                       */
+  /*    FT_GLYPH_BBOX_PIXELS ::                                            */
+  /*      Return grid-fitted pixel coordinates.                            */
+  /*                                                                       */
+  typedef enum  FT_Glyph_BBox_Mode_
+  {
+    FT_GLYPH_BBOX_UNSCALED  = 0,
+    FT_GLYPH_BBOX_SUBPIXELS = 0,
+    FT_GLYPH_BBOX_GRIDFIT   = 1,
+    FT_GLYPH_BBOX_TRUNCATE  = 2,
+    FT_GLYPH_BBOX_PIXELS    = 3
+
+  } FT_Glyph_BBox_Mode;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    ft_glyph_bbox_xxx                                                  */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    These constants are deprecated.  Use the corresponding             */
+  /*    @FT_Glyph_BBox_Mode values instead.                                */
+  /*                                                                       */
+  /* <Values>                                                              */
+  /*   ft_glyph_bbox_unscaled  :: see @FT_GLYPH_BBOX_UNSCALED              */
+  /*   ft_glyph_bbox_subpixels :: see @FT_GLYPH_BBOX_SUBPIXELS             */
+  /*   ft_glyph_bbox_gridfit   :: see @FT_GLYPH_BBOX_GRIDFIT               */
+  /*   ft_glyph_bbox_truncate  :: see @FT_GLYPH_BBOX_TRUNCATE              */
+  /*   ft_glyph_bbox_pixels    :: see @FT_GLYPH_BBOX_PIXELS                */
+  /*                                                                       */
+#define ft_glyph_bbox_unscaled   FT_GLYPH_BBOX_UNSCALED
+#define ft_glyph_bbox_subpixels  FT_GLYPH_BBOX_SUBPIXELS
+#define ft_glyph_bbox_gridfit    FT_GLYPH_BBOX_GRIDFIT
+#define ft_glyph_bbox_truncate   FT_GLYPH_BBOX_TRUNCATE
+#define ft_glyph_bbox_pixels     FT_GLYPH_BBOX_PIXELS
+
 
   /*************************************************************************/
   /*                                                                       */
@@ -316,11 +373,9 @@ FT_BEGIN_HEADER
   /*    convention.                                                        */
   /*                                                                       */
   /*    If the glyph has been loaded with FT_LOAD_NO_SCALE, `bbox_mode'    */
-  /*    must be set to `ft_glyph_bbox_unscaled' to get unscaled font       */
-  /*    units.                                                             */
-  /*                                                                       */
-  /*    If `bbox_mode' is set to `ft_glyph_bbox_subpixels' the bbox        */
-  /*    coordinates are returned in 26.6 pixels (i.e. 1/64th of pixels).   */
+  /*    must be set to `FT_GLYPH_BBOX_UNSCALED' to get unscaled font       */
+  /*    units in 26.6 pixel format.  The value `FT_GLYPH_BBOX_SUBPIXELS'   */
+  /*    is another name for this constant.                                 */
   /*                                                                       */
   /*    Note that the maximum coordinates are exclusive, which means that  */
   /*    one can compute the width and height of the glyph image (be it in  */
@@ -330,7 +385,7 @@ FT_BEGIN_HEADER
   /*      height = bbox.yMax - bbox.yMin;                                  */
   /*                                                                       */
   /*    Note also that for 26.6 coordinates, if `bbox_mode' is set to      */
-  /*    `ft_glyph_bbox_gridfit', the coordinates will also be grid-fitted, */
+  /*    `FT_GLYPH_BBOX_GRIDFIT', the coordinates will also be grid-fitted, */
   /*    which corresponds to:                                              */
   /*                                                                       */
   /*      bbox.xMin = FLOOR(bbox.xMin);                                    */
@@ -339,23 +394,11 @@ FT_BEGIN_HEADER
   /*      bbox.yMax = CEILING(bbox.yMax);                                  */
   /*                                                                       */
   /*    To get the bbox in pixel coordinates, set `bbox_mode' to           */
-  /*    `ft_glyph_bbox_truncate'.                                          */
+  /*    `FT_GLYPH_BBOX_TRUNCATE'.                                          */
   /*                                                                       */
   /*    To get the bbox in grid-fitted pixel coordinates, set `bbox_mode'  */
-  /*    to `ft_glyph_bbox_pixels'.                                         */
+  /*    to `FT_GLYPH_BBOX_PIXELS'.                                         */
   /*                                                                       */
-  /*    The default value for `bbox_mode' is `ft_glyph_bbox_pixels'.       */
-  /*                                                                       */
-  enum
-  {
-    ft_glyph_bbox_unscaled  = 0, /* return unscaled font units           */
-    ft_glyph_bbox_subpixels = 0, /* return unfitted 26.6 coordinates     */
-    ft_glyph_bbox_gridfit   = 1, /* return grid-fitted 26.6 coordinates  */
-    ft_glyph_bbox_truncate  = 2, /* return coordinates in integer pixels */
-    ft_glyph_bbox_pixels    = 3  /* return grid-fitted pixel coordinates */
-  };
-
-
   FT_EXPORT( void )
   FT_Glyph_Get_CBox( FT_Glyph  glyph,
                      FT_UInt   bbox_mode,
@@ -391,8 +434,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Note>                                                                */
   /*    The glyph image is translated with the `origin' vector before      */
-  /*    rendering.  In case of error, it it translated back to its         */
-  /*    original position and the glyph is left untouched.                 */
+  /*    rendering.                                                         */
   /*                                                                       */
   /*    The first parameter is a pointer to a FT_Glyph handle, that will   */
   /*    be replaced by this function.  Typically, you would use (omitting  */
@@ -413,7 +455,7 @@ FT_BEGIN_HEADER
   /*        // convert to a bitmap (default render mode + destroy old)     */
   /*        if ( glyph->format != FT_GLYPH_FORMAT_BITMAP )                 */
   /*        {                                                              */
-  /*          error = FT_Glyph_To_Bitmap( &glyph, ft_render_mode_default,  */
+  /*          error = FT_Glyph_To_Bitmap( &glyph, FT_RENDER_MODE_DEFAULT,  */
   /*                                      0, 1 );                          */
   /*          if ( error ) // glyph unchanged                              */
   /*            ...                                                        */
diff --git a/reactos/lib/freetype/include/freetype/ftgzip.h b/reactos/lib/freetype/include/freetype/ftgzip.h
index c254622fd4a..673b4885bc1 100644
--- a/reactos/lib/freetype/include/freetype/ftgzip.h
+++ b/reactos/lib/freetype/include/freetype/ftgzip.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Gzip-compressed stream support.                                      */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -40,47 +40,54 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*************************************************************************/
 
+
  /************************************************************************
   *
-  * @type: FT_Stream_OpenGzip
+  * @function:
+  *   FT_Stream_OpenGzip
   *
   * @description:
-  *   open a new stream to parse gzip-compressed font files. This is
+  *   Open a new stream to parse gzip-compressed font files.  This is
   *   mainly used to support the compressed *.pcf.gz fonts that come
-  *   with XFree86
+  *   with XFree86.
   *
   * @input:
-  *   stream :: target embedding stream
-  *   source :: source stream, used to
+  *   stream :: The target embedding stream.
+  *
+  *   source :: The source stream.
   *
   * @return:
-  *   error code. 0 means success
+  *   FreeType error code.  0 means success.
   *
   * @note:
-  *   the source stream must be opened _before_ calling this function.
+  *   The source stream must be opened _before_ calling this function.
   *
-  *   calling @FT_Stream_Close on the new stream will *not* call
-  *   @FT_Stream_Close on the source stream. None of the stream objects
-  *   will be released to the heap.
+  *   Calling the internal function FT_Stream_Close on the new stream will
+  *   *not* call FT_Stream_Close on the source stream.  None of the stream
+  *   objects will be released to the heap.
   *
-  *   the stream implementation is very basic, and resets the decompression
-  *   process each time seeking backwards is needed within the stream
+  *   The stream implementation is very basic and resets the decompression
+  *   process each time seeking backwards is needed within the stream.
   *
-  *   in certain builds of the library, gzip compression recognition is
-  *   automatic when calling @FT_New_Face or @FT_Open_Face. This means that
-  *   if no font driver is capable of handling the raw compressed file,
-  *   the library will try to open a gzip stream from it and re-open
-  *   the face with it.
+  *   In certain builds of the library, gzip compression recognition is
+  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
+  *   This means that if no font driver is capable of handling the raw
+  *   compressed file, the library will try to open a gzipped stream from
+  *   it and re-open the face with it.
   *
-  *   this function may return "FT_Err_Unimplemented" if your build of
+  *   This function may return "FT_Err_Unimplemented" if your build of
   *   FreeType was not compiled with zlib support.
   */
   FT_EXPORT( FT_Error )
-  FT_Stream_OpenGzip( FT_Stream    stream,
-                      FT_Stream    source );
+  FT_Stream_OpenGzip( FT_Stream  stream,
+                      FT_Stream  source );
 
  /* */
 
+
 FT_END_HEADER
 
 #endif /* __FTGZIP_H__ */
+
+
+/* END */
diff --git a/reactos/lib/freetype/include/freetype/ftimage.h b/reactos/lib/freetype/include/freetype/ftimage.h
index fe46bf529bf..d54ef2dec01 100644
--- a/reactos/lib/freetype/include/freetype/ftimage.h
+++ b/reactos/lib/freetype/include/freetype/ftimage.h
@@ -5,7 +5,7 @@
 /*    FreeType glyph image formats and default raster interface            */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -261,7 +261,8 @@ FT_BEGIN_HEADER
   /*                    `FT_PIXEL_MODE_GRAY'; it gives the number of gray  */
   /*                    levels used in the bitmap.                         */
   /*                                                                       */
-  /*    pixel_mode   :: The pixel_mode, i.e., how pixel bits are stored.   */
+  /*    pixel_mode   :: The pixel mode, i.e., how pixel bits are stored.   */
+  /*                    See @FT_Pixel_Mode for possible values.            */
   /*                                                                       */
   /*    palette_mode :: This field is only used with paletted pixel modes; */
   /*                    it indicates how the palette is stored.            */
@@ -357,11 +358,11 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* <Enum>                                                                */
-  /*   FT_Outline_Flags                                                    */
+  /*   FT_OUTLINE_FLAGS                                                    */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    A simple type used to enumerates the flags in an outline's         */
-  /*    `outline_flags' field.                                             */
+  /*    A list of bit-field constants use for the flags in an outline's    */
+  /*    `flags' field.                                                     */
   /*                                                                       */
   /* <Values>                                                              */
   /*    FT_OUTLINE_NONE           :: Value 0 is reserved.                  */
@@ -414,27 +415,24 @@ FT_BEGIN_HEADER
   /*                                 completely ignored by a given         */
   /*                                 scan-converter.                       */
   /*                                                                       */
-  typedef enum  FT_Outline_Flags_
-  {
-    FT_OUTLINE_NONE            = 0,
-    FT_OUTLINE_OWNER           = 1,
-    FT_OUTLINE_EVEN_ODD_FILL   = 2,
-    FT_OUTLINE_REVERSE_FILL    = 4,
-    FT_OUTLINE_IGNORE_DROPOUTS = 8,
-    FT_OUTLINE_HIGH_PRECISION  = 256,
-    FT_OUTLINE_SINGLE_PASS     = 512
+#define FT_OUTLINE_NONE             0x0
+#define FT_OUTLINE_OWNER            0x1
+#define FT_OUTLINE_EVEN_ODD_FILL    0x2
+#define FT_OUTLINE_REVERSE_FILL     0x4
+#define FT_OUTLINE_IGNORE_DROPOUTS  0x8
 
-  } FT_Outline_Flags;
+#define FT_OUTLINE_HIGH_PRECISION   0x100
+#define FT_OUTLINE_SINGLE_PASS      0x200
 
 
  /*************************************************************************
   *
   * @enum:
-  *   ft_outline_xxx
+  *   ft_outline_flags
   *
   * @description:
   *   These constants are deprecated.  Please use the corresponding
-  *   @FT_OUTLINE_XXX values.
+  *   @FT_OUTLINE_FLAGS values.
   *
   * @values:
   *   ft_outline_none            :: See @FT_OUTLINE_NONE.
@@ -689,8 +687,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    FT_GLYPH_FORMAT_COMPOSITE ::                                       */
   /*      The glyph image is a composite of several other images.  This    */
-  /*      format is _only_ used with @FT_LOAD_FLAG_NO_RECURSE, and is      */
-  /*      used to report compound glyphs (like accented characters).       */
+  /*      format is _only_ used with @FT_LOAD_NO_RECURSE, and is used to   */
+  /*      report compound glyphs (like accented characters).               */
   /*                                                                       */
   /*    FT_GLYPH_FORMAT_BITMAP ::                                          */
   /*      The glyph image is a bitmap, and can be described as an          */
@@ -937,11 +935,11 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* <Enum>                                                                */
-  /*    FT_Raster_Flag                                                     */
+  /*    FT_RASTER_FLAG_XXX                                                 */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    An enumeration to list the bit flags as used in the `flags' field  */
-  /*    of a FT_Raster_Params structure.                                   */
+  /*    A list of bit flag constants as used in the `flags' field of a     */
+  /*    @FT_Raster_Params structure.                                       */
   /*                                                                       */
   /* <Values>                                                              */
   /*    FT_RASTER_FLAG_DEFAULT :: This value is 0.                         */
@@ -949,7 +947,7 @@ FT_BEGIN_HEADER
   /*    FT_RASTER_FLAG_AA      :: This flag is set to indicate that an     */
   /*                              anti-aliased glyph image should be       */
   /*                              generated.  Otherwise, it will be        */
-  /*                              monochrome (1-bit)                       */
+  /*                              monochrome (1-bit).                      */
   /*                                                                       */
   /*    FT_RASTER_FLAG_DIRECT  :: This flag is set to indicate direct      */
   /*                              rendering.  In this mode, client         */
@@ -974,15 +972,12 @@ FT_BEGIN_HEADER
   /*                              in direct rendering mode where all spans */
   /*                              are generated if no clipping box is set. */
   /*                                                                       */
-  typedef  enum
-  {
-    FT_RASTER_FLAG_DEFAULT = 0,
-    FT_RASTER_FLAG_AA      = 1,
-    FT_RASTER_FLAG_DIRECT  = 2,
-    FT_RASTER_FLAG_CLIP    = 4
-
-  } FT_Raster_Flag;
+#define FT_RASTER_FLAG_DEFAULT  0x0
+#define FT_RASTER_FLAG_AA       0x1
+#define FT_RASTER_FLAG_DIRECT   0x2
+#define FT_RASTER_FLAG_CLIP     0x4
 
+  /* deprecated */
 #define ft_raster_flag_default  FT_RASTER_FLAG_DEFAULT
 #define ft_raster_flag_aa       FT_RASTER_FLAG_AA
 #define ft_raster_flag_direct   FT_RASTER_FLAG_DIRECT
diff --git a/reactos/lib/freetype/include/freetype/ftincrem.h b/reactos/lib/freetype/include/freetype/ftincrem.h
index c9e8b56d6b7..e3477120e59 100644
--- a/reactos/lib/freetype/include/freetype/ftincrem.h
+++ b/reactos/lib/freetype/include/freetype/ftincrem.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType incremental loading (specification).                        */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -186,10 +186,10 @@ FT_BEGIN_HEADER
   */
   typedef FT_Error
   (*FT_Incremental_GetGlyphMetricsFunc)
-                      ( FT_Incremental                   incremental,
-                        FT_UInt                          glyph_index,
-                        FT_Bool                          vertical,
-                        FT_Incremental_MetricsRec        *ametrics );
+                      ( FT_Incremental              incremental,
+                        FT_UInt                     glyph_index,
+                        FT_Bool                     vertical,
+                        FT_Incremental_MetricsRec  *ametrics );
 
 
   /**************************************************************************
@@ -199,7 +199,7 @@ FT_BEGIN_HEADER
    * 
    * @description:
    *   A table of functions for accessing fonts that load data
-   *   incrementally.  Used in @FT_Incremental_Interface.
+   *   incrementally.  Used in @FT_Incremental_InterfaceRec.
    * 
    * @fields:
    *   get_glyph_data ::
@@ -246,8 +246,7 @@ FT_BEGIN_HEADER
   *       parameter.data = &inc_int;
   *
   *       // set up FT_Open_Args structure
-  *       open_args.flags      = (FT_Open_Flags)( FT_OPEN_PATHNAME |
-  *                                               FT_OPEN_PARAMS   );
+  *       open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;
   *       open_args.pathname   = my_font_pathname;
   *       open_args.num_params = 1;
   *       open_args.params     = &parameter; // we use one optional argument
diff --git a/reactos/lib/freetype/include/freetype/ftmoderr.h b/reactos/lib/freetype/include/freetype/ftmoderr.h
index 59e15c10c89..c9b812179fc 100644
--- a/reactos/lib/freetype/include/freetype/ftmoderr.h
+++ b/reactos/lib/freetype/include/freetype/ftmoderr.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType module error offsets (specification).                       */
 /*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
+/*  Copyright 2001, 2002, 2003 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -23,8 +23,8 @@
   /* The lower byte gives the error code, the higher byte gives the        */
   /* module.  The base module has error offset 0.  For example, the error  */
   /* `FT_Err_Invalid_File_Format' has value 0x003, the error               */
-  /* `TT_Err_Invalid_File_Format' has value 0xB03, the error               */
-  /* `T1_Err_Invalid_File_Format' has value 0xC03, etc.                    */
+  /* `TT_Err_Invalid_File_Format' has value 0xF03, the error               */
+  /* `T1_Err_Invalid_File_Format' has value 0x1003, etc.                   */
   /*                                                                       */
   /* Undefine the macro FT_CONFIG_OPTION_USE_MODULE_ERRORS in ftoption.h   */
   /* to make the higher byte always zero (disabling the module error       */
@@ -102,21 +102,25 @@
 #endif
 
 
-  FT_MODERRDEF( Base,     0x000, "base module" )
-  FT_MODERRDEF( Autohint, 0x100, "autohinter module" )
-  FT_MODERRDEF( Cache,    0x200, "cache module" )
-  FT_MODERRDEF( CFF,      0x300, "CFF module" )
-  FT_MODERRDEF( CID,      0x400, "CID module" )
-  FT_MODERRDEF( PCF,      0x500, "PCF module" )
-  FT_MODERRDEF( PSaux,    0x600, "PS auxiliary module" )
-  FT_MODERRDEF( PSnames,  0x700, "PS names module" )
-  FT_MODERRDEF( Raster,   0x800, "raster module" )
-  FT_MODERRDEF( SFNT,     0x900, "SFNT module" )
-  FT_MODERRDEF( Smooth,   0xA00, "smooth raster module" )
-  FT_MODERRDEF( TrueType, 0xB00, "TrueType module" )
-  FT_MODERRDEF( Type1,    0xC00, "Type 1 module" )
-  FT_MODERRDEF( Winfonts, 0xD00, "Windows FON/FNT module" )
-  FT_MODERRDEF( PFR,      0xE00, "PFR module" )
+  FT_MODERRDEF( Base,      0x000, "base module" )
+  FT_MODERRDEF( Autohint,  0x100, "autohinter module" )
+  FT_MODERRDEF( BDF,       0x200, "BDF module" )
+  FT_MODERRDEF( Cache,     0x300, "cache module" )
+  FT_MODERRDEF( CFF,       0x400, "CFF module" )
+  FT_MODERRDEF( CID,       0x500, "CID module" )
+  FT_MODERRDEF( Gzip,      0x600, "Gzip module" )
+  FT_MODERRDEF( PCF,       0x700, "PCF module" )
+  FT_MODERRDEF( PFR,       0x800, "PFR module" )
+  FT_MODERRDEF( PSaux,     0x900, "PS auxiliary module" )
+  FT_MODERRDEF( PShinter,  0xA00, "PS hinter module" )
+  FT_MODERRDEF( PSnames,   0xB00, "PS names module" )
+  FT_MODERRDEF( Raster,    0xC00, "raster module" )
+  FT_MODERRDEF( SFNT,      0xD00, "SFNT module" )
+  FT_MODERRDEF( Smooth,    0xE00, "smooth raster module" )
+  FT_MODERRDEF( TrueType,  0xF00, "TrueType module" )
+  FT_MODERRDEF( Type1,    0x1000, "Type 1 module" )
+  FT_MODERRDEF( Type42,   0x1100, "Type 42 module" )
+  FT_MODERRDEF( Winfonts, 0x1200, "Windows FON/FNT module" )
 
 
 #ifdef FT_MODERR_END_LIST
diff --git a/reactos/lib/freetype/include/freetype/ftmodule.h b/reactos/lib/freetype/include/freetype/ftmodule.h
index 2ec5a030790..caf081d6d09 100644
--- a/reactos/lib/freetype/include/freetype/ftmodule.h
+++ b/reactos/lib/freetype/include/freetype/ftmodule.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType modules public interface (specification).                   */
 /*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -46,21 +46,28 @@ FT_BEGIN_HEADER
 
 
   /* module bit flags */
-  typedef enum  FT_Module_Flags_
-  {
-    ft_module_font_driver         = 1,     /* this module is a font driver  */
-    ft_module_renderer            = 2,     /* this module is a renderer     */
-    ft_module_hinter              = 4,     /* this module is a glyph hinter */
-    ft_module_styler              = 8,     /* this module is a styler       */
+#define FT_MODULE_FONT_DRIVER         1  /* this module is a font driver  */
+#define FT_MODULE_RENDERER            2  /* this module is a renderer     */
+#define FT_MODULE_HINTER              4  /* this module is a glyph hinter */
+#define FT_MODULE_STYLER              8  /* this module is a styler       */
 
-    ft_module_driver_scalable     = 0x100, /* the driver supports scalable  */
-                                           /* fonts                         */
-    ft_module_driver_no_outlines  = 0x200, /* the driver does not support   */
-                                           /* vector outlines               */
-    ft_module_driver_has_hinter   = 0x400  /* the driver provides its own   */
-                                           /* hinter                        */
+#define FT_MODULE_DRIVER_SCALABLE     0x100   /* the driver supports      */
+                                              /* scalable fonts           */
+#define FT_MODULE_DRIVER_NO_OUTLINES  0x200   /* the driver does not      */
+                                              /* support vector outlines  */
+#define FT_MODULE_DRIVER_HAS_HINTER   0x400   /* the driver provides its  */
+                                              /* own hinter               */
 
-  } FT_Module_Flags;
+
+  /* deprecated values */
+#define ft_module_font_driver         FT_MODULE_FONT_DRIVER
+#define ft_module_renderer            FT_MODULE_RENDERER
+#define ft_module_hinter              FT_MODULE_HINTER
+#define ft_module_styler              FT_MODULE_STYLER
+
+#define ft_module_driver_scalable     FT_MODULE_DRIVER_SCALABLE
+#define ft_module_driver_no_outlines  FT_MODULE_DRIVER_NO_OUTLINES
+#define ft_module_driver_has_hinter   FT_MODULE_DRIVER_HAS_HINTER
 
 
   typedef void
diff --git a/reactos/lib/freetype/include/freetype/ftoutln.h b/reactos/lib/freetype/include/freetype/ftoutln.h
index fdf7ed29834..19b5724a5c8 100644
--- a/reactos/lib/freetype/include/freetype/ftoutln.h
+++ b/reactos/lib/freetype/include/freetype/ftoutln.h
@@ -46,7 +46,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Order>                                                               */
   /*    FT_Outline                                                         */
-  /*    FT_Outline_Flags                                                   */
+  /*    FT_OUTLINE_FLAGS                                                   */
   /*    FT_Outline_New                                                     */
   /*    FT_Outline_Done                                                    */
   /*    FT_Outline_Copy                                                    */
diff --git a/reactos/lib/freetype/include/freetype/ftpfr.h b/reactos/lib/freetype/include/freetype/ftpfr.h
index 212539101c7..7b687dacc2e 100644
--- a/reactos/lib/freetype/include/freetype/ftpfr.h
+++ b/reactos/lib/freetype/include/freetype/ftpfr.h
@@ -2,9 +2,9 @@
 /*                                                                         */
 /*  ftpfr.h                                                                */
 /*                                                                         */
-/*    FreeType API for accessing PFR-specific data                         */
+/*    FreeType API for accessing PFR-specific data (specification only).   */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -49,42 +49,44 @@ FT_BEGIN_HEADER
   *    FT_Get_PFR_Metrics
   *
   * @description:
-  *    returns the outline and metrics resolutions of a given PFR
-  *    face.
+  *    Return the outline and metrics resolutions of a given PFR face.
   *
   * @input:
-  *    face :: handle to input face. It can be a non-PFR face.
+  *    face :: Handle to the input face.  It can be a non-PFR face.
   *
   * @output:
   *    aoutline_resolution ::
-  *      outline resolution. This is equivalent to "face->units_per_EM".
-  *      optional (parameter can be NULL)
+  *      Outline resolution.  This is equivalent to `face->units_per_EM'.
+  *      Optional (parameter can be NULL).
   *
   *    ametrics_resolution ::
-  *      metrics_resolution. This is equivalent to "outline_resolution"
-  *      for non-PFR fonts. can be NULL
-  *      optional (parameter can be NULL)
+  *      Metrics resolution.  This is equivalent to `outline_resolution'
+  *      for non-PFR fonts.  Optional (parameter can be NULL).
   *
   *    ametrics_x_scale ::
-  *      a 16.16 fixed-point number used to scale distance expressed
-  *      in metrics units to device sub-pixels. This is equivalent to
-  *      'face->size->x_scale', but for metrics only.
-  *      optional (parameter can be NULL)
+  *      A 16.16 fixed-point number used to scale distance expressed
+  *      in metrics units to device sub-pixels.  This is equivalent to
+  *      `face->size->x_scale', but for metrics only.  Optional (parameter
+  *      can be NULL)
   *
   *    ametrics_y_scale ::
-  *      same as 'ametrics_x_scale', but for the vertical direction.
+  *      Same as `ametrics_x_scale' but for the vertical direction.
   *      optional (parameter can be NULL)
   *
+  * @return:
+  *    FreeType error code.  0 means success.
+  *
   * @note:
-  *   if the input face is not a PFR, this function will return an error.
+  *   If the input face is not a PFR, this function will return an error.
   *   However, in all cases, it will return valid values.
   */
   FT_EXPORT( FT_Error )
-  FT_Get_PFR_Metrics( FT_Face     face,
-                      FT_UInt    *aoutline_resolution,
-                      FT_UInt    *ametrics_resolution,
-                      FT_Fixed   *ametrics_x_scale,
-                      FT_Fixed   *ametrics_y_scale );
+  FT_Get_PFR_Metrics( FT_Face    face,
+                      FT_UInt   *aoutline_resolution,
+                      FT_UInt   *ametrics_resolution,
+                      FT_Fixed  *ametrics_x_scale,
+                      FT_Fixed  *ametrics_y_scale );
+
 
  /**********************************************************************
   *
@@ -92,25 +94,30 @@ FT_BEGIN_HEADER
   *    FT_Get_PFR_Kerning
   *
   * @description:
-  *    returns the kerning pair corresponding to two glyphs in
-  *    a PFR face. The distance is expressed in metrics units, unlike
-  *    the result of @FT_Get_Kerning.
+  *    Return the kerning pair corresponding to two glyphs in a PFR face.
+  *    The distance is expressed in metrics units, unlike the result of
+  *    @FT_Get_Kerning.
   *
   * @input:
-  *    face :: handle to input face.
-  *    left  :: left glyph index
-  *    right :: right glyph index
+  *    face  :: A handle to the input face.
+  *
+  *    left  :: Index of the left glyph.
+  *
+  *    right :: Index of the right glyph.
   *
   * @output:
-  *    avector :: kerning vector
+  *    avector :: A kerning vector.
+  *
+  * @return:
+  *    FreeType error code.  0 means success.
   *
   * @note:
-  *    this function always return distances in original PFR metrics
-  *    units. This is unlike @FT_Get_Kerning with the @FT_KERNING_UNSCALED
-  *    mode, which always return distances converted to outline units.
+  *    This function always return distances in original PFR metrics
+  *    units.  This is unlike @FT_Get_Kerning with the @FT_KERNING_UNSCALED
+  *    mode, which always returns distances converted to outline units.
   *
-  *    you can use the value of the 'x_scale' and 'y_scale' parameters
-  *    returned by @FT_Get_PFR_Metrics to scale these to device sub-pixels
+  *    You can use the value of the `x_scale' and `y_scale' parameters
+  *    returned by @FT_Get_PFR_Metrics to scale these to device sub-pixels.
   */
   FT_EXPORT( FT_Error )
   FT_Get_PFR_Kerning( FT_Face     face,
@@ -118,36 +125,39 @@ FT_BEGIN_HEADER
                       FT_UInt     right,
                       FT_Vector  *avector );
 
+
  /**********************************************************************
   *
   * @function:
   *    FT_Get_PFR_Advance
   *
   * @description:
-  *    returns a given glyph advance, expressed in original metrics units,
+  *    Return a given glyph advance, expressed in original metrics units,
   *    from a PFR font.
   *
   * @input:
-  *    face   :: handle to input face.
-  *    gindex :: glyph index
+  *    face   :: A handle to the input face.
+  *
+  *    gindex :: The glyph index.
   *
   * @output:
-  *    aadvance :: glyph advance in metrics units
+  *    aadvance :: The glyph advance in metrics units.
   *
   * @return:
-  *    error code. 0 means success
+  *    FreeType error code.  0 means success.
   *
   * @note:
-  *    you can use the 'x_scale' or 'y_scale' results of @FT_Get_PFR_Metrics
-  *    to convert the advance to device sub-pixels (i.e. 1/64th of pixels)
+  *    You can use the `x_scale' or `y_scale' results of @FT_Get_PFR_Metrics
+  *    to convert the advance to device sub-pixels (i.e. 1/64th of pixels).
   */
   FT_EXPORT( FT_Error )
-  FT_Get_PFR_Advance( FT_Face    face,
-                      FT_UInt    gindex,
-                      FT_Pos    *aadvance );
+  FT_Get_PFR_Advance( FT_Face   face,
+                      FT_UInt   gindex,
+                      FT_Pos   *aadvance );
 
  /* */
 
+
 FT_END_HEADER
 
 #endif /* __FTBDF_H__ */
diff --git a/reactos/lib/freetype/include/freetype/ftstroker.h b/reactos/lib/freetype/include/freetype/ftstroke.h
similarity index 72%
rename from reactos/lib/freetype/include/freetype/ftstroker.h
rename to reactos/lib/freetype/include/freetype/ftstroke.h
index a7140564118..a92c68d622a 100644
--- a/reactos/lib/freetype/include/freetype/ftstroker.h
+++ b/reactos/lib/freetype/include/freetype/ftstroke.h
@@ -1,5 +1,23 @@
-#ifndef __FT_STROKER_H__
-#define __FT_STROKER_H__
+/***************************************************************************/
+/*                                                                         */
+/*  ftstroke.h                                                             */
+/*                                                                         */
+/*    FreeType path stroker (specification).                               */
+/*                                                                         */
+/*  Copyright 2002, 2003 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __FT_STROKE_H__
+#define __FT_STROKE_H__
 
 #include <ft2build.h>
 #include FT_OUTLINE_H
@@ -136,4 +154,7 @@ FT_BEGIN_HEADER
 
 FT_END_HEADER
 
-#endif /* __FT_STROKER_H__ */
+#endif /* __FT_STROKE_H__ */
+
+
+/* END */
diff --git a/reactos/lib/freetype/include/freetype/fttrigon.h b/reactos/lib/freetype/include/freetype/fttrigon.h
index 3b8257b6d61..cf0650e2f5d 100644
--- a/reactos/lib/freetype/include/freetype/fttrigon.h
+++ b/reactos/lib/freetype/include/freetype/fttrigon.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType trigonometric functions (specification).                    */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -257,22 +257,6 @@ FT_BEGIN_HEADER
   FT_Vector_Length( FT_Vector*  vec );
 
 
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Vector_Normalize                                                */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Normalize a given vector (i.e. compute the equivalent unit         */
-  /*    vector).                                                           */
-  /*                                                                       */
-  /* @inout:                                                               */
-  /*    vec :: The address of target vector.                               */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Vector_Normalize( FT_Vector*  vec );
-
-
   /*************************************************************************/
   /*                                                                       */
   /* @function:                                                            */
diff --git a/reactos/lib/freetype/include/freetype/ftwinfnt.h b/reactos/lib/freetype/include/freetype/ftwinfnt.h
index 6d29fe16ad5..9b308af27d1 100644
--- a/reactos/lib/freetype/include/freetype/ftwinfnt.h
+++ b/reactos/lib/freetype/include/freetype/ftwinfnt.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType API for accessing Windows fnt-specific data.                */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2003 by                                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -93,31 +93,31 @@ FT_BEGIN_HEADER
   } FT_WinFNT_HeaderRec, *FT_WinFNT_Header;
 
 
-
  /**********************************************************************
   *
   * @function:
   *    FT_Get_WinFNT_Header
   *
   * @description:
-  *    Retrieves a Windows FNT font info header.
+  *    Retrieve a Windows FNT font info header.
   *
   * @input:
-  *    face   :: handle to input face
+  *    face    :: A handle to the input face.
   *
   * @output:
-  *    header :: WinFNT header.
+  *    aheader :: The WinFNT header.
   *
   * @return:
   *   FreeType error code.  0 means success.
   *
   * @note:
-  *   This function only works with Windows FNT faces, returning an erro
+  *   This function only works with Windows FNT faces, returning an error
   *   otherwise.
   */
   FT_EXPORT( FT_Error )
-  FT_Get_WinFNT_Header( FT_Face              face,
-                        FT_WinFNT_HeaderRec *header );
+  FT_Get_WinFNT_Header( FT_Face               face,
+                        FT_WinFNT_HeaderRec  *aheader );
+
 
  /* */
 
diff --git a/reactos/lib/freetype/include/freetype/internal/cfftypes.h b/reactos/lib/freetype/include/freetype/internal/cfftypes.h
index 82e1e91b4ed..e19e593e03b 100644
--- a/reactos/lib/freetype/include/freetype/internal/cfftypes.h
+++ b/reactos/lib/freetype/include/freetype/internal/cfftypes.h
@@ -5,7 +5,7 @@
 /*    Basic OpenType/CFF type definitions and interface (specification     */
 /*    only).                                                               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -96,8 +96,8 @@ FT_BEGIN_HEADER
     FT_UInt    weight;
     FT_Bool    is_fixed_pitch;
     FT_Fixed   italic_angle;
-    FT_Pos     underline_position;
-    FT_Pos     underline_thickness;
+    FT_Fixed   underline_position;
+    FT_Fixed   underline_thickness;
     FT_Int     paint_type;
     FT_Int     charstring_type;
     FT_Matrix  font_matrix;
diff --git a/reactos/lib/freetype/include/freetype/internal/fnttypes.h b/reactos/lib/freetype/include/freetype/internal/fnttypes.h
index a85d6abae0d..3efa86092da 100644
--- a/reactos/lib/freetype/include/freetype/internal/fnttypes.h
+++ b/reactos/lib/freetype/include/freetype/internal/fnttypes.h
@@ -5,7 +5,7 @@
 /*    Basic Windows FNT/FON type definitions and interface (specification  */
 /*    only).                                                               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -85,20 +85,10 @@ FT_BEGIN_HEADER
   } FNT_FontRec, *FNT_Font;
 
 
-  typedef struct  FNT_SizeRec_
-  {
-    FT_SizeRec  root;
-    FNT_Font    font;
-
-  } FNT_SizeRec, *FNT_Size;
-
-
   typedef struct  FNT_FaceRec_
   {
     FT_FaceRec     root;
-
-    FT_UInt        num_fonts;
-    FNT_Font       fonts;
+    FNT_Font       font;
 
     FT_CharMap     charmap_handle;
     FT_CharMapRec  charmap;  /* a single charmap per face */
diff --git a/reactos/lib/freetype/include/freetype/internal/ftdriver.h b/reactos/lib/freetype/include/freetype/internal/ftdriver.h
index 9323910b255..1f1c55aaa53 100644
--- a/reactos/lib/freetype/include/freetype/internal/ftdriver.h
+++ b/reactos/lib/freetype/include/freetype/internal/ftdriver.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType font driver interface (specification).                      */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -169,9 +169,9 @@ FT_BEGIN_HEADER
   {
     FT_Module_Class           root;
 
-    FT_Int                    face_object_size;
-    FT_Int                    size_object_size;
-    FT_Int                    slot_object_size;
+    FT_Long                   face_object_size;
+    FT_Long                   size_object_size;
+    FT_Long                   slot_object_size;
 
     FT_Face_InitFunc          init_face;
     FT_Face_DoneFunc          done_face;
diff --git a/reactos/lib/freetype/include/freetype/internal/ftgloadr.h b/reactos/lib/freetype/include/freetype/internal/ftgloadr.h
index d66d10b195a..284f4e3b6ac 100644
--- a/reactos/lib/freetype/include/freetype/internal/ftgloadr.h
+++ b/reactos/lib/freetype/include/freetype/internal/ftgloadr.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType glyph loader (specification).                           */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -52,12 +52,6 @@ FT_BEGIN_HEADER
 #define FT_SUBGLYPH_FLAG_USE_MY_METRICS      0x200
 
 
-  enum
-  {
-    FT_GLYPH_OWN_BITMAP = 1
-  };
-
-
   typedef struct  FT_SubGlyphRec_
   {
     FT_Int     index;
diff --git a/reactos/lib/freetype/include/freetype/internal/ftmemory.h b/reactos/lib/freetype/include/freetype/internal/ftmemory.h
index cbe66d7f85b..8da5fadc3c6 100644
--- a/reactos/lib/freetype/include/freetype/internal/ftmemory.h
+++ b/reactos/lib/freetype/include/freetype/internal/ftmemory.h
@@ -141,7 +141,7 @@ FT_BEGIN_HEADER
   FT_Realloc( FT_Memory  memory,
               FT_Long    current,
               FT_Long    size,
-              void**     P );
+              void*     *P );
 
 
   /*************************************************************************/
@@ -159,17 +159,14 @@ FT_BEGIN_HEADER
   /*    P      :: This is the _address_ of a _pointer_ which points to the */
   /*              allocated block.  It is always set to NULL on exit.      */
   /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
   /* <Note>                                                                */
-  /*    If P or *P are NULL, this function should return successfully.     */
+  /*    If P or *P is NULL, this function should return successfully.      */
   /*    This is a strong convention within all of FreeType and its         */
   /*    drivers.                                                           */
   /*                                                                       */
   FT_BASE( void )
   FT_Free( FT_Memory  memory,
-           void**     P );
+           void*     *P );
 
 
 #define FT_MEM_SET( dest, byte, count )     ft_memset( dest, byte, count )
diff --git a/reactos/lib/freetype/include/freetype/internal/ftobjs.h b/reactos/lib/freetype/include/freetype/internal/ftobjs.h
index 92761508678..79319e8742b 100644
--- a/reactos/lib/freetype/include/freetype/internal/ftobjs.h
+++ b/reactos/lib/freetype/include/freetype/internal/ftobjs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType private base classes (specification).                   */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -112,7 +112,7 @@ FT_BEGIN_HEADER
   /*   return an error later when trying to load the glyph).               */
   /*                                                                       */
   /*   It also check that fields that must be a multiple of 2, 4, or 8     */
-  /*   dont' have incorrect values, etc.                                   */
+  /*   don't have incorrect values, etc.                                   */
   /*                                                                       */
   /* FT_VALIDATE_PARANOID ::                                               */
   /*   Only for font debugging.  Checks that a table follows the           */
@@ -239,7 +239,7 @@ FT_BEGIN_HEADER
 
   typedef struct  FT_CMap_ClassRec_
   {
-    FT_UInt                size;
+    FT_ULong               size;
     FT_CMap_InitFunc       init;
     FT_CMap_DoneFunc       done;
     FT_CMap_CharIndexFunc  char_index;
@@ -296,9 +296,6 @@ FT_BEGIN_HEADER
   /*    transform_flags  :: Some flags used to classify the transform.     */
   /*                        Only used by the convenience functions.        */
   /*                                                                       */
-  /*    hint_flags       :: Some flags used to change the hinters'         */
-  /*                        behaviour.  Only used for debugging for now.   */
-  /*                                                                       */
   /*    postscript_name  :: Postscript font name for this face.            */
   /*                                                                       */
   /*    incremental_interface ::                                           */
@@ -318,8 +315,6 @@ FT_BEGIN_HEADER
     FT_Vector    transform_delta;
     FT_Int       transform_flags;
 
-    FT_UInt32    hint_flags;
-
     const char*  postscript_name;
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
@@ -343,6 +338,11 @@ FT_BEGIN_HEADER
   /*    loader            :: The glyph loader object used to load outlines */
   /*                         into the glyph slot.                          */
   /*                                                                       */
+  /*    flags             :: Possible values are zero or                   */
+  /*                         FT_GLYPH_OWN_BITMAP.  The latter indicates    */
+  /*                         that the FT_GlyphSlot structure owns the      */
+  /*                         bitmap buffer.                                */
+  /*                                                                       */
   /*    glyph_transformed :: Boolean.  Set to TRUE when the loaded glyph   */
   /*                         must be transformed through a specific        */
   /*                         font transformation.  This is _not_ the same  */
@@ -357,9 +357,13 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    glyph_hints       :: Format-specific glyph hints management.       */
   /*                                                                       */
+
+#define FT_GLYPH_OWN_BITMAP  0x1
+
   typedef struct  FT_Slot_InternalRec_
   {
     FT_GlyphLoader  loader;
+    FT_UInt         flags;
     FT_Bool         glyph_transformed;
     FT_Matrix       glyph_matrix;
     FT_Vector       glyph_delta;
@@ -416,25 +420,25 @@ FT_BEGIN_HEADER
 
 
 #define FT_MODULE_IS_DRIVER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    ft_module_font_driver )
+                                    FT_MODULE_FONT_DRIVER )
 
 #define FT_MODULE_IS_RENDERER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                      ft_module_renderer )
+                                      FT_MODULE_RENDERER )
 
 #define FT_MODULE_IS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    ft_module_hinter )
+                                    FT_MODULE_HINTER )
 
 #define FT_MODULE_IS_STYLER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    ft_module_styler )
+                                    FT_MODULE_STYLER )
 
 #define FT_DRIVER_IS_SCALABLE( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                      ft_module_driver_scalable )
+                                      FT_MODULE_DRIVER_SCALABLE )
 
 #define FT_DRIVER_USES_OUTLINES( x )  !( FT_MODULE_CLASS( x )->module_flags & \
-                                         ft_module_driver_no_outlines )
+                                         FT_MODULE_DRIVER_NO_OUTLINES )
 
 #define FT_DRIVER_HAS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                     ft_module_driver_has_hinter )
+                                     FT_MODULE_DRIVER_HAS_HINTER )
 
 
   /*************************************************************************/
@@ -537,28 +541,30 @@ FT_BEGIN_HEADER
   FT_Done_GlyphSlot( FT_GlyphSlot  slot );
 
  /* */
- 
+
  /*
-  * free the bitmap of a given glyphslot when needed
-  * (i.e. only when it was allocated with ft_glyphslot_alloc_bitmap)
+  * Free the bitmap of a given glyphslot when needed
+  * (i.e., only when it was allocated with ft_glyphslot_alloc_bitmap).
   */
   FT_BASE( void )
   ft_glyphslot_free_bitmap( FT_GlyphSlot  slot );
- 
+
+
  /*
-  * allocate a new bitmap buffer in a glyph slot
+  * Allocate a new bitmap buffer in a glyph slot.
   */
   FT_BASE( FT_Error )
   ft_glyphslot_alloc_bitmap( FT_GlyphSlot  slot,
                              FT_ULong      size );
 
+
  /*
-  * set the bitmap buffer in a glyph slot to a given pointer.
-  * the buffer will not be freed by a later call to ft_glyphslot_free_bitmap
+  * Set the bitmap buffer in a glyph slot to a given pointer.
+  * The buffer will not be freed by a later call to ft_glyphslot_free_bitmap.
   */
   FT_BASE( void )
-  ft_glyphslot_set_bitmap( FT_GlyphSlot   slot,
-                           FT_Pointer     buffer );
+  ft_glyphslot_set_bitmap( FT_GlyphSlot  slot,
+                           FT_Byte*      buffer );
 
 
   /*************************************************************************/
@@ -667,8 +673,18 @@ FT_BEGIN_HEADER
   /*************************************************************************/
 
 
-#define FT_DEBUG_HOOK_TRUETYPE  0
-#define FT_DEBUG_HOOK_TYPE1     1
+/* this hook is used by the TrueType debugger. It must be set to an alternate
+ * truetype bytecode interpreter function
+ */
+#define FT_DEBUG_HOOK_TRUETYPE            0
+
+
+/* set this debug hook to a non-null pointer to force unpatented hinting
+ * for all faces when both TT_CONFIG_OPTION_BYTECODE_INTERPRETER and
+ * TT_CONFIG_OPTION_UNPATENTED_HINTING are defined. this is only used
+ * during debugging
+ */
+#define FT_DEBUG_HOOK_UNPATENTED_HINTING  1
 
 
   /*************************************************************************/
diff --git a/reactos/lib/freetype/include/freetype/internal/pcftypes.h b/reactos/lib/freetype/include/freetype/internal/pcftypes.h
index 2c924d7d1a7..382796ffb48 100644
--- a/reactos/lib/freetype/include/freetype/internal/pcftypes.h
+++ b/reactos/lib/freetype/include/freetype/internal/pcftypes.h
@@ -2,7 +2,7 @@
 
   FreeType font driver for pcf fonts
 
-  Copyright (C) 2000-2001 by
+  Copyright (C) 2000, 2001, 2002 by
   Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/reactos/lib/freetype/include/freetype/internal/pfr.h b/reactos/lib/freetype/include/freetype/internal/pfr.h
index cead078188f..51be6202c0f 100644
--- a/reactos/lib/freetype/include/freetype/internal/pfr.h
+++ b/reactos/lib/freetype/include/freetype/internal/pfr.h
@@ -1,9 +1,28 @@
-#ifndef __FT_INTERNAL_PFR_H__
-#define __FT_INTERNAL_PFR_H__
+/***************************************************************************/
+/*                                                                         */
+/*  pfr.h                                                                  */
+/*                                                                         */
+/*    Internal PFR service functions (specification only).                 */
+/*                                                                         */
+/*  Copyright 2002, 2003 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __PFR_H__
+#define __PFR_H__
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+
 FT_BEGIN_HEADER
 
   typedef FT_Error  (*FT_PFR_GetMetricsFunc)( FT_Face    face,
@@ -21,16 +40,21 @@ FT_BEGIN_HEADER
                                               FT_UInt   gindex,
                                               FT_Pos   *aadvance );
 
-  typedef struct FT_PFR_ServiceRec_
+
+  typedef struct  FT_PFR_ServiceRec_
   {
-    FT_PFR_GetMetricsFunc    get_metrics;
-    FT_PFR_GetKerningFunc    get_kerning;
-    FT_PFR_GetAdvanceFunc    get_advance;
+    FT_PFR_GetMetricsFunc  get_metrics;
+    FT_PFR_GetKerningFunc  get_kerning;
+    FT_PFR_GetAdvanceFunc  get_advance;
 
   } FT_PFR_ServiceRec, *FT_PFR_Service;
 
-#define  FT_PFR_SERVICE_NAME  "pfr"
+#define FT_PFR_SERVICE_NAME  "pfr"
+
 
 FT_END_HEADER
 
-#endif /* __FT_INTERNAL_PFR_H__ */
+#endif /* __PFR_H__ */
+
+
+/* END */
diff --git a/reactos/lib/freetype/include/freetype/internal/psaux.h b/reactos/lib/freetype/include/freetype/internal/psaux.h
index e79f83aa4f3..c7093fe5470 100644
--- a/reactos/lib/freetype/include/freetype/internal/psaux.h
+++ b/reactos/lib/freetype/include/freetype/internal/psaux.h
@@ -5,7 +5,7 @@
 /*    Auxiliary functions and data structures related to PostScript fonts  */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -70,10 +70,10 @@ FT_BEGIN_HEADER
     (*done)( PS_Table  table );
 
     FT_Error
-    (*add)( PS_Table   table,
-            FT_Int     index,
-            void*      object,
-            FT_Int     length );
+    (*add)( PS_Table    table,
+            FT_Int      idx,
+            void*       object,
+            FT_PtrDist  length );
 
     void
     (*release)( PS_Table  table );
@@ -177,7 +177,9 @@ FT_BEGIN_HEADER
     T1_FIELD_TYPE_BOOL,
     T1_FIELD_TYPE_INTEGER,
     T1_FIELD_TYPE_FIXED,
+    T1_FIELD_TYPE_FIXED_1000,
     T1_FIELD_TYPE_STRING,
+    T1_FIELD_TYPE_KEY,
     T1_FIELD_TYPE_BBOX,
     T1_FIELD_TYPE_INTEGER_ARRAY,
     T1_FIELD_TYPE_FIXED_ARRAY,
@@ -261,7 +263,7 @@ FT_BEGIN_HEADER
           },
 
 
-#define T1_FIELD_TYPE_BOOL( _ident, _fname )                        \
+#define T1_FIELD_BOOL( _ident, _fname )                             \
           T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BOOL, _fname )
 
 #define T1_FIELD_NUM( _ident, _fname )                                 \
@@ -270,9 +272,15 @@ FT_BEGIN_HEADER
 #define T1_FIELD_FIXED( _ident, _fname )                             \
           T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED, _fname )
 
+#define T1_FIELD_FIXED_1000( _ident, _fname )                             \
+          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED_1000, _fname )
+
 #define T1_FIELD_STRING( _ident, _fname )                             \
           T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_STRING, _fname )
 
+#define T1_FIELD_KEY( _ident, _fname )                             \
+          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_KEY, _fname )
+
 #define T1_FIELD_BBOX( _ident, _fname )                             \
           T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BBOX, _fname )
 
@@ -328,6 +336,12 @@ FT_BEGIN_HEADER
     FT_Fixed
     (*to_fixed)( PS_Parser  parser,
                  FT_Int     power_ten );
+    FT_Error
+    (*to_bytes)( PS_Parser  parser,
+                 FT_Byte*   bytes,
+                 FT_Int     max_bytes,
+                 FT_Int*    pnum_bytes );
+
     FT_Int
     (*to_coord_array)( PS_Parser  parser,
                        FT_Int     max_coords,
@@ -652,7 +666,6 @@ FT_BEGIN_HEADER
 
     PS_Blend             blend;       /* for multiple master support */
 
-    FT_UInt32            hint_flags;
     FT_Render_Mode       hint_mode;
 
     T1_Decoder_Callback  parse_callback;
diff --git a/reactos/lib/freetype/include/freetype/internal/pshints.h b/reactos/lib/freetype/include/freetype/internal/pshints.h
index 15571d9bc5d..cd48f6cf32e 100644
--- a/reactos/lib/freetype/include/freetype/internal/pshints.h
+++ b/reactos/lib/freetype/include/freetype/internal/pshints.h
@@ -6,7 +6,7 @@
 /*    recorders (specification only).  These are used to support native    */
 /*    T1/T2 hints in the "type1", "cid" and "cff" font drivers.            */
 /*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
+/*  Copyright 2001, 2002, 2003 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -261,13 +261,13 @@ FT_BEGIN_HEADER
   /*    been recorded.                                                     */
   /*                                                                       */
   /* @input:                                                               */
-  /*   hints      :: A handle to the Type 1 hints recorder.                */
+  /*   hints     :: A handle to the Type 1 hints recorder.                 */
   /*                                                                       */
-  /*   outline    :: A pointer to the target outline descriptor.           */
+  /*   outline   :: A pointer to the target outline descriptor.            */
   /*                                                                       */
-  /*   globals    :: The hinter globals for this font.                     */
+  /*   globals   :: The hinter globals for this font.                      */
   /*                                                                       */
-  /*   hint_flags :: Hinter bit flags.                                     */
+  /*   hint_mode :: Hinting information.                                   */
   /*                                                                       */
   /* @return:                                                              */
   /*   FreeType error code.  0 means success.                              */
@@ -542,13 +542,13 @@ FT_BEGIN_HEADER
   /*    method.                                                            */
   /*                                                                       */
   /* @input:                                                               */
-  /*    hints      :: A handle to the Type 2 hints recorder.               */
+  /*    hints     :: A handle to the Type 2 hints recorder.                */
   /*                                                                       */
-  /*    outline    :: A pointer to the target outline descriptor.          */
+  /*    outline   :: A pointer to the target outline descriptor.           */
   /*                                                                       */
-  /*    globals    :: The hinter globals for this font.                    */
+  /*    globals   :: The hinter globals for this font.                     */
   /*                                                                       */
-  /*    hint_flags :: Hinter bit flags.                                    */
+  /*    hint_mode :: Hinting information.                                  */
   /*                                                                       */
   /* @return:                                                              */
   /*   FreeType error code.  0 means success.                              */
diff --git a/reactos/lib/freetype/include/freetype/internal/sfnt.h b/reactos/lib/freetype/include/freetype/internal/sfnt.h
index c5f3bd3c914..10b2275531a 100644
--- a/reactos/lib/freetype/include/freetype/internal/sfnt.h
+++ b/reactos/lib/freetype/include/freetype/internal/sfnt.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    High-level `sfnt' driver interface (specification).                  */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -463,14 +463,15 @@ FT_BEGIN_HEADER
   /*    SFNT_Load_Table_Func                                               */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Loads a given SFNT table in memory                                 */
+  /*    Loads a given SFNT table into memory.                              */
   /*                                                                       */
   typedef FT_Error
-  (*SFNT_Load_Table_Func)( FT_Face      face,
-                           FT_ULong     tag,
-                           FT_Long      offset,
-                           FT_Byte*     buffer,
-                           FT_ULong*    length );
+  (*SFNT_Load_Table_Func)( FT_Face    face,
+                           FT_ULong   tag,
+                           FT_Long    offset,
+                           FT_Byte*   buffer,
+                           FT_ULong*  length );
+
 
   /*************************************************************************/
   /*                                                                       */
diff --git a/reactos/lib/freetype/include/freetype/internal/t1types.h b/reactos/lib/freetype/include/freetype/internal/t1types.h
index 2625394693b..f6f68f4a58e 100644
--- a/reactos/lib/freetype/include/freetype/internal/t1types.h
+++ b/reactos/lib/freetype/include/freetype/internal/t1types.h
@@ -5,7 +5,7 @@
 /*    Basic Type1/Type2 type definitions and interface (specification      */
 /*    only).                                                               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -108,14 +108,14 @@ FT_BEGIN_HEADER
     FT_Byte**        charstrings;       /* array of glyph charstrings */
     FT_Int*          charstrings_len;
 
-    FT_Byte          paint_type;
+    FT_Byte*         paint_type;
     FT_Byte          font_type;
     FT_Matrix        font_matrix;
     FT_Vector        font_offset;
     FT_BBox          font_bbox;
     FT_Long          font_id;
 
-    FT_Int           stroke_width;
+    FT_Fixed*        stroke_width;
 
   } T1_FontRec, *T1_Font;
 
diff --git a/reactos/lib/freetype/include/freetype/internal/tttypes.h b/reactos/lib/freetype/include/freetype/internal/tttypes.h
index 4097ac8f52f..736d9075157 100644
--- a/reactos/lib/freetype/include/freetype/internal/tttypes.h
+++ b/reactos/lib/freetype/include/freetype/internal/tttypes.h
@@ -1456,6 +1456,9 @@ FT_BEGIN_HEADER
   /*                            interpreters field is also used to hook    */
   /*                            the debugger in `ttdebug'.                 */
   /*                                                                       */
+  /*    unpatented_hinting   :: If true, use only unpatented methods in    */
+  /*                            the bytecode interpreter.                  */
+  /*                                                                       */
   /*    extra                :: Reserved for third-party font drivers.     */
   /*                                                                       */
   typedef struct  TT_FaceRec_
@@ -1559,6 +1562,10 @@ FT_BEGIN_HEADER
     /* used to hook the debugger for the `ttdebug' utility.        */
     TT_Interpreter        interpreter;
 
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    /* Use unpatented hinting only. */
+    FT_Bool               unpatented_hinting;
+#endif
 
     /***********************************************************************/
     /*                                                                     */
diff --git a/reactos/lib/freetype/include/freetype/t1tables.h b/reactos/lib/freetype/include/freetype/t1tables.h
index 200ba9be58c..70ea43897fe 100644
--- a/reactos/lib/freetype/include/freetype/t1tables.h
+++ b/reactos/lib/freetype/include/freetype/t1tables.h
@@ -5,7 +5,7 @@
 /*    Basic Type 1/Type 2 tables definitions and interface (specification  */
 /*    only).                                                               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -314,7 +314,7 @@ FT_BEGIN_HEADER
   /*    CID_Info                                                           */
   /*                                                                       */
   /* <Description>                                                         */
-  /*   This type is equivalent to @CID_FaceInfoRec. It is deprecated but   */
+  /*   This type is equivalent to CID_FaceInfoRec.  It is deprecated but   */
   /*   kept to maintain source compatibility between various versions of   */
   /*   FreeType.                                                           */
   /*                                                                       */
@@ -373,7 +373,7 @@ FT_BEGIN_HEADER
   *    the face and don't need to be freed by the caller.
   *
   *    If the font's format is not Postscript-based, this function will
-  *    return the @FT_Err_Invalid_Argument error code.
+  *    return the FT_Err_Invalid_Argument error code.
   */
   FT_EXPORT( FT_Error )
   FT_Get_PS_Font_Info( FT_Face          face,
diff --git a/reactos/lib/freetype/include/freetype/ttnameid.h b/reactos/lib/freetype/include/freetype/ttnameid.h
index 9428ac643e1..8b56686bb44 100644
--- a/reactos/lib/freetype/include/freetype/ttnameid.h
+++ b/reactos/lib/freetype/include/freetype/ttnameid.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType name ID definitions (specification only).                   */
 /*                                                                         */
-/*  Copyright 1996-2002 by                                                 */
+/*  Copyright 1996-2002, 2003 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -41,7 +41,7 @@ FT_BEGIN_HEADER
    *
    * @description:
    *   A list of valid values for the `platform_id' identifier code in
-   *   @FT_CharmapRec and @FT_SfntName structures.
+   *   @FT_CharMapRec and @FT_SfntName structures.
    *
    * @values:
    *   TT_PLATFORM_APPLE_UNICODE ::
@@ -231,34 +231,33 @@ FT_BEGIN_HEADER
    *
    * @values:
    *   TT_MS_ID_SYMBOL_CS ::
-   *     Corresponds to symbol encodings. see @FT_ENCODING_MS_SYMBOL.
+   *     Corresponds to Microsoft symbol encoding. See
+   *     @FT_ENCODING_MS_SYMBOL.
    *
    *   TT_MS_ID_UNICODE_CS ::
    *     Corresponds to a Microsoft WGL4 charmap, matching Unicode.  See
    *     @FT_ENCODING_UNICODE.
    *
    *   TT_MS_ID_SJIS ::
-   *     Corresponds to Microsoft SJIS Japanese encoding.
-   *     See @FT_ENCODING_MS_SJIS.
+   *     Corresponds to SJIS Japanese encoding.  See @FT_ENCODING_SJIS.
    *
    *   TT_MS_ID_GB2312 ::
-   *     Corresponds to Microsoft Simplified Chinese as used in Mainland
-   *     China.  See @FT_ENCODING_MS_GB2312.
+   *     Corresponds to Simplified Chinese as used in Mainland China.  See
+   *     @FT_ENCODING_GB2312.
    *
    *   TT_MS_ID_BIG_5 ::
-   *     Corresponds to Microsoft Traditional Chinese as used in Taiwan and
-   *     Hong Kong.  See @FT_ENCODING_MS_BIG5.
+   *     Corresponds to Traditional Chinese as used in Taiwan and Hong Kong.
+   *     See @FT_ENCODING_BIG5.
    *
    *   TT_MS_ID_WANSUNG ::
-   *     Corresponds to Microsoft Korean Wansung encoding.  See
-   *     @FT_ENCODING_MS_WANSUNG.
+   *     Corresponds to Korean Wansung encoding.  See @FT_ENCODING_WANSUNG.
    *
    *   TT_MS_ID_JOHAB ::
-   *     Corresponds to Microsoft Johab encoding.  See @FT_ENCODING_MS_JOHAB.
+   *     Corresponds to Johab encoding.  See @FT_ENCODING_JOHAB.
    *
    *   TT_MS_ID_UCS_4 ::
-   *     Corresponds to UCS-4 or UTF-32 charmaps.  This has been added into
-   *     OpenType specification as of version 1.4 (mid-2001.)
+   *     Corresponds to UCS-4 or UTF-32 charmaps.  This has been added to
+   *     the OpenType specification version 1.4 (mid-2001.)
    */
 
 #define TT_MS_ID_SYMBOL_CS    0
@@ -705,8 +704,8 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_SPANISH_UNITED_STATES             0x540a
   /* The following two IDs blatantly violate MS specs by using a */
   /* sublanguage > 0x1F.                                         */
-#define TT_MS_LANGID_SPANISH_LATIN_AMERICA             0xE40a
-#define TT_MS_LANGID_FRENCH_NORTH_AFRICA               0xE40c
+#define TT_MS_LANGID_SPANISH_LATIN_AMERICA             0xE40aU
+#define TT_MS_LANGID_FRENCH_NORTH_AFRICA               0xE40cU
 
 #define TT_MS_LANGID_FRENCH_MOROCCO                    0x380c
 #define TT_MS_LANGID_FRENCH_HAITI                      0x3c0c
diff --git a/reactos/lib/freetype/include/freetype/tttables.h b/reactos/lib/freetype/include/freetype/tttables.h
index 45996322cf1..2d2e63c9080 100644
--- a/reactos/lib/freetype/include/freetype/tttables.h
+++ b/reactos/lib/freetype/include/freetype/tttables.h
@@ -5,7 +5,7 @@
 /*    Basic SFNT/TrueType tables definitions and interface                 */
 /*    (specification only).                                                */
 /*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -541,8 +541,15 @@ FT_BEGIN_HEADER
   } TT_MaxProfile;
 
 
-  /* */
-
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Enum>                                                                */
+  /*    FT_Sfnt_Tag                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    An enumeration used to specify the index of an SFNT table.         */
+  /*    Used in the @FT_Get_Sfnt_Table API function.                       */
+  /*                                                                       */
   typedef enum
   {
     ft_sfnt_head = 0,
@@ -553,10 +560,11 @@ FT_BEGIN_HEADER
     ft_sfnt_post = 5,
     ft_sfnt_pclt = 6,
 
-    sfnt_max   /* don't remove */
+    sfnt_max   /* internal end mark */
 
   } FT_Sfnt_Tag;
 
+  /* */
 
   /* internal use only */
   typedef void*
@@ -586,13 +594,14 @@ FT_BEGIN_HEADER
   /*    The table is owned by the face object and disappears with it.      */
   /*                                                                       */
   /*    This function is only useful to access SFNT tables that are loaded */
-  /*    by the sfnt/truetype/opentype drivers.  See FT_Sfnt_Tag for a      */
+  /*    by the sfnt/truetype/opentype drivers.  See @FT_Sfnt_Tag for a     */
   /*    list.                                                              */
   /*                                                                       */
   FT_EXPORT( void* )
   FT_Get_Sfnt_Table( FT_Face      face,
                      FT_Sfnt_Tag  tag );
 
+
  /**************************************************************************
   *
   * <Function>
@@ -602,54 +611,56 @@ FT_BEGIN_HEADER
   *   Loads any font table into client memory.
   *
   * <Input>
-  *   face   :: handle to source face.
-  *   tag    :: the 4-byte tag of the table to load. Use the value 0 if
-  *             you want to access the whole font file. Else, you can use
-  *             one of the definitions found in the @FT_TRUETYPE_TAGS_H
-  *             file, or forge a new one with @FT_MAKE_TAG
+  *   face   :: A handle to the source face.
+  *
+  *   tag    :: The 4-byte tag of the table to load.  Use the value 0 if
+  *             you want to access the whole font file.  Otherwise, you can
+  *             use one of the definitions found in the @FT_TRUETYPE_TAGS_H
+  *             file, or forge a new one with @FT_MAKE_TAG.
   *              
-  *   offset :: the starting offset in the table (or file if tag == 0)
+  *   offset :: The starting offset in the table (or file if tag == 0).
   *
   * <Output>
-  *   buffer :: target buffer address. client must ensure that there are
-  *             enough bytes in it.
+  *   buffer :: The target buffer address.  The client must ensure that
+  *             the memory array is big enough to hold the data.
   *
   * <InOut>
-  *   length :: if the 'length' parameter is NULL, then try to load the whole
-  *             table, and return an error code if it fails.
+  *   length :: If the `length' parameter is NULL, then try to load the whole
+  *             table.  Return an error code if it fails.
   *
-  *             else, if '*length' is 0, then exit immediately while returning
+  *             Else, if `*length' is 0, exit immediately while returning
   *             the table's (or file) full size in it.
   *
-  *             else, the number of bytes to read from the table or file,
+  *             Else the number of bytes to read from the table or file,
   *             from the starting offset.
   *
   * <Return>
-  *   error code. 0 means success
+  *   FreeType error code.  0 means success.
   *
   * <Note>
-  *   if you need to determine the table's length you should first call this
-  *   function with "*length" set to 0, as in the following example:
+  *   If you need to determine the table's length you should first call this
+  *   function with `*length' set to 0, as in the following example:
   *
   *   {
   *     FT_ULong  length = 0;
   *
+  *
   *     error = FT_Load_Sfnt_Table( face, tag, 0, NULL, &length );
   *     if ( error ) { ... table does not exist ... }
   *
   *     buffer = malloc( length );
-  *     if ( buffer == NULL )  { ... not enough memory ... }
+  *     if ( buffer == NULL ) { ... not enough memory ... }
   *
   *     error = FT_Load_Sfnt_Table( face,tag, 0, buffer, &length );
   *     if ( error ) { ... could not load table ... }
   *   }
   */
   FT_EXPORT( FT_Error )
-  FT_Load_Sfnt_Table( FT_Face      face,
-                      FT_ULong     tag,
-                      FT_Long      offset,
-                      FT_Byte*     buffer,
-                      FT_ULong*    length );
+  FT_Load_Sfnt_Table( FT_Face    face,
+                      FT_ULong   tag,
+                      FT_Long    offset,
+                      FT_Byte*   buffer,
+                      FT_ULong*  length );
 
   /* */
 
diff --git a/reactos/lib/freetype/include/freetype/ttunpat.h b/reactos/lib/freetype/include/freetype/ttunpat.h
new file mode 100644
index 00000000000..e4885aaa32d
--- /dev/null
+++ b/reactos/lib/freetype/include/freetype/ttunpat.h
@@ -0,0 +1,53 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ttunpat.h                                                              */
+/*                                                                         */
+/*    Definitions for the unpatented TrueType hinting system               */
+/*                                                                         */
+/*  Copyright 2003 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  Written by Graham Asher <graham.asher@btinternet.com>                  */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#ifndef __TTUNPAT_H__
+#define __TTUNPAT_H__
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+
+FT_BEGIN_HEADER
+
+
+ /***************************************************************************
+  *
+  * @constant:
+  *   FT_PARAM_TAG_UNPATENTED_HINTING
+  *
+  * @description:
+  *   A constant used as the tag of an @FT_Parameter structure to indicate
+  *   that unpatented methods only should be used by the TrueType bytecode
+  *   interpreter for a typeface opened by FT_Open_Face.
+  *
+  */
+#define FT_PARAM_TAG_UNPATENTED_HINTING  FT_MAKE_TAG( 'u', 'n', 'p', 'a' )
+
+ /* */
+
+FT_END_HEADER
+
+
+#endif /* __TTUNPAT_H__ */
+
+
+/* END */
diff --git a/reactos/lib/freetype/src/autohint/ahglobal.c b/reactos/lib/freetype/src/autohint/ahglobal.c
index efce3444d31..4183b010999 100644
--- a/reactos/lib/freetype/src/autohint/ahglobal.c
+++ b/reactos/lib/freetype/src/autohint/ahglobal.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Routines used to compute global metrics automatically (body).        */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 Catharon Productions Inc.                    */
+/*  Copyright 2000-2001, 2002, 2003 Catharon Productions Inc.              */
 /*  Author: David Turner                                                   */
 /*                                                                         */
 /*  This file is part of the Catharon Typography Project and shall only    */
@@ -27,6 +27,8 @@
 
 #define MAX_TEST_CHARACTERS  12
 
+  /* cf. AH_BLUE_XXX constants in ahtypes.h */
+
   static
   const char*  blue_chars[AH_BLUE_MAX] =
   {
@@ -93,8 +95,8 @@
       goto Exit;
 
     /* we compute the blues simply by loading each character from the */
-    /* 'blue_chars[blues]' string, then compute its top-most and      */
-    /* bottom-most points                                             */
+    /* 'blue_chars[blues]' string, then compute its top-most or       */
+    /* bottom-most points (depending on `AH_IS_TOP_BLUE')             */
 
     AH_LOG(( "blue zones computation\n" ));
     AH_LOG(( "------------------------------------------------\n" ));
@@ -103,6 +105,7 @@
     {
       const char*  p     = blue_chars[blue];
       const char*  limit = p + MAX_TEST_CHARACTERS;
+
       FT_Pos       *blue_ref, *blue_shoot;
 
 
@@ -235,8 +238,8 @@
       AH_LOG(( "\n" ));
 
       /* we have computed the contents of the `rounds' and `flats' tables, */
-      /* now determine the reference and overshoot position of the blue;   */
-      /* we simply take the median value after a simple short              */
+      /* now determine the reference and overshoot position of the blue -- */
+      /* we simply take the median value after a simple sort               */
       sort_values( num_rounds, rounds );
       sort_values( num_flats,  flats  );
 
@@ -312,7 +315,7 @@
     /* stem height of the "-", but it wasn't too good.  Moreover, we now */
     /* have a single character that gives us standard width and height.  */
     {
-      FT_UInt   glyph_index;
+      FT_UInt  glyph_index;
 
 
       glyph_index = FT_Get_Char_Index( hinter->face, 'o' );
@@ -323,7 +326,8 @@
       if ( error )
         goto Exit;
 
-      error = ah_outline_load( hinter->glyph, 0x10000L, 0x10000L, hinter->face );
+      error = ah_outline_load( hinter->glyph, 0x10000L, 0x10000L,
+                               hinter->face );
       if ( error )
         goto Exit;
 
@@ -375,7 +379,7 @@
     }
 
     /* Now, compute the edge distance threshold as a fraction of the */
-    /* smallest width in the font. Set it in `hinter.glyph' too!     */
+    /* smallest width in the font. Set it in `hinter->glyph' too!    */
     if ( edge_distance_threshold == 32000 )
       edge_distance_threshold = 50;
 
diff --git a/reactos/lib/freetype/src/autohint/ahglobal.h b/reactos/lib/freetype/src/autohint/ahglobal.h
index ef99a01fda1..5a9bcf8352a 100644
--- a/reactos/lib/freetype/src/autohint/ahglobal.h
+++ b/reactos/lib/freetype/src/autohint/ahglobal.h
@@ -5,7 +5,7 @@
 /*    Routines used to compute global metrics automatically                */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 Catharon Productions Inc.                    */
+/*  Copyright 2000-2001, 2002, 2003 Catharon Productions Inc.              */
 /*  Author: David Turner                                                   */
 /*                                                                         */
 /*  This file is part of the Catharon Typography Project and shall only    */
@@ -34,16 +34,16 @@ FT_BEGIN_HEADER
 
 #ifdef  FT_CONFIG_CHESTER_SMALL_F
 
-#  define AH_IS_TOP_BLUE( b )  ( (b) == AH_BLUE_CAPITAL_TOP || \
-                                 (b) == AH_BLUE_SMALL_F_TOP || \
-                                 (b) == AH_BLUE_SMALL_TOP   )
+#define AH_IS_TOP_BLUE( b )  ( (b) == AH_BLUE_CAPITAL_TOP || \
+                               (b) == AH_BLUE_SMALL_F_TOP || \
+                               (b) == AH_BLUE_SMALL_TOP   )
 
-#else /* !CHESTER_SMALL_F */
+#else /* !FT_CONFIG_CHESTER_SMALL_F */
 
-#  define AH_IS_TOP_BLUE( b )  ( (b) == AH_BLUE_CAPITAL_TOP || \
-                                 (b) == AH_BLUE_SMALL_TOP   )
+#define AH_IS_TOP_BLUE( b )  ( (b) == AH_BLUE_CAPITAL_TOP || \
+                               (b) == AH_BLUE_SMALL_TOP   )
 
-#endif /* !CHESTER_SMALL_F */
+#endif /* !FT_CONFIG_CHESTER_SMALL_F */
 
 
   /* compute global metrics automatically */
diff --git a/reactos/lib/freetype/src/autohint/ahglyph.c b/reactos/lib/freetype/src/autohint/ahglyph.c
index 4f375045f93..85c3b380e65 100644
--- a/reactos/lib/freetype/src/autohint/ahglyph.c
+++ b/reactos/lib/freetype/src/autohint/ahglyph.c
@@ -5,7 +5,7 @@
 /*    Routines used to load and analyze a given glyph before hinting       */
 /*    (body).                                                              */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 Catharon Productions Inc.                    */
+/*  Copyright 2000-2001, 2002, 2003 Catharon Productions Inc.              */
 /*  Author: David Turner                                                   */
 /*                                                                         */
 /*  This file is part of the Catharon Typography Project and shall only    */
@@ -120,8 +120,8 @@
                                : ( seg->dir == AH_DIR_RIGHT
                                      ? "right"
                                      : "none" ) ) ),
-                 seg->link ? (seg->link-segments) : -1,
-                 seg->serif ? (seg->serif-segments) : -1,
+                 seg->link ? ( seg->link - segments ) : -1,
+                 seg->serif ? ( seg->serif - segments ) : -1,
                  (int)seg->num_linked,
                  seg->first - points,
                  seg->last - points );
@@ -135,7 +135,7 @@
 #endif /* AH_DEBUG */
 
 
-  /* compute the direction value of a given vector.. */
+  /* compute the direction value of a given vector */
   static AH_Direction
   ah_compute_direction( FT_Pos  dx,
                         FT_Pos  dy )
@@ -147,6 +147,8 @@
 
     dir = AH_DIR_NONE;
 
+    /* atan(1/12) == 4.7 degrees */
+
     /* test for vertical direction */
     if ( ax * 12 < ay )
     {
@@ -163,10 +165,10 @@
 
 
   /* this function is used by ah_get_orientation (see below) to test */
-  /* the fill direction of a given bbox extrema                      */
+  /* the fill direction of given bbox extremum                       */
   static FT_Int
-  ah_test_extrema( FT_Outline*  outline,
-                   FT_Int       n )
+  ah_test_extremum( FT_Outline*  outline,
+                    FT_Int       n )
   {
     FT_Vector  *prev, *cur, *next;
     FT_Pos      product;
@@ -175,7 +177,9 @@
 
 
     /* we need to compute the `previous' and `next' point */
-    /* for these extrema                                  */
+    /* for this extremum; we check whether the extremum   */
+    /* is start or end of a contour and providing         */
+    /* appropriate values if so                           */
     cur  = outline->points + n;
     prev = cur - 1;
     next = cur + 1;
@@ -183,7 +187,7 @@
     first = 0;
     for ( c = 0; c < outline->n_contours; c++ )
     {
-      last  = outline->contours[c];
+      last = outline->contours[c];
 
       if ( n == first )
         prev = outline->points + last;
@@ -194,6 +198,10 @@
       first = last + 1;
     }
 
+    /* compute the vectorial product -- since we know that the angle */
+    /* is <= 180 degrees (otherwise it wouldn't be an extremum) we   */
+    /* can determine the filling orientation if the product is       */
+    /* either positive or negative                                   */
     product = FT_MulDiv( cur->x  - prev->x,  /* in.x  */
                          next->y - cur->y,   /* out.y */
                          0x40 )
@@ -218,7 +226,7 @@
   /* We do this by computing bounding box points, and computing their      */
   /* curvature.                                                            */
   /*                                                                       */
-  /* The function returns either 1 or -1.                                  */
+  /* The function returns either 1 or 2.                                   */
   /*                                                                       */
   static FT_Int
   ah_get_orientation( FT_Outline*  outline )
@@ -272,20 +280,20 @@
       }
     }
 
-    /* test orientation of the xmin */
-    n = ah_test_extrema( outline, indices_xMin );
+    /* test orientation of the extrema */
+    n = ah_test_extremum( outline, indices_xMin );
     if ( n )
       goto Exit;
 
-    n = ah_test_extrema( outline, indices_yMin );
+    n = ah_test_extremum( outline, indices_yMin );
     if ( n )
       goto Exit;
 
-    n = ah_test_extrema( outline, indices_xMax );
+    n = ah_test_extremum( outline, indices_xMax );
     if ( n )
       goto Exit;
 
-    n = ah_test_extrema( outline, indices_yMax );
+    n = ah_test_extremum( outline, indices_yMax );
     if ( !n )
       n = 1;
 
@@ -306,14 +314,14 @@
   ah_outline_new( FT_Memory    memory,
                   AH_Outline*  aoutline )
   {
-    FT_Error     error;
-    AH_Outline   outline;
+    FT_Error    error;
+    AH_Outline  outline;
 
 
     if ( !FT_NEW( outline ) )
     {
       outline->memory = memory;
-      *aoutline = outline;
+      *aoutline       = outline;
     }
 
     return error;
@@ -452,7 +460,7 @@
 
     /* We can't rely on the value of `FT_Outline.flags' to know the fill  */
     /* direction used for a glyph, given that some fonts are broken (e.g. */
-    /* the Arphic ones). We thus recompute it each time we need to.       */
+    /* the Arphic ones).  We thus recompute it each time we need to.      */
     /*                                                                    */
     outline->vert_major_dir = AH_DIR_UP;
     outline->horz_major_dir = AH_DIR_LEFT;
@@ -479,7 +487,7 @@
 
       /* compute coordinates */
       {
-        FT_Vector*  vec     = source->points;
+        FT_Vector*  vec = source->points;
 
 
         for ( point = points; point < point_limit; vec++, point++ )
@@ -503,9 +511,11 @@
           switch ( FT_CURVE_TAG( *tag ) )
           {
           case FT_CURVE_TAG_CONIC:
-            point->flags = AH_FLAG_CONIC; break;
+            point->flags = AH_FLAG_CONIC;
+            break;
           case FT_CURVE_TAG_CUBIC:
-            point->flags = AH_FLAG_CUBIC; break;
+            point->flags = AH_FLAG_CUBIC;
+            break;
           default:
             ;
           }
@@ -585,7 +595,7 @@
           point->out_dir = ah_compute_direction( ovec.x, ovec.y );
 
 #ifndef AH_OPTION_NO_WEAK_INTERPOLATION
-          if ( point->flags & (AH_FLAG_CONIC | AH_FLAG_CUBIC) )
+          if ( point->flags & ( AH_FLAG_CONIC | AH_FLAG_CUBIC ) )
           {
           Is_Weak_Point:
             point->flags |= AH_FLAG_WEAK_INTERPOLATION;
@@ -631,48 +641,70 @@
     AH_Point  point_limit = point + outline->num_points;
 
 
-    for ( ; point < point_limit; point++ )
+    switch ( source )
     {
-      FT_Pos  u, v;
-
-
-      switch ( source )
+    case AH_UV_FXY:
+      for ( ; point < point_limit; point++ )
       {
-      case AH_UV_FXY:
-        u = point->fx;
-        v = point->fy;
-        break;
-      case AH_UV_FYX:
-        u = point->fy;
-        v = point->fx;
-        break;
-      case AH_UV_OXY:
-        u = point->ox;
-        v = point->oy;
-        break;
-      case AH_UV_OYX:
-        u = point->oy;
-        v = point->ox;
-        break;
-      case AH_UV_YX:
-        u = point->y;
-        v = point->x;
-        break;
-      case AH_UV_OX:
-        u = point->x;
-        v = point->ox;
-        break;
-      case AH_UV_OY:
-        u = point->y;
-        v = point->oy;
-        break;
-      default:
-        u = point->x;
-        v = point->y;
-        break;
+        point->u = point->fx;
+        point->v = point->fy;
+      }
+      break;
+
+    case AH_UV_FYX:
+      for ( ; point < point_limit; point++ )
+      {
+        point->u = point->fy;
+        point->v = point->fx;
+      }
+      break;
+
+    case AH_UV_OXY:
+      for ( ; point < point_limit; point++ )
+      {
+        point->u = point->ox;
+        point->v = point->oy;
+      }
+      break;
+
+    case AH_UV_OYX:
+      for ( ; point < point_limit; point++ )
+      {
+        point->u = point->oy;
+        point->v = point->ox;
+      }
+      break;
+
+    case AH_UV_YX:
+      for ( ; point < point_limit; point++ )
+      {
+        point->u = point->y;
+        point->v = point->x;
+      }
+      break;
+
+    case AH_UV_OX:
+      for ( ; point < point_limit; point++ )
+      {
+        point->u = point->x;
+        point->v = point->ox;
+      }
+      break;
+
+    case AH_UV_OY:
+      for ( ; point < point_limit; point++ )
+      {
+        point->u = point->y;
+        point->v = point->oy;
+      }
+      break;
+
+    default:
+      for ( ; point < point_limit; point++ )
+      {
+        point->u = point->x;
+        point->v = point->y;
       }
-      point->u = u;
-      point->v = v;
     }
   }
 
@@ -681,8 +713,8 @@
   static void
   ah_outline_compute_inflections( AH_Outline  outline )
   {
-    AH_Point*  contour       =  outline->contours;
-    AH_Point*  contour_limit =  contour + outline->num_contours;
+    AH_Point*  contour       = outline->contours;
+    AH_Point*  contour_limit = contour + outline->num_contours;
 
 
     /* load original coordinates in (u,v) */
@@ -692,10 +724,10 @@
     for ( ; contour < contour_limit; contour++ )
     {
       FT_Vector  vec;
-      AH_Point   point   = contour[0];
-      AH_Point   first   = point;
-      AH_Point   start   = point;
-      AH_Point   end     = point;
+      AH_Point   point = contour[0];
+      AH_Point   first = point;
+      AH_Point   start = point;
+      AH_Point   end   = point;
       AH_Point   before;
       AH_Point   after;
       AH_Angle   angle_in, angle_seg, angle_out;
@@ -769,7 +801,6 @@
         {
           /* diff_in and diff_out have different signs, we have */
           /* inflection points here...                          */
-
           do
           {
             start->flags |= AH_FLAG_INFLECTION;
@@ -829,10 +860,10 @@
       /* do each contour separately */
       for ( ; contour < contour_limit; contour++ )
       {
-        AH_Point  point   = contour[0];
-        AH_Point  last    = point->prev;
-        int       on_edge = 0;
-        FT_Pos    min_pos = +32000;  /* minimum segment pos != min_coord */
+        AH_Point  point   =  contour[0];
+        AH_Point  last    =  point->prev;
+        int       on_edge =  0;
+        FT_Pos    min_pos =  32000;  /* minimum segment pos != min_coord */
         FT_Pos    max_pos = -32000;  /* maximum segment pos != max_coord */
         FT_Bool   passed;
 
@@ -850,7 +881,7 @@
         }
 #endif
 
-        if ( point == last )  /* skip singletons -- just in case? */
+        if ( point == last )  /* skip singletons -- just in case */
           continue;
 
         if ( ABS( last->out_dir )  == major_dir &&
@@ -941,6 +972,8 @@
             segment->first    = point;
             segment->last     = point;
             segment->contour  = contour;
+            segment->score    = 32000;
+            segment->link     = NULL;
             on_edge           = 1;
 
 #ifdef AH_HINT_METRICS
@@ -963,11 +996,11 @@
       /* we do this by inserting fake segments when needed            */
       if ( dimension == 0 )
       {
-        AH_Point  point       =  outline->points;
-        AH_Point  point_limit =  point + outline->num_points;
+        AH_Point  point       = outline->points;
+        AH_Point  point_limit = point + outline->num_points;
 
-        FT_Pos    min_pos     =  32000;
-        FT_Pos    max_pos     = -32000;
+        FT_Pos    min_pos =  32000;
+        FT_Pos    max_pos = -32000;
 
 
         min_point = 0;
@@ -1002,6 +1035,8 @@
           segment->first = min_point;
           segment->last  = min_point;
           segment->pos   = min_pos;
+          segment->score = 32000;
+          segment->link  = NULL;
 
           num_segments++;
           segment++;
@@ -1018,6 +1053,8 @@
           segment->first = max_point;
           segment->last  = max_point;
           segment->pos   = max_pos;
+          segment->score = 32000;
+          segment->link  = NULL;
 
           num_segments++;
           segment++;
@@ -1030,6 +1067,7 @@
       segments       = outline->vert_segments;
       major_dir      = AH_DIR_UP;
       p_num_segments = &outline->num_vsegments;
+
       ah_setup_uv( outline, AH_UV_FXY );
     }
   }
@@ -1038,22 +1076,22 @@
   FT_LOCAL_DEF( void )
   ah_outline_link_segments( AH_Outline  outline )
   {
-    AH_Segment  segments;
-    AH_Segment  segment_limit;
-    int         dimension;
+    AH_Segment    segments;
+    AH_Segment    segment_limit;
+    AH_Direction  major_dir;
+    int           dimension;
 
 
-    ah_setup_uv( outline, AH_UV_FYX );
-
     segments      = outline->horz_segments;
     segment_limit = segments + outline->num_hsegments;
+    major_dir     = outline->horz_major_dir;
 
     for ( dimension = 1; dimension >= 0; dimension-- )
     {
       AH_Segment  seg1;
       AH_Segment  seg2;
 
-
+#if 0
       /* now compare each segment to the others */
       for ( seg1 = segments; seg1 < segment_limit; seg1++ )
       {
@@ -1070,7 +1108,7 @@
         if ( best_segment )
           best_score = seg1->score;
         else
-          best_score = 32000;
+          best_score = +32000;
 
         for ( seg2 = segments; seg2 < segment_limit; seg2++ )
           if ( seg1 != seg2 && seg1->dir + seg2->dir == 0 )
@@ -1125,28 +1163,86 @@
         {
           seg1->link  = best_segment;
           seg1->score = best_score;
-
           best_segment->num_linked++;
         }
+      }
+#endif /* 0 */
 
-      } /* edges 1 */
+#if 1
+      /* the following code does the same, but much faster! */
+
+      /* now compare each segment to the others */
+      for ( seg1 = segments; seg1 < segment_limit; seg1++ )
+      {
+        /* the fake segments are introduced to hint the metrics -- */
+        /* we must never link them to anything                     */
+        if ( seg1->first == seg1->last || seg1->dir != major_dir )
+          continue;
+
+        for ( seg2 = segments; seg2 < segment_limit; seg2++ )
+          if ( seg2 != seg1 && seg1->dir + seg2->dir == 0 )
+          {
+            FT_Pos  pos1 = seg1->pos;
+            FT_Pos  pos2 = seg2->pos;
+            FT_Pos  dist = pos2 - pos1;
+
+
+            if ( dist < 0 )
+              continue;
+
+            {
+              FT_Pos  min = seg1->min_coord;
+              FT_Pos  max = seg1->max_coord;
+              FT_Pos  len, score;
+
+
+              if ( min < seg2->min_coord )
+                min = seg2->min_coord;
+
+              if ( max > seg2->max_coord )
+                max = seg2->max_coord;
+
+              len = max - min;
+              if ( len >= 8 )
+              {
+                score = dist + 3000 / len;
+
+                if ( score < seg1->score )
+                {
+                  seg1->score = score;
+                  seg1->link  = seg2;
+                }
+
+                if ( score < seg2->score )
+                {
+                  seg2->score = score;
+                  seg2->link  = seg1;
+                }
+              }
+            }
+          }
+      }
+#endif /* 1 */
 
       /* now, compute the `serif' segments */
       for ( seg1 = segments; seg1 < segment_limit; seg1++ )
       {
         seg2 = seg1->link;
 
-        if ( seg2 && seg2->link != seg1 )
+        if ( seg2 )
         {
-          seg1->link  = 0;
-          seg1->serif = seg2->link;
+          seg2->num_linked++;
+          if ( seg2->link != seg1 )
+          {
+            seg1->link  = 0;
+            seg1->serif = seg2->link;
+          }
         }
       }
 
-      ah_setup_uv( outline, AH_UV_FXY );
-
       segments      = outline->vert_segments;
       segment_limit = segments + outline->num_vsegments;
+      major_dir     = outline->vert_major_dir;
     }
   }
 
@@ -1199,6 +1295,9 @@
       if ( edge_distance_threshold > 64 / 4 )
         edge_distance_threshold = 64 / 4;
 
+      edge_distance_threshold = FT_DivFix( edge_distance_threshold,
+                                           scale );
+
       edge_limit = edges;
       for ( seg = segments; seg < segment_limit; seg++ )
       {
@@ -1215,7 +1314,6 @@
           if ( dist < 0 )
             dist = -dist;
 
-          dist = FT_MulFix( dist, scale );
           if ( dist < edge_distance_threshold )
           {
             found = edge;
@@ -1253,7 +1351,6 @@
           edge->last            = seg;
         }
       }
-
       *p_num_edges = (FT_Int)( edge_limit - edges );
 
 
@@ -1264,13 +1361,19 @@
       /*                                                                   */
       /*  - edge's main direction                                          */
       /*  - stem edge, serif edge or both (which defaults to stem then)    */
-      /*  - rounded edge, straigth or both (which defaults to straight)    */
+      /*  - rounded edge, straight or both (which defaults to straight)    */
       /*  - link for edge                                                  */
       /*                                                                   */
       /*********************************************************************/
 
       /* first of all, set the `edge' field in each segment -- this is */
       /* required in order to compute edge links                       */
+
+      /* Note that I've tried to remove this loop, setting
+       * the "edge" field of each segment directly in the
+       * code above.  For some reason, it slows down execution
+       * speed -- on a Sun.
+       */
       for ( edge = edges; edge < edge_limit; edge++ )
       {
         seg = edge->first;
@@ -1358,12 +1461,12 @@
             }
             else
               edge->link  = edge2;
-#else /* !CHESTER_SERIF */
+#else /* !FT_CONFIG_CHESTER_SERIF */
             if ( is_serif )
               edge->serif = edge2;
             else
               edge->link  = edge2;
-#endif
+#endif /* !FT_CONFIG_CHESTER_SERIF */
           }
 
           seg = seg->edge_next;
@@ -1383,10 +1486,10 @@
           edge->dir = up_dir;
 
         else if ( ups < downs )
-          edge->dir = - up_dir;
+          edge->dir = -up_dir;
 
         else if ( ups == downs )
-          edge->dir = 0;  /* both up and down !! */
+          edge->dir = 0;  /* both up and down! */
 
         /* gets rid of serifs if link is set                */
         /* XXX: This gets rid of many unpleasant artefacts! */
@@ -1459,7 +1562,7 @@
 
         ref   = globals->blue_refs[blue];
         shoot = globals->blue_shoots[blue];
-        dist  = ref-shoot;
+        dist  = ref - shoot;
         if ( dist < 0 )
           dist = -dist;
 
@@ -1477,7 +1580,7 @@
         return;
     }
 
-    /* compute for each horizontal edge, which blue zone is closer */
+    /* for each horizontal edge search the blue zone which is closest */
     for ( ; edge < edge_limit; edge++ )
     {
       AH_Blue  blue;
@@ -1493,7 +1596,7 @@
         best_dist = 64 / 2;
 #else
       if ( best_dist > 64 / 4 )
-         best_dist = 64 / 4;
+        best_dist = 64 / 4;
 #endif
 
       for ( blue = AH_BLUE_CAPITAL_TOP; blue < AH_BLUE_MAX; blue++ )
@@ -1507,6 +1610,7 @@
         FT_Bool  is_major_dir =
                    FT_BOOL( edge->dir == outline->horz_major_dir );
 
+
         if ( !blue_active[blue] )
           continue;
 
@@ -1569,7 +1673,7 @@
   /*    ah_outline_scale_blue_edges                                        */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    This functions must be called before hinting in order to re-adjust */
+  /*    This function must be called before hinting in order to re-adjust  */
   /*    the contents of the detected edges (basically change the `blue     */
   /*    edge' pointer from `design units' to `scaled ones').               */
   /*                                                                       */
diff --git a/reactos/lib/freetype/src/autohint/ahhint.c b/reactos/lib/freetype/src/autohint/ahhint.c
index 5814e37ab9e..c4c8cfc50d1 100644
--- a/reactos/lib/freetype/src/autohint/ahhint.c
+++ b/reactos/lib/freetype/src/autohint/ahhint.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Glyph hinter (body).                                                 */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 Catharon Productions Inc.                    */
+/*  Copyright 2000-2001, 2002, 2003 Catharon Productions Inc.              */
 /*  Author: David Turner                                                   */
 /*                                                                         */
 /*  This file is part of the Catharon Typography Project and shall only    */
@@ -27,11 +27,12 @@
 #include FT_OUTLINE_H
 
 
-#define FACE_GLOBALS( face )  ((AH_Face_Globals)(face)->autohint.data)
+#define FACE_GLOBALS( face )  ( (AH_Face_Globals)(face)->autohint.data )
 
 #define AH_USE_IUP
 #define OPTIM_STEM_SNAP
 
+
   /*************************************************************************/
   /*************************************************************************/
   /****                                                                 ****/
@@ -70,7 +71,7 @@
       }
     }
 
-    scaled = (reference+32) & -64;
+    scaled = ( reference + 32 ) & -64;
 
     if ( width >= reference )
     {
@@ -88,7 +89,9 @@
 
 
   /* compute the snapped width of a given stem */
+
 #ifdef FT_CONFIG_CHESTER_SERIF
+
   static FT_Pos
   ah_compute_stem_width( AH_Hinter      hinter,
                          int            vertical,
@@ -114,7 +117,7 @@
     else if ( (  vertical && !hinter->do_vert_snapping ) ||
               ( !vertical && !hinter->do_horz_snapping ) )
     {
-      /* smooth hinting process, very lightly quantize the stem width */
+      /* smooth hinting process: very lightly quantize the stem width */
       /*                                                              */
 
       /* leave the widths of serifs alone */
@@ -148,8 +151,8 @@
 
         if ( dist < 3 * 64 )
         {
-          delta = ( dist & 63 );
-          dist &= -64;
+          delta  = dist & 63;
+          dist  &= -64;
 
           if ( delta < 10 )
             dist += delta;
@@ -169,7 +172,7 @@
     }
     else
     {
-      /* strong hinting process, snap the stem width to integer pixels */
+      /* strong hinting process: snap the stem width to integer pixels */
       /*                                                               */
       if ( vertical )
       {
@@ -184,7 +187,7 @@
       }
       else
       {
-        dist = ah_snap_width( globals->widths,  globals->num_widths, dist );
+        dist = ah_snap_width( globals->widths, globals->num_widths, dist );
 
         if ( hinter->flags & AH_HINTER_MONOCHROME )
         {
@@ -206,7 +209,7 @@
           else if ( dist < 128 )
             dist = ( dist + 22 ) & -64;
           else
-            /* XXX: round otherwise, prevent color fringes in LCD mode */
+            /* XXX: round otherwise to prevent color fringes in LCD mode */
             dist = ( dist + 32 ) & -64;
         }
       }
@@ -218,7 +221,9 @@
 
     return dist;
   }
-#else /* !CHESTER_SERIF */
+
+#else /* !FT_CONFIG_CHESTER_SERIF */
+
   static FT_Pos
   ah_compute_stem_width( AH_Hinter  hinter,
                          int        vertical,
@@ -242,7 +247,7 @@
     else if ( (  vertical && !hinter->do_vert_snapping ) ||
               ( !vertical && !hinter->do_horz_snapping ) )
     {
-      /* smooth hinting process, very lightly quantize the stem width */
+      /* smooth hinting process: very lightly quantize the stem width */
       /*                                                              */
       if ( dist < 64 )
         dist = 64;
@@ -263,8 +268,8 @@
 
         if ( dist < 3 * 64 )
         {
-          delta = ( dist & 63 );
-          dist &= -64;
+          delta  = dist & 63;
+          dist  &= -64;
 
           if ( delta < 10 )
             dist += delta;
@@ -284,7 +289,7 @@
     }
     else
     {
-      /* strong hinting process, snap the stem width to integer pixels */
+      /* strong hinting process: snap the stem width to integer pixels */
       /*                                                               */
       if ( vertical )
       {
@@ -299,7 +304,7 @@
       }
       else
       {
-        dist = ah_snap_width( globals->widths,  globals->num_widths, dist );
+        dist = ah_snap_width( globals->widths, globals->num_widths, dist );
 
         if ( hinter->flags & AH_HINTER_MONOCHROME )
         {
@@ -321,7 +326,7 @@
           else if ( dist < 128 )
             dist = ( dist + 22 ) & -64;
           else
-            /* XXX: round otherwise, prevent color fringes in LCD mode */
+            /* XXX: round otherwise to prevent color fringes in LCD mode */
             dist = ( dist + 32 ) & -64;
         }
       }
@@ -332,7 +337,8 @@
 
     return dist;
   }
-#endif /* !CHESTER_SERIF */
+
+#endif /* !FT_CONFIG_CHESTER_SERIF */
 
 
   /* align one stem edge relative to the previous stem edge */
@@ -345,17 +351,23 @@
     FT_Pos  dist = stem_edge->opos - base_edge->opos;
 
 #ifdef FT_CONFIG_CHESTER_SERIF
+
     FT_Pos  fitted_width = ah_compute_stem_width( hinter,
                                                   vertical,
                                                   dist,
                                                   base_edge->flags,
                                                   stem_edge->flags );
 
+
     stem_edge->pos = base_edge->pos + fitted_width;
+
 #else
+
     stem_edge->pos = base_edge->pos +
                      ah_compute_stem_width( hinter, vertical, dist );
+
 #endif
+
   }
 
 
@@ -371,6 +383,7 @@
     FT_UNUSED( hinter );
     FT_UNUSED( vertical );
 
+
     dist = serif->opos - base->opos;
     if ( dist < 0 )
     {
@@ -378,15 +391,16 @@
       sign = -1;
     }
 
-    /* do not touch serifs widths !! */
 #if 0
+    /* do not touch serifs widths! */
     if ( base->flags & AH_EDGE_DONE )
     {
       if ( dist >= 64 )
-        dist = (dist+8) & -64;
+        dist = ( dist + 8 ) & -64;
 
       else if ( dist <= 32 && !vertical )
         dist = ( dist + 33 ) >> 1;
+
       else
         dist = 0;
     }
@@ -407,14 +421,14 @@
   /*************************************************************************/
 
 
-  /* Another alternative edge hinting algorithm */
-  static void
-  ah_hint_edges_3( AH_Hinter  hinter )
+  FT_LOCAL_DEF( void )
+  ah_hinter_hint_edges( AH_Hinter  hinter )
   {
     AH_Edge     edges;
     AH_Edge     edge_limit;
     AH_Outline  outline = hinter->glyph;
     FT_Int      dimension;
+    FT_Int      n_edges;
 
 
     edges      = outline->horz_edges;
@@ -454,7 +468,7 @@
           {
             edge1 = edge;
           }
-          else if (edge2 && edge2->blue_edge)
+          else if ( edge2 && edge2->blue_edge )
           {
             blue  = edge2->blue_edge;
             edge1 = edge2;
@@ -478,8 +492,8 @@
         }
       }
 
-      /* now, we will align all stem edges, trying to maintain the */
-      /* relative order of stems in the glyph..                    */
+      /* now we will align all stem edges, trying to maintain the */
+      /* relative order of stems in the glyph                     */
       for ( edge = edges; edge < edge_limit; edge++ )
       {
         AH_EdgeRec*  edge2;
@@ -496,12 +510,11 @@
           continue;
         }
 
-        /* now, align the stem */
+        /* now align the stem */
 
-        /* this should not happen, but it's better to be safe. */
+        /* this should not happen, but it's better to be safe */
         if ( edge2->blue_edge || edge2 < edge )
         {
-
           ah_align_linked_edge( hinter, edge2, edge, dimension );
           edge->flags |= AH_EDGE_DONE;
           continue;
@@ -509,15 +522,18 @@
 
         if ( !anchor )
         {
+
 #ifdef FT_CONFIG_CHESTER_STEM
-          FT_Pos   org_len, org_center, cur_len;
-          FT_Pos   cur_pos1, error1, error2, u_off, d_off;
 
-          org_len    = edge2->opos - edge->opos;
-          cur_len    = ah_compute_stem_width( hinter, dimension, org_len,
-                                              edge->flags, edge2->flags   );
+          FT_Pos  org_len, org_center, cur_len;
+          FT_Pos  cur_pos1, error1, error2, u_off, d_off;
 
-          if (cur_len <= 64 )
+
+          org_len = edge2->opos - edge->opos;
+          cur_len = ah_compute_stem_width( hinter, dimension, org_len,
+                                           edge->flags, edge2->flags );
+
+          if ( cur_len <= 64 )
             u_off = d_off = 32;
           else
           {
@@ -551,44 +567,54 @@
           else
             edge->pos = ( edge->opos + 32 ) & -64;
 
-          anchor    = edge;
+          anchor = edge;
 
           edge->flags |= AH_EDGE_DONE;
 
           ah_align_linked_edge( hinter, edge, edge2, dimension );
-#else /* !CHESTER_STEM */
+
+#else /* !FT_CONFIG_CHESTER_STEM */
+
           edge->pos = ( edge->opos + 32 ) & -64;
           anchor    = edge;
 
           edge->flags |= AH_EDGE_DONE;
 
           ah_align_linked_edge( hinter, edge, edge2, dimension );
-#endif /* !CHESTER_STEM */
+
+#endif /* !FT_CONFIG_CHESTER_STEM */
+
         }
         else
         {
-          FT_Pos   org_pos, org_len, org_center, cur_len;
-          FT_Pos   cur_pos1, cur_pos2, delta1, delta2;
+          FT_Pos  org_pos, org_len, org_center, cur_len;
+          FT_Pos  cur_pos1, cur_pos2, delta1, delta2;
 
 
-          org_pos    = anchor->pos + (edge->opos - anchor->opos);
+          org_pos    = anchor->pos + ( edge->opos - anchor->opos );
           org_len    = edge2->opos - edge->opos;
           org_center = org_pos + ( org_len >> 1 );
 
 #ifdef FT_CONFIG_CHESTER_SERIF
-          cur_len    = ah_compute_stem_width( hinter, dimension, org_len,
-                                              edge->flags, edge2->flags  );
-#else  /* !CHESTER_SERIF */
-          cur_len    = ah_compute_stem_width( hinter, dimension, org_len );
-#endif /* !CHESTER_SERIF */
+
+          cur_len = ah_compute_stem_width( hinter, dimension, org_len,
+                                           edge->flags, edge2->flags  );
+
+
+#else  /* !FT_CONFIG_CHESTER_SERIF */
+
+          cur_len = ah_compute_stem_width( hinter, dimension, org_len );
+
+#endif /* !FT_CONFIG_CHESTER_SERIF */
 
 #ifdef FT_CONFIG_CHESTER_STEM
+
           if ( cur_len < 96 )
           {
             FT_Pos  u_off, d_off;
 
 
-            cur_pos1   = ( org_center + 32 ) & -64;
+            cur_pos1 = ( org_center + 32 ) & -64;
 
             if (cur_len <= 64 )
               u_off = d_off = 32;
@@ -598,11 +624,11 @@
               d_off = 26;
             }
 
-            delta1 = org_center - (cur_pos1 - u_off);
+            delta1 = org_center - ( cur_pos1 - u_off );
             if ( delta1 < 0 )
               delta1 = -delta1;
 
-            delta2 = org_center - (cur_pos1 + d_off);
+            delta2 = org_center - ( cur_pos1 + d_off );
             if ( delta2 < 0 )
               delta2 = -delta2;
 
@@ -616,8 +642,7 @@
           }
           else
           {
-
-            org_pos    = anchor->pos + (edge->opos - anchor->opos);
+            org_pos    = anchor->pos + ( edge->opos - anchor->opos );
             org_len    = edge2->opos - edge->opos;
             org_center = org_pos + ( org_len >> 1 );
 
@@ -638,7 +663,7 @@
             edge2->pos = edge->pos + cur_len;
           }
 
-#else /* !CHESTER_STEM */
+#else /* !FT_CONFIG_CHESTER_STEM */
 
           cur_pos1   = ( org_pos + 32 ) & -64;
           delta1     = ( cur_pos1 + ( cur_len >> 1 ) - org_center );
@@ -653,7 +678,7 @@
           edge->pos  = ( delta1 <= delta2 ) ? cur_pos1 : cur_pos2;
           edge2->pos = edge->pos + cur_len;
 
-#endif /* !CHESTER_STEM */
+#endif /* !FT_CONFIG_CHESTER_STEM */
 
           edge->flags  |= AH_EDGE_DONE;
           edge2->flags |= AH_EDGE_DONE;
@@ -663,11 +688,73 @@
         }
       }
 
+      /* make sure that lowercase m's maintain their symmetry */
+
+      /* In general, lowercase m's have six vertical edges if they are sans */
+      /* serif, or twelve if they are avec serif.  This implementation is   */
+      /* based on that assumption, and seems to work very well with most    */
+      /* faces.  However, if for a certain face this assumption is not      */
+      /* true, the m is just rendered like before.  In addition, any stem   */
+      /* correction will only be applied to symmetrical glyphs (even if the */
+      /* glyph is not an m), so the potential for unwanted distortion is    */
+      /* relatively low.                                                    */
+
+      /* We don't handle horizontal edges since we can't easily assure that */
+      /* the third (lowest) stem aligns with the base line; it might end up */
+      /* one pixel higher or lower.                                         */
+
+      n_edges = edge_limit - edges;
+      if ( !dimension && ( n_edges == 6 || n_edges == 12 ) )
+      {
+        AH_EdgeRec  *edge1, *edge2, *edge3;
+        FT_Pos       dist1, dist2, span, delta;
+
+
+        if ( n_edges == 6 )
+        {
+          edge1 = edges;
+          edge2 = edges + 2;
+          edge3 = edges + 4;
+        }
+        else
+        {
+          edge1 = edges + 1;
+          edge2 = edges + 5;
+          edge3 = edges + 9;
+        }
+
+        dist1 = edge2->opos - edge1->opos;
+        dist2 = edge3->opos - edge2->opos;
+
+        span = dist1 - dist2;
+        if ( span < 0 )
+          span = -span;
+
+        if ( span < 8 )
+        {
+          delta = edge3->pos - ( 2 * edge2->pos - edge1->pos );
+          edge3->pos -= delta;
+          if ( edge3->link )
+            edge3->link->pos -= delta;
+
+          /* move the serifs along with the stem */
+          if ( n_edges == 12 )
+          {
+            ( edges + 8 )->pos -= delta;
+            ( edges + 11 )->pos -= delta;
+          }
+
+          edge3->flags |= AH_EDGE_DONE;
+          if ( edge3->link )
+            edge3->link->flags |= AH_EDGE_DONE;
+        }
+      }
+
       if ( !has_serifs )
         goto Next_Dimension;
 
-      /* now, hint the remaining edges (serifs and single) in order */
-      /* to complete our processing                                 */
+      /* now hint the remaining edges (serifs and single) in order */
+      /* to complete our processing                                */
       for ( edge = edges; edge < edge_limit; edge++ )
       {
         if ( edge->flags & AH_EDGE_DONE )
@@ -702,18 +789,6 @@
   }
 
 
-  FT_LOCAL_DEF( void )
-  ah_hinter_hint_edges( AH_Hinter  hinter )
-  {
-    /* AH_Interpolate_Blue_Edges( hinter ); -- doesn't seem to help      */
-    /* reduce the problem of the disappearing eye in the `e' of Times... */
-    /* also, creates some artifacts near the blue zones?                 */
-    {
-      ah_hint_edges_3( hinter );
-    }
-  }
-
-
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
@@ -785,6 +860,7 @@
 
 
   /* hint the strong points -- this is equivalent to the TrueType `IP' */
+  /* hinting instruction                                               */
   static void
   ah_hinter_align_strong_points( AH_Hinter  hinter )
   {
@@ -850,7 +926,7 @@
             goto Store_Point;
           }
 
-          /* is the point after the last edge ? */
+          /* is the point after the last edge? */
           edge  = edge_limit - 1;
           delta = u - edge->fpos;
           if ( delta >= 0 )
@@ -859,6 +935,51 @@
             goto Store_Point;
           }
 
+#if 1
+          {
+            FT_UInt  min, max, mid;
+            FT_Pos   fpos;
+
+
+            /* find enclosing edges */
+            min = 0;
+            max = edge_limit - edges;
+
+            while ( min < max )
+            {
+              mid  = ( max + min ) >> 1;
+              edge = edges + mid;
+              fpos = edge->fpos;
+
+              if ( u < fpos )
+                max = mid;
+              else if ( u > fpos )
+                min = mid + 1;
+              else
+              {
+                /* we are on the edge */
+                u = edge->pos;
+                goto Store_Point;
+              }
+            }
+
+            {
+              AH_Edge  before = edges + min - 1;
+              AH_Edge  after  = edges + min + 0;
+
+
+              /* assert( before && after && before != after ) */
+              if ( before->scale == 0 )
+                before->scale = FT_DivFix( after->pos - before->pos,
+                                           after->fpos - before->fpos );
+
+              u = before->pos + FT_MulFix( fu - before->fpos,
+                                           before->scale );
+            }
+          }
+
+#else /* !0 */
+
           /* otherwise, interpolate the point in between */
           {
             AH_Edge  before = 0;
@@ -889,12 +1010,16 @@
               after = edge;
             }
 
-            /* assert( before && after && before != after ) */
-            u = before->pos + FT_MulDiv( fu - before->fpos,
-                                         after->pos - before->pos,
-                                         after->fpos - before->fpos );
+            if ( before->scale == 0 )
+              before->scale = FT_DivFix( after->pos - before->pos,
+                                        after->fpos - before->fpos );
+
+            u = before->pos + FT_MulFix( fu - before->fpos,
+                                        before->scale );
           }
 
+#endif /* !0 */
+
         Store_Point:
 
           /* save the point position */
@@ -1001,6 +1126,7 @@
 
 
   /* interpolate weak points -- this is equivalent to the TrueType `IUP' */
+  /* hinting instruction                                                 */
   static void
   ah_hinter_align_weak_points( AH_Hinter  hinter )
   {
@@ -1141,8 +1267,8 @@
   {
     FT_Int           n;
     AH_Face_Globals  globals = hinter->globals;
-    AH_Globals       design = &globals->design;
-    AH_Globals       scaled = &globals->scaled;
+    AH_Globals       design  = &globals->design;
+    AH_Globals       scaled  = &globals->scaled;
 
 
     /* copy content */
@@ -1211,7 +1337,7 @@
       ah_outline_done( hinter->glyph );
 
       /* note: the `globals' pointer is _not_ owned by the hinter */
-      /*       but by the current face object, we don't need to   */
+      /*       but by the current face object; we don't need to   */
       /*       release it                                         */
       hinter->globals = 0;
       hinter->face    = 0;
@@ -1360,8 +1486,8 @@
         }
       }
 
-      /* copy the outline points in the loader's current                */
-      /* extra points, which is used to keep original glyph coordinates */
+      /* copy the outline points in the loader's current               */
+      /* extra points which is used to keep original glyph coordinates */
       error = ah_loader_check_points( gloader, slot->outline.n_points + 2,
                                       slot->outline.n_contours );
       if ( error )
@@ -1389,8 +1515,8 @@
       if ( slot->outline.n_points == 0 )
         goto Hint_Metrics;
 
-      /* now, load the slot image into the auto-outline, and run the */
-      /* automatic hinting process                                   */
+      /* now load the slot image into the auto-outline and run the */
+      /* automatic hinting process                                 */
       error = ah_outline_load( outline, x_scale, y_scale, face );
       if ( error )
         goto Exit;
@@ -1446,7 +1572,7 @@
         FT_SubGlyph  subglyph;
 
 
-        start_point   = gloader->base.outline.n_points;
+        start_point = gloader->base.outline.n_points;
 
         /* first of all, copy the subglyph descriptors in the glyph loader */
         error = ah_loader_check_subglyphs( gloader, num_subglyphs );
@@ -1529,8 +1655,8 @@
             FT_Vector*  p2;
 
 
-            if ( start_point + k >= num_base_points          ||
-                               l >= (FT_UInt)num_new_points  )
+            if ( start_point + k >= num_base_points         ||
+                               l >= (FT_UInt)num_new_points )
             {
               error = AH_Err_Invalid_Composite;
               goto Exit;
@@ -1538,7 +1664,7 @@
 
             l += num_base_points;
 
-            /* for now, only use the current point coordinates     */
+            /* for now, only use the current point coordinates;    */
             /* we may consider another approach in the near future */
             p1 = gloader->base.outline.points + start_point + k;
             p2 = gloader->base.outline.points + start_point + l;
@@ -1583,8 +1709,8 @@
       if ( hinter->transformed )
         FT_Outline_Transform( &gloader->base.outline, &hinter->trans_matrix );
 
-      /* we must translate our final outline by -pp1.x, and compute */
-      /* the new metrics                                            */
+      /* we must translate our final outline by -pp1.x and compute */
+      /* the new metrics                                           */
       if ( hinter->pp1.x )
         FT_Outline_Translate( &gloader->base.outline, -hinter->pp1.x, 0 );
 
@@ -1599,8 +1725,8 @@
       slot->metrics.horiBearingX = bbox.xMin;
       slot->metrics.horiBearingY = bbox.yMax;
 
-      /* for mono-width fonts (like Andale, Courier, etc.), we need */
-      /* to keep the original rounded advance width                 */
+      /* for mono-width fonts (like Andale, Courier, etc.) we need */
+      /* to keep the original rounded advance width                */
       if ( !FT_IS_FIXED_WIDTH( slot->face ) )
         slot->metrics.horiAdvance = hinter->pp2.x - hinter->pp1.x;
       else
@@ -1641,7 +1767,7 @@
     FT_Fixed         x_scale      = size->metrics.x_scale;
     FT_Fixed         y_scale      = size->metrics.y_scale;
     AH_Face_Globals  face_globals = FACE_GLOBALS( face );
-    FT_Render_Mode   hint_mode    = FT_LOAD_TARGET_MODE(load_flags);
+    FT_Render_Mode   hint_mode    = FT_LOAD_TARGET_MODE( load_flags );
 
 
     /* first of all, we need to check that we're using the correct face and */
@@ -1662,20 +1788,23 @@
     }
 
 #ifdef FT_CONFIG_CHESTER_BLUE_SCALE
+
    /* try to optimize the y_scale so that the top of non-capital letters
     * is aligned on a pixel boundary whenever possible
     */
     {
       AH_Globals  design = &face_globals->design;
-      FT_Pos      shoot  = design->blue_shoots[ AH_BLUE_SMALL_TOP ];
+      FT_Pos      shoot  = design->blue_shoots[AH_BLUE_SMALL_TOP];
 
-     /* the value of 'shoot' will be -1000 if the font doesn't have */
-     /* small latin letters; we simply check the sign here...       */
+
+      /* the value of 'shoot' will be -1000 if the font doesn't have */
+      /* small latin letters; we simply check the sign here...       */
       if ( shoot > 0 )
       {
         FT_Pos  scaled = FT_MulFix( shoot, y_scale );
         FT_Pos  fitted = ( scaled + 32 ) & -64;
 
+
         if ( scaled != fitted )
         {
          /* adjust y_scale
@@ -1685,10 +1814,11 @@
          /* adust x_scale
           */
           if ( fitted < scaled )
-            x_scale -= x_scale/50;  /* x_scale*0.98 with integers */
+            x_scale -= x_scale / 50;  /* x_scale*0.98 with integers */
         }
       }
     }
+
 #endif /* FT_CONFIG_CHESTER_BLUE_SCALE */
 
     /* now, we must check the current character pixel size to see if we */
@@ -1720,12 +1850,9 @@
 
     hinter->do_stem_adjust   = FT_BOOL( hint_mode != FT_RENDER_MODE_LIGHT );
 
-#if 1
-    load_flags  = FT_LOAD_NO_SCALE
-                | FT_LOAD_IGNORE_TRANSFORM ;
-#else
-    load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_RECURSE;
-#endif
+
+    load_flags  |= FT_LOAD_NO_SCALE
+                 | FT_LOAD_IGNORE_TRANSFORM ;
 
     error = ah_hinter_load( hinter, glyph_index, load_flags, 0 );
 
diff --git a/reactos/lib/freetype/src/autohint/ahmodule.c b/reactos/lib/freetype/src/autohint/ahmodule.c
index 1819e9ef92c..8fce31d618d 100644
--- a/reactos/lib/freetype/src/autohint/ahmodule.c
+++ b/reactos/lib/freetype/src/autohint/ahmodule.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-hinting module implementation (declaration).                    */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 Catharon Productions Inc.                    */
+/*  Copyright 2000-2001, 2002, 2003 Catharon Productions Inc.              */
 /*  Author: David Turner                                                   */
 /*                                                                         */
 /*  This file is part of the Catharon Typography Project and shall only    */
@@ -119,7 +119,7 @@
   FT_CALLBACK_TABLE_DEF
   const FT_Module_Class  autohint_module_class =
   {
-    ft_module_hinter,
+    FT_MODULE_HINTER,
     sizeof ( FT_AutoHinterRec ),
 
     "autohinter",
diff --git a/reactos/lib/freetype/src/autohint/ahoptim.c b/reactos/lib/freetype/src/autohint/ahoptim.c
deleted file mode 100644
index 8d10f4a4dba..00000000000
--- a/reactos/lib/freetype/src/autohint/ahoptim.c
+++ /dev/null
@@ -1,882 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ahoptim.c                                                              */
-/*                                                                         */
-/*    FreeType auto hinting outline optimization (body).                   */
-/*                                                                         */
-/*  Copyright 2000-2001, 2002 Catharon Productions Inc.                    */
-/*  Author: David Turner                                                   */
-/*                                                                         */
-/*  This file is part of the Catharon Typography Project and shall only    */
-/*  be used, modified, and distributed under the terms of the Catharon     */
-/*  Open Source License that should come with this file under the name     */
-/*  `CatharonLicense.txt'.  By continuing to use, modify, or distribute    */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/*  Note that this license is compatible with the FreeType license.        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This module is in charge of optimising the outlines produced by the   */
-  /* auto-hinter in direct mode. This is required at small pixel sizes in  */
-  /* order to ensure coherent spacing, among other things..                */
-  /*                                                                       */
-  /* The technique used in this module is a simplified simulated           */
-  /* annealing.                                                            */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H       /* for FT_ALLOC_ARRAY() and FT_FREE() */
-#include "ahoptim.h"
-
-
-  /* define this macro to use brute force optimization -- this is slow,  */
-  /* but a good way to perfect the distortion function `by hand' through */
-  /* tweaking                                                            */
-#define AH_BRUTE_FORCE
-
-
-#define xxxAH_DEBUG_OPTIM
-
-
-#undef LOG
-#ifdef AH_DEBUG_OPTIM
-
-#define LOG( x )  optim_log ## x
-
-#else
-
-#define LOG( x )
-
-#endif /* AH_DEBUG_OPTIM */
-
-
-#ifdef AH_DEBUG_OPTIM
-
-#include <stdarg.h>
-#include <stdlib.h>
-
-#define FLOAT( x )  ( (float)( (x) / 64.0 ) )
-
-
-  static void
-  optim_log( const char*  fmt, ... )
-  {
-    va_list  ap;
-
-
-    va_start( ap, fmt );
-    vprintf( fmt, ap );
-    va_end( ap );
-  }
-
-
-  static void
-  AH_Dump_Stems( AH_Optimizer*  optimizer )
-  {
-    int       n;
-    AH_Stem*  stem;
-
-
-    stem = optimizer->stems;
-    for ( n = 0; n < optimizer->num_stems; n++, stem++ )
-    {
-      LOG(( " %c%2d [%.1f:%.1f]={%.1f:%.1f}="
-            "<%1.f..%1.f> force=%.1f speed=%.1f\n",
-            optimizer->vertical ? 'V' : 'H', n,
-            FLOAT( stem->edge1->opos ), FLOAT( stem->edge2->opos ),
-            FLOAT( stem->edge1->pos ),  FLOAT( stem->edge2->pos ),
-            FLOAT( stem->min_pos ),     FLOAT( stem->max_pos ),
-            FLOAT( stem->force ),       FLOAT( stem->velocity ) ));
-    }
-  }
-
-
-  static void
-  AH_Dump_Stems2( AH_Optimizer*  optimizer )
-  {
-    int       n;
-    AH_Stem*  stem;
-
-
-    stem = optimizer->stems;
-    for ( n = 0; n < optimizer->num_stems; n++, stem++ )
-    {
-      LOG(( " %c%2d [%.1f]=<%1.f..%1.f> force=%.1f speed=%.1f\n",
-            optimizer->vertical ? 'V' : 'H', n,
-            FLOAT( stem->pos ),
-            FLOAT( stem->min_pos ), FLOAT( stem->max_pos ),
-            FLOAT( stem->force ),   FLOAT( stem->velocity ) ));
-    }
-  }
-
-
-  static void
-  AH_Dump_Springs( AH_Optimizer*  optimizer )
-  {
-    int  n;
-    AH_Spring*  spring;
-    AH_Stem*    stems;
-
-
-    spring = optimizer->springs;
-    stems  = optimizer->stems;
-    LOG(( "%cSprings ", optimizer->vertical ? 'V' : 'H' ));
-
-    for ( n = 0; n < optimizer->num_springs; n++, spring++ )
-    {
-      LOG(( " [%d-%d:%.1f:%1.f:%.1f]",
-            spring->stem1 - stems, spring->stem2 - stems,
-            FLOAT( spring->owidth ),
-            FLOAT( spring->stem2->pos -
-                   ( spring->stem1->pos + spring->stem1->width ) ),
-            FLOAT( spring->tension ) ));
-    }
-
-    LOG(( "\n" ));
-  }
-
-#endif /* AH_DEBUG_OPTIM */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****   COMPUTE STEMS AND SPRINGS IN AN OUTLINE                       ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  static int
-  valid_stem_segments( AH_Segment  seg1,
-                       AH_Segment  seg2 )
-  {
-    return seg1->serif == 0                   &&
-           seg2                               &&
-           seg2->link == seg1                 &&
-           seg1->pos < seg2->pos              &&
-           seg1->min_coord <= seg2->max_coord &&
-           seg2->min_coord <= seg1->max_coord;
-  }
-
-
-  /* compute all stems in an outline */
-  static int
-  optim_compute_stems( AH_Optimizer*  optimizer )
-  {
-    AH_Outline  outline = optimizer->outline;
-    FT_Fixed    scale;
-    FT_Memory   memory  = optimizer->memory;
-    FT_Error    error   = 0;
-    FT_Int      dimension;
-    AH_Edge     edges;
-    AH_Edge     edge_limit;
-    AH_Stem**   p_stems;
-    FT_Int*     p_num_stems;
-
-
-    edges      = outline->horz_edges;
-    edge_limit = edges + outline->num_hedges;
-    scale      = outline->y_scale;
-
-    p_stems     = &optimizer->horz_stems;
-    p_num_stems = &optimizer->num_hstems;
-
-    for ( dimension = 1; dimension >= 0; dimension-- )
-    {
-      AH_Stem*  stems     = 0;
-      FT_Int    num_stems = 0;
-      AH_Edge   edge;
-
-
-      /* first of all, count the number of stems in this direction */
-      for ( edge = edges; edge < edge_limit; edge++ )
-      {
-        AH_Segment  seg = edge->first;
-
-
-        do
-        {
-          if (valid_stem_segments( seg, seg->link ) )
-            num_stems++;
-
-          seg = seg->edge_next;
-
-        } while ( seg != edge->first );
-      }
-
-      /* now allocate the stems and build their table */
-      if ( num_stems > 0 )
-      {
-        AH_Stem*  stem;
-
-
-        if ( FT_NEW_ARRAY( stems, num_stems ) )
-          goto Exit;
-
-        stem = stems;
-        for ( edge = edges; edge < edge_limit; edge++ )
-        {
-          AH_Segment  seg = edge->first;
-          AH_Segment  seg2;
-
-
-          do
-          {
-            seg2 = seg->link;
-            if ( valid_stem_segments( seg, seg2 ) )
-            {
-              AH_Edge  edge1 = seg->edge;
-              AH_Edge  edge2 = seg2->edge;
-
-
-              stem->edge1  = edge1;
-              stem->edge2  = edge2;
-              stem->opos   = edge1->opos;
-              stem->pos    = edge1->pos;
-              stem->owidth = edge2->opos - edge1->opos;
-              stem->width  = edge2->pos  - edge1->pos;
-
-              /* compute min_coord and max_coord */
-              {
-                FT_Pos  min_coord = seg->min_coord;
-                FT_Pos  max_coord = seg->max_coord;
-
-
-                if ( seg2->min_coord > min_coord )
-                  min_coord = seg2->min_coord;
-
-                if ( seg2->max_coord < max_coord )
-                  max_coord = seg2->max_coord;
-
-                stem->min_coord = min_coord;
-                stem->max_coord = max_coord;
-              }
-
-              /* compute minimum and maximum positions for stem --   */
-              /* note that the left-most/bottom-most stem has always */
-              /* a fixed position                                    */
-              if ( stem == stems || edge1->blue_edge || edge2->blue_edge )
-              {
-                /* this stem cannot move; it is snapped to a blue edge */
-                stem->min_pos = stem->pos;
-                stem->max_pos = stem->pos;
-              }
-              else
-              {
-                /* this edge can move; compute its min and max positions */
-                FT_Pos  pos1 = stem->opos;
-                FT_Pos  pos2 = pos1 + stem->owidth - stem->width;
-                FT_Pos  min1 = pos1 & -64;
-                FT_Pos  min2 = pos2 & -64;
-
-
-                stem->min_pos = min1;
-                stem->max_pos = min1 + 64;
-                if ( min2 < min1 )
-                  stem->min_pos = min2;
-                else
-                  stem->max_pos = min2 + 64;
-
-                /* XXX: just to see what it does */
-                stem->max_pos += 64;
-
-                /* just for the case where direct hinting did some */
-                /* incredible things (e.g. blue edge shifts)       */
-                if ( stem->min_pos > stem->pos )
-                  stem->min_pos = stem->pos;
-
-                if ( stem->max_pos < stem->pos )
-                  stem->max_pos = stem->pos;
-              }
-
-              stem->velocity = 0;
-              stem->force    = 0;
-
-              stem++;
-            }
-            seg = seg->edge_next;
-
-          } while ( seg != edge->first );
-        }
-      }
-
-      *p_stems     = stems;
-      *p_num_stems = num_stems;
-
-      edges      = outline->vert_edges;
-      edge_limit = edges + outline->num_vedges;
-      scale      = outline->x_scale;
-
-      p_stems     = &optimizer->vert_stems;
-      p_num_stems = &optimizer->num_vstems;
-    }
-
-  Exit:
-
-#ifdef AH_DEBUG_OPTIM
-    AH_Dump_Stems( optimizer );
-#endif
-
-    return error;
-  }
-
-
-  /* returns the spring area between two stems, 0 if none */
-  static FT_Pos
-  stem_spring_area( AH_Stem*  stem1,
-                    AH_Stem*  stem2 )
-  {
-    FT_Pos  area1 = stem1->max_coord - stem1->min_coord;
-    FT_Pos  area2 = stem2->max_coord - stem2->min_coord;
-    FT_Pos  min   = stem1->min_coord;
-    FT_Pos  max   = stem1->max_coord;
-    FT_Pos  area;
-
-
-    /* order stems */
-    if ( stem2->opos <= stem1->opos + stem1->owidth )
-      return 0;
-
-    if ( min < stem2->min_coord )
-      min = stem2->min_coord;
-
-    if ( max < stem2->max_coord )
-      max = stem2->max_coord;
-
-    area = ( max-min );
-    if ( 2 * area < area1 && 2 * area < area2 )
-      area = 0;
-
-    return area;
-  }
-
-
-  /* compute all springs in an outline */
-  static int
-  optim_compute_springs( AH_Optimizer*  optimizer )
-  {
-    /* basically, a spring exists between two stems if most of their */
-    /* surface is aligned                                            */
-    FT_Memory    memory  = optimizer->memory;
-
-    AH_Stem*     stems;
-    AH_Stem*     stem_limit;
-    AH_Stem*     stem;
-    int          dimension;
-    int          error = 0;
-
-    FT_Int*      p_num_springs;
-    AH_Spring**  p_springs;
-
-
-    stems      = optimizer->horz_stems;
-    stem_limit = stems + optimizer->num_hstems;
-
-    p_springs     = &optimizer->horz_springs;
-    p_num_springs = &optimizer->num_hsprings;
-
-    for ( dimension = 1; dimension >= 0; dimension-- )
-    {
-      FT_Int      num_springs = 0;
-      AH_Spring*  springs     = 0;
-
-
-      /* first of all, count stem springs */
-      for ( stem = stems; stem + 1 < stem_limit; stem++ )
-      {
-        AH_Stem*  stem2;
-
-
-        for ( stem2 = stem+1; stem2 < stem_limit; stem2++ )
-          if ( stem_spring_area( stem, stem2 ) )
-            num_springs++;
-      }
-
-      /* then allocate and build the springs table */
-      if ( num_springs > 0 )
-      {
-        AH_Spring*  spring;
-
-
-        /* allocate table of springs */
-        if ( FT_NEW_ARRAY( springs, num_springs ) )
-          goto Exit;
-
-        /* fill the springs table */
-        spring = springs;
-        for ( stem = stems; stem+1 < stem_limit; stem++ )
-        {
-          AH_Stem*  stem2;
-          FT_Pos    area;
-
-
-          for ( stem2 = stem + 1; stem2 < stem_limit; stem2++ )
-          {
-            area = stem_spring_area( stem, stem2 );
-            if ( area )
-            {
-              /* add a new spring here */
-              spring->stem1   = stem;
-              spring->stem2   = stem2;
-              spring->owidth  = stem2->opos - ( stem->opos + stem->owidth );
-              spring->tension = 0;
-
-              spring++;
-            }
-          }
-        }
-      }
-      *p_num_springs = num_springs;
-      *p_springs     = springs;
-
-      stems      = optimizer->vert_stems;
-      stem_limit = stems + optimizer->num_vstems;
-
-      p_springs     = &optimizer->vert_springs;
-      p_num_springs = &optimizer->num_vsprings;
-    }
-
-  Exit:
-
-#ifdef AH_DEBUG_OPTIM
-    AH_Dump_Springs( optimizer );
-#endif
-
-    return error;
-  }
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****   OPTIMIZE THROUGH MY STRANGE SIMULATED ANNEALING ALGO ;-)      ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#ifndef AH_BRUTE_FORCE
-
-  /* compute all spring tensions */
-  static void
-  optim_compute_tensions( AH_Optimizer*  optimizer )
-  {
-    AH_Spring*  spring = optimizer->springs;
-    AH_Spring*  limit  = spring + optimizer->num_springs;
-
-
-    for ( ; spring < limit; spring++ )
-    {
-      AH_Stem*  stem1 = spring->stem1;
-      AH_Stem*  stem2 = spring->stem2;
-      FT_Int    status;
-
-      FT_Pos  width;
-      FT_Pos  tension;
-      FT_Pos  sign;
-
-
-      /* compute the tension; it simply is -K*(new_width-old_width) */
-      width   = stem2->pos - ( stem1->pos + stem1->width );
-      tension = width - spring->owidth;
-
-      sign = 1;
-      if ( tension < 0 )
-      {
-        sign    = -1;
-        tension = -tension;
-      }
-
-      if ( width <= 0 )
-        tension = 32000;
-      else
-        tension = ( tension << 10 ) / width;
-
-      tension = -sign * FT_MulFix( tension, optimizer->tension_scale );
-      spring->tension = tension;
-
-      /* now, distribute tension among the englobing stems, if they */
-      /* are able to move                                           */
-      status = 0;
-      if ( stem1->pos <= stem1->min_pos )
-        status |= 1;
-      if ( stem2->pos >= stem2->max_pos )
-        status |= 2;
-
-      if ( !status )
-        tension /= 2;
-
-      if ( ( status & 1 ) == 0 )
-        stem1->force -= tension;
-
-      if ( ( status & 2 ) == 0 )
-        stem2->force += tension;
-    }
-  }
-
-
-  /* compute all stem movements -- returns 0 if nothing moved */
-  static int
-  optim_compute_stem_movements( AH_Optimizer*  optimizer )
-  {
-    AH_Stem*  stems = optimizer->stems;
-    AH_Stem*  limit = stems + optimizer->num_stems;
-    AH_Stem*  stem  = stems;
-    int       moved = 0;
-
-
-    /* set initial forces to velocity */
-    for ( stem = stems; stem < limit; stem++ )
-    {
-      stem->force     = stem->velocity;
-      stem->velocity /= 2;                  /* XXX: Heuristics */
-    }
-
-    /* compute the sum of forces applied on each stem */
-    optim_compute_tensions( optimizer );
-
-#ifdef AH_DEBUG_OPTIM
-    AH_Dump_Springs( optimizer );
-    AH_Dump_Stems2( optimizer );
-#endif
-
-    /* now, see whether something can move */
-    for ( stem = stems; stem < limit; stem++ )
-    {
-      if ( stem->force > optimizer->tension_threshold )
-      {
-        /* there is enough tension to move the stem to the right */
-        if ( stem->pos < stem->max_pos )
-        {
-          stem->pos     += 64;
-          stem->velocity = stem->force / 2;
-          moved          = 1;
-        }
-        else
-          stem->velocity = 0;
-      }
-      else if ( stem->force < optimizer->tension_threshold )
-      {
-        /* there is enough tension to move the stem to the left */
-        if ( stem->pos > stem->min_pos )
-        {
-          stem->pos     -= 64;
-          stem->velocity = stem->force / 2;
-          moved          = 1;
-        }
-        else
-          stem->velocity = 0;
-      }
-    }
-
-    /* return 0 if nothing moved */
-    return moved;
-  }
-
-#endif /* AH_BRUTE_FORCE */
-
-
-  /* compute current global distortion from springs */
-  static FT_Pos
-  optim_compute_distortion( AH_Optimizer*  optimizer )
-  {
-    AH_Spring*  spring = optimizer->springs;
-    AH_Spring*  limit  = spring + optimizer->num_springs;
-    FT_Pos      distortion = 0;
-
-
-    for ( ; spring < limit; spring++ )
-    {
-      AH_Stem*  stem1 = spring->stem1;
-      AH_Stem*  stem2 = spring->stem2;
-      FT_Pos  width;
-
-      width  = stem2->pos - ( stem1->pos + stem1->width );
-      width -= spring->owidth;
-      if ( width < 0 )
-        width = -width;
-
-      distortion += width;
-    }
-
-    return distortion;
-  }
-
-
-  /* record stems configuration in `best of' history */
-  static void
-  optim_record_configuration( AH_Optimizer*  optimizer )
-  {
-    FT_Pos             distortion;
-    AH_Configuration*  configs = optimizer->configs;
-    AH_Configuration*  limit   = configs + optimizer->num_configs;
-    AH_Configuration*  config;
-
-
-    distortion = optim_compute_distortion( optimizer );
-    LOG(( "config distortion = %.1f ", FLOAT( distortion * 64 ) ));
-
-    /* check that we really need to add this configuration to our */
-    /* sorted history                                             */
-    if ( limit > configs && limit[-1].distortion < distortion )
-    {
-      LOG(( "ejected\n" ));
-      return;
-    }
-
-    /* add new configuration at the end of the table */
-    {
-      int  n;
-
-
-      config = limit;
-      if ( optimizer->num_configs < AH_MAX_CONFIGS )
-        optimizer->num_configs++;
-      else
-        config--;
-
-      config->distortion = distortion;
-
-      for ( n = 0; n < optimizer->num_stems; n++ )
-        config->positions[n] = optimizer->stems[n].pos;
-    }
-
-    /* move the current configuration towards the front of the list */
-    /* when necessary -- yes this is slow bubble sort ;-)           */
-    while ( config > configs && config[0].distortion < config[-1].distortion )
-    {
-      AH_Configuration  temp;
-
-
-      config--;
-      temp      = config[0];
-      config[0] = config[1];
-      config[1] = temp;
-    }
-    LOG(( "recorded!\n" ));
-  }
-
-
-#ifdef AH_BRUTE_FORCE
-
-  /* optimize outline in a single direction */
-  static void
-  optim_compute( AH_Optimizer*  optimizer )
-  {
-    int       n;
-    FT_Bool   moved;
-
-    AH_Stem*  stem  = optimizer->stems;
-    AH_Stem*  limit = stem + optimizer->num_stems;
-
-
-    /* empty, exit */
-    if ( stem >= limit )
-      return;
-
-    optimizer->num_configs = 0;
-
-    stem = optimizer->stems;
-    for ( ; stem < limit; stem++ )
-      stem->pos = stem->min_pos;
-
-    do
-    {
-      /* record current configuration */
-      optim_record_configuration( optimizer );
-
-      /* now change configuration */
-      moved = 0;
-      for ( stem = optimizer->stems; stem < limit; stem++ )
-      {
-        if ( stem->pos < stem->max_pos )
-        {
-          stem->pos += 64;
-          moved      = 1;
-          break;
-        }
-
-        stem->pos = stem->min_pos;
-      }
-    } while ( moved );
-
-    /* now, set the best stem positions */
-    for ( n = 0; n < optimizer->num_stems; n++ )
-    {
-      AH_Stem*  stem = optimizer->stems + n;
-      FT_Pos    pos  = optimizer->configs[0].positions[n];
-
-
-      stem->edge1->pos = pos;
-      stem->edge2->pos = pos + stem->width;
-
-      stem->edge1->flags |= AH_EDGE_DONE;
-      stem->edge2->flags |= AH_EDGE_DONE;
-    }
-  }
-
-#else /* AH_BRUTE_FORCE */
-
-  /* optimize outline in a single direction */
-  static void
-  optim_compute( AH_Optimizer*  optimizer )
-  {
-    int  n, counter, counter2;
-
-
-    optimizer->num_configs       = 0;
-    optimizer->tension_scale     = 0x80000L;
-    optimizer->tension_threshold = 64;
-
-    /* record initial configuration threshold */
-    optim_record_configuration( optimizer );
-
-    counter = 0;
-    for ( counter2 = optimizer->num_stems*8; counter2 >= 0; counter2-- )
-    {
-      if ( counter == 0 )
-        counter = 2 * optimizer->num_stems;
-
-      if ( !optim_compute_stem_movements( optimizer ) )
-        break;
-
-      optim_record_configuration( optimizer );
-
-      counter--;
-      if ( counter == 0 )
-        optimizer->tension_scale /= 2;
-    }
-
-    /* now, set the best stem positions */
-    for ( n = 0; n < optimizer->num_stems; n++ )
-    {
-      AH_Stem*  stem = optimizer->stems + n;
-      FT_Pos    pos  = optimizer->configs[0].positions[n];
-
-
-      stem->edge1->pos = pos;
-      stem->edge2->pos = pos + stem->width;
-
-      stem->edge1->flags |= AH_EDGE_DONE;
-      stem->edge2->flags |= AH_EDGE_DONE;
-    }
-  }
-
-#endif /* AH_BRUTE_FORCE */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****   HIGH-LEVEL OPTIMIZER API                                      ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* releases the optimization data */
-  void
-  AH_Optimizer_Done( AH_Optimizer*  optimizer )
-  {
-    if ( optimizer )
-    {
-      FT_Memory  memory = optimizer->memory;
-
-
-      FT_FREE( optimizer->horz_stems );
-      FT_FREE( optimizer->vert_stems );
-      FT_FREE( optimizer->horz_springs );
-      FT_FREE( optimizer->vert_springs );
-      FT_FREE( optimizer->positions );
-    }
-  }
-
-
-  /* loads the outline into the optimizer */
-  int
-  AH_Optimizer_Init( AH_Optimizer*  optimizer,
-                     AH_Outline     outline,
-                     FT_Memory      memory )
-  {
-    FT_Error  error;
-
-
-    FT_MEM_ZERO( optimizer, sizeof ( *optimizer ) );
-    optimizer->outline = outline;
-    optimizer->memory  = memory;
-
-    LOG(( "initializing new optimizer\n" ));
-    /* compute stems and springs */
-    error = optim_compute_stems  ( optimizer ) ||
-            optim_compute_springs( optimizer );
-    if ( error )
-      goto Fail;
-
-    /* allocate stem positions history and configurations */
-    {
-      int  n, max_stems;
-
-
-      max_stems = optimizer->num_hstems;
-      if ( max_stems < optimizer->num_vstems )
-        max_stems = optimizer->num_vstems;
-
-      if ( FT_NEW_ARRAY( optimizer->positions, max_stems * AH_MAX_CONFIGS ) )
-        goto Fail;
-
-      optimizer->num_configs = 0;
-      for ( n = 0; n < AH_MAX_CONFIGS; n++ )
-        optimizer->configs[n].positions = optimizer->positions +
-                                          n * max_stems;
-    }
-
-    return error;
-
-  Fail:
-    AH_Optimizer_Done( optimizer );
-    return error;
-  }
-
-
-  /* compute optimal outline */
-  void
-  AH_Optimizer_Compute( AH_Optimizer*  optimizer )
-  {
-    optimizer->num_stems   = optimizer->num_hstems;
-    optimizer->stems       = optimizer->horz_stems;
-    optimizer->num_springs = optimizer->num_hsprings;
-    optimizer->springs     = optimizer->horz_springs;
-
-    if ( optimizer->num_springs > 0 )
-    {
-      LOG(( "horizontal optimization ------------------------\n" ));
-      optim_compute( optimizer );
-    }
-
-    optimizer->num_stems   = optimizer->num_vstems;
-    optimizer->stems       = optimizer->vert_stems;
-    optimizer->num_springs = optimizer->num_vsprings;
-    optimizer->springs     = optimizer->vert_springs;
-
-    if ( optimizer->num_springs )
-    {
-      LOG(( "vertical optimization --------------------------\n" ));
-      optim_compute( optimizer );
-    }
-  }
-
-
-/* END */
diff --git a/reactos/lib/freetype/src/autohint/ahoptim.h b/reactos/lib/freetype/src/autohint/ahoptim.h
deleted file mode 100644
index d7862ba9656..00000000000
--- a/reactos/lib/freetype/src/autohint/ahoptim.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ahoptim.h                                                              */
-/*                                                                         */
-/*    FreeType auto hinting outline optimization (declaration).            */
-/*                                                                         */
-/*  Copyright 2000-2001 Catharon Productions Inc.                          */
-/*  Author: David Turner                                                   */
-/*                                                                         */
-/*  This file is part of the Catharon Typography Project and shall only    */
-/*  be used, modified, and distributed under the terms of the Catharon     */
-/*  Open Source License that should come with this file under the name     */
-/*  `CatharonLicense.txt'.  By continuing to use, modify, or distribute    */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/*  Note that this license is compatible with the FreeType license.        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __AHOPTIM_H__
-#define __AHOPTIM_H__
-
-
-#include <ft2build.h>
-#include "ahtypes.h"
-
-
-FT_BEGIN_HEADER
-
-
-  /* the maximal number of stem configurations to record */
-  /* during optimization                                 */
-#define AH_MAX_CONFIGS  8
-
-
-  typedef struct  AH_Stem_
-  {
-    FT_Pos   pos;       /* current position        */
-    FT_Pos   velocity;  /* current velocity        */
-    FT_Pos   force;     /* sum of current forces   */
-    FT_Pos   width;     /* normalized width        */
-
-    FT_Pos   min_pos;   /* minimum grid position */
-    FT_Pos   max_pos;   /* maximum grid position */
-
-    AH_Edge  edge1;     /* left/bottom edge */
-    AH_Edge  edge2;     /* right/top edge   */
-
-    FT_Pos   opos;      /* original position */
-    FT_Pos   owidth;    /* original width    */
-
-    FT_Pos   min_coord; /* minimum coordinate */
-    FT_Pos   max_coord; /* maximum coordinate */
-
-  } AH_Stem;
-
-
-  /* A spring between two stems */
-  typedef struct  AH_Spring_
-  {
-    AH_Stem*  stem1;
-    AH_Stem*  stem2;
-    FT_Pos    owidth;   /* original width  */
-    FT_Pos    tension;  /* current tension */
-
-  } AH_Spring;
-
-
-  /* A configuration records the position of each stem at a given time  */
-  /* as well as the associated distortion                               */
-  typedef struct AH_Configuration_
-  {
-    FT_Pos*  positions;
-    FT_Long  distortion;
-
-  } AH_Configuration;
-
-
-  typedef struct  AH_Optimizer_
-  {
-    FT_Memory         memory;
-    AH_Outline        outline;
-
-    FT_Int            num_hstems;
-    AH_Stem*          horz_stems;
-
-    FT_Int            num_vstems;
-    AH_Stem*          vert_stems;
-
-    FT_Int            num_hsprings;
-    FT_Int            num_vsprings;
-    AH_Spring*        horz_springs;
-    AH_Spring*        vert_springs;
-
-    FT_Int            num_configs;
-    AH_Configuration  configs[AH_MAX_CONFIGS];
-    FT_Pos*           positions;
-
-    /* during each pass, use these instead */
-    FT_Int            num_stems;
-    AH_Stem*          stems;
-
-    FT_Int            num_springs;
-    AH_Spring*        springs;
-    FT_Bool           vertical;
-
-    FT_Fixed          tension_scale;
-    FT_Pos            tension_threshold;
-
-  } AH_Optimizer;
-
-
-  /* loads the outline into the optimizer */
-  int
-  AH_Optimizer_Init( AH_Optimizer*  optimizer,
-                     AH_Outline     outline,
-                     FT_Memory      memory );
-
-
-  /* compute optimal outline */
-  void
-  AH_Optimizer_Compute( AH_Optimizer*  optimizer );
-
-
-  /* release the optimization data */
-  void
-  AH_Optimizer_Done( AH_Optimizer*  optimizer );
-
-
-FT_END_HEADER
-
-#endif /* __AHOPTIM_H__ */
-
-
-/* END */
diff --git a/reactos/lib/freetype/src/autohint/ahtypes.h b/reactos/lib/freetype/src/autohint/ahtypes.h
index fb1458617da..c748b661318 100644
--- a/reactos/lib/freetype/src/autohint/ahtypes.h
+++ b/reactos/lib/freetype/src/autohint/ahtypes.h
@@ -5,7 +5,7 @@
 /*    General types and definitions for the auto-hint module               */
 /*    (specification only).                                                */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 Catharon Productions Inc.                    */
+/*  Copyright 2000-2001, 2002, 2003 Catharon Productions Inc.              */
 /*  Author: David Turner                                                   */
 /*                                                                         */
 /*  This file is part of the Catharon Typography Project and shall only    */
@@ -76,16 +76,6 @@ FT_BEGIN_HEADER
 #undef AH_OPTION_NO_WEAK_INTERPOLATION
 
 
-  /*************************************************************************/
-  /*                                                                       */
-  /* If this option is defined, only weak interpolation will be used to    */
-  /* place the points between edges.  Otherwise, `strong' points are       */
-  /* detected and later hinted through strong interpolation to correct     */
-  /* some unpleasant artefacts.                                            */
-  /*                                                                       */
-#undef AH_OPTION_NO_STRONG_INTERPOLATION
-
-
   /*************************************************************************/
   /*                                                                       */
   /* Undefine this macro if you don't want to hint the metrics.  There is  */
@@ -121,7 +111,7 @@ FT_BEGIN_HEADER
   /*************************************************************************/
 
 
-  /* see agangles.h */
+  /* see ahangles.h */
   typedef FT_Int  AH_Angle;
 
 
@@ -201,10 +191,6 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    out_dir   :: The direction of the outwards vector (point->next).   */
   /*                                                                       */
-  /*    in_angle  :: The angle of the inwards vector.                      */
-  /*                                                                       */
-  /*    out_angle :: The angle of the outwards vector.                     */
-  /*                                                                       */
   /*    next      :: The next point in same contour.                       */
   /*                                                                       */
   /*    prev      :: The previous point in same contour.                   */
@@ -220,9 +206,6 @@ FT_BEGIN_HEADER
     AH_Direction  in_dir;   /* direction of inwards vector  */
     AH_Direction  out_dir;  /* direction of outwards vector */
 
-    AH_Angle      in_angle;
-    AH_Angle      out_angle;
-
     AH_Point      next;     /* next point in contour     */
     AH_Point      prev;     /* previous point in contour */
 
@@ -244,16 +227,9 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    dir        :: The segment direction.                               */
   /*                                                                       */
-  /*    first      :: The first point in the segment.                      */
+  /*    min_coord  :: The minimum coordinate of the segment.               */
   /*                                                                       */
-  /*    last       :: The last point in the segment.                       */
-  /*                                                                       */
-  /*    contour    :: A pointer to the first point of the segment's        */
-  /*                  contour.                                             */
-  /*                                                                       */
-  /*    pos        :: The segment position in font units.                  */
-  /*                                                                       */
-  /*    size       :: The segment size.                                    */
+  /*    max_coord  :: The maximum coordinate of the segment.               */
   /*                                                                       */
   /*    edge       :: The edge of the current segment.                     */
   /*                                                                       */
@@ -267,15 +243,17 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    score      :: Used to score the segment when selecting them.       */
   /*                                                                       */
+  /*    first      :: The first point in the segment.                      */
+  /*                                                                       */
+  /*    last       :: The last point in the segment.                       */
+  /*                                                                       */
+  /*    contour    :: A pointer to the first point of the segment's        */
+  /*                  contour.                                             */
+  /*                                                                       */
   typedef struct  AH_SegmentRec_
   {
     AH_Edge_Flags  flags;
     AH_Direction   dir;
-
-    AH_Point       first;       /* first point in edge segment             */
-    AH_Point       last;        /* last point in edge segment              */
-    AH_Point*      contour;     /* ptr to first point of segment's contour */
-
     FT_Pos         pos;         /* position of segment           */
     FT_Pos         min_coord;   /* minimum coordinate of segment */
     FT_Pos         max_coord;   /* maximum coordinate of segment */
@@ -288,6 +266,10 @@ FT_BEGIN_HEADER
     FT_Pos         num_linked;  /* number of linked segments  */
     FT_Pos         score;
 
+    AH_Point       first;       /* first point in edge segment             */
+    AH_Point       last;        /* last point in edge segment              */
+    AH_Point*      contour;     /* ptr to first point of segment's contour */
+
   } AH_SegmentRec;
 
 
@@ -302,50 +284,55 @@ FT_BEGIN_HEADER
   /*    located on it.                                                     */
   /*                                                                       */
   /* <Fields>                                                              */
-  /*    flags      :: The segment edge flags (straight, rounded, etc.).    */
-  /*                                                                       */
-  /*    dir        :: The main segment direction on this edge.             */
-  /*                                                                       */
-  /*    first      :: The first edge segment.                              */
-  /*                                                                       */
-  /*    last       :: The last edge segment.                               */
-  /*                                                                       */
   /*    fpos       :: The original edge position in font units.            */
   /*                                                                       */
   /*    opos       :: The original scaled edge position.                   */
   /*                                                                       */
   /*    pos        :: The hinted edge position.                            */
   /*                                                                       */
+  /*    flags      :: The segment edge flags (straight, rounded, etc.).    */
+  /*                                                                       */
+  /*    dir        :: The main segment direction on this edge.             */
+  /*                                                                       */
+  /*    scale      :: Scaling factor between original and hinted edge      */
+  /*                  positions.                                           */
+  /*                                                                       */
+  /*    blue_edge  :: Indicate the blue zone edge this edge is related to. */
+  /*                  Only set for some of the horizontal edges in a latin */
+  /*                  font.                                                */
+  /*                                                                       */
   /*    link       :: The linked edge.                                     */
   /*                                                                       */
   /*    serif      :: The serif edge.                                      */
   /*                                                                       */
-  /*    num_paired :: The number of other edges that pair to this one.     */
+  /*    num_linked :: The number of other edges that pair to this one.     */
   /*                                                                       */
   /*    score      :: Used to score the edge when selecting them.          */
   /*                                                                       */
-  /*    blue_edge  :: Indicate the blue zone edge this edge is related to. */
-  /*                  Only set for some of the horizontal edges in a Latin */
-  /*                  font.                                                */
+  /*    first      :: The first edge segment.                              */
+  /*                                                                       */
+  /*    last       :: The last edge segment.                               */
   /*                                                                       */
   typedef struct  AH_EdgeRec_
   {
-    AH_Edge_Flags  flags;
-    AH_Direction   dir;
-
-    AH_Segment     first;
-    AH_Segment     last;
-
     FT_Pos         fpos;
     FT_Pos         opos;
     FT_Pos         pos;
 
+    AH_Edge_Flags  flags;
+    AH_Direction   dir;
+    FT_Fixed       scale;
+    FT_Pos*        blue_edge;
+
     AH_Edge        link;
     AH_Edge        serif;
     FT_Int         num_linked;
 
     FT_Int         score;
-    FT_Pos*        blue_edge;
+
+    AH_Segment     first;
+    AH_Segment     last;
+
 
   } AH_EdgeRec;
 
@@ -368,7 +355,7 @@ FT_BEGIN_HEADER
 
     FT_Int        max_contours;
     FT_Int        num_contours;
-    AH_Point *    contours;
+    AH_Point*     contours;
 
     FT_Int        num_hedges;
     AH_Edge       horz_edges;
@@ -387,24 +374,24 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_CHESTER_SMALL_F
 
-#  define AH_BLUE_CAPITAL_TOP     0                              /* THEZOCQS */
-#  define AH_BLUE_CAPITAL_BOTTOM  ( AH_BLUE_CAPITAL_TOP + 1 )    /* HEZLOCUS */
-#  define AH_BLUE_SMALL_F_TOP     ( AH_BLUE_CAPITAL_BOTTOM + 1 ) /* fijkdbh  */
-#  define AH_BLUE_SMALL_TOP       ( AH_BLUE_SMALL_F_TOP + 1 )    /* xzroesc  */
-#  define AH_BLUE_SMALL_BOTTOM    ( AH_BLUE_SMALL_TOP + 1 )      /* xzroesc  */
-#  define AH_BLUE_SMALL_MINOR     ( AH_BLUE_SMALL_BOTTOM + 1 )   /* pqgjy    */
-#  define AH_BLUE_MAX             ( AH_BLUE_SMALL_MINOR + 1 )
+#define AH_BLUE_CAPITAL_TOP     0                              /* THEZOCQS */
+#define AH_BLUE_CAPITAL_BOTTOM  ( AH_BLUE_CAPITAL_TOP + 1 )    /* HEZLOCUS */
+#define AH_BLUE_SMALL_F_TOP     ( AH_BLUE_CAPITAL_BOTTOM + 1 ) /* fijkdbh  */
+#define AH_BLUE_SMALL_TOP       ( AH_BLUE_SMALL_F_TOP + 1 )    /* xzroesc  */
+#define AH_BLUE_SMALL_BOTTOM    ( AH_BLUE_SMALL_TOP + 1 )      /* xzroesc  */
+#define AH_BLUE_SMALL_MINOR     ( AH_BLUE_SMALL_BOTTOM + 1 )   /* pqgjy    */
+#define AH_BLUE_MAX             ( AH_BLUE_SMALL_MINOR + 1 )
 
-#else /* !CHESTER_SMALL_F */
+#else /* !FT_CONFIG_CHESTER_SMALL_F */
 
-#  define AH_BLUE_CAPITAL_TOP     0                              /* THEZOCQS */
-#  define AH_BLUE_CAPITAL_BOTTOM  ( AH_BLUE_CAPITAL_TOP + 1 )    /* HEZLOCUS */
-#  define AH_BLUE_SMALL_TOP       ( AH_BLUE_CAPITAL_BOTTOM + 1)  /* xzroesc  */
-#  define AH_BLUE_SMALL_BOTTOM    ( AH_BLUE_SMALL_TOP + 1 )      /* xzroesc  */
-#  define AH_BLUE_SMALL_MINOR     ( AH_BLUE_SMALL_BOTTOM + 1 )   /* pqgjy    */
-#  define AH_BLUE_MAX             ( AH_BLUE_SMALL_MINOR + 1 )
+#define AH_BLUE_CAPITAL_TOP     0                              /* THEZOCQS */
+#define AH_BLUE_CAPITAL_BOTTOM  ( AH_BLUE_CAPITAL_TOP + 1 )    /* HEZLOCUS */
+#define AH_BLUE_SMALL_TOP       ( AH_BLUE_CAPITAL_BOTTOM + 1 ) /* xzroesc  */
+#define AH_BLUE_SMALL_BOTTOM    ( AH_BLUE_SMALL_TOP + 1 )      /* xzroesc  */
+#define AH_BLUE_SMALL_MINOR     ( AH_BLUE_SMALL_BOTTOM + 1 )   /* pqgjy    */
+#define AH_BLUE_MAX             ( AH_BLUE_SMALL_MINOR + 1 )
 
-#endif /* !CHESTER_SMALL_F */
+#endif /* !FT_CONFIG_CHESTER_SMALL_F */
 
   typedef FT_Int  AH_Blue;
 
@@ -429,6 +416,9 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    num_heights :: The number of heights.                              */
   /*                                                                       */
+  /*    stds        :: A two-element array giving the default stem width   */
+  /*                   and height.                                         */
+  /*                                                                       */
   /*    widths      :: Snap widths, including standard one.                */
   /*                                                                       */
   /*    heights     :: Snap height, including standard one.                */
@@ -474,6 +464,9 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    y_scale :: The current vertical scale.                             */
   /*                                                                       */
+  /*    control_overshoot ::                                               */
+  /*               Currently unused.                                       */
+  /*                                                                       */
   typedef struct  AH_Face_GlobalsRec_
   {
     FT_Face        face;
@@ -486,39 +479,39 @@ FT_BEGIN_HEADER
   } AH_Face_GlobalsRec, *AH_Face_Globals;
 
 
-  typedef struct  AH_HinterRec
+  typedef struct  AH_HinterRec_
   {
-    FT_Memory         memory;
-    AH_Hinter_Flags   flags;
+    FT_Memory        memory;
+    AH_Hinter_Flags  flags;
 
-    FT_Int            algorithm;
-    FT_Face           face;
+    FT_Int           algorithm;
+    FT_Face          face;
 
-    AH_Face_Globals   globals;
+    AH_Face_Globals  globals;
 
-    AH_Outline        glyph;
+    AH_Outline       glyph;
 
-    AH_Loader         loader;
-    FT_Vector         pp1;
-    FT_Vector         pp2;
+    AH_Loader        loader;
+    FT_Vector        pp1;
+    FT_Vector        pp2;
 
-    FT_Bool           transformed;
-    FT_Vector         trans_delta;
-    FT_Matrix         trans_matrix;
+    FT_Bool          transformed;
+    FT_Vector        trans_delta;
+    FT_Matrix        trans_matrix;
 
-    FT_Bool           do_horz_hints;     /* disable X hinting            */
-    FT_Bool           do_vert_hints;     /* disable Y hinting            */
-    FT_Bool           do_horz_snapping;  /* disable X stem size snapping */
-    FT_Bool           do_vert_snapping;  /* disable Y stem size snapping */
-    FT_Bool           do_stem_adjust;    /* disable light stem snapping  */
+    FT_Bool          do_horz_hints;     /* disable X hinting            */
+    FT_Bool          do_vert_hints;     /* disable Y hinting            */
+    FT_Bool          do_horz_snapping;  /* disable X stem size snapping */
+    FT_Bool          do_vert_snapping;  /* disable Y stem size snapping */
+    FT_Bool          do_stem_adjust;    /* disable light stem snapping  */
 
   } AH_HinterRec, *AH_Hinter;
 
 
-#ifdef  DEBUG_HINTER
-  extern AH_Hinter   ah_debug_hinter;
-  extern FT_Bool     ah_debug_disable_horz;
-  extern FT_Bool     ah_debug_disable_vert;
+#ifdef DEBUG_HINTER
+  extern AH_Hinter  ah_debug_hinter;
+  extern FT_Bool    ah_debug_disable_horz;
+  extern FT_Bool    ah_debug_disable_vert;
 #else
 #define ah_debug_disable_horz  0
 #define ah_debug_disable_vert  0
diff --git a/reactos/lib/freetype/src/autohint/descrip.mms b/reactos/lib/freetype/src/autohint/descrip.mms
deleted file mode 100644
index 72039cc68c5..00000000000
--- a/reactos/lib/freetype/src/autohint/descrip.mms
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# FreeType 2 auto-hinter module compilation rules for VMS
-#
-
-
-# Copyright 2001, 2002 Catharon Productions Inc.
-#
-# This file is part of the Catharon Typography Project and shall only
-# be used, modified, and distributed under the terms of the Catharon
-# Open Source License that should come with this file under the name
-# `CatharonLicense.txt'.  By continuing to use, modify, or distribute
-# this file you indicate that you have read the license and
-# understand and accept it fully.
-#
-# Note that this license is compatible with the FreeType license.
-
-
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/incl=([--.include],[--.src.autohint])
-
-OBJS=autohint.obj
-
-all : $(OBJS)
-        library [--.lib]freetype.olb $(OBJS)
-
-# EOF
diff --git a/reactos/lib/freetype/src/autohint/rules.mk b/reactos/lib/freetype/src/autohint/rules.mk
index 6dcaa20d0fd..ee264e86221 100644
--- a/reactos/lib/freetype/src/autohint/rules.mk
+++ b/reactos/lib/freetype/src/autohint/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2000, 2001 Catharon Productions Inc.
+# Copyright 2000, 2001, 2002, 2003 Catharon Productions Inc.
 # Author: David Turner
 #
 # This file is part of the Catharon Typography Project and shall only
@@ -18,29 +18,28 @@
 
 # AUTO driver directory
 #
-AUTO_DIR  := $(SRC_)autohint
-AUTO_DIR_ := $(AUTO_DIR)$(SEP)
+AUTO_DIR := $(SRC_DIR)/autohint
 
 
 # compilation flags for the driver
 #
-AUTO_COMPILE := $(FT_COMPILE) $I$(AUTO_DIR)
+AUTO_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(AUTO_DIR))
 
 
 # AUTO driver sources (i.e., C files)
 #
-AUTO_DRV_SRC := $(AUTO_DIR_)ahangles.c  \
-                $(AUTO_DIR_)ahglobal.c  \
-                $(AUTO_DIR_)ahglyph.c   \
-                $(AUTO_DIR_)ahhint.c    \
-                $(AUTO_DIR_)ahmodule.c
+AUTO_DRV_SRC := $(AUTO_DIR)/ahangles.c \
+                $(AUTO_DIR)/ahglobal.c \
+                $(AUTO_DIR)/ahglyph.c  \
+                $(AUTO_DIR)/ahhint.c   \
+                $(AUTO_DIR)/ahmodule.c
 
 # AUTO driver headers
 #
 AUTO_DRV_H := $(AUTO_DRV_SRC:%c=%h)  \
-              $(AUTO_DIR_)ahloader.h \
-              $(AUTO_DIR_)ahtypes.h \
-              $(AUTO_DIR_)aherrors.h
+              $(AUTO_DIR)/ahloader.h \
+              $(AUTO_DIR)/ahtypes.h  \
+              $(AUTO_DIR)/aherrors.h
 
 
 # AUTO driver object(s)
@@ -48,25 +47,25 @@ AUTO_DRV_H := $(AUTO_DRV_SRC:%c=%h)  \
 #   AUTO_DRV_OBJ_M is used during `multi' builds.
 #   AUTO_DRV_OBJ_S is used during `single' builds.
 #
-AUTO_DRV_OBJ_M := $(AUTO_DRV_SRC:$(AUTO_DIR_)%.c=$(OBJ_)%.$O)
-AUTO_DRV_OBJ_S := $(OBJ_)autohint.$O
+AUTO_DRV_OBJ_M := $(AUTO_DRV_SRC:$(AUTO_DIR)/%.c=$(OBJ_DIR)/%.$O)
+AUTO_DRV_OBJ_S := $(OBJ_DIR)/autohint.$O
 
 # AUTO driver source file for single build
 #
-AUTO_DRV_SRC_S := $(AUTO_DIR_)autohint.c
+AUTO_DRV_SRC_S := $(AUTO_DIR)/autohint.c
 
 
 # AUTO driver - single object
 #
 $(AUTO_DRV_OBJ_S): $(AUTO_DRV_SRC_S) $(AUTO_DRV_SRC) \
                    $(FREETYPE_H) $(AUTO_DRV_H)
-	$(AUTO_COMPILE) $T$@ $(AUTO_DRV_SRC_S)
+	$(AUTO_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(AUTO_DRV_SRC_S))
 
 
 # AUTO driver - multiple objects
 #
-$(OBJ_)%.$O: $(AUTO_DIR_)%.c $(FREETYPE_H) $(AUTO_DRV_H)
-	$(AUTO_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(AUTO_DIR)/%.c $(FREETYPE_H) $(AUTO_DRV_H)
+	$(AUTO_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
diff --git a/reactos/lib/freetype/src/base/Jamfile b/reactos/lib/freetype/src/base/Jamfile
index 5ebcd7caa17..fbb7b39d008 100644
--- a/reactos/lib/freetype/src/base/Jamfile
+++ b/reactos/lib/freetype/src/base/Jamfile
@@ -1,4 +1,4 @@
-# FreeType 2 src/base Jamfile (c) 2001, 2002 David Turner
+# FreeType 2 src/base Jamfile (c) 2001, 2002, 2003 David Turner
 #
 
 SubDir  FT2_TOP $(FT2_SRC_DIR) base ;
@@ -24,7 +24,7 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) base ;
 #
 Library  $(FT2_LIB) : ftsystem.c   ftinit.c    ftglyph.c  ftmm.c     ftbdf.c
                       ftbbox.c     ftdebug.c   ftxf86.c   fttype1.c  ftpfr.c
-                      ftstroker.c  ftwinfnt.c
+                      ftstroke.c   ftwinfnt.c
                       ;
 
 # Add Macintosh-specific file to the library when necessary.
diff --git a/reactos/lib/freetype/src/base/descrip.mms b/reactos/lib/freetype/src/base/descrip.mms
index 02a806a5f1b..cf69bdde4d8 100644
--- a/reactos/lib/freetype/src/base/descrip.mms
+++ b/reactos/lib/freetype/src/base/descrip.mms
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2001 by
+# Copyright 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,7 @@
 
 CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base])
 
-OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftbdf.obj,ftmm.obj,fttype1.obj,ftxf86.obj,ftpfr.obj,ftstroker.obj,ftwinfnt.obj
+OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftbdf.obj,ftmm.obj,fttype1.obj,ftxf86.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj
 
 all : $(OBJS)
         library [--.lib]freetype.olb $(OBJS)
diff --git a/reactos/lib/freetype/src/base/ftbase.c b/reactos/lib/freetype/src/base/ftbase.c
index 4ea846dc8cf..18a98c3a15c 100644
--- a/reactos/lib/freetype/src/base/ftbase.c
+++ b/reactos/lib/freetype/src/base/ftbase.c
@@ -30,5 +30,8 @@
 #include "ftobjs.c"
 #include "ftnames.c"
 
+#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
+#include "ftmac.c"
+#endif
 
 /* END */
diff --git a/reactos/lib/freetype/src/base/ftbbox.c b/reactos/lib/freetype/src/base/ftbbox.c
index dd445d810d6..f71c9f0dbfa 100644
--- a/reactos/lib/freetype/src/base/ftbbox.c
+++ b/reactos/lib/freetype/src/base/ftbbox.c
@@ -98,9 +98,9 @@
   static void
   BBox_Conic_Check( FT_Pos   y1,
                     FT_Pos   y2,
-                          FT_Pos   y3,
-                          FT_Pos*  min,
-                          FT_Pos*  max )
+                    FT_Pos   y3,
+                    FT_Pos*  min,
+                    FT_Pos*  max )
   {
     if ( y1 <= y3 )
     {
diff --git a/reactos/lib/freetype/src/base/ftbdf.c b/reactos/lib/freetype/src/base/ftbdf.c
index 3e76e9f32b8..63e3071c11d 100644
--- a/reactos/lib/freetype/src/base/ftbdf.c
+++ b/reactos/lib/freetype/src/base/ftbdf.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType API for accessing BDF-specific strings (body).              */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,13 +20,16 @@
 #include FT_INTERNAL_BDF_TYPES_H
 #include FT_INTERNAL_OBJECTS_H
 
+
   static FT_Bool
-  test_font_type( FT_Face face, const char*  name )
+  test_font_type( FT_Face      face,
+                  const char*  name )
   {
     if ( face && face->driver )
     {
       FT_Module  driver = (FT_Module)face->driver;
 
+
       if ( driver->clazz && driver->clazz->module_name )
       {
         if ( ft_strcmp( driver->clazz->module_name, name ) == 0 )
@@ -74,7 +77,8 @@
                        const char*       prop_name,
                        BDF_PropertyRec  *aproperty )
   {
-    FT_Error   error;
+    FT_Error  error;
+
 
     error = FT_Err_Invalid_Argument;
 
@@ -82,15 +86,21 @@
 
     if ( face != NULL && face->driver != NULL )
     {
-      FT_Driver              driver = face->driver;
-      BDF_GetPropertyFunc    func;
+      FT_Driver            driver = face->driver;
+      BDF_GetPropertyFunc  func;
 
-      func = (BDF_GetPropertyFunc) driver->root.clazz->get_interface(
-                             FT_MODULE( driver ), "get_bdf_property" );
-      if ( func )
-        error = func( face, prop_name, aproperty );
+
+      if ( driver->root.clazz->get_interface )
+      {
+        func = (BDF_GetPropertyFunc)driver->root.clazz->get_interface(
+                 FT_MODULE( driver ), "get_bdf_property" );
+        if ( func )
+          error = func( face, prop_name, aproperty );
+      }
     }
+
     return error;
   }
 
+
 /* END */
diff --git a/reactos/lib/freetype/src/base/ftcalc.c b/reactos/lib/freetype/src/base/ftcalc.c
index 6b78bc3e552..29a3a59fc04 100644
--- a/reactos/lib/freetype/src/base/ftcalc.c
+++ b/reactos/lib/freetype/src/base/ftcalc.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Arithmetic computations (body).                                      */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -168,7 +168,7 @@
     if ( a < 0 ) { a = -a; s = -1; }
     if ( b < 0 ) { b = -b; s = -s; }
 
-    c = (FT_Long)( ( (FT_Int64)a * b + 0x8000 ) >> 16 );
+    c = (FT_Long)( ( (FT_Int64)a * b + 0x8000L ) >> 16 );
     return ( s > 0 ) ? c : -c ;
   }
 
@@ -346,15 +346,15 @@
 
     if ( ua <= 2048 && ub <= 1048576L )
     {
-      ua = ( ua * ub + 0x8000 ) >> 16;
+      ua = ( ua * ub + 0x8000L ) >> 16;
     }
     else
     {
-      FT_ULong  al = ua & 0xFFFF;
+      FT_ULong  al = ua & 0xFFFFL;
 
 
       ua = ( ua >> 16 ) * ub +  al * ( ub >> 16 ) +
-           ( ( al * ( ub & 0xFFFF ) + 0x8000 ) >> 16 );
+           ( ( al * ( ub & 0xFFFFL ) + 0x8000L ) >> 16 );
     }
 
     return ( s < 0 ? -(FT_Long)ua : (FT_Long)ua );
diff --git a/reactos/lib/freetype/src/base/ftdbgmem.c b/reactos/lib/freetype/src/base/ftdbgmem.c
index 15d186a200d..dc4a1bbf2b4 100644
--- a/reactos/lib/freetype/src/base/ftdbgmem.c
+++ b/reactos/lib/freetype/src/base/ftdbgmem.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Memory debugger (body).                                              */
 /*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
+/*  Copyright 2001, 2002, 2003 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
diff --git a/reactos/lib/freetype/src/base/ftglyph.c b/reactos/lib/freetype/src/base/ftglyph.c
index dbd31ea8212..fad5a620daf 100644
--- a/reactos/lib/freetype/src/base/ftglyph.c
+++ b/reactos/lib/freetype/src/base/ftglyph.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType convenience functions to handle glyphs (body).              */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -57,7 +57,7 @@
 
   FT_EXPORT_DEF( void )
   FT_Matrix_Multiply( const FT_Matrix*  a,
-                      FT_Matrix*  b )
+                      FT_Matrix        *b )
   {
     FT_Fixed  xx, xy, yx, yy;
 
@@ -158,8 +158,8 @@
     glyph->left   = slot->bitmap_left;
     glyph->top    = slot->bitmap_top;
 
-    if ( slot->flags & FT_GLYPH_OWN_BITMAP )
-      slot->flags &= ~FT_GLYPH_OWN_BITMAP;
+    if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP )
+      slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP;
     else
     {
       /* copy the bitmap into a new buffer */
@@ -254,13 +254,13 @@
 
     /* copy it */
     FT_MEM_COPY( target->points, source->points,
-              source->n_points * sizeof ( FT_Vector ) );
+                 source->n_points * sizeof ( FT_Vector ) );
 
     FT_MEM_COPY( target->tags, source->tags,
-              source->n_points * sizeof ( FT_Byte ) );
+                 source->n_points * sizeof ( FT_Byte ) );
 
     FT_MEM_COPY( target->contours, source->contours,
-              source->n_contours * sizeof ( FT_Short ) );
+                 source->n_contours * sizeof ( FT_Short ) );
 
     /* copy all flags, except the `FT_OUTLINE_OWNER' one */
     target->flags = source->flags | FT_OUTLINE_OWNER;
@@ -541,7 +541,8 @@
         clazz->glyph_bbox( glyph, acbox );
 
         /* perform grid fitting if needed */
-        if ( bbox_mode & ft_glyph_bbox_gridfit )
+        if ( bbox_mode == FT_GLYPH_BBOX_GRIDFIT ||
+             bbox_mode == FT_GLYPH_BBOX_PIXELS  )
         {
           acbox->xMin &= -64;
           acbox->yMin &= -64;
@@ -550,7 +551,8 @@
         }
 
         /* convert to integer pixels if needed */
-        if ( bbox_mode & ft_glyph_bbox_truncate )
+        if ( bbox_mode == FT_GLYPH_BBOX_TRUNCATE ||
+             bbox_mode == FT_GLYPH_BBOX_PIXELS   )
         {
           acbox->xMin >>= 6;
           acbox->yMin >>= 6;
@@ -571,12 +573,13 @@
                       FT_Vector*      origin,
                       FT_Bool         destroy )
   {
-    FT_GlyphSlotRec  dummy;
-    FT_Error         error = FT_Err_Ok;
-    FT_Glyph         glyph;
-    FT_BitmapGlyph   bitmap = NULL;
+    FT_GlyphSlotRec           dummy;
+    FT_GlyphSlot_InternalRec  dummy_internal;
+    FT_Error                  error = FT_Err_Ok;
+    FT_Glyph                  glyph;
+    FT_BitmapGlyph            bitmap = NULL;
 
-    const FT_Glyph_Class*  clazz;
+    const FT_Glyph_Class*     clazz;
 
 
     /* check argument */
@@ -592,7 +595,7 @@
 
     clazz = glyph->clazz;
 
-    /* when called with a bitmap glyph, do nothing and return succesfully */
+    /* when called with a bitmap glyph, do nothing and return successfully */
     if ( clazz == &ft_bitmap_glyph_class )
       goto Exit;
 
@@ -600,8 +603,10 @@
       goto Bad;
 
     FT_MEM_ZERO( &dummy, sizeof ( dummy ) );
-    dummy.library = glyph->library;
-    dummy.format  = clazz->glyph_format;
+    FT_MEM_ZERO( &dummy_internal, sizeof ( dummy_internal ) );
+    dummy.internal = &dummy_internal;
+    dummy.library  = glyph->library;
+    dummy.format   = clazz->glyph_format;
 
     /* create result bitmap glyph */
     error = ft_new_glyph( glyph->library, &ft_bitmap_glyph_class,
@@ -609,7 +614,7 @@
     if ( error )
       goto Exit;
 
-#if 0
+#if 1
     /* if `origin' is set, translate the glyph image */
     if ( origin )
       FT_Glyph_Transform( glyph, 0, origin );
@@ -622,7 +627,7 @@
     if ( !error )
       error = FT_Render_Glyph_Internal( glyph->library, &dummy, render_mode );
 
-#if 0
+#if 1
     if ( !destroy && origin )
     {
       FT_Vector  v;
diff --git a/reactos/lib/freetype/src/base/ftmac.c b/reactos/lib/freetype/src/base/ftmac.c
index 2d37d397e03..04c03d99e31 100644
--- a/reactos/lib/freetype/src/base/ftmac.c
+++ b/reactos/lib/freetype/src/base/ftmac.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Mac FOND support.  Written by just@letterror.com.                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -62,15 +62,20 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_INTERNAL_STREAM_H
+
+#ifdef __GNUC__
+#include "../truetype/ttobjs.h"
+#include "../type1/t1objs.h"
+#include <Carbon/Carbon.h>
+#else
 #include "truetype/ttobjs.h"
 #include "type1/t1objs.h"
-
 #include <Resources.h>
 #include <Fonts.h>
 #include <Errors.h>
 #include <Files.h>
 #include <TextUtils.h>
-
+#endif
 
 #include FT_MAC_H
 
@@ -87,7 +92,7 @@
   file_spec_from_path( const char*  pathname,
                        FSSpec*      spec )
   {
-#if TARGET_API_MAC_CARBON
+#if defined( TARGET_API_MAC_CARBON ) && !defined( __MWERKS__ )
 
     OSErr  e;
     FSRef  ref;
@@ -135,7 +140,7 @@
   }
 
 
-#if TARGET_API_MAC_CARBON
+#ifdef TARGET_API_MAC_CARBON
 
   /* is this a Mac OS X .dfont file */
   static Boolean
@@ -144,8 +149,8 @@
     int  nameLen = spec->name[0];
 
 
-    return nameLen >= 6                                   &&
-           !memcmp( spec->name + nameLen - 5, ".dfont", 6 );
+    return nameLen >= 6                                      &&
+           !ft_memcmp( spec->name + nameLen - 5, ".dfont", 6 );
   }
 
 #endif
@@ -165,7 +170,7 @@
 
     while ( *q )
     {
-      if ( isupper( *q ) )
+      if ( ft_isupper( *q ) )
       {
         if ( count )
           max = 3;
@@ -304,7 +309,7 @@
 
         if ( ps_name_len != 0 )
         {
-          memcpy(ps_name, names[0] + 1, ps_name_len);
+          ft_memcpy(ps_name, names[0] + 1, ps_name_len);
           ps_name[ps_name_len] = 0;
         }
         if ( style->indexes[0] > 1 )
@@ -312,7 +317,7 @@
           unsigned char*  suffixes = names[style->indexes[0] - 1];
 
 
-          for ( i = 1; i < suffixes[0]; i++ )
+          for ( i = 1; i <= suffixes[0]; i++ )
           {
             unsigned char*  s;
             size_t          j = suffixes[i] - 1;
@@ -325,7 +330,7 @@
 
               if ( s_len != 0 && ps_name_len + s_len < sizeof ( ps_name ) )
               {
-                memcpy( ps_name + ps_name_len, s + 1, s_len );
+                ft_memcpy( ps_name + ps_name_len, s + 1, s_len );
                 ps_name_len += s_len;
                 ps_name[ps_name_len] = 0;
               }
@@ -541,11 +546,6 @@
     error = FT_Open_Face( library, &args, face_index, aface );
     if ( error == FT_Err_Ok )
       (*aface)->face_flags &= ~FT_FACE_FLAG_EXTERNAL_STREAM;
-    else
-    {
-      FT_Stream_CloseFunc( stream );
-      FT_FREE( stream );
-    }
 
     return error;
   }
@@ -588,6 +588,7 @@
     size_t     sfnt_size;
     FT_Error   error = 0;
     FT_Memory  memory = library->memory;
+    int        is_cff;
 
 
     sfnt = GetResource( 'sfnt', sfnt_id );
@@ -606,11 +607,16 @@
     HUnlock( sfnt );
     ReleaseResource( sfnt );
 
+    is_cff = sfnt_size > 4 && sfnt_data[0] == 'O' &&
+                              sfnt_data[1] == 'T' &&
+                              sfnt_data[2] == 'T' &&
+                              sfnt_data[3] == 'O';
+
     return open_face_from_buffer( library,
                                   sfnt_data,
                                   sfnt_size,
                                   face_index,
-                                  "truetype",
+                                  is_cff ? "cff" : "truetype",
                                   aface );
   }
 
@@ -656,7 +662,7 @@
   }
 
 
-#if TARGET_API_MAC_CARBON
+#ifdef TARGET_API_MAC_CARBON
 
   /* Create a new FT_Face from a file spec to a suitcase file. */
   static FT_Error
@@ -902,7 +908,7 @@
         return FT_New_Face_From_LWFN( library, &spec, face_index, aface );
     }
 
-#if TARGET_API_MAC_CARBON
+#ifdef TARGET_API_MAC_CARBON
 
     if ( is_dfont( &spec ) )
       return FT_New_Face_From_dfont( library, &spec, face_index, aface );
diff --git a/reactos/lib/freetype/src/base/ftobjs.c b/reactos/lib/freetype/src/base/ftobjs.c
index 40fd2860466..8fdcc883e1f 100644
--- a/reactos/lib/freetype/src/base/ftobjs.c
+++ b/reactos/lib/freetype/src/base/ftobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType private base classes (body).                            */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -198,16 +198,17 @@
     return error;
   }
 
+
   FT_BASE_DEF( void )
   ft_glyphslot_free_bitmap( FT_GlyphSlot  slot )
   {
-    if ( slot->flags & FT_GLYPH_OWN_BITMAP )
+    if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP )
     {
       FT_Memory  memory = FT_FACE_MEMORY( slot->face );
-      
-      
+
+
       FT_FREE( slot->bitmap.buffer );
-      slot->flags &= ~FT_GLYPH_OWN_BITMAP;
+      slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP;
     }
     else
     {
@@ -220,14 +221,14 @@
 
   FT_BASE_DEF( void )
   ft_glyphslot_set_bitmap( FT_GlyphSlot  slot,
-                           FT_Pointer    buffer )
+                           FT_Byte*      buffer )
   {
     ft_glyphslot_free_bitmap( slot );
-    
+
     slot->bitmap.buffer = buffer;
-    
-    FT_ASSERT( (slot->flags & FT_GLYPH_OWN_BITMAP) == 0 );
-  }                           
+
+    FT_ASSERT( (slot->internal->flags & FT_GLYPH_OWN_BITMAP) == 0 );
+  }
 
 
   FT_BASE_DEF( FT_Error )
@@ -235,15 +236,15 @@
                              FT_ULong      size )
   {
     FT_Memory  memory = FT_FACE_MEMORY( slot->face );
-    
-    
-    if ( slot->flags & FT_GLYPH_OWN_BITMAP )
+
+
+    if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP )
       FT_FREE( slot->bitmap.buffer );
     else
-      slot->flags |= FT_GLYPH_OWN_BITMAP;
-    
+      slot->internal->flags |= FT_GLYPH_OWN_BITMAP;
+
     return FT_MEM_ALLOC( slot->bitmap.buffer, size );
-  }                             
+  }
 
 
   static void
@@ -260,7 +261,7 @@
     slot->bitmap.rows  = 0;
     slot->bitmap.pitch = 0;
     slot->bitmap.pixel_mode = 0;
-    /* don't touch 'slot->bitmap.buffer' !! */
+    /* don't touch 'slot->bitmap.buffer'! */
 
     slot->bitmap_left   = 0;
     slot->bitmap_top    = 0;
@@ -426,23 +427,6 @@
   }
 
 
-  /* documentation is in freetype.h */
-
-  FT_EXPORT_DEF( void )
-  FT_Set_Hint_Flags( FT_Face     face,
-                     FT_ULong    flags )
-  {
-    FT_Face_Internal  internal;
-
-    if ( !face )
-      return;
-
-    internal = face->internal;
-
-    internal->hint_flags = (FT_UInt)flags;
-  }
-
-
   static FT_Renderer
   ft_lookup_glyph_renderer( FT_GlyphSlot  slot );
 
@@ -465,7 +449,7 @@
     if ( !face || !face->size || !face->glyph )
       return FT_Err_Invalid_Face_Handle;
 
-    if ( glyph_index > (FT_UInt)face->num_glyphs )
+    if ( glyph_index >= (FT_UInt)face->num_glyphs )
       return FT_Err_Invalid_Argument;
 
     slot = face->glyph;
@@ -560,7 +544,8 @@
     }
 
     /* compute the linear advance in 16.16 pixels */
-    if ( ( load_flags & FT_LOAD_LINEAR_DESIGN ) == 0 )
+    if ( ( load_flags & FT_LOAD_LINEAR_DESIGN ) == 0  &&
+         ( face->face_flags & FT_FACE_FLAG_SCALABLE ) )
     {
       FT_UInt           EM      = face->units_per_EM;
       FT_Size_Metrics*  metrics = &face->size->metrics;
@@ -748,11 +733,11 @@
   /* <Description>                                                         */
   /*    This function finds a Unicode charmap, if there is one.            */
   /*    And if there is more than one, it tries to favour the more         */
-  /*    extensive one, i.e. one that supports UCS-4 against those which    */
+  /*    extensive one, i.e., one that supports UCS-4 against those which   */
   /*    are limited to the BMP (said UCS-2 encoding.)                      */
   /*                                                                       */
   /*    This function is called from open_face() (just below), and also    */
-  /*    from FT_Select_Charmap( , FT_ENCODING_UNICODE).                    */
+  /*    from FT_Select_Charmap( ..., FT_ENCODING_UNICODE).                 */
   /*                                                                       */
   static FT_Error
   find_unicode_charmap( FT_Face  face )
@@ -771,26 +756,26 @@
       return FT_Err_Invalid_CharMap_Handle;
 
     /*
-     *  the original TrueType specification(s) only specified charmap
+     *  The original TrueType specification(s) only specified charmap
      *  formats that are capable of mapping 8 or 16 bit character codes to
      *  glyph indices.
      *
-     *  however, recent updates to the Apple and OpenType specifications
+     *  However, recent updates to the Apple and OpenType specifications
      *  introduced new formats that are capable of mapping 32-bit character
-     *  codes as well. And these are already used on some fonts, mainly to
+     *  codes as well.  And these are already used on some fonts, mainly to
      *  map non-BMP Asian ideographs as defined in Unicode.
      *
-     *  for compatibility purposes, these fonts generally come with
+     *  For compatibility purposes, these fonts generally come with
      *  *several* Unicode charmaps:
      *
-     *   - one of them in the "old" 16-bit format, that cannot access
-     *     all glyphs in the font
+     *   - One of them in the "old" 16-bit format, that cannot access
+     *     all glyphs in the font.
      *
-     *   - another one in the "new" 32-bit format, that can access all
+     *   - Another one in the "new" 32-bit format, that can access all
      *     the glyphs.
      *
-     *  this function has been written to always favor a 32-bit charmap
-     *  when found. Otherwise, a 16-bit one is returned when found
+     *  This function has been written to always favor a 32-bit charmap
+     *  when found.  Otherwise, a 16-bit one is returned when found.
      */
 
     /* since the `interesting' table, with id's 3,10, is normally the */
@@ -848,10 +833,10 @@
              FT_Long        face_index,
              FT_Int         num_params,
              FT_Parameter*  params,
-             FT_Face*       aface )
+             FT_Face       *aface )
   {
     FT_Memory         memory;
-    FT_Driver_Class  clazz;
+    FT_Driver_Class   clazz;
     FT_Face           face = 0;
     FT_Error          error, error2;
     FT_Face_Internal  internal;
@@ -897,11 +882,10 @@
     /* select Unicode charmap by default */
     error2 = find_unicode_charmap( face );
 
-    /* if no Unicode charmap can be found, FT_Err_Invalid_CharMap_Handle is
-     * returned.
-     */
+    /* if no Unicode charmap can be found, FT_Err_Invalid_CharMap_Handle */
+    /* is returned.                                                      */
 
-    /* no error should happen, but we want to play safe. */
+    /* no error should happen, but we want to play safe */
     if ( error2 && error2 != FT_Err_Invalid_CharMap_Handle )
     {
       error = error2;
@@ -914,7 +898,7 @@
     if ( error )
     {
       clazz->done_face( face );
-      FT_FREE( face->internal );
+      FT_FREE( internal );
       FT_FREE( face );
       *aface = 0;
     }
@@ -976,6 +960,587 @@
   }
 
 
+#if !defined( FT_MACINTOSH ) && defined( FT_CONFIG_OPTION_MAC_FONTS )
+
+  /* The behavior here is very similar to that in base/ftmac.c, but it     */
+  /* is designed to work on non-mac systems, so no mac specific calls.     */
+  /*                                                                       */
+  /* We look at the file and determine if it is a mac dfont file or a mac  */
+  /* resource file, or a macbinary file containing a mac resource file.    */
+  /*                                                                       */
+  /* Unlike ftmac I'm not going to look at a `FOND'.  I don't really see   */
+  /* the point, especially since there may be multiple `FOND' resources.   */
+  /* Instead I'll just look for `sfnt' and `POST' resources, ordered as    */
+  /* they occur in the file.                                               */
+  /*                                                                       */
+  /* Note that multiple `POST' resources do not mean multiple postscript   */
+  /* fonts; they all get jammed together to make what is essentially a     */
+  /* pfb file.                                                             */
+  /*                                                                       */
+  /* We aren't interested in `NFNT' or `FONT' bitmap resources.            */
+  /*                                                                       */
+  /* As soon as we get an `sfnt' load it into memory and pass it off to    */
+  /* FT_Open_Face.                                                         */
+  /*                                                                       */
+  /* If we have a (set of) `POST' resources, massage them into a (memory)  */
+  /* pfb file and pass that to FT_Open_Face.  (As with ftmac.c I'm not     */
+  /* going to try to save the kerning info.  After all that lives in the   */
+  /* `FOND' which isn't in the file containing the `POST' resources so     */
+  /* we don't really have access to it.                                    */
+
+
+  /* Finalizer for a memory stream; gets called by FT_Done_Face().
+     It frees the memory it uses. */
+  /* from ftmac.c */
+  static void
+  memory_stream_close( FT_Stream  stream )
+  {
+    FT_Memory  memory = stream->memory;
+
+
+    FT_FREE( stream->base );
+
+    stream->size  = 0;
+    stream->base  = 0;
+    stream->close = 0;
+  }
+
+
+  /* Create a new memory stream from a buffer and a size. */
+  /* from ftmac.c */
+  static FT_Error
+  new_memory_stream( FT_Library           library,
+                     FT_Byte*             base,
+                     FT_ULong             size,
+                     FT_Stream_CloseFunc  close,
+                     FT_Stream           *astream )
+  {
+    FT_Error   error;
+    FT_Memory  memory;
+    FT_Stream  stream;
+
+
+    if ( !library )
+      return FT_Err_Invalid_Library_Handle;
+
+    if ( !base )
+      return FT_Err_Invalid_Argument;
+
+    *astream = 0;
+    memory = library->memory;
+    if ( FT_NEW( stream ) )
+      goto Exit;
+
+    FT_Stream_OpenMemory( stream, base, size );
+
+    stream->close = close;
+
+    *astream = stream;
+
+  Exit:
+    return error;
+  }
+
+
+  /* Create a new FT_Face given a buffer and a driver name. */
+  /* from ftmac.c */
+  static FT_Error
+  open_face_from_buffer( FT_Library   library,
+                         FT_Byte*     base,
+                         FT_ULong     size,
+                         FT_Long      face_index,
+                         const char*  driver_name,
+                         FT_Face     *aface )
+  {
+    FT_Open_Args  args;
+    FT_Error      error;
+    FT_Stream     stream;
+    FT_Memory     memory = library->memory;
+
+
+    error = new_memory_stream( library,
+                               base,
+                               size,
+                               memory_stream_close,
+                               &stream );
+    if ( error )
+    {
+      FT_FREE( base );
+      return error;
+    }
+
+    args.flags = FT_OPEN_STREAM;
+    args.stream = stream;
+    if ( driver_name )
+    {
+      args.flags = args.flags | FT_OPEN_DRIVER;
+      args.driver = FT_Get_Module( library, driver_name );
+    }
+
+    error = FT_Open_Face( library, &args, face_index, aface );
+
+    if ( error == FT_Err_Ok )
+      (*aface)->face_flags &= ~FT_FACE_FLAG_EXTERNAL_STREAM;
+    else
+    {
+      FT_Stream_Close( stream );
+      FT_FREE( stream );
+    }
+
+    return error;
+  }
+
+
+  /* The resource header says we've got resource_cnt `POST' (type1) */
+  /* resources in this file.  They all need to be coalesced into    */
+  /* one lump which gets passed on to the type1 driver.             */
+  /* Here can be only one PostScript font in a file so face_index   */
+  /* must be 0 (or -1).                                             */
+  /*                                                                */
+  static FT_Error
+  Mac_Read_POST_Resource( FT_Library  library,
+                          FT_Stream   stream,
+                          FT_Long     resource_listoffset,
+                          FT_Long     resource_cnt,
+                          FT_Long     resource_data,
+                          FT_Long     face_index,
+                          FT_Face    *aface )
+  {
+    FT_Error   error  = FT_Err_Cannot_Open_Resource;
+    FT_Memory  memory = library->memory;
+    FT_Byte*   pfb_data;
+    int        i, type, flags, len;
+    FT_Long    pfb_len, pfb_pos, pfb_lenpos;
+    FT_Long    rlen, junk, temp;
+    FT_Long   *offsets;
+
+
+    if ( face_index == -1 )
+      face_index = 0;
+    if ( face_index != 0 )
+      return error;
+
+    if ( FT_ALLOC( offsets, (FT_Long)resource_cnt * sizeof ( FT_Long ) ) )
+      return error;
+
+    error = FT_Stream_Seek( stream, resource_listoffset );
+    if ( error )
+      goto Exit;
+
+    /* Find all the POST resource offsets */
+    for ( i = 0; i < resource_cnt; ++i )
+    {
+      (void)FT_READ_USHORT( junk ); /* resource id */
+      (void)FT_READ_USHORT( junk ); /* rsource name */
+      if ( FT_READ_LONG( temp ) )
+        goto Exit;
+      offsets[i] = resource_data + ( temp & 0xFFFFFFL );
+      (void)FT_READ_LONG( junk );   /* mbz */
+    }
+
+    /* Find the length of all the POST resources, concatenated.  Assume */
+    /* worst case (each resource in its own section).                   */
+    pfb_len = 0;
+    for ( i = 0; i < resource_cnt; ++i )
+    {
+      error = FT_Stream_Seek( stream, offsets[i] );
+      if ( error )
+        goto Exit;
+      if ( FT_READ_LONG( temp ) )
+        goto Exit;
+      pfb_len += temp + 6;
+    }
+
+    if ( FT_ALLOC( pfb_data, (FT_Long)pfb_len + 2 ) )
+      goto Exit;
+
+    pfb_pos             = 0;
+    pfb_data[pfb_pos++] = 0x80;
+    pfb_data[pfb_pos++] = 1;            /* Ascii section */
+    pfb_lenpos          = pfb_pos;
+    pfb_data[pfb_pos++] = 0;            /* 4-byte length, fill in later */
+    pfb_data[pfb_pos++] = 0;
+    pfb_data[pfb_pos++] = 0;
+    pfb_data[pfb_pos++] = 0;
+
+    len = 0;
+    type = 1;
+    for ( i = 0; i < resource_cnt; ++i )
+    {
+      error = FT_Stream_Seek( stream, offsets[i] );
+      if ( error )
+        goto Exit2;
+      if ( FT_READ_LONG( rlen ) )
+        goto Exit;
+      if ( FT_READ_USHORT( flags ) )
+        goto Exit;
+      rlen -= 2;                    /* the flags are part of the resource */
+      if ( ( flags >> 8 ) == type )
+        len += rlen;
+      else
+      {
+        pfb_data[pfb_lenpos    ] =   len         & 0xFF;
+        pfb_data[pfb_lenpos + 1] = ( len >>  8 ) & 0xFF;
+        pfb_data[pfb_lenpos + 2] = ( len >> 16 ) & 0xFF;
+        pfb_data[pfb_lenpos + 3] = ( len >> 24 ) & 0xFF;
+
+        if ( ( flags >> 8 ) == 5 )      /* End of font mark */
+          break;
+
+        pfb_data[pfb_pos++] = 0x80;
+
+        type = flags >> 8;
+        len = rlen;
+
+        pfb_data[pfb_pos++] = type;
+        pfb_lenpos          = pfb_pos;
+        pfb_data[pfb_pos++] = 0;        /* 4-byte length, fill in later */
+        pfb_data[pfb_pos++] = 0;
+        pfb_data[pfb_pos++] = 0;
+        pfb_data[pfb_pos++] = 0;
+      }
+
+      error = FT_Stream_Read( stream, (FT_Byte *)pfb_data + pfb_pos, rlen );
+      pfb_pos += rlen;
+    }
+
+    pfb_data[pfb_pos++] = 0x80;
+    pfb_data[pfb_pos++] = 3;
+
+    pfb_data[pfb_lenpos    ] =   len         & 0xFF;
+    pfb_data[pfb_lenpos + 1] = ( len >>  8 ) & 0xFF;
+    pfb_data[pfb_lenpos + 2] = ( len >> 16 ) & 0xFF;
+    pfb_data[pfb_lenpos + 3] = ( len >> 24 ) & 0xFF;
+
+    return open_face_from_buffer( library,
+                                  pfb_data,
+                                  pfb_pos,
+                                  face_index,
+                                  "type1",
+                                  aface );
+
+  Exit2:
+    FT_FREE( pfb_data );
+
+  Exit:
+    FT_FREE( offsets );
+    return error;
+  }
+
+
+  /* The resource header says we've got resource_cnt `sfnt'      */
+  /* (TrueType/OpenType) resources in this file.  Look through   */
+  /* them for the one indicated by face_index, load it into mem, */
+  /* pass it on the the truetype driver and return it.           */
+  /*                                                             */
+  static FT_Error
+  Mac_Read_sfnt_Resource( FT_Library  library,
+                          FT_Stream   stream,
+                          FT_Long     resource_listoffset,
+                          FT_Long     resource_cnt,
+                          FT_Long     resource_data,
+                          FT_Long     face_index,
+                          FT_Face    *aface )
+  {
+    FT_Memory  memory = library->memory;
+    FT_Byte*   sfnt_data;
+    FT_Error   error;
+    int        i;
+    FT_Long    flag_offset= 0xFFFFFFL;
+    FT_Long    rlen, junk;
+    int        is_cff;
+
+
+    if ( face_index == -1 )
+      face_index = 0;
+    if ( face_index >= resource_cnt )
+      return FT_Err_Cannot_Open_Resource;
+
+    error = FT_Stream_Seek( stream, resource_listoffset );
+    if ( error )
+      goto Exit;
+
+    for ( i = 0; i <= face_index; ++i )
+    {
+      (void)FT_READ_USHORT( junk );     /* resource id */
+      (void)FT_READ_USHORT( junk );     /* rsource name */
+      if ( FT_READ_LONG( flag_offset ) )
+        goto Exit;
+      flag_offset &= 0xFFFFFFL;
+      (void)FT_READ_LONG( junk );       /* mbz */
+    }
+
+    if ( flag_offset == 0xFFFFFFL )
+      return FT_Err_Cannot_Open_Resource;
+
+    error = FT_Stream_Seek( stream, flag_offset + resource_data );
+    if ( error )
+      goto Exit;
+    if ( FT_READ_LONG( rlen ) )
+      goto Exit;
+    if ( rlen == -1 )
+      return FT_Err_Cannot_Open_Resource;
+
+    if ( FT_ALLOC( sfnt_data, (FT_Long)rlen ) )
+      return error;
+    error = FT_Stream_Read( stream, (FT_Byte *)sfnt_data, rlen );
+    if ( error )
+      goto Exit;
+
+    is_cff = rlen > 4 && sfnt_data[0] == 'O' &&
+                         sfnt_data[1] == 'T' &&
+                         sfnt_data[2] == 'T' &&
+                         sfnt_data[3] == 'O';
+
+    error = open_face_from_buffer( library,
+                                   sfnt_data,
+                                   rlen,
+                                   face_index,
+                                   is_cff ? "cff" : "truetype",
+                                   aface );
+
+  Exit:
+    return error;
+  }
+
+
+  /* Check for a valid resource fork header, or a valid dfont    */
+  /* header.  In a resource fork the first 16 bytes are repeated */
+  /* at the location specified by bytes 4-7.  In a dfont bytes   */
+  /* 4-7 point to 16 bytes of zeroes instead.                    */
+  /*                                                             */
+  static FT_Error
+  IsMacResource( FT_Library  library,
+                 FT_Stream   stream,
+                 FT_Long     resource_offset,
+                 FT_Long     face_index,
+                 FT_Face    *aface )
+  {
+    FT_Error       error;
+    unsigned char  head[16], head2[16];
+    FT_Long        rdata_pos, map_pos, rdata_len, map_len;
+    int            allzeros, allmatch, i, cnt, subcnt;
+    FT_Long        type_list, tag, rpos, junk;
+
+
+    error = FT_Stream_Seek( stream, resource_offset );
+    if ( error )
+      goto Exit;
+    error = FT_Stream_Read( stream, (FT_Byte *)head, 16 );
+    if ( error )
+      goto Exit;
+
+    rdata_pos = resource_offset + ( ( head[0] << 24 ) |
+                                    ( head[1] << 16 ) |
+                                    ( head[2] <<  8 ) |
+                                      head[3]         );
+    map_pos   = resource_offset + ( ( head[4] << 24 ) |
+                                    ( head[5] << 16 ) |
+                                    ( head[6] <<  8 ) |
+                                      head[7]         );
+    rdata_len = ( head[ 8] << 24 ) |
+                ( head[ 9] << 16 ) |
+                ( head[10] <<  8 ) |
+                  head[11];
+    map_len   = ( head[12] << 24 ) |
+                ( head[13] << 16 ) |
+                ( head[14] <<  8 ) |
+                  head[15];
+
+    if ( rdata_pos + rdata_len != map_pos || map_pos == resource_offset )
+      return FT_Err_Unknown_File_Format;
+
+    error = FT_Stream_Seek( stream, map_pos );
+    if ( error )
+      goto Exit;
+
+    head2[15] = head[15] + 1;       /* make it be different */
+
+    error = FT_Stream_Read( stream, (FT_Byte*)head2, 16 );
+    if ( error )
+      goto Exit;
+
+    allzeros = 1;
+    allmatch = 1;
+    for ( i = 0; i < 16; ++i )
+    {
+      if ( head2[i] != 0 )
+        allzeros = 0;
+      if ( head2[i] != head[i] )
+        allmatch = 0;
+    }
+    if ( !allzeros && !allmatch )
+      return FT_Err_Unknown_File_Format;
+
+    /* If we've gotten this far then it's probably a mac resource file. */
+    /* Now, does it contain any interesting resources?                  */
+
+    (void)FT_READ_LONG( junk );    /* skip handle to next resource map */
+    (void)FT_READ_USHORT( junk );  /* skip file resource number */
+    (void)FT_READ_USHORT( junk );  /* skip attributes */
+
+    if ( FT_READ_USHORT( type_list ) )
+      goto Exit;
+    if ( type_list == -1 )
+      return FT_Err_Unknown_File_Format;
+
+    error = FT_Stream_Seek( stream, map_pos + type_list );
+    if ( error )
+      goto Exit;
+
+    if ( FT_READ_USHORT( cnt ) )
+      goto Exit;
+
+    ++cnt;
+    for ( i = 0; i < cnt; ++i )
+    {
+      if ( FT_READ_LONG( tag )      ||
+           FT_READ_USHORT( subcnt ) ||
+           FT_READ_USHORT( rpos )   )
+        goto Exit;
+
+      ++subcnt;
+      rpos += map_pos + type_list;
+      if ( tag == FT_MAKE_TAG( 'P', 'O', 'S', 'T' ) )
+        return Mac_Read_POST_Resource( library,
+                                       stream,
+                                       rpos,
+                                       subcnt,
+                                       rdata_pos,
+                                       face_index,
+                                       aface );
+      else if ( tag == FT_MAKE_TAG( 's', 'f', 'n', 't' ) )
+        return Mac_Read_sfnt_Resource( library,
+                                       stream,
+                                       rpos,
+                                       subcnt,
+                                       rdata_pos,
+                                       face_index,
+                                       aface );
+    }
+
+    error = FT_Err_Cannot_Open_Resource; /* this file contains no
+                                            interesting resources */
+  Exit:
+    return error;
+  }
+
+
+  /* Check for a valid macbinary header, and if we find one   */
+  /* check that the (flattened) resource fork in it is valid. */
+  /*                                                          */
+  static FT_Error
+  IsMacBinary( FT_Library  library,
+               FT_Stream   stream,
+               FT_Long     face_index,
+               FT_Face    *aface )
+  {
+    unsigned char  header[128];
+    FT_Error       error;
+    FT_Long        dlen, offset;
+
+
+    error = FT_Stream_Seek( stream, 0 );
+    if ( error )
+      goto Exit;
+
+    error = FT_Stream_Read( stream, (FT_Byte*)header, 128 );
+    if ( error )
+      goto Exit;
+
+    if (            header[ 0] !=  0 ||
+                    header[74] !=  0 ||
+                    header[82] !=  0 ||
+                    header[ 1] ==  0 ||
+                    header[ 1] >  33 ||
+                    header[63] !=  0 ||
+         header[2 + header[1]] !=  0 )
+      return FT_Err_Unknown_File_Format;
+
+    dlen = ( header[0x53] << 24 ) |
+           ( header[0x54] << 16 ) |
+           ( header[0x55] <<  8 ) |
+             header[0x56];
+#if 0
+    rlen = ( header[0x57] << 24 ) |
+           ( header[0x58] << 16 ) |
+           ( header[0x59] <<  8 ) |
+             header[0x5a];
+#endif /* 0 */
+    offset = 128 + ( ( dlen + 127 ) & ~127 );
+
+    return IsMacResource( library, stream, offset, face_index, aface );
+
+  Exit:
+    return error;
+  }
+
+
+  /* Check for some macintosh formats                              */
+  /* Is this a macbinary file?  If so look at the resource fork.   */
+  /* Is this a mac dfont file?                                     */
+  /* Is this an old style resource fork? (in data)                 */
+  /* Else if we're on Mac OS/X, open the resource fork explicitly. */
+  /*                                                               */
+  static FT_Error
+  load_mac_face( FT_Library           library,
+                 FT_Stream            stream,
+                 FT_Long              face_index,
+                 FT_Face             *aface,
+                 const FT_Open_Args  *args )
+  {
+    FT_Error error;
+    FT_UNUSED( args );
+
+
+    error = IsMacBinary( library, stream, face_index, aface );
+    if ( FT_ERROR_BASE( error ) == FT_Err_Unknown_File_Format )
+      error = IsMacResource( library, stream, 0, face_index, aface );
+
+#ifdef FT_MACINTOSH
+    /*
+       I know this section is within code which is normally turned off 
+       for the Mac.  It provides an alternative approach to reading the
+       mac resource forks on OS/X in the event that a user does not wish
+       to compile ftmac.c.
+     */
+         
+    if ( ( FT_ERROR_BASE( error ) == FT_Err_Unknown_File_Format      ||
+           FT_ERROR_BASE( error ) == FT_Err_Invalid_Stream_Operation )  &&
+           ( args->flags & FT_OPEN_PATHNAME )                           )
+    {
+      FT_Open_Args  args2;
+      char*         newpath;
+      FT_Memory     memory;
+      FT_Stream     stream2;
+
+
+      memory = library->memory;
+
+      FT_ALLOC( newpath,
+                ft_strlen( args->pathname ) + ft_strlen( "/rsrc" ) + 1 );
+      ft_strcpy( newpath, args->pathname );
+      ft_strcat( newpath, "/rsrc" );
+
+      args2.flags    = FT_OPEN_PATHNAME;
+      args2.pathname = (char*)newpath;
+      error = ft_input_stream_new( library, &args2, &stream2 );
+      if ( !error )
+      {
+        error = IsMacResource( library, stream2, 0, face_index, aface );
+        FT_Stream_Close( stream2 );
+      }
+      FT_FREE( newpath );
+    }
+
+#endif  /* FT_MACINTOSH */
+
+    return error;
+  }
+
+#endif  /* !FT_MACINTOSH && FT_CONFIG_OPTION_MAC_FONTS */
+
+
   /* documentation is in freetype.h */
 
   FT_EXPORT_DEF( FT_Error )
@@ -1066,15 +1631,40 @@
           }
 
           error = open_face( driver, stream, face_index,
-                            num_params, params, &face );
+                             num_params, params, &face );
           if ( !error )
             goto Success;
 
           if ( FT_ERROR_BASE( error ) != FT_Err_Unknown_File_Format )
-            goto Fail2;
+            goto Fail3;
         }
       }
 
+  Fail3:
+    /* If we are on the mac, and we get an FT_Err_Invalid_Stream_Operation */
+    /* it may be because we have an empty data fork, so we need to check   */
+    /* the resource fork.                                                  */
+    if ( FT_ERROR_BASE( error ) != FT_Err_Unknown_File_Format      &&
+         FT_ERROR_BASE( error ) != FT_Err_Invalid_Stream_Operation )
+      goto Fail2;
+
+#ifndef FT_MACINTOSH
+    error = load_mac_face( library, stream, face_index, aface, args );
+    if ( !error )
+    {
+      /* We don't want to go to Success here.  We've already done that. */
+      /* On the other hand, if we succeeded we still need to close this */
+      /* stream (we opened a different stream which extracted the       */
+      /* interesting information out of this stream here.  That stream  */
+      /* will still be open and the face will point to it).             */
+      ft_input_stream_free( stream, external_stream );
+      return error;
+    }
+
+    if ( FT_ERROR_BASE( error ) != FT_Err_Unknown_File_Format )
+      goto Fail2;
+#endif  /* !FT_MACINTOSH */
+
       /* no driver is able to handle this format */
       error = FT_Err_Unknown_File_Format;
 
@@ -1403,6 +1993,7 @@
 
     driver  = face->driver;
     metrics = &face->size->metrics;
+    clazz   = driver->clazz;
 
     if ( !char_width )
       char_width = char_height;
@@ -1416,17 +2007,13 @@
     if ( !vert_resolution )
       vert_resolution = 72;
 
-    driver = face->driver;
-    clazz  = driver->clazz;
-
     /* default processing -- this can be overridden by the driver */
     if ( char_width  < 1 * 64 )
       char_width  = 1 * 64;
     if ( char_height < 1 * 64 )
       char_height = 1 * 64;
 
-   /* Compute pixel sizes in 26.6 units. we use rounding
-    */
+    /* Compute pixel sizes in 26.6 units with rounding */
     dim_x = ( ( char_width  * horz_resolution + (36+32*72) ) / 72 ) & -64;
     dim_y = ( ( char_height * vert_resolution + (36+32*72) ) / 72 ) & -64;
 
@@ -1464,14 +2051,15 @@
     FT_Error          error = FT_Err_Ok;
     FT_Driver         driver;
     FT_Driver_Class   clazz;
-    FT_Size_Metrics*  metrics = &face->size->metrics;
+    FT_Size_Metrics*  metrics;
 
 
     if ( !face || !face->size || !face->driver )
       return FT_Err_Invalid_Face_Handle;
 
-    driver = face->driver;
-    clazz  = driver->clazz;
+    driver  = face->driver;
+    metrics = &face->size->metrics;
+    clazz   = driver->clazz;
 
     /* default processing -- this can be overridden by the driver */
     if ( pixel_width == 0 )
@@ -1570,10 +2158,10 @@
     if ( !face )
       return FT_Err_Invalid_Face_Handle;
 
-    /* FT_ENCODING_UNICODE is special. We try to find the `best' Unicode */
-    /* charmap available, i.e. one with UCS-4 characters, if possible.   */
-    /*                                                                   */
-    /* This is done by find_unicode_charmap() above, to share code.      */
+    /* FT_ENCODING_UNICODE is special.  We try to find the `best' Unicode */
+    /* charmap available, i.e., one with UCS-4 characters, if possible.   */
+    /*                                                                    */
+    /* This is done by find_unicode_charmap() above, to share code.       */
     if ( encoding == FT_ENCODING_UNICODE )
       return find_unicode_charmap( face );
 
@@ -1661,7 +2249,7 @@
       return FT_Err_Invalid_Argument;
 
     face   = charmap->face;
-    memory = FT_FACE_MEMORY(face);
+    memory = FT_FACE_MEMORY( face );
 
     if ( !FT_ALLOC( cmap, clazz->size ) )
     {
@@ -1717,7 +2305,6 @@
   }
 
 
-
   /* documentation is in freetype.h */
 
   FT_EXPORT_DEF( FT_ULong )
@@ -1741,8 +2328,8 @@
     return result;
   }
 
-  /* documentation is in freetype.h */
 
+  /* documentation is in freetype.h */
 
   FT_EXPORT_DEF( FT_ULong )
   FT_Get_Next_Char( FT_Face   face,
@@ -1770,7 +2357,6 @@
   }
 
 
-
   /* documentation is in freetype.h */
 
   FT_EXPORT_DEF( FT_UInt )
@@ -1906,11 +2492,11 @@
   /* documentation is in tttables.h */
 
   FT_EXPORT_DEF( FT_Error )
-  FT_Load_Sfnt_Table( FT_Face      face,
-                      FT_ULong     tag,
-                      FT_Long      offset,
-                      FT_Byte*     buffer,
-                      FT_ULong*    length )
+  FT_Load_Sfnt_Table( FT_Face    face,
+                      FT_ULong   tag,
+                      FT_Long    offset,
+                      FT_Byte*   buffer,
+                      FT_ULong*  length )
   {
     SFNT_Load_Table_Func  func;
     FT_Driver             driver;
diff --git a/reactos/lib/freetype/src/base/ftpfr.c b/reactos/lib/freetype/src/base/ftpfr.c
index bf2c2a2a5c9..d9594cb788a 100644
--- a/reactos/lib/freetype/src/base/ftpfr.c
+++ b/reactos/lib/freetype/src/base/ftpfr.c
@@ -2,9 +2,9 @@
 /*                                                                         */
 /*  ftpfr.c                                                                */
 /*                                                                         */
-/*    FreeType API for accessing PFR-specific data                         */
+/*    FreeType API for accessing PFR-specific data (body).                 */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,18 +20,20 @@
 #include FT_INTERNAL_OBJECTS_H
 
 
- /* check the format */
+  /* check the format */
   static FT_Error
-  ft_pfr_check( FT_Face           face,
-                FT_PFR_Service   *aservice )
+  ft_pfr_check( FT_Face          face,
+                FT_PFR_Service  *aservice )
   {
     FT_Error  error = FT_Err_Bad_Argument;
 
+
     if ( face && face->driver )
     {
       FT_Module    module = (FT_Module) face->driver;
       const char*  name   = module->clazz->module_name;
 
+
       if ( name[0] == 'p' &&
            name[1] == 'f' &&
            name[2] == 'r' &&
@@ -45,17 +47,17 @@
   }
 
 
-
   FT_EXPORT_DEF( FT_Error )
-  FT_Get_PFR_Metrics( FT_Face     face,
-                      FT_UInt    *aoutline_resolution,
-                      FT_UInt    *ametrics_resolution,
-                      FT_Fixed   *ametrics_x_scale,
-                      FT_Fixed   *ametrics_y_scale )
+  FT_Get_PFR_Metrics( FT_Face    face,
+                      FT_UInt   *aoutline_resolution,
+                      FT_UInt   *ametrics_resolution,
+                      FT_Fixed  *ametrics_x_scale,
+                      FT_Fixed  *ametrics_y_scale )
   {
     FT_Error        error;
     FT_PFR_Service  service;
 
+
     error = ft_pfr_check( face, &service );
     if ( !error )
     {
@@ -68,6 +70,7 @@
     return error;
   }
 
+
   FT_EXPORT_DEF( FT_Error )
   FT_Get_PFR_Kerning( FT_Face     face,
                       FT_UInt     left,
@@ -77,6 +80,7 @@
     FT_Error        error;
     FT_PFR_Service  service;
 
+
     error = ft_pfr_check( face, &service );
     if ( !error )
     {
@@ -87,13 +91,14 @@
 
 
   FT_EXPORT_DEF( FT_Error )
-  FT_Get_PFR_Advance( FT_Face    face,
-                      FT_UInt    gindex,
-                      FT_Pos    *aadvance )
+  FT_Get_PFR_Advance( FT_Face   face,
+                      FT_UInt   gindex,
+                      FT_Pos   *aadvance )
   {
     FT_Error        error;
     FT_PFR_Service  service;
 
+
     error = ft_pfr_check( face, &service );
     if ( !error )
     {
@@ -102,4 +107,5 @@
     return error;
   }
 
+
 /* END */
diff --git a/reactos/lib/freetype/src/base/ftstroker.c b/reactos/lib/freetype/src/base/ftstroke.c
similarity index 69%
rename from reactos/lib/freetype/src/base/ftstroker.c
rename to reactos/lib/freetype/src/base/ftstroke.c
index 712020e78f2..d6d5be3211e 100644
--- a/reactos/lib/freetype/src/base/ftstroker.c
+++ b/reactos/lib/freetype/src/base/ftstroke.c
@@ -1,9 +1,28 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftstroke.c                                                             */
+/*                                                                         */
+/*    FreeType path stroker (body).                                        */
+/*                                                                         */
+/*  Copyright 2002, 2003 by                                                */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
 #include <ft2build.h>
 #include FT_STROKER_H
 #include FT_TRIGONOMETRY_H
 #include FT_INTERNAL_MEMORY_H
 #include FT_INTERNAL_DEBUG_H
 
+
  /***************************************************************************/
  /***************************************************************************/
  /*****                                                                 *****/
@@ -12,18 +31,20 @@
  /***************************************************************************/
  /***************************************************************************/
 
-#define FT_SMALL_CONIC_THRESHOLD   (FT_ANGLE_PI/6)
-#define FT_SMALL_CUBIC_THRESHOLD   (FT_ANGLE_PI/6)
+#define FT_SMALL_CONIC_THRESHOLD  ( FT_ANGLE_PI / 6 )
+#define FT_SMALL_CUBIC_THRESHOLD  ( FT_ANGLE_PI / 6 )
 #define FT_EPSILON  2
 
-#define FT_IS_SMALL(x)  ((x) > -FT_EPSILON && (x) < FT_EPSILON)
+#define FT_IS_SMALL( x )  ( (x) > -FT_EPSILON && (x) < FT_EPSILON )
+
 
   static FT_Pos
   ft_pos_abs( FT_Pos  x )
   {
-    return  x >= 0 ? x : -x ;
+    return x >= 0 ? x : -x ;
   }
 
+
   static void
   ft_conic_split( FT_Vector*  base )
   {
@@ -32,15 +53,15 @@
 
     base[4].x = base[2].x;
     b = base[1].x;
-    a = base[3].x = ( base[2].x + b )/2;
-    b = base[1].x = ( base[0].x + b )/2;
-    base[2].x = ( a + b )/2;
+    a = base[3].x = ( base[2].x + b ) / 2;
+    b = base[1].x = ( base[0].x + b ) / 2;
+    base[2].x = ( a + b ) / 2;
 
     base[4].y = base[2].y;
     b = base[1].y;
-    a = base[3].y = ( base[2].y + b )/2;
-    b = base[1].y = ( base[0].y + b )/2;
-    base[2].y = ( a + b )/2;
+    a = base[3].y = ( base[2].y + b ) / 2;
+    b = base[1].y = ( base[0].y + b ) / 2;
+    base[2].y = ( a + b ) / 2;
   }
 
 
@@ -53,22 +74,23 @@
     FT_Angle   theta;
     FT_Int     close1, close2;
 
+
     d1.x = base[1].x - base[2].x;
     d1.y = base[1].y - base[2].y;
     d2.x = base[0].x - base[1].x;
     d2.y = base[0].y - base[1].y;
 
-    close1 = FT_IS_SMALL(d1.x) && FT_IS_SMALL(d1.y);
-    close2 = FT_IS_SMALL(d2.x) && FT_IS_SMALL(d2.y);
+    close1 = FT_IS_SMALL( d1.x ) && FT_IS_SMALL( d1.y );
+    close2 = FT_IS_SMALL( d2.x ) && FT_IS_SMALL( d2.y );
 
-    if (close1)
+    if ( close1 )
     {
-      if (close2)
+      if ( close2 )
         *angle_in = *angle_out = 0;
       else
         *angle_in = *angle_out = FT_Atan2( d2.x, d2.y );
     }
-    else if (close2)
+    else if ( close2 )
     {
       *angle_in = *angle_out = FT_Atan2( d1.x, d1.y );
     }
@@ -93,22 +115,22 @@
     base[6].x = base[3].x;
     c = base[1].x;
     d = base[2].x;
-    base[1].x = a = ( base[0].x + c )/2;
-    base[5].x = b = ( base[3].x + d )/2;
-    c = ( c + d )/2;
-    base[2].x = a = ( a + c )/2;
-    base[4].x = b = ( b + c )/2;
-    base[3].x = ( a + b )/2;
+    base[1].x = a = ( base[0].x + c ) / 2;
+    base[5].x = b = ( base[3].x + d ) / 2;
+    c = ( c + d ) / 2;
+    base[2].x = a = ( a + c ) / 2;
+    base[4].x = b = ( b + c ) / 2;
+    base[3].x = ( a + b ) / 2;
 
     base[6].y = base[3].y;
     c = base[1].y;
     d = base[2].y;
-    base[1].y = a = ( base[0].y + c )/2;
-    base[5].y = b = ( base[3].y + d )/2;
-    c = ( c + d )/2;
-    base[2].y = a = ( a + c )/2;
-    base[4].y = b = ( b + c )/2;
-    base[3].y = ( a + b )/2;
+    base[1].y = a = ( base[0].y + c ) / 2;
+    base[5].y = b = ( base[3].y + d ) / 2;
+    c = ( c + d ) / 2;
+    base[2].y = a = ( a + c ) / 2;
+    base[4].y = b = ( b + c ) / 2;
+    base[3].y = ( a + b ) / 2;
   }
 
 
@@ -122,6 +144,7 @@
     FT_Angle   theta1, theta2;
     FT_Int     close1, close2, close3;
 
+
     d1.x = base[2].x - base[3].x;
     d1.y = base[2].y - base[3].y;
     d2.x = base[1].x - base[2].x;
@@ -129,18 +152,18 @@
     d3.x = base[0].x - base[1].x;
     d3.y = base[0].y - base[1].y;
 
-    close1 = FT_IS_SMALL(d1.x) && FT_IS_SMALL(d1.y);
-    close2 = FT_IS_SMALL(d2.x) && FT_IS_SMALL(d2.y);
-    close3 = FT_IS_SMALL(d3.x) && FT_IS_SMALL(d3.y);
+    close1 = FT_IS_SMALL( d1.x ) && FT_IS_SMALL( d1.y );
+    close2 = FT_IS_SMALL( d2.x ) && FT_IS_SMALL( d2.y );
+    close3 = FT_IS_SMALL( d3.x ) && FT_IS_SMALL( d3.y );
 
-    if (close1 || close3)
+    if ( close1 || close3 )
     {
-      if (close2)
+      if ( close2 )
       {
         /* basically a point */
         *angle_in = *angle_out = *angle_mid = 0;
       }
-      else if (close1)
+      else if ( close1 )
       {
         *angle_in  = *angle_mid = FT_Atan2( d2.x, d2.y );
         *angle_out = FT_Atan2( d3.x, d3.y );
@@ -151,7 +174,7 @@
         *angle_mid = *angle_out = FT_Atan2( d2.x, d2.y );
       }
     }
-    else if (close2)
+    else if ( close2 )
     {
       *angle_in  = *angle_mid = FT_Atan2( d1.x, d1.y );
       *angle_out = FT_Atan2( d3.x, d3.y );
@@ -162,6 +185,7 @@
       *angle_mid = FT_Atan2( d2.x, d2.y );
       *angle_out = FT_Atan2( d3.x, d3.y );
     }
+
     theta1 = ft_pos_abs( FT_Angle_Diff( *angle_in,  *angle_mid ) );
     theta2 = ft_pos_abs( FT_Angle_Diff( *angle_mid, *angle_out ) );
 
@@ -170,7 +194,6 @@
   }
 
 
-
  /***************************************************************************/
  /***************************************************************************/
  /*****                                                                 *****/
@@ -189,7 +212,7 @@
   } FT_StrokeTags;
 
 
-  typedef struct FT_StrokeBorderRec_
+  typedef struct  FT_StrokeBorderRec_
   {
     FT_UInt     num_points;
     FT_UInt     max_points;
@@ -210,13 +233,15 @@
     FT_UInt   new_max = border->num_points + new_points;
     FT_Error  error   = 0;
 
+
     if ( new_max > old_max )
     {
       FT_UInt    cur_max = old_max;
       FT_Memory  memory  = border->memory;
 
+
       while ( cur_max < new_max )
-        cur_max += (cur_max >> 1) + 16;
+        cur_max += ( cur_max >> 1 ) + 16;
 
       if ( FT_RENEW_ARRAY( border->points, old_max, cur_max ) ||
            FT_RENEW_ARRAY( border->tags,   old_max, cur_max ) )
@@ -228,16 +253,17 @@
     return error;
   }
 
+
   static void
   ft_stroke_border_close( FT_StrokeBorder  border )
   {
     FT_ASSERT( border->start >= 0 );
 
-    /* don't record empty paths !! */
+    /* don't record empty paths! */
     if ( border->num_points > (FT_UInt)border->start )
     {
-      border->tags[ border->start        ] |= FT_STROKE_TAG_BEGIN;
-      border->tags[ border->num_points-1 ] |= FT_STROKE_TAG_END;
+      border->tags[border->start         ] |= FT_STROKE_TAG_BEGIN;
+      border->tags[border->num_points - 1] |= FT_STROKE_TAG_END;
     }
 
     border->start   = -1;
@@ -252,22 +278,24 @@
   {
     FT_Error  error = 0;
 
+
     FT_ASSERT( border->start >= 0 );
 
     if ( border->movable )
     {
       /* move last point */
-      border->points[ border->num_points-1 ] = *to;
+      border->points[border->num_points - 1] = *to;
     }
     else
     {
       /* add one point */
       error = ft_stroke_border_grow( border, 1 );
-      if (!error)
+      if ( !error )
       {
         FT_Vector*  vec = border->points + border->num_points;
         FT_Byte*    tag = border->tags   + border->num_points;
 
+
         vec[0] = *to;
         tag[0] = FT_STROKE_TAG_ON;
 
@@ -286,10 +314,11 @@
   {
     FT_Error  error;
 
+
     FT_ASSERT( border->start >= 0 );
 
     error = ft_stroke_border_grow( border, 2 );
-    if (!error)
+    if ( !error )
     {
       FT_Vector*  vec = border->points + border->num_points;
       FT_Byte*    tag = border->tags   + border->num_points;
@@ -315,14 +344,16 @@
   {
     FT_Error  error;
 
+
     FT_ASSERT( border->start >= 0 );
 
     error = ft_stroke_border_grow( border, 3 );
-    if (!error)
+    if ( !error )
     {
       FT_Vector*  vec = border->points + border->num_points;
       FT_Byte*    tag = border->tags   + border->num_points;
 
+
       vec[0] = *control1;
       vec[1] = *control2;
       vec[2] = *to;
@@ -338,7 +369,7 @@
   }
 
 
-#define  FT_ARC_CUBIC_ANGLE  (FT_ANGLE_PI/2)
+#define FT_ARC_CUBIC_ANGLE  ( FT_ANGLE_PI / 2 )
 
 
   static FT_Error
@@ -353,6 +384,7 @@
     FT_Fixed   length;
     FT_Error   error = 0;
 
+
     /* compute start point */
     FT_Vector_From_Polar( &a, radius, angle_start );
     a.x += center->x;
@@ -362,11 +394,11 @@
     angle  = angle_start;
     rotate = ( angle_diff >= 0 ) ? FT_ANGLE_PI2 : -FT_ANGLE_PI2;
 
-    while (total != 0)
+    while ( total != 0 )
     {
       step = total;
       if ( step > FT_ARC_CUBIC_ANGLE )
-        step   = FT_ARC_CUBIC_ANGLE;
+        step = FT_ARC_CUBIC_ANGLE;
 
       else if ( step < -FT_ARC_CUBIC_ANGLE )
         step = -FT_ARC_CUBIC_ANGLE;
@@ -384,8 +416,8 @@
       b.y += center->y;
 
       /* compute first and second control points */
-      length = FT_MulDiv( radius, FT_Sin(theta)*4,
-                          (0x10000L + FT_Cos(theta))*3 );
+      length = FT_MulDiv( radius, FT_Sin( theta ) * 4,
+                          ( 0x10000L + FT_Cos( theta ) ) * 3 );
 
       FT_Vector_From_Polar( &a2, length, angle + rotate );
       a2.x += a.x;
@@ -397,13 +429,15 @@
 
       /* add cubic arc */
       error = ft_stroke_border_cubicto( border, &a2, &b2, &b );
-      if (error) break;
+      if ( error )
+        break;
 
       /* process the rest of the arc ?? */
       a      = b;
       total -= step;
       angle  = next;
     }
+
     return error;
   }
 
@@ -423,139 +457,144 @@
   }
 
 
- static void
- ft_stroke_border_init( FT_StrokeBorder  border,
-                        FT_Memory        memory )
- {
-   border->memory = memory;
-   border->points = NULL;
-   border->tags   = NULL;
+  static void
+  ft_stroke_border_init( FT_StrokeBorder  border,
+                         FT_Memory        memory )
+  {
+    border->memory = memory;
+    border->points = NULL;
+    border->tags   = NULL;
 
-   border->num_points = 0;
-   border->max_points = 0;
-   border->start      = -1;
- }
+    border->num_points = 0;
+    border->max_points = 0;
+    border->start      = -1;
+  }
 
 
- static void
- ft_stroke_border_reset( FT_StrokeBorder  border )
- {
-   border->num_points = 0;
-   border->start      = -1;
- }
+  static void
+  ft_stroke_border_reset( FT_StrokeBorder  border )
+  {
+    border->num_points = 0;
+    border->start      = -1;
+  }
 
 
- static void
- ft_stroke_border_done( FT_StrokeBorder  border )
- {
-   FT_Memory  memory = border->memory;
-
-   FT_FREE( border->points );
-   FT_FREE( border->tags );
-
-   border->num_points = 0;
-   border->max_points = 0;
-   border->start      = -1;
- }
+  static void
+  ft_stroke_border_done( FT_StrokeBorder  border )
+  {
+    FT_Memory  memory = border->memory;
 
 
- static FT_Error
- ft_stroke_border_get_counts( FT_StrokeBorder  border,
-                              FT_UInt         *anum_points,
-                              FT_UInt         *anum_contours )
- {
-   FT_Error  error        = 0;
-   FT_UInt   num_points   = 0;
-   FT_UInt   num_contours = 0;
+    FT_FREE( border->points );
+    FT_FREE( border->tags );
 
-   FT_UInt     count      = border->num_points;
-   FT_Vector*  point      = border->points;
-   FT_Byte*    tags       = border->tags;
-   FT_Int      in_contour = 0;
-
-   for ( ; count > 0; count--, num_points++, point++, tags++ )
-   {
-     if ( tags[0] & FT_STROKE_TAG_BEGIN )
-     {
-       if ( in_contour != 0 )
-         goto Fail;
-
-       in_contour = 1;
-     }
-     else if ( in_contour == 0 )
-       goto Fail;
-
-     if ( tags[0] & FT_STROKE_TAG_END )
-     {
-       if ( in_contour == 0 )
-         goto Fail;
-
-       in_contour = 0;
-       num_contours++;
-     }
-   }
-   if ( in_contour != 0 )
-     goto Fail;
-
- Exit:
-   *anum_points   = num_points;
-   *anum_contours = num_contours;
-   return error;
-
- Fail:
-   num_points   = 0;
-   num_contours = 0;
-   goto Exit;
- }
+    border->num_points = 0;
+    border->max_points = 0;
+    border->start      = -1;
+  }
 
 
- static void
- ft_stroke_border_export( FT_StrokeBorder  border,
-                          FT_Outline*      outline )
- {
-   /* copy point locations */
-   FT_MEM_COPY( outline->points + outline->n_points,
-                border->points,
-                border->num_points * sizeof(FT_Vector) );
+  static FT_Error
+  ft_stroke_border_get_counts( FT_StrokeBorder  border,
+                               FT_UInt         *anum_points,
+                               FT_UInt         *anum_contours )
+  {
+    FT_Error  error        = 0;
+    FT_UInt   num_points   = 0;
+    FT_UInt   num_contours = 0;
 
-   /* copy tags */
-   {
-     FT_UInt   count = border->num_points;
-     FT_Byte*  read  = border->tags;
-     FT_Byte*  write = (FT_Byte*) outline->tags + outline->n_points;
+    FT_UInt     count      = border->num_points;
+    FT_Vector*  point      = border->points;
+    FT_Byte*    tags       = border->tags;
+    FT_Int      in_contour = 0;
 
-     for ( ; count > 0; count--, read++, write++ )
-     {
-       if ( *read & FT_STROKE_TAG_ON )
-         *write = FT_CURVE_TAG_ON;
-       else if ( *read & FT_STROKE_TAG_CUBIC )
-         *write = FT_CURVE_TAG_CUBIC;
-       else
-         *write = FT_CURVE_TAG_CONIC;
-     }
-   }
 
-   /* copy contours */
-   {
-     FT_UInt    count = border->num_points;
-     FT_Byte*   tags  = border->tags;
-     FT_Short*  write = outline->contours + outline->n_contours;
-     FT_Short   index = (FT_Short) outline->n_points;
+    for ( ; count > 0; count--, num_points++, point++, tags++ )
+    {
+      if ( tags[0] & FT_STROKE_TAG_BEGIN )
+      {
+        if ( in_contour != 0 )
+          goto Fail;
 
-     for ( ; count > 0; count--, tags++, index++ )
-     {
-       if ( *tags & FT_STROKE_TAG_END )
-       {
-         *write++ = index;
-         outline->n_contours++;
-       }
-     }
-   }
+        in_contour = 1;
+      }
+      else if ( in_contour == 0 )
+        goto Fail;
+ 
+      if ( tags[0] & FT_STROKE_TAG_END )
+      {
+        if ( in_contour == 0 )
+          goto Fail;
 
-   outline->n_points  = (short)( outline->n_points + border->num_points );
+        in_contour = 0;
+        num_contours++;
+      }
+    }
 
-   FT_ASSERT( FT_Outline_Check( outline ) == 0 );
- }
+    if ( in_contour != 0 )
+      goto Fail;
+
+  Exit:
+    *anum_points   = num_points;
+    *anum_contours = num_contours;
+    return error;
+
+  Fail:
+    num_points   = 0;
+    num_contours = 0;
+    goto Exit;
+  }
+
+
+  static void
+  ft_stroke_border_export( FT_StrokeBorder  border,
+                           FT_Outline*      outline )
+  {
+    /* copy point locations */
+    FT_MEM_COPY( outline->points + outline->n_points,
+                 border->points,
+                 border->num_points * sizeof ( FT_Vector ) );
+
+    /* copy tags */
+    {
+      FT_UInt   count = border->num_points;
+      FT_Byte*  read  = border->tags;
+      FT_Byte*  write = (FT_Byte*)outline->tags + outline->n_points;
+
+
+      for ( ; count > 0; count--, read++, write++ )
+      {
+        if ( *read & FT_STROKE_TAG_ON )
+          *write = FT_CURVE_TAG_ON;
+        else if ( *read & FT_STROKE_TAG_CUBIC )
+          *write = FT_CURVE_TAG_CUBIC;
+        else
+          *write = FT_CURVE_TAG_CONIC;
+      }
+    }
+
+    /* copy contours */
+    {
+      FT_UInt    count = border->num_points;
+      FT_Byte*   tags  = border->tags;
+      FT_Short*  write = outline->contours + outline->n_contours;
+      FT_Short   idx   = (FT_Short)outline->n_points;
+
+
+      for ( ; count > 0; count--, tags++, idx++ )
+      {
+        if ( *tags & FT_STROKE_TAG_END )
+        {
+          *write++ = idx;
+          outline->n_contours++;
+        }
+      }
+    }
+
+    outline->n_points  = (short)( outline->n_points + border->num_points );
+
+    FT_ASSERT( FT_Outline_Check( outline ) == 0 );
+  }
 
 
  /***************************************************************************/
@@ -566,9 +605,9 @@
  /***************************************************************************/
  /***************************************************************************/
 
-#define  FT_SIDE_TO_ROTATE(s)   (FT_ANGLE_PI2 - (s)*FT_ANGLE_PI)
+#define FT_SIDE_TO_ROTATE( s )   ( FT_ANGLE_PI2 - (s) * FT_ANGLE_PI )
 
-  typedef struct FT_StrokerRec_
+  typedef struct  FT_StrokerRec_
   {
     FT_Angle             angle_in;
     FT_Angle             angle_out;
@@ -597,6 +636,7 @@
     FT_Error    error;
     FT_Stroker  stroker;
 
+
     if ( !FT_NEW( stroker ) )
     {
       stroker->memory = memory;
@@ -635,6 +675,7 @@
     {
       FT_Memory  memory = stroker->memory;
 
+
       ft_stroke_border_done( &stroker->borders[0] );
       ft_stroke_border_done( &stroker->borders[1] );
 
@@ -644,22 +685,22 @@
   }
 
 
-
- /* creates a circular arc at a corner or cap */
+  /* creates a circular arc at a corner or cap */
   static FT_Error
   ft_stroker_arcto( FT_Stroker  stroker,
                     FT_Int      side )
   {
-    FT_Angle          total, rotate;
-    FT_Fixed          radius = stroker->radius;
-    FT_Error          error  = 0;
-    FT_StrokeBorder   border = stroker->borders + side;
+    FT_Angle         total, rotate;
+    FT_Fixed         radius = stroker->radius;
+    FT_Error         error  = 0;
+    FT_StrokeBorder  border = stroker->borders + side;
 
-    rotate = FT_SIDE_TO_ROTATE(side);
+
+    rotate = FT_SIDE_TO_ROTATE( side );
 
     total = FT_Angle_Diff( stroker->angle_in, stroker->angle_out );
-    if (total == FT_ANGLE_PI)
-      total = -rotate*2;
+    if ( total == FT_ANGLE_PI )
+      total = -rotate * 2;
 
     error = ft_stroke_border_arcto( border,
                                     &stroker->center,
@@ -679,6 +720,7 @@
   {
     FT_Error  error  = 0;
 
+
     if ( stroker->line_cap == FT_STROKER_LINECAP_ROUND )
     {
       /* add a round cap */
@@ -689,21 +731,23 @@
     else if ( stroker->line_cap == FT_STROKER_LINECAP_SQUARE )
     {
       /* add a square cap */
-      FT_Vector         delta, delta2;
-      FT_Angle          rotate = FT_SIDE_TO_ROTATE(side);
-      FT_Fixed          radius = stroker->radius;
-      FT_StrokeBorder   border = stroker->borders + side;
+      FT_Vector        delta, delta2;
+      FT_Angle         rotate = FT_SIDE_TO_ROTATE( side );
+      FT_Fixed         radius = stroker->radius;
+      FT_StrokeBorder  border = stroker->borders + side;
 
-      FT_Vector_From_Polar( &delta2, radius, angle+rotate );
+
+      FT_Vector_From_Polar( &delta2, radius, angle + rotate );
       FT_Vector_From_Polar( &delta,  radius, angle );
 
       delta.x += stroker->center.x + delta2.x;
       delta.y += stroker->center.y + delta2.y;
 
       error = ft_stroke_border_lineto( border, &delta, 0 );
-      if (error) goto Exit;
+      if ( error )
+        goto Exit;
 
-      FT_Vector_From_Polar( &delta2, radius, angle-rotate );
+      FT_Vector_From_Polar( &delta2, radius, angle - rotate );
       FT_Vector_From_Polar( &delta,  radius, angle );
 
       delta.x += delta2.x + stroker->center.x;
@@ -711,13 +755,13 @@
 
       error = ft_stroke_border_lineto( border, &delta, 0 );
     }
+
   Exit:
     return error;
   }
 
 
-
- /* process an inside corner, i.e. compute intersection */
+  /* process an inside corner, i.e. compute intersection */
   static FT_Error
   ft_stroker_inside( FT_Stroker  stroker,
                      FT_Int      side)
@@ -729,14 +773,14 @@
     FT_Error         error = 0;
 
 
-    rotate = FT_SIDE_TO_ROTATE(side);
+    rotate = FT_SIDE_TO_ROTATE( side );
 
     /* compute median angle */
     theta = FT_Angle_Diff( stroker->angle_in, stroker->angle_out );
     if ( theta == FT_ANGLE_PI )
       theta = rotate;
     else
-      theta = theta/2;
+      theta = theta / 2;
 
     phi = stroker->angle_in + theta;
 
@@ -745,7 +789,8 @@
 
     if ( sigma < 0x10000L )
     {
-      FT_Vector_From_Polar( &delta, stroker->radius, stroker->angle_out + rotate );
+      FT_Vector_From_Polar( &delta, stroker->radius,
+                            stroker->angle_out + rotate );
       delta.x += stroker->center.x;
       delta.y += stroker->center.y;
       border->movable = 0;
@@ -765,7 +810,7 @@
   }
 
 
- /* process an outside corner, i.e. compute bevel/miter/round */
+  /* process an outside corner, i.e. compute bevel/miter/round */
   static FT_Error
   ft_stroker_outside( FT_Stroker  stroker,
                       FT_Int      side )
@@ -774,6 +819,7 @@
     FT_Error         error;
     FT_Angle         rotate;
 
+
     if ( stroker->line_join == FT_STROKER_LINEJOIN_ROUND )
     {
       error = ft_stroker_arcto( stroker, side );
@@ -781,54 +827,58 @@
     else
     {
       /* this is a mitered or beveled corner */
-      FT_Fixed   sigma, radius = stroker->radius;
-      FT_Angle   theta, phi;
-      FT_Fixed   thcos;
-      FT_Bool    miter;
+      FT_Fixed  sigma, radius = stroker->radius;
+      FT_Angle  theta, phi;
+      FT_Fixed  thcos;
+      FT_Bool   miter;
 
-      rotate = FT_SIDE_TO_ROTATE(side);
+
+      rotate = FT_SIDE_TO_ROTATE( side );
       miter  = FT_BOOL( stroker->line_join == FT_STROKER_LINEJOIN_MITER );
 
       theta  = FT_Angle_Diff( stroker->angle_in, stroker->angle_out );
-      if (theta == FT_ANGLE_PI)
+      if ( theta == FT_ANGLE_PI )
       {
         theta = rotate;
         phi   = stroker->angle_in;
       }
       else
       {
-        theta = theta/2;
+        theta = theta / 2;
         phi   = stroker->angle_in + theta + rotate;
       }
 
-      thcos  = FT_Cos( theta );
-      sigma  = FT_MulFix( stroker->miter_limit, thcos );
+      thcos = FT_Cos( theta );
+      sigma = FT_MulFix( stroker->miter_limit, thcos );
 
       if ( sigma >= 0x10000L )
         miter = 0;
 
-
-      if (miter)  /* this is a miter (broken angle) */
+      if ( miter )  /* this is a miter (broken angle) */
       {
         FT_Vector  middle, delta;
-        FT_Fixed  length;
+        FT_Fixed   length;
+
 
         /* compute middle point */
-        FT_Vector_From_Polar( &middle, FT_MulFix( radius, stroker->miter_limit ),
+        FT_Vector_From_Polar( &middle,
+                              FT_MulFix( radius, stroker->miter_limit ),
                               phi );
         middle.x += stroker->center.x;
         middle.y += stroker->center.y;
 
         /* compute first angle point */
-        length = FT_MulFix( radius, FT_DivFix( 0x10000L - sigma,
-                                    ft_pos_abs( FT_Sin( theta ) ) ) );
+        length = FT_MulFix( radius,
+                            FT_DivFix( 0x10000L - sigma,
+                                       ft_pos_abs( FT_Sin( theta ) ) ) );
 
         FT_Vector_From_Polar( &delta, length, phi + rotate );
         delta.x += middle.x;
         delta.y += middle.y;
 
         error = ft_stroke_border_lineto( border, &delta, 0 );
-        if (error) goto Exit;
+        if ( error )
+          goto Exit;
 
         /* compute second angle point */
         FT_Vector_From_Polar( &delta, length, phi - rotate );
@@ -836,7 +886,8 @@
         delta.y += middle.y;
 
         error = ft_stroke_border_lineto( border, &delta, 0 );
-        if (error) goto Exit;
+        if ( error )
+          goto Exit;
 
         /* finally, add a movable end point */
         FT_Vector_From_Polar( &delta, radius, stroker->angle_out + rotate );
@@ -845,11 +896,13 @@
 
         error = ft_stroke_border_lineto( border, &delta, 1 );
       }
+
       else /* this is a bevel (intersection) */
       {
-        FT_Fixed  length;
+        FT_Fixed   length;
         FT_Vector  delta;
 
+
         length = FT_DivFix( stroker->radius, thcos );
 
         FT_Vector_From_Polar( &delta, length, phi );
@@ -860,13 +913,15 @@
         if (error) goto Exit;
 
         /* now add end point */
-        FT_Vector_From_Polar( &delta, stroker->radius, stroker->angle_out + rotate );
+        FT_Vector_From_Polar( &delta, stroker->radius,
+                              stroker->angle_out + rotate );
         delta.x += stroker->center.x;
         delta.y += stroker->center.y;
 
         error = ft_stroke_border_lineto( border, &delta, 1 );
       }
     }
+
   Exit:
     return error;
   }
@@ -879,33 +934,35 @@
     FT_Angle  turn;
     FT_Int    inside_side;
 
+
     turn = FT_Angle_Diff( stroker->angle_in, stroker->angle_out );
 
     /* no specific corner processing is required if the turn is 0 */
-    if (turn == 0)
+    if ( turn == 0 )
       goto Exit;
 
     /* when we turn to the right, the inside side is 0 */
     inside_side = 0;
 
     /* otherwise, the inside side is 1 */
-    if (turn < 0)
+    if ( turn < 0 )
       inside_side = 1;
 
     /* process the inside side */
     error = ft_stroker_inside( stroker, inside_side );
-    if (error) goto Exit;
+    if ( error )
+      goto Exit;
 
     /* process the outside side */
-    error = ft_stroker_outside( stroker, 1-inside_side );
+    error = ft_stroker_outside( stroker, 1 - inside_side );
 
   Exit:
     return error;
   }
 
 
- /* add two points to the left and right borders corresponding to the */
- /* start of the subpath..                                            */
+  /* add two points to the left and right borders corresponding to the */
+  /* start of the subpath..                                            */
   static FT_Error
   ft_stroker_subpath_start( FT_Stroker  stroker,
                             FT_Angle    start_angle )
@@ -915,14 +972,17 @@
     FT_Error         error;
     FT_StrokeBorder  border;
 
-    FT_Vector_From_Polar( &delta, stroker->radius, start_angle + FT_ANGLE_PI2 );
+
+    FT_Vector_From_Polar( &delta, stroker->radius,
+                          start_angle + FT_ANGLE_PI2 );
 
     point.x = stroker->center.x + delta.x;
     point.y = stroker->center.y + delta.y;
 
     border = stroker->borders;
     error = ft_stroke_border_moveto( border, &point );
-    if (error) goto Exit;
+    if ( error )
+      goto Exit;
 
     point.x = stroker->center.x - delta.x;
     point.y = stroker->center.y - delta.y;
@@ -958,18 +1018,20 @@
     /* process corner if necessary */
     if ( stroker->first_point )
     {
-      /* this is the first segment of a subpath. We need to      */
+      /* This is the first segment of a subpath.  We need to     */
       /* add a point to each border at their respective starting */
-      /* point locations..                                       */
+      /* point locations.                                        */
       error = ft_stroker_subpath_start( stroker, angle );
-      if (error) goto Exit;
+      if ( error )
+        goto Exit;
     }
     else
     {
       /* process the current corner */
       stroker->angle_out = angle;
       error = ft_stroker_process_corner( stroker );
-      if (error) goto Exit;
+      if ( error )
+        goto Exit;
     }
 
     /* now add a line segment to both the "inside" and "outside" paths */
@@ -978,25 +1040,26 @@
     {
       FT_Vector  point;
 
+
       point.x = to->x + delta.x;
       point.y = to->y + delta.y;
 
       error = ft_stroke_border_lineto( border, &point, 1 );
-      if (error) goto Exit;
+      if ( error )
+        goto Exit;
 
       delta.x = -delta.x;
       delta.y = -delta.y;
     }
 
-    stroker->angle_in  = angle;
-    stroker->center    = *to;
+    stroker->angle_in = angle;
+    stroker->center   = *to;
 
   Exit:
     return error;
   }
 
 
-
   FT_EXPORT_DEF( FT_Error )
   FT_Stroker_ConicTo( FT_Stroker  stroker,
                       FT_Vector*  control,
@@ -1009,6 +1072,7 @@
     FT_Angle    start_angle;
     FT_Bool     first_arc = 1;
 
+
     arc    = bez_stack;
     arc[0] = *to;
     arc[1] = *control;
@@ -1018,9 +1082,10 @@
     {
       FT_Angle  angle_in, angle_out;
 
+
       angle_in = angle_out = 0;  /* remove compiler warnings */
 
-      if ( arc < limit &&
+      if ( arc < limit                                             &&
            !ft_conic_is_small_enough( arc, &angle_in, &angle_out ) )
       {
         ft_conic_split( arc );
@@ -1044,21 +1109,22 @@
         }
       }
 
-      /* the arc's angle is small enough, we can add it directly to each */
-      /* border..                                                        */
+      /* the arc's angle is small enough; we can add it directly to each */
+      /* border                                                          */
       {
         FT_Vector  ctrl, end;
         FT_Angle   theta, phi, rotate;
-        FT_Fixed  length;
+        FT_Fixed   length;
         FT_Int     side;
 
-        theta  = FT_Angle_Diff( angle_in, angle_out )/2;
+
+        theta  = FT_Angle_Diff( angle_in, angle_out ) / 2;
         phi    = angle_in + theta;
-        length = FT_DivFix( stroker->radius, FT_Cos(theta) );
+        length = FT_DivFix( stroker->radius, FT_Cos( theta ) );
 
         for ( side = 0; side <= 1; side++ )
         {
-          rotate = FT_SIDE_TO_ROTATE(side);
+          rotate = FT_SIDE_TO_ROTATE( side );
 
           /* compute control point */
           FT_Vector_From_Polar( &ctrl, length, phi + rotate );
@@ -1070,14 +1136,16 @@
           end.x += arc[0].x;
           end.y += arc[0].y;
 
-          error = ft_stroke_border_conicto( stroker->borders + side, &ctrl, &end );
-          if (error) goto Exit;
+          error = ft_stroke_border_conicto( stroker->borders + side,
+                                            &ctrl, &end );
+          if ( error )
+            goto Exit;
         }
       }
 
       arc -= 2;
 
-      if (arc < bez_stack)
+      if ( arc < bez_stack )
         stroker->angle_in = angle_out;
     }
 
@@ -1088,12 +1156,11 @@
   }
 
 
-
   FT_EXPORT_DEF( FT_Error )
   FT_Stroker_CubicTo( FT_Stroker  stroker,
-                      FT_Vector*      control1,
-                      FT_Vector*      control2,
-                      FT_Vector*      to )
+                      FT_Vector*  control1,
+                      FT_Vector*  control2,
+                      FT_Vector*  to )
   {
     FT_Error    error = 0;
     FT_Vector   bez_stack[37];
@@ -1102,6 +1169,7 @@
     FT_Angle    start_angle;
     FT_Bool     first_arc = 1;
 
+
     arc    = bez_stack;
     arc[0] = *to;
     arc[1] = *control2;
@@ -1112,11 +1180,13 @@
     {
       FT_Angle  angle_in, angle_mid, angle_out;
 
+
       /* remove compiler warnings */
       angle_in = angle_out = angle_mid = 0;
 
-      if ( arc < limit &&
-           !ft_cubic_is_small_enough( arc, &angle_in, &angle_mid, &angle_out ) )
+      if ( arc < limit                                         &&
+           !ft_cubic_is_small_enough( arc, &angle_in,
+                                      &angle_mid, &angle_out ) )
       {
         ft_cubic_split( arc );
         arc += 3;
@@ -1133,31 +1203,33 @@
         if ( stroker->first_point )
           error = ft_stroker_subpath_start( stroker, start_angle );
         else
-            {
-              stroker->angle_out = start_angle;
-              error = ft_stroker_process_corner( stroker );
-            }
-        if (error) goto Exit;
+        {
+          stroker->angle_out = start_angle;
+          error = ft_stroker_process_corner( stroker );
+        }
+        if ( error )
+          goto Exit;
       }
 
-      /* the arc's angle is small enough, we can add it directly to each */
-      /* border..                                                        */
+      /* the arc's angle is small enough; we can add it directly to each */
+      /* border                                                          */
       {
         FT_Vector  ctrl1, ctrl2, end;
         FT_Angle   theta1, phi1, theta2, phi2, rotate;
         FT_Fixed   length1, length2;
         FT_Int     side;
 
-        theta1  = ft_pos_abs( angle_mid - angle_in )/2;
-        theta2  = ft_pos_abs( angle_out - angle_mid )/2;
-        phi1    = (angle_mid+angle_in)/2;
-        phi2    = (angle_mid+angle_out)/2;
-        length1 = FT_DivFix( stroker->radius, FT_Cos(theta1) );
+
+        theta1  = ft_pos_abs( angle_mid - angle_in ) / 2;
+        theta2  = ft_pos_abs( angle_out - angle_mid ) / 2;
+        phi1    = (angle_mid + angle_in ) / 2;
+        phi2    = (angle_mid + angle_out ) / 2;
+        length1 = FT_DivFix( stroker->radius, FT_Cos( theta1 ) );
         length2 = FT_DivFix( stroker->radius, FT_Cos(theta2) );
 
         for ( side = 0; side <= 1; side++ )
         {
-          rotate = FT_SIDE_TO_ROTATE(side);
+          rotate = FT_SIDE_TO_ROTATE( side );
 
           /* compute control points */
           FT_Vector_From_Polar( &ctrl1, length1, phi1 + rotate );
@@ -1173,13 +1245,15 @@
           end.x += arc[0].x;
           end.y += arc[0].y;
 
-          error = ft_stroke_border_cubicto( stroker->borders + side, &ctrl1, &ctrl2, &end );
-          if (error) goto Exit;
+          error = ft_stroke_border_cubicto( stroker->borders + side,
+                                            &ctrl1, &ctrl2, &end );
+          if ( error )
+            goto Exit;
         }
       }
 
       arc -= 3;
-      if (arc < bez_stack)
+      if ( arc < bez_stack )
         stroker->angle_in = angle_out;
     }
 
@@ -1195,10 +1269,10 @@
                            FT_Vector*  to,
                            FT_Bool     open )
   {
-    /* we cannot process the first point, because there is not enough     */
-    /* information regarding its corner/cap. The latter will be processed */
-    /* in the "end_subpath" routine                                       */
-    /*                                                                    */
+    /* We cannot process the first point, because there is not enough      */
+    /* information regarding its corner/cap.  The latter will be processed */
+    /* in the "end_subpath" routine.                                       */
+    /*                                                                     */
     stroker->first_point   = 1;
     stroker->center        = *to;
     stroker->subpath_open  = open;
@@ -1209,40 +1283,43 @@
   }
 
 
-  static
-  FT_Error  ft_stroker_add_reverse_left( FT_Stroker  stroker,
-                                         FT_Bool     open )
+  static FT_Error
+  ft_stroker_add_reverse_left( FT_Stroker  stroker,
+                               FT_Bool     open )
   {
     FT_StrokeBorder  right  = stroker->borders + 0;
     FT_StrokeBorder  left   = stroker->borders + 1;
     FT_Int           new_points;
     FT_Error         error  = 0;
 
+
     FT_ASSERT( left->start >= 0 );
 
     new_points = left->num_points - left->start;
     if ( new_points > 0 )
     {
       error = ft_stroke_border_grow( right, (FT_UInt)new_points );
-      if (error) goto Exit;
+      if ( error )
+        goto Exit;
+
       {
-        FT_Vector*    dst_point = right->points + right->num_points;
-        FT_Byte*      dst_tag   = right->tags   + right->num_points;
-        FT_Vector*    src_point = left->points  + left->num_points - 1;
-        FT_Byte*      src_tag   = left->tags    + left->num_points - 1;
+        FT_Vector*  dst_point = right->points + right->num_points;
+        FT_Byte*    dst_tag   = right->tags   + right->num_points;
+        FT_Vector*  src_point = left->points  + left->num_points - 1;
+        FT_Byte*    src_tag   = left->tags    + left->num_points - 1;
 
         while ( src_point >= left->points + left->start )
         {
           *dst_point = *src_point;
           *dst_tag   = *src_tag;
 
-          if (open)
-            dst_tag[0] &= ~(FT_STROKE_TAG_BEGIN | FT_STROKE_TAG_END);
+          if ( open )
+            dst_tag[0] &= ~( FT_STROKE_TAG_BEGIN | FT_STROKE_TAG_END );
           else
           {
             /* switch begin/end tags if necessary.. */
-            if (dst_tag[0] & (FT_STROKE_TAG_BEGIN | FT_STROKE_TAG_END))
-              dst_tag[0] ^= (FT_STROKE_TAG_BEGIN | FT_STROKE_TAG_END);
+            if ( dst_tag[0] & ( FT_STROKE_TAG_BEGIN | FT_STROKE_TAG_END ) )
+              dst_tag[0] ^= ( FT_STROKE_TAG_BEGIN | FT_STROKE_TAG_END );
           }
 
           src_point--;
@@ -1251,73 +1328,84 @@
           dst_tag++;
         }
       }
+
       left->num_points   = left->start;
       right->num_points += new_points;
 
       right->movable = 0;
       left->movable  = 0;
     }
+
   Exit:
     return error;
   }
 
 
- /* there's a lot of magic in this function !! */
+  /* there's a lot of magic in this function! */
   FT_EXPORT_DEF( FT_Error )
   FT_Stroker_EndSubPath( FT_Stroker  stroker )
   {
     FT_Error  error  = 0;
 
+
     if ( stroker->subpath_open )
     {
       FT_StrokeBorder  right = stroker->borders;
 
-      /* all right, this is an opened path, we need to add a cap between     */
-      /* right & left, add the reverse of left, then add a final cap between */
-      /* left & right..                                                      */
+      /* All right, this is an opened path, we need to add a cap between */
+      /* right & left, add the reverse of left, then add a final cap     */
+      /* between left & right.                                           */
       error = ft_stroker_cap( stroker, stroker->angle_in, 0 );
-      if (error) goto Exit;
+      if ( error )
+        goto Exit;
 
       /* add reversed points from "left" to "right" */
       error = ft_stroker_add_reverse_left( stroker, 1 );
-      if (error) goto Exit;
+      if ( error )
+        goto Exit;
 
       /* now add the final cap */
       stroker->center = stroker->subpath_start;
-      error = ft_stroker_cap( stroker, stroker->subpath_angle+FT_ANGLE_PI, 0 );
-      if (error) goto Exit;
+      error = ft_stroker_cap( stroker,
+                              stroker->subpath_angle + FT_ANGLE_PI, 0 );
+      if ( error )
+        goto Exit;
 
-      /* now, end the right subpath accordingly. the left one is */
-      /* rewind and doesn't need further processing..            */
+      /* Now end the right subpath accordingly.  The left one is */
+      /* rewind and doesn't need further processing.             */
       ft_stroke_border_close( right );
     }
     else
     {
-      FT_Angle           turn;
-      FT_Int             inside_side;
+      FT_Angle  turn;
+      FT_Int    inside_side;
 
-      /* process the corner ... */
+
+      /* process the corner */
       stroker->angle_out = stroker->subpath_angle;
-      turn               = FT_Angle_Diff( stroker->angle_in, stroker->angle_out );
+      turn               = FT_Angle_Diff( stroker->angle_in,
+                                          stroker->angle_out );
 
       /* no specific corner processing is required if the turn is 0 */
-      if (turn != 0)
+      if ( turn != 0 )
       {
         /* when we turn to the right, the inside side is 0 */
         inside_side = 0;
 
         /* otherwise, the inside side is 1 */
-        if (turn < 0)
+        if ( turn < 0 )
           inside_side = 1;
 
-        /* IMPORTANT: WE DO NOT PROCESS THE INSIDE BORDER HERE !! */
-        /* process the inside side */
-        /* error = ft_stroker_inside( stroker, inside_side );
-             if (error) goto Exit; */
+        /* IMPORTANT: WE DO NOT PROCESS THE INSIDE BORDER HERE! */
+        /* process the inside side                              */
+        /* error = ft_stroker_inside( stroker, inside_side );   */
+        /* if ( error )                                         */
+        /*   goto Exit;                                         */
 
         /* process the outside side */
-        error = ft_stroker_outside( stroker, 1-inside_side );
-        if (error) goto Exit;
+        error = ft_stroker_outside( stroker, 1 - inside_side );
+        if ( error )
+          goto Exit;
       }
 
       /* we will first end our two subpaths */
@@ -1326,7 +1414,8 @@
 
       /* now, add the reversed left subpath to "right" */
       error = ft_stroker_add_reverse_left( stroker, 0 );
-      if (error) goto Exit;
+      if ( error )
+        goto Exit;
     }
 
   Exit:
@@ -1343,11 +1432,16 @@
     FT_UInt   count3, count4, num_contours = 0;
     FT_Error  error;
 
-    error = ft_stroke_border_get_counts( stroker->borders+0, &count1, &count2 );
-    if (error) goto Exit;
 
-    error = ft_stroke_border_get_counts( stroker->borders+1, &count3, &count4 );
-    if (error) goto Exit;
+    error = ft_stroke_border_get_counts( stroker->borders + 0,
+                                         &count1, &count2 );
+    if ( error )
+      goto Exit;
+
+    error = ft_stroke_border_get_counts( stroker->borders + 1,
+                                         &count3, &count4 );
+    if ( error )
+      goto Exit;
 
     num_points   = count1 + count3;
     num_contours = count2 + count4;
@@ -1367,19 +1461,16 @@
   {
     if ( stroker->valid )
     {
-      ft_stroke_border_export( stroker->borders+0, outline );
-      ft_stroke_border_export( stroker->borders+1, outline );
+      ft_stroke_border_export( stroker->borders + 0, outline );
+      ft_stroke_border_export( stroker->borders + 1, outline );
     }
   }
 
 
-
-
-
- /*
-  *  the following is very similar to FT_Outline_Decompose, except
-  *  that we do support opened paths, and do not scale the outline
-  */
+  /*
+   *  The following is very similar to FT_Outline_Decompose, except
+   *  that we do support opened paths, and do not scale the outline.
+   */
   FT_EXPORT_DEF( FT_Error )
   FT_Stroker_ParseOutline( FT_Stroker   stroker,
                            FT_Outline*  outline,
@@ -1398,15 +1489,13 @@
     FT_Int   n;         /* index of contour in outline     */
     FT_UInt  first;     /* index of first point in contour */
     FT_Int   tag;       /* current point's state           */
-    FT_Int   in_path;
+
 
     if ( !outline || !stroker )
       return FT_Err_Invalid_Argument;
 
     first = 0;
 
-    in_path = 0;
-
     for ( n = 0; n < outline->n_contours; n++ )
     {
       FT_Int  last;  /* index of last point in contour */
@@ -1431,7 +1520,7 @@
       /* check first point to determine origin */
       if ( tag == FT_CURVE_TAG_CONIC )
       {
-        /* first point is conic control.  Yes, this happens. */
+        /* First point is conic control.  Yes, this happens. */
         if ( FT_CURVE_TAG( outline->tags[last] ) == FT_CURVE_TAG_ON )
         {
           /* start at last point if it is on the curve */
@@ -1456,8 +1545,6 @@
       if ( error )
         goto Exit;
 
-      in_path = 1;
-
       while ( point < limit )
       {
         point++;
@@ -1575,3 +1662,6 @@
   Invalid_Outline:
     return FT_Err_Invalid_Outline;
   }
+
+
+/* END */
diff --git a/reactos/lib/freetype/src/base/ftsynth.c b/reactos/lib/freetype/src/base/ftsynth.c
index 45459f3ee56..72979faae57 100644
--- a/reactos/lib/freetype/src/base/ftsynth.c
+++ b/reactos/lib/freetype/src/base/ftsynth.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType synthesizing code for emboldening and slanting (body).      */
 /*                                                                         */
-/*  Copyright 2000-2001 by                                                 */
+/*  Copyright 2000-2001, 2002 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -82,14 +82,14 @@
 
     /* we need to compute the `previous' and `next' point */
     /* for these extrema.                                 */
-    cur   = outline->points + n;
-    prev  = cur - 1;
-    next  = cur + 1;
+    cur  = outline->points + n;
+    prev = cur - 1;
+    next = cur + 1;
 
     first = 0;
     for ( c = 0; c < outline->n_contours; c++ )
     {
-      last  = outline->contours[c];
+      last = outline->contours[c];
 
       if ( n == first )
         prev = outline->points + last;
diff --git a/reactos/lib/freetype/src/base/fttrigon.c b/reactos/lib/freetype/src/base/fttrigon.c
index c16fa2468eb..82cd3b246fb 100644
--- a/reactos/lib/freetype/src/base/fttrigon.c
+++ b/reactos/lib/freetype/src/base/fttrigon.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType trigonometric functions (body).                             */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2002, 2003 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -71,10 +71,10 @@
     val = ( val >= 0 ) ? val : -val;
 
     v1 = (FT_UInt32)val >> 16;
-    v2 = (FT_UInt32)val & 0xFFFF;
+    v2 = (FT_UInt32)val & 0xFFFFL;
 
     k1 = FT_TRIG_SCALE >> 16;       /* constant */
-    k2 = FT_TRIG_SCALE & 0xFFFF;    /* constant */
+    k2 = FT_TRIG_SCALE & 0xFFFFL;   /* constant */
 
     hi   = k1 * v1;
     lo1  = k1 * v2 + k2 * v1;       /* can't overflow */
@@ -356,6 +356,14 @@
   }
 
 
+  /* these macros return 0 for positive numbers,
+     and -1 for negative ones */
+#define FT_SIGN_LONG( x )   ( (x) >> ( FT_SIZEOF_LONG * 8 - 1 ) )
+#define FT_SIGN_INT( x )    ( (x) >> ( FT_SIZEOF_INT * 8 - 1 ) )
+#define FT_SIGN_INT32( x )  ( (x) >> 31 )
+#define FT_SIGN_INT16( x )  ( (x) >> 15 )
+
+
   /* documentation is in fttrigon.h */
 
   FT_EXPORT_DEF( void )
@@ -376,10 +384,13 @@
       v.x = ft_trig_downscale( v.x );
       v.y = ft_trig_downscale( v.y );
 
-      if ( shift >= 0 )
+      if ( shift > 0 )
       {
-        vec->x = v.x >> shift;
-        vec->y = v.y >> shift;
+        FT_Int32  half = 1L << ( shift - 1 );
+
+
+        vec->x = ( v.x + half + FT_SIGN_LONG( v.x ) ) >> shift;
+        vec->y = ( v.y + half + FT_SIGN_LONG( v.y ) ) >> shift;
       }
       else
       {
diff --git a/reactos/lib/freetype/src/base/ftwinfnt.c b/reactos/lib/freetype/src/base/ftwinfnt.c
index 88644e954b7..2cbe343d1c7 100644
--- a/reactos/lib/freetype/src/base/ftwinfnt.c
+++ b/reactos/lib/freetype/src/base/ftwinfnt.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType API for accessing Windows FNT specific info (body).         */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2003 by                                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -23,10 +23,11 @@
 
 
   FT_EXPORT_DEF( FT_Error )
-  FT_Get_WinFNT_Header( FT_Face              face,
-                        FT_WinFNT_HeaderRec *header )
+  FT_Get_WinFNT_Header( FT_Face               face,
+                        FT_WinFNT_HeaderRec  *header )
   {
-    FT_Error     error;
+    FT_Error  error;
+
 
     error = FT_Err_Invalid_Argument;
 
@@ -38,13 +39,14 @@
       if ( driver->clazz && driver->clazz->module_name              &&
            ft_strcmp( driver->clazz->module_name, "winfonts" ) == 0 )
       {
-        FNT_Size  size = (FNT_Size)face->size;
-        FNT_Font  font = size->font;
+        FNT_Face  fnt_face = (FNT_Face)face;
+        FNT_Font  font     = fnt_face->font;
 
-        if (font)
+
+        if ( font )
         {
-          FT_MEM_COPY( header, &font->header, sizeof(*header) );
-          error    = 0;
+          FT_MEM_COPY( header, &font->header, sizeof ( *header ) );
+          error = FT_Err_Ok;
         }
       }
     }
diff --git a/reactos/lib/freetype/src/base/ftxf86.c b/reactos/lib/freetype/src/base/ftxf86.c
index 6fd7722a0f5..1f5e42ced47 100644
--- a/reactos/lib/freetype/src/base/ftxf86.c
+++ b/reactos/lib/freetype/src/base/ftxf86.c
@@ -45,7 +45,7 @@
       { "cidtype1", "CID Type 1" },
       { "cff",      "CFF" },
       { "pfr",      "PFR" },
-      { "winfonts",   "Windows FNT" }
+      { "winfonts", "Windows FNT" }
     };
 
     const char*  result = NULL;
diff --git a/reactos/lib/freetype/src/base/rules.mk b/reactos/lib/freetype/src/base/rules.mk
index da345ddc5f1..725631b1df9 100644
--- a/reactos/lib/freetype/src/base/rules.mk
+++ b/reactos/lib/freetype/src/base/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2002 by
+# Copyright 1996-2000, 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -25,23 +25,23 @@
 # BASE_H is defined in freetype.mk to simplify the dependency rules.
 
 
-BASE_COMPILE := $(FT_COMPILE) $I$(SRC_)base
+BASE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SRC_DIR)/base)
 
 
 # Base layer sources
 #
 #   ftsystem, ftinit, and ftdebug are handled by freetype.mk
 #
-BASE_SRC := $(BASE_)ftcalc.c   \
-            $(BASE_)fttrigon.c \
-            $(BASE_)ftutil.c   \
-            $(BASE_)ftstream.c \
-            $(BASE_)ftgloadr.c \
-            $(BASE_)ftoutln.c  \
-            $(BASE_)ftobjs.c   \
-            $(BASE_)ftapi.c    \
-            $(BASE_)ftnames.c  \
-            $(BASE_)ftdbgmem.c
+BASE_SRC := $(BASE_DIR)/ftcalc.c   \
+            $(BASE_DIR)/fttrigon.c \
+            $(BASE_DIR)/ftutil.c   \
+            $(BASE_DIR)/ftstream.c \
+            $(BASE_DIR)/ftgloadr.c \
+            $(BASE_DIR)/ftoutln.c  \
+            $(BASE_DIR)/ftobjs.c   \
+            $(BASE_DIR)/ftapi.c    \
+            $(BASE_DIR)/ftnames.c  \
+            $(BASE_DIR)/ftdbgmem.c
 
 # Base layer `extensions' sources
 #
@@ -49,19 +49,19 @@ BASE_SRC := $(BASE_)ftcalc.c   \
 # object.  It will then be linked to the final executable only if one of its
 # symbols is used by the application.
 #
-BASE_EXT_SRC := $(BASE_)ftglyph.c   \
-                $(BASE_)ftmm.c      \
-                $(BASE_)ftbdf.c     \
-                $(BASE_)fttype1.c   \
-                $(BASE_)ftxf86.c    \
-                $(BASE_)ftpfr.c     \
-                $(BASE_)ftstroker.c \
-                $(BASE_)ftwinfnt.c  \
-                $(BASE_)ftbbox.c
+BASE_EXT_SRC := $(BASE_DIR)/ftglyph.c  \
+                $(BASE_DIR)/ftmm.c     \
+                $(BASE_DIR)/ftbdf.c    \
+                $(BASE_DIR)/fttype1.c  \
+                $(BASE_DIR)/ftxf86.c   \
+                $(BASE_DIR)/ftpfr.c    \
+                $(BASE_DIR)/ftstroke.c \
+                $(BASE_DIR)/ftwinfnt.c \
+                $(BASE_DIR)/ftbbox.c
 
 # Default extensions objects
 #
-BASE_EXT_OBJ := $(BASE_EXT_SRC:$(BASE_)%.c=$(OBJ_)%.$O)
+BASE_EXT_OBJ := $(BASE_EXT_SRC:$(BASE_DIR)/%.c=$(OBJ_DIR)/%.$O)
 
 
 # Base layer object(s)
@@ -72,23 +72,24 @@ BASE_EXT_OBJ := $(BASE_EXT_SRC:$(BASE_)%.c=$(OBJ_)%.$O)
 #   BASE_OBJ_S is used during `single' builds (the whole base layer is
 #   compiled as a single object file using ftbase.c).
 #
-BASE_OBJ_M := $(BASE_SRC:$(BASE_)%.c=$(OBJ_)%.$O)
-BASE_OBJ_S := $(OBJ_)ftbase.$O
+BASE_OBJ_M := $(BASE_SRC:$(BASE_DIR)/%.c=$(OBJ_DIR)/%.$O)
+BASE_OBJ_S := $(OBJ_DIR)/ftbase.$O
 
 # Base layer root source file for single build
 #
-BASE_SRC_S := $(BASE_)ftbase.c
+BASE_SRC_S := $(BASE_DIR)/ftbase.c
 
 
 # Base layer - single object build
 #
 $(BASE_OBJ_S): $(BASE_SRC_S) $(BASE_SRC) $(FREETYPE_H)
-	$(BASE_COMPILE) $T$@ $(BASE_SRC_S)
+	$(BASE_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(BASE_SRC_S))
 
 
 # Multiple objects build + extensions
 #
-$(OBJ_)%.$O: $(BASE_)%.c $(FREETYPE_H)
-	$(BASE_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(BASE_DIR)/%.c $(FREETYPE_H)
+	$(BASE_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
+
 
 # EOF
diff --git a/reactos/lib/freetype/src/bdf/bdf.h b/reactos/lib/freetype/src/bdf/bdf.h
index 6a4bb821f1f..4dab5ae9d05 100644
--- a/reactos/lib/freetype/src/bdf/bdf.h
+++ b/reactos/lib/freetype/src/bdf/bdf.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000 Computing Research Labs, New Mexico State University
- * Copyright 2001, 2002 Francesco Zappa Nardelli
+ * Copyright 2001, 2002, 2003 Francesco Zappa Nardelli
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -159,8 +159,8 @@ FT_BEGIN_HEADER
 
   typedef struct  _hashnode_
   {
-    char*  key;
-    void*  data;
+    const char*  key;
+    void*        data;
   
   } _hashnode, *hashnode;
 
@@ -283,7 +283,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( bdf_property_t * )
   bdf_get_font_property( bdf_font_t*  font,
-                         char*        name );
+                         const char*  name );
 
 
 FT_END_HEADER
diff --git a/reactos/lib/freetype/src/bdf/bdfdrivr.c b/reactos/lib/freetype/src/bdf/bdfdrivr.c
index 4f60266cb5b..dbd4a2f6475 100644
--- a/reactos/lib/freetype/src/bdf/bdfdrivr.c
+++ b/reactos/lib/freetype/src/bdf/bdfdrivr.c
@@ -2,7 +2,7 @@
 
     FreeType font driver for bdf files
 
-    Copyright (C) 2001-2002 by
+    Copyright (C) 2001, 2002, 2003 by
     Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -65,7 +65,7 @@ THE SOFTWARE.
     cmap->num_encodings = face->bdffont->glyphs_used;
     cmap->encodings     = face->en_table;
 
-    return FT_Err_Ok;
+    return BDF_Err_Ok;
   }
 
 
@@ -169,8 +169,6 @@ THE SOFTWARE.
   };
 
 
-
-
   FT_CALLBACK_DEF( FT_Error )
   BDF_Face_Done( BDF_Face  face )
   {
@@ -250,34 +248,39 @@ THE SOFTWARE.
                          FT_FACE_FLAG_HORIZONTAL  |
                          FT_FACE_FLAG_FAST_GLYPHS;
 
-      prop = bdf_get_font_property( font, (char *)"SPACING" );
+      prop = bdf_get_font_property( font, "SPACING" );
       if ( prop != NULL )
         if ( prop->format == BDF_ATOM )
           if ( prop->value.atom != NULL )
             if ( ( *(prop->value.atom) == 'M' ) ||
-                 ( *(prop->value.atom) == 'C' ) )
+                 ( *(prop->value.atom) == 'm' ) ||
+                 ( *(prop->value.atom) == 'C' ) ||
+                 ( *(prop->value.atom) == 'c' ) )
               root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
 
       /* FZ XXX: TO DO: FT_FACE_FLAGS_VERTICAL   */
       /* FZ XXX: I need a font to implement this */
 
       root->style_flags = 0;
-      prop = bdf_get_font_property( font, (char *)"SLANT" );
+      prop = bdf_get_font_property( font, "SLANT" );
       if ( prop != NULL )
         if ( prop->format == BDF_ATOM )
           if ( prop->value.atom != NULL )
             if ( ( *(prop->value.atom) == 'O' ) ||
-                 ( *(prop->value.atom) == 'I' ) )
+                 ( *(prop->value.atom) == 'o' ) ||
+                 ( *(prop->value.atom) == 'I' ) ||
+                 ( *(prop->value.atom) == 'i' ) )
               root->style_flags |= FT_STYLE_FLAG_ITALIC;
 
-      prop = bdf_get_font_property( font, (char *)"WEIGHT_NAME" );
+      prop = bdf_get_font_property( font, "WEIGHT_NAME" );
       if ( prop != NULL )
         if ( prop->format == BDF_ATOM )
           if ( prop->value.atom != NULL )
-            if ( *(prop->value.atom) == 'B' )
+            if ( ( *(prop->value.atom) == 'B' ) ||
+                 ( *(prop->value.atom) == 'b' ) )
               root->style_flags |= FT_STYLE_FLAG_BOLD;
 
-      prop = bdf_get_font_property( font, (char *)"FAMILY_NAME" );
+      prop = bdf_get_font_property( font, "FAMILY_NAME" );
       if ( ( prop != NULL ) && ( prop->value.atom != NULL ) )
       {
         int  l = ft_strlen( prop->value.atom ) + 1;
@@ -307,45 +310,46 @@ THE SOFTWARE.
       if ( FT_NEW_ARRAY( root->available_sizes, 1 ) )
         goto Exit;
 
-      prop = bdf_get_font_property( font, (char *)"AVERAGE_WIDTH" );
-      if ( ( prop != NULL ) && ( prop->value.int32 >= 10 ) )
-        root->available_sizes->width = (short)( prop->value.int32 / 10 );
-
-      prop = bdf_get_font_property( font, (char *)"PIXEL_SIZE" );
-      if ( prop != NULL )
-        root->available_sizes->height = (short) prop->value.int32;
-      else
       {
-        prop = bdf_get_font_property( font, (char *)"POINT_SIZE" );
+        FT_Bitmap_Size*  bsize = root->available_sizes;
+
+
+        FT_MEM_ZERO( bsize, sizeof ( FT_Bitmap_Size ) );
+
+        prop = bdf_get_font_property( font, "PIXEL_SIZE" );
         if ( prop != NULL )
+          bsize->height = (FT_Short)prop->value.int32;
+
+        prop = bdf_get_font_property( font, "AVERAGE_WIDTH" );
+        if ( prop != NULL )
+          bsize->width = (FT_Short)( ( prop->value.int32 + 5 ) / 10 );
+
+        prop = bdf_get_font_property( font, "POINT_SIZE" );
+        if ( prop != NULL )
+          /* convert from 722.7 decipoints to 72 points per inch */
+          bsize->size =
+            (FT_Pos)( ( prop->value.int32 * 64 * 7200 + 36135L ) / 72270L );
+
+        prop = bdf_get_font_property( font, "RESOLUTION_X" );
+        if ( prop != NULL )
+          bsize->x_ppem =
+            (FT_Pos)( ( prop->value.int32 * bsize->size + 36 ) / 72 );
+
+        prop = bdf_get_font_property( font, "RESOLUTION_Y" );
+        if ( prop != NULL )
+          bsize->y_ppem =
+            (FT_Pos)( ( prop->value.int32 * bsize->size + 36 ) / 72 );
+
+        if ( bsize->height == 0 )
+          bsize->height = (FT_Short)( ( bsize->y_ppem + 32 ) / 64 );
+
+        if ( bsize->height == 0 )
         {
-          bdf_property_t  *yres;
-
-
-          yres = bdf_get_font_property( font, (char *)"RESOLUTION_Y" );
-          if ( yres != NULL )
-          {
-            FT_TRACE4(( "POINT_SIZE: %d  RESOLUTION_Y: %d\n",
-                        prop->value.int32, yres->value.int32 ));
-            root->available_sizes->height =
-              (FT_Short)( prop->value.int32 * yres->value.int32 / 720 );
-          }
-        }
-      }
-
-      if ( root->available_sizes->width == 0 )
-      {
-        if ( root->available_sizes->height == 0 )
-        {
-          /* some fonts have broken SIZE declaration (jiskan24.bdf) */
+          /* some fonts have a broken SIZE declaration (jiskan24.bdf) */
           FT_ERROR(( "BDF_Face_Init: reading size\n" ));
-          root->available_sizes->width = (FT_Short)font->point_size;
+          bsize->height = (FT_Short)font->point_size;
         }
-        else
-          root->available_sizes->width = root->available_sizes->height;
       }
-      if ( root->available_sizes->height == 0 )
-          root->available_sizes->height = root->available_sizes->width;
 
       /* encoding table */
       {
@@ -371,9 +375,9 @@ THE SOFTWARE.
 
 
         charset_registry =
-          bdf_get_font_property( font, (char *)"CHARSET_REGISTRY" );
+          bdf_get_font_property( font, "CHARSET_REGISTRY" );
         charset_encoding =
-          bdf_get_font_property( font, (char *)"CHARSET_ENCODING" );
+          bdf_get_font_property( font, "CHARSET_ENCODING" );
         if ( ( charset_registry != NULL ) && ( charset_encoding != NULL ) )
         {
           if ( ( charset_registry->format == BDF_ATOM ) &&
@@ -381,18 +385,32 @@ THE SOFTWARE.
                ( charset_registry->value.atom != NULL ) &&
                ( charset_encoding->value.atom != NULL ) )
           {
+            const char*  s;
+
+
             if ( FT_NEW_ARRAY( face->charset_encoding,
                                strlen( charset_encoding->value.atom ) + 1 ) )
               goto Exit;
             if ( FT_NEW_ARRAY( face->charset_registry,
                                strlen( charset_registry->value.atom ) + 1 ) )
               goto Exit;
+
             ft_strcpy( face->charset_registry, charset_registry->value.atom );
             ft_strcpy( face->charset_encoding, charset_encoding->value.atom );
-            if ( !ft_strcmp( face->charset_registry, "ISO10646" )     ||
-                 ( !ft_strcmp( face->charset_registry, "ISO8859" ) &&
-                   !ft_strcmp( face->charset_encoding, "1" )       )  )
+
+            /* Uh, oh, compare first letters manually to avoid dependency
+               on locales. */
+            s = face->charset_registry;
+            if ( ( s[0] == 'i' || s[0] == 'I' ) &&
+                 ( s[1] == 's' || s[1] == 'S' ) &&
+                 ( s[2] == 'o' || s[2] == 'O' ) )
+            {
+              s += 3;
+              if ( !ft_strcmp( s, "10646" )                      ||
+                   ( !ft_strcmp( s, "8859" ) &&
+                     !ft_strcmp( face->charset_encoding, "1" ) ) )
               unicode_charmap = 1;
+            }
 
             {
               FT_CharMapRec  charmap;
@@ -464,9 +482,10 @@ THE SOFTWARE.
 
     if ( size->metrics.y_ppem == root->available_sizes->height )
     {
-      size->metrics.ascender  = face->bdffont->bbx.ascent << 6;
-      size->metrics.descender = face->bdffont->bbx.descent * ( -64 );
-      size->metrics.height    = face->bdffont->bbx.height << 6;
+      size->metrics.ascender    = face->bdffont->bbx.ascent << 6;
+      size->metrics.descender   = face->bdffont->bbx.descent * ( -64 );
+      size->metrics.height      = face->bdffont->bbx.height << 6;
+      size->metrics.max_advance = face->bdffont->bbx.width << 6;
 
       return BDF_Err_Ok;
     }
@@ -637,35 +656,37 @@ THE SOFTWARE.
   {
     bdf_property_t*  prop;
 
+
     FT_ASSERT( face && face->bdffont );
 
-    prop = bdf_get_font_property( face->bdffont, (char*)prop_name );
+    prop = bdf_get_font_property( face->bdffont, prop_name );
     if ( prop != NULL )
     {
       switch ( prop->format )
       {
-        case BDF_ATOM:
-          aproperty->type   = BDF_PROPERTY_TYPE_ATOM;
-          aproperty->u.atom = prop->value.atom;
-          break;
+      case BDF_ATOM:
+        aproperty->type   = BDF_PROPERTY_TYPE_ATOM;
+        aproperty->u.atom = prop->value.atom;
+        break;
 
-        case BDF_INTEGER:
-          aproperty->type      = BDF_PROPERTY_TYPE_INTEGER;
-          aproperty->u.integer = prop->value.int32;
-          break;
+      case BDF_INTEGER:
+        aproperty->type      = BDF_PROPERTY_TYPE_INTEGER;
+        aproperty->u.integer = prop->value.int32;
+        break;
 
-        case BDF_CARDINAL:
-          aproperty->type       = BDF_PROPERTY_TYPE_CARDINAL;
-          aproperty->u.cardinal = prop->value.card32;
-          break;
+      case BDF_CARDINAL:
+        aproperty->type       = BDF_PROPERTY_TYPE_CARDINAL;
+        aproperty->u.cardinal = prop->value.card32;
+        break;
 
-        default:
-          goto Fail;
+      default:
+        goto Fail;
       }
       return 0;
     }
+
   Fail:
-    return FT_Err_Invalid_Argument;
+    return BDF_Err_Invalid_Argument;
   }
 
 
@@ -676,7 +697,7 @@ THE SOFTWARE.
     FT_UNUSED( module );
 
     if ( name && ft_strcmp( name, "get_bdf_property" ) == 0 )
-      return (FT_Module_Interface) bdf_get_bdf_property;
+      return (FT_Module_Interface)bdf_get_bdf_property;
 
     return NULL;
   }
@@ -686,7 +707,8 @@ THE SOFTWARE.
   const FT_Driver_ClassRec  bdf_driver_class =
   {
     {
-      ft_module_font_driver,
+      FT_MODULE_FONT_DRIVER         |
+      FT_MODULE_DRIVER_NO_OUTLINES,
       sizeof ( FT_DriverRec ),
 
       "bdf",
diff --git a/reactos/lib/freetype/src/bdf/bdfdrivr.h b/reactos/lib/freetype/src/bdf/bdfdrivr.h
index 5c5896459f7..1e0224c33d2 100644
--- a/reactos/lib/freetype/src/bdf/bdfdrivr.h
+++ b/reactos/lib/freetype/src/bdf/bdfdrivr.h
@@ -39,8 +39,8 @@ FT_BEGIN_HEADER
 
   typedef struct  BDF_encoding_el_
   {
-    FT_ULong  enc;
-    FT_Short  glyph;
+    FT_ULong   enc;
+    FT_UShort  glyph;
 
   } BDF_encoding_el;
 
diff --git a/reactos/lib/freetype/src/bdf/bdflib.c b/reactos/lib/freetype/src/bdf/bdflib.c
index 7496e6061c4..2d90b4c5bb1 100644
--- a/reactos/lib/freetype/src/bdf/bdflib.c
+++ b/reactos/lib/freetype/src/bdf/bdflib.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000 Computing Research Labs, New Mexico State University
- * Copyright 2001, 2002 Francesco Zappa Nardelli
+ * Copyright 2001, 2002, 2003 Francesco Zappa Nardelli
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -183,10 +183,10 @@
   (*hash_free_func)( hashnode  node );
 
   static hashnode*
-  hash_bucket( char*       key,
-               hashtable*  ht )
+  hash_bucket( const char*  key,
+               hashtable*   ht )
   {
-    char*          kp  = key;
+    const char*    kp  = key;
     unsigned long  res = 0;
     hashnode*      bp  = ht->table, *ndp;
 
@@ -317,7 +317,7 @@
 
 
   static hashnode
-  hash_lookup( char*       key,
+  hash_lookup( const char* key,
                hashtable*  ht )
   {
     hashnode *np = hash_bucket( key, ht );
@@ -641,7 +641,7 @@
   {
     _bdf_line_func_t  cb;
     unsigned long     lineno;
-    int               n, res, done, refill, bytes, hold;
+    int               n, done, refill, bytes, hold;
     char              *ls, *le, *pp, *pe, *hp;
     char              *buf = 0;
     FT_Memory         memory = stream->memory;
@@ -661,7 +661,7 @@
     lineno = 1;
     buf[0] = 0;
 
-    res = done = 0;
+    done = 0;
     pp = ls = le = buf;
 
     bytes = 65536L;
@@ -696,7 +696,7 @@
           le -= n;
           n   = pe - pp;
 
-          FT_MEM_COPY( buf, pp, n );
+          FT_MEM_MOVE( buf, pp, n );
 
           pp     = buf + n;
           bytes  = 65536L - n;
@@ -1443,7 +1443,6 @@
     unsigned char*     bp;
     unsigned long      i, slen, nibbles;
 
-    _bdf_line_func_t*  next;
     _bdf_parse_t*      p;
     bdf_glyph_t*       glyph;
     bdf_font_t*        font;
@@ -1451,11 +1450,11 @@
     FT_Memory          memory;
     FT_Error           error = BDF_Err_Ok;
 
+    FT_UNUSED( call_data );
     FT_UNUSED( lineno );        /* only used in debug mode */
 
 
-    next = (_bdf_line_func_t *)call_data;
-    p    = (_bdf_parse_t *)    client_data;
+    p = (_bdf_parse_t *)client_data;
 
     font   = p->font;
     memory = font->memory;
@@ -1883,7 +1882,7 @@
       /*                                                                  */
       /* This is *always* done regardless of the options, because X11     */
       /* requires these two fields to compile fonts.                      */
-      if ( bdf_get_font_property( p->font, (char *)"FONT_ASCENT" ) == 0 )
+      if ( bdf_get_font_property( p->font, "FONT_ASCENT" ) == 0 )
       {
         p->font->font_ascent = p->font->bbx.ascent;
         ft_sprintf( nbuf, "%hd", p->font->bbx.ascent );
@@ -1895,7 +1894,7 @@
         p->font->modified = 1;
       }
 
-      if ( bdf_get_font_property( p->font, (char *)"FONT_DESCENT" ) == 0 )
+      if ( bdf_get_font_property( p->font, "FONT_DESCENT" ) == 0 )
       {
         p->font->font_descent = p->font->bbx.descent;
         ft_sprintf( nbuf, "%hd", p->font->bbx.descent );
@@ -2419,7 +2418,7 @@
 
   FT_LOCAL_DEF( bdf_property_t * )
   bdf_get_font_property( bdf_font_t*  font,
-                         char*        name )
+                         const char*  name )
   {
     hashnode  hn;
 
diff --git a/reactos/lib/freetype/src/bdf/rules.mk b/reactos/lib/freetype/src/bdf/rules.mk
index b1a3ed9f8eb..25d98e55b07 100644
--- a/reactos/lib/freetype/src/bdf/rules.mk
+++ b/reactos/lib/freetype/src/bdf/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 2001, 2002 by
+# Copyright (C) 2001, 2002, 2003 by
 # Francesco Zappa Nardelli
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,46 +29,46 @@
 
 # bdf driver directory
 #
-BDF_DIR  := $(SRC_)bdf
-BDF_DIR_ := $(BDF_DIR)$(SEP)
+BDF_DIR  := $(SRC_DIR)/bdf
 
 
-BDF_COMPILE := $(FT_COMPILE) $I$(BDF_DIR)
+BDF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(BDF_DIR))
 
 
 # bdf driver sources (i.e., C files)
 #
-BDF_DRV_SRC := $(BDF_DIR_)bdflib.c $(BDF_DIR_)bdfdrivr.c
+BDF_DRV_SRC := $(BDF_DIR)/bdflib.c \
+               $(BDF_DIR)/bdfdrivr.c
 
 
 # bdf driver headers
 #
-BDF_DRV_H := $(BDF_DIR_)bdf.h \
-             $(BDF_DIR_)bdfdrivr.h
+BDF_DRV_H := $(BDF_DIR)/bdf.h \
+             $(BDF_DIR)/bdfdrivr.h
 
 # bdf driver object(s)
 #
 #   BDF_DRV_OBJ_M is used during `multi' builds
 #   BDF_DRV_OBJ_S is used during `single' builds
 #
-BDF_DRV_OBJ_M := $(BDF_DRV_SRC:$(BDF_DIR_)%.c=$(OBJ_)%.$O)
-BDF_DRV_OBJ_S := $(OBJ_)bdf.$O
+BDF_DRV_OBJ_M := $(BDF_DRV_SRC:$(BDF_DIR)/%.c=$(OBJ_DIR)/%.$O)
+BDF_DRV_OBJ_S := $(OBJ_DIR)/bdf.$O
 
 # bdf driver source file for single build
 #
-BDF_DRV_SRC_S := $(BDF_DIR_)bdf.c
+BDF_DRV_SRC_S := $(BDF_DIR)/bdf.c
 
 
 # bdf driver - single object
 #
 $(BDF_DRV_OBJ_S): $(BDF_DRV_SRC_S) $(BDF_DRV_SRC) $(FREETYPE_H) $(BDF_DRV_H)
-	$(BDF_COMPILE) $T$@ $(BDF_DRV_SRC_S)
+	$(BDF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(BDF_DRV_SRC_S))
 
 
 # bdf driver - multiple objects
 #
-$(OBJ_)%.$O: $(BDF_DIR_)%.c $(FREETYPE_H) $(BDF_DRV_H)
-	$(BDF_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(BDF_DIR)/%.c $(FREETYPE_H) $(BDF_DRV_H)
+	$(BDF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -76,4 +76,5 @@ $(OBJ_)%.$O: $(BDF_DIR_)%.c $(FREETYPE_H) $(BDF_DRV_H)
 DRV_OBJS_S += $(BDF_DRV_OBJ_S)
 DRV_OBJS_M += $(BDF_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/cache/ftccache.c b/reactos/lib/freetype/src/cache/ftccache.c
index a12fedc6696..cc01c397811 100644
--- a/reactos/lib/freetype/src/cache/ftccache.c
+++ b/reactos/lib/freetype/src/cache/ftccache.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType internal cache interface (body).                        */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
+/*  Copyright 2000-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -173,7 +173,7 @@
       if ( *pnode == NULL )
       {
         FT_ERROR(( "ftc_node_hash_unlink: unknown node!\n" ));
-        return FT_Err_Ok;
+        return FTC_Err_Ok;
       }
 
       if ( *pnode == node )
@@ -196,7 +196,7 @@
       FTC_Node*  pold;
 
 
-      if ( old_index+1 <= FTC_HASH_INITIAL_SIZE )
+      if ( old_index + 1 <= FTC_HASH_INITIAL_SIZE )
         goto Exit;
 
       if ( p == 0 )
@@ -551,7 +551,7 @@
                     FTC_Query   query,
                     FTC_Node   *anode )
   {
-    FT_Error     error = FT_Err_Ok;
+    FT_Error     error = FTC_Err_Ok;
     FTC_Manager  manager;
     FT_LruNode   lru;
     FT_UInt      free_count = 0;
@@ -567,24 +567,24 @@
 
     manager = cache->manager;
 
-   /*  here's a small note explaining what's hapenning in the code below.
+   /*  here's a small note explaining what's happening in the code below.
     *
-    *  we need to deal intelligently with out-of-memory (OOM) conditions
+    *  We need to deal intelligently with out-of-memory (OOM) conditions
     *  when trying to create a new family or cache node during the lookup.
     *
-    *  when an OOM is detected, we'll try to free one or more "old" nodes
-    *  from the cache, then try again. it may be necessary to do that several
-    *  times, so a loop is needed.
+    *  When an OOM is detected, we try to free one or more "old" nodes
+    *  from the cache, then try again.  It may be necessary to do that
+    *  several times, so a loop is needed.
     *
-    *  the local variable "free_count" holds the number of "old" nodes to
-    *  discard on each attempt. it starts at 1 and doubles on each iteration.
-    *  the loop stops when:
+    *  The local variable "free_count" holds the number of "old" nodes to
+    *  discard on each attempt.  It starts at 1 and doubles on each
+    *  iteration.  The loop stops when:
     *
     *   - a non-OOM error is detected
     *   - a succesful lookup is performed
     *   - there are no more unused nodes in the cache
     *
-    *  for the record, remember that all used nodes appear _before_
+    *  For the record, remember that all used nodes appear _before_
     *  unused ones in the manager's MRU node list.
     */
 
@@ -632,7 +632,6 @@
       }
 
       {
-        FTC_Manager  manager = cache->manager;
         FTC_Family   family  = (FTC_Family) lru;
         FT_UFast     hash    = query->hash;
         FTC_Node*    bucket;
@@ -744,16 +743,17 @@
       }
 
     Fail:
-      if ( error != FT_Err_Out_Of_Memory )
+      if ( error != FTC_Err_Out_Of_Memory )
         goto Exit;
 
-     /* there is not enough memory, try to release some unused nodes
+     /* There is not enough memory; try to release some unused nodes
       * from the cache to make room for a new one.
       */
       {
-        FT_UInt   new_count;
+        FT_UInt  new_count;
 
-        new_count = 1 + free_count*2;
+
+        new_count = 1 + free_count * 2;
 
         /* check overflow and bounds */
         if ( new_count < free_count || free_count > manager->num_nodes )
@@ -763,22 +763,24 @@
 
         /* try to remove "new_count" nodes from the list */
         {
-          FTC_Node   first = manager->nodes_list;
-          FTC_Node   node;
+          FTC_Node  first = manager->nodes_list;
+          FTC_Node  node;
 
-          if ( first == NULL )  /* empty list ! */
+
+          if ( first == NULL )  /* empty list! */
             goto Exit;
 
-         /* go to last node - it's a circular list */
+          /* go to last node - it's a circular list */
           node = first->mru_prev;
           for ( ; node && new_count > 0; new_count-- )
           {
             FTC_Node  prev = node->mru_prev;
 
-           /* used nodes always appear before unused one in the MRU
-            * list. if we find one here, we'd better stop right now
-            * our iteration
-            */
+
+            /* Used nodes always appear before unused one in the MRU
+             * list.  If we find one here, we'd better stop right now
+             * our iteration.
+             */
             if ( node->ref_count > 0 )
             {
               /* if there are no unused nodes in the list, we'd better exit */
diff --git a/reactos/lib/freetype/src/cache/ftccmap.c b/reactos/lib/freetype/src/cache/ftccmap.c
index 8366ce57437..bdb83abb530 100644
--- a/reactos/lib/freetype/src/cache/ftccmap.c
+++ b/reactos/lib/freetype/src/cache/ftccmap.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType CharMap cache (body)                                        */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
+/*  Copyright 2000-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -193,16 +193,17 @@
         break;
 
       case FTC_CMAP_BY_ENCODING:
-        if (desc->u.encoding == FT_ENCODING_UNICODE)
+        if ( desc->u.encoding == FT_ENCODING_UNICODE )
         {
-         /* since the `interesting' table, with id's 3,10, is normally the
-          * last one, we loop backwards. This looses with type1 fonts with
-          * non-BMP characters (<.0001%), this wins with .ttf with non-BMP
-          * chars (.01% ?), and this is the same about 99.99% of the time!
-          */
+          /* Since the `interesting' table, pid/eid (3,10), is normally the
+           * last one, we loop backwards.  This looses with type1 fonts with
+           * non-BMP characters (<.0001%), this wins with .ttf with non-BMP
+           * chars (.01% ?), and this is the same about 99.99% of the time!
+           */
 
           FT_UInt  unicmap_idx = count;  /* some UCS-2 map, if we found it */
 
+
           cur += count - 1;
 
           for ( idx = 0; idx < count; idx++, cur-- )
@@ -211,15 +212,15 @@
             {
               unicmap_idx = idx;  /* record we found a Unicode charmap */
 
-             /* XXX If some new encodings to represent UCS-4 are added,
-              *     they should be added here.
-              */
+              /* XXX If some new encodings to represent UCS-4 are added,
+               *     they should be added here.
+               */
               if ( ( cur[0]->platform_id == TT_PLATFORM_MICROSOFT &&
-                     cur[0]->encoding_id == TT_MS_ID_UCS_4        )          ||
+                     cur[0]->encoding_id == TT_MS_ID_UCS_4        )      ||
                    ( cur[0]->platform_id == TT_PLATFORM_APPLE_UNICODE &&
-                     cur[0]->encoding_id == TT_APPLE_ID_UNICODE_32    )      )
+                     cur[0]->encoding_id == TT_APPLE_ID_UNICODE_32    )  )
 
-              /* Hurray! We found a UCS-4 charmap. We can stop the scan! */
+              /* Hurray! We found a UCS-4 charmap.  We can stop the scan! */
               {
                 idx = count - 1 - idx;
                 goto Found_idx_for_FTC_CMAP_BY_ENCODING;
@@ -227,9 +228,9 @@
             }
           }
 
-         /* We do not have any UCS-4 charmap. Sigh.
-          * Let's see if we have some other kind of Unicode charmap, though.
-          */
+          /* We do not have any UCS-4 charmap. Sigh.
+           * Let's see if we have some other kind of Unicode charmap, though.
+           */
           if ( unicmap_idx < count )
             idx = count - 1 - unicmap_idx;
         }
diff --git a/reactos/lib/freetype/src/cache/ftcsbits.c b/reactos/lib/freetype/src/cache/ftcsbits.c
index 5840382412e..2faf80f33ed 100644
--- a/reactos/lib/freetype/src/cache/ftcsbits.c
+++ b/reactos/lib/freetype/src/cache/ftcsbits.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType sbits manager (body).                                       */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
+/*  Copyright 2000-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -189,13 +189,13 @@
           sbit->format    = (FT_Byte)bitmap->pixel_mode;
           sbit->max_grays = (FT_Byte)(bitmap->num_grays - 1);
 
-#if 0 /* this doesn't work well with embedded bitmaps !! */
+#if 0 /* this doesn't work well with embedded bitmaps */
 
           /* grab the bitmap when possible - this is a hack! */
-          if ( slot->flags & FT_GLYPH_OWN_BITMAP )
+          if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP )
           {
-            slot->flags &= ~FT_GLYPH_OWN_BITMAP;
-            sbit->buffer = bitmap->buffer;
+            slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP;
+            sbit->buffer           = bitmap->buffer;
           }
           else
 #endif
@@ -216,7 +216,7 @@
       /* we mark unloaded glyphs with `sbit.buffer == 0' */
       /* and 'width == 255', 'height == 0'               */
       /*                                                 */
-      if ( error && error != FT_Err_Out_Of_Memory )
+      if ( error && error != FTC_Err_Out_Of_Memory )
       {
         sbit->width = 255;
         error       = 0;
@@ -308,14 +308,11 @@
         FT_ULong  size;
 
 
-        /* yes, it's safe to ignore errors here */
-        ftc_sbit_node_load( snode,
-                            cache->manager,
-                            FTC_SBIT_FAMILY( FTC_QUERY( squery )->family ),
-                            gindex,
-                            &size );
-
-        cache->manager->cur_weight += size;
+        if ( !ftc_sbit_node_load(
+                snode, cache->manager,
+                FTC_SBIT_FAMILY( FTC_QUERY( squery )->family ),
+                gindex, &size ) )
+          cache->manager->cur_weight += size;
       }
     }
 
diff --git a/reactos/lib/freetype/src/cache/ftlru.c b/reactos/lib/freetype/src/cache/ftlru.c
index 4eab0d9b438..b25d7419da7 100644
--- a/reactos/lib/freetype/src/cache/ftlru.c
+++ b/reactos/lib/freetype/src/cache/ftlru.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Simple LRU list-cache (body).                                        */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
+/*  Copyright 2000-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -130,7 +130,6 @@
     FT_Error          error = 0;
     FT_LruNode        node, *pnode;
     FT_LruList_Class  clazz;
-    FT_LruNode*       plast;
     FT_LruNode        result = NULL;
     FT_Memory         memory;
 
@@ -139,7 +138,6 @@
       return FTC_Err_Invalid_Argument;
 
     pnode  = &list->nodes;
-    plast  = pnode;
     node   = NULL;
     clazz  = list->clazz;
     memory = list->memory;
@@ -155,7 +153,6 @@
         if ( clazz->node_compare( node, key, list->data ) )
           break;
 
-        plast = pnode;
         pnode = &(*pnode)->next;
       }
     }
@@ -170,7 +167,6 @@
         if ( node->key == key )
           break;
 
-        plast = pnode;
         pnode = &(*pnode)->next;
       }
     }
@@ -188,40 +184,40 @@
       goto Exit;
     }
 
-   /* since we haven't found the relevant element in our LRU list,
+   /* Since we haven't found the relevant element in our LRU list,
     * we're going to "create" a new one.
     *
-    * the following code is a bit special, because it tries to handle
+    * The following code is a bit special, because it tries to handle
     * out-of-memory conditions (OOM) in an intelligent way.
     *
-    * more precisely, if not enough memory is available to create a
+    * More precisely, if not enough memory is available to create a
     * new node or "flush" an old one, we need to remove the oldest
-    * elements from our list, and try again. since several tries may
-    * be necessary, a loop is needed
+    * elements from our list, and try again.  Since several tries may
+    * be necessary, a loop is needed.
     *
-    * this loop will only exit when:
+    * This loop will only exit when:
     *
-    *   - a new node was succesfully created, or an old node flushed
-    *   - an error other than FT_Err_Out_Of_Memory is detected
+    *   - a new node was successfully created, or an old node flushed
+    *   - an error other than FTC_Err_Out_Of_Memory is detected
     *   - the list of nodes is empty, and it isn't possible to create
     *     new nodes
     *
-    * on each unsucesful attempt, one node will be removed from the list
+    * On each unsuccessful attempt, one node will be removed from the list.
     *
     */
     
     {
-      FT_Int   drop_last = ( list->max_nodes > 0 && 
-                             list->num_nodes >= list->max_nodes );
+      FT_Int  drop_last = ( list->max_nodes > 0 && 
+                            list->num_nodes >= list->max_nodes );
 
       for (;;)
       {
         node = NULL;
 
-       /* when "drop_last" is true, we should free the last node in
-        * the list to make room for a new one. note that we re-use
-        * its memory block to save allocation calls.
-        */
+        /* If "drop_last" is true, we should free the last node in
+         * the list to make room for a new one.  Note that we reuse
+         * its memory block to save allocation calls.
+         */
         if ( drop_last )
         {
          /* find the last node in the list
@@ -231,8 +227,8 @@
   
           if ( node == NULL )
           {
-            FT_ASSERT( list->nodes == 0 );
-            error = FT_Err_Out_Of_Memory;
+            FT_ASSERT( list->num_nodes == 0 );
+            error = FTC_Err_Out_Of_Memory;
             goto Exit;
           }
 
@@ -244,12 +240,12 @@
             node  = *pnode;
           }
   
-         /* remove it from the list, and try to "flush" it. doing this will
-          * save a significant number of dynamic allocations compared to
-          * a classic destroy/create cycle
-          */
+          /* Remove it from the list, and try to "flush" it.  Doing this will
+           * save a significant number of dynamic allocations compared to
+           * a classic destroy/create cycle.
+           */
           *pnode = NULL;
-          list->num_nodes -= 1;
+          list->num_nodes--;
   
           if ( clazz->node_flush )
           {
@@ -257,14 +253,14 @@
             if ( !error )
               goto Success;
 
-           /* note that if an error occured during the flush, we need to
+           /* Note that if an error occured during the flush, we need to
             * finalize it since it is potentially in incomplete state.
             */
           }
 
-         /* we finalize, but do not destroy the last node, we
-          * simply re-use its memory block !
-          */
+          /* We finalize, but do not destroy the last node, we
+           * simply reuse its memory block!
+           */
           if ( clazz->node_done )
             clazz->node_done( node, list->data );
             
@@ -272,8 +268,8 @@
         }
         else
         {
-         /* try to allocate a new node when "drop_last" is not TRUE
-          * this usually happens on the first pass, when the LRU list
+         /* Try to allocate a new node when "drop_last" is not TRUE.
+          * This usually happens on the first pass, when the LRU list
           * is not already full.
           */
           if ( FT_ALLOC( node, clazz->node_size ) )
@@ -302,7 +298,7 @@
         goto Exit;
   
       Fail:
-        if ( error != FT_Err_Out_Of_Memory )
+        if ( error != FTC_Err_Out_Of_Memory )
           goto Exit;
         
         drop_last = 1;
@@ -316,7 +312,6 @@
   }
 
 
-
   FT_EXPORT_DEF( void )
   FT_LruList_Remove( FT_LruList  list,
                      FT_LruNode  node )
@@ -384,6 +379,7 @@
           clazz->node_done( node, list );
 
         FT_FREE( node );
+        list->num_nodes--;
       }
       else
         pnode = &(*pnode)->next;
diff --git a/reactos/lib/freetype/src/cache/rules.mk b/reactos/lib/freetype/src/cache/rules.mk
index a74e7800ac0..617ca48dae8 100644
--- a/reactos/lib/freetype/src/cache/rules.mk
+++ b/reactos/lib/freetype/src/cache/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2000, 2001 by
+# Copyright 2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,66 +15,63 @@
 
 # Cache driver directory
 #
-CACHE_DIR  := $(SRC_)cache
-CACHE_DIR_ := $(CACHE_DIR)$(SEP)
-
-CACHE_H_DIR  := $(PUBLIC_)cache
-CACHE_H_DIR_ := $(CACHE_H_DIR)$(SEP)
+CACHE_DIR   := $(SRC_DIR)/cache
+CACHE_H_DIR := $(PUBLIC_DIR)/cache
 
 # compilation flags for the driver
 #
-Cache_COMPILE := $(FT_COMPILE) $I$(CACHE_DIR)
+CACHE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(CACHE_DIR))
 
 
 # Cache driver sources (i.e., C files)
 #
-Cache_DRV_SRC := $(CACHE_DIR_)ftlru.c    \
-                 $(CACHE_DIR_)ftcmanag.c \
-                 $(CACHE_DIR_)ftccache.c \
-                 $(CACHE_DIR_)ftcglyph.c \
-                 $(CACHE_DIR_)ftcsbits.c \
-                 $(CACHE_DIR_)ftcimage.c \
-                 $(CACHE_DIR_)ftccmap.c
+CACHE_DRV_SRC := $(CACHE_DIR)/ftlru.c    \
+                 $(CACHE_DIR)/ftcmanag.c \
+                 $(CACHE_DIR)/ftccache.c \
+                 $(CACHE_DIR)/ftcglyph.c \
+                 $(CACHE_DIR)/ftcsbits.c \
+                 $(CACHE_DIR)/ftcimage.c \
+                 $(CACHE_DIR)/ftccmap.c
 
 # Cache driver headers
 #
-Cache_DRV_H := $(CACHE_H_DIR_)ftlru.h    \
-               $(CACHE_H_DIR_)ftcmanag.h \
-               $(CACHE_H_DIR_)ftcglyph.h \
-               $(CACHE_H_DIR_)ftcimage.h \
-               $(CACHE_DIR_)ftcerror.h
+CACHE_DRV_H := $(CACHE_H_DIR)/ftlru.h    \
+               $(CACHE_H_DIR)/ftcmanag.h \
+               $(CACHE_H_DIR)/ftcglyph.h \
+               $(CACHE_H_DIR)/ftcimage.h \
+               $(CACHE_DIR)/ftcerror.h
 
 
 # Cache driver object(s)
 #
-#   Cache_DRV_OBJ_M is used during `multi' builds.
-#   Cache_DRV_OBJ_S is used during `single' builds.
+#   CACHE_DRV_OBJ_M is used during `multi' builds.
+#   CACHE_DRV_OBJ_S is used during `single' builds.
 #
-Cache_DRV_OBJ_M := $(Cache_DRV_SRC:$(CACHE_DIR_)%.c=$(OBJ_)%.$O)
-Cache_DRV_OBJ_S := $(OBJ_)ftcache.$O
+CACHE_DRV_OBJ_M := $(CACHE_DRV_SRC:$(CACHE_DIR)/%.c=$(OBJ_DIR)/%.$O)
+CACHE_DRV_OBJ_S := $(OBJ_DIR)/ftcache.$O
 
 # Cache driver source file for single build
 #
-Cache_DRV_SRC_S := $(CACHE_DIR_)ftcache.c
+CACHE_DRV_SRC_S := $(CACHE_DIR)/ftcache.c
 
 
 # Cache driver - single object
 #
-$(Cache_DRV_OBJ_S): $(Cache_DRV_SRC_S) $(Cache_DRV_SRC) \
-                   $(FREETYPE_H) $(Cache_DRV_H)
-	$(Cache_COMPILE) $T$@ $(Cache_DRV_SRC_S)
+$(CACHE_DRV_OBJ_S): $(CACHE_DRV_SRC_S) $(CACHE_DRV_SRC) \
+                   $(FREETYPE_H) $(CACHE_DRV_H)
+	$(CACHE_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(CACHE_DRV_SRC_S))
 
 
 # Cache driver - multiple objects
 #
-$(OBJ_)%.$O: $(CACHE_DIR_)%.c $(FREETYPE_H) $(Cache_DRV_H)
-	$(Cache_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(CACHE_DIR)/%.c $(FREETYPE_H) $(CACHE_DRV_H)
+	$(CACHE_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
 #
-DRV_OBJS_S += $(Cache_DRV_OBJ_S)
-DRV_OBJS_M += $(Cache_DRV_OBJ_M)
+DRV_OBJS_S += $(CACHE_DRV_OBJ_S)
+DRV_OBJS_M += $(CACHE_DRV_OBJ_M)
 
 
 # EOF
diff --git a/reactos/lib/freetype/src/cff/cffcmap.c b/reactos/lib/freetype/src/cff/cffcmap.c
index 5beb6aea58c..5ed9d5dcf9a 100644
--- a/reactos/lib/freetype/src/cff/cffcmap.c
+++ b/reactos/lib/freetype/src/cff/cffcmap.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CFF character mapping table (cmap) support (body).                   */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -36,7 +36,6 @@
     CFF_Encoding  encoding = &cff->encoding;
 
 
-    cmap->count = encoding->count;
     cmap->gids  = encoding->codes;
     
     return 0;
@@ -46,7 +45,6 @@
   FT_CALLBACK_DEF( void )
   cff_cmap_encoding_done( CFF_CMapStd  cmap )
   {
-    cmap->count = 0;
     cmap->gids  = NULL;
   }
 
@@ -58,7 +56,7 @@
     FT_UInt  result = 0;
 
 
-    if ( char_code < cmap->count )
+    if ( char_code < 256 )
       result = cmap->gids[char_code];
     
     return result;
@@ -75,14 +73,14 @@
 
     *pchar_code = 0;
 
-    if ( char_code < cmap->count )
+    if ( char_code < 255 )
     {
       FT_UInt  code = (FT_UInt)(char_code + 1);
       
 
       for (;;)
       {
-        if ( code >= cmap->count )
+        if ( code >= 256 )
           break;
           
         result = cmap->gids[code];
@@ -164,7 +162,7 @@
       pair = cmap->pairs;
       for ( n = 0; n < count; n++ )
       {
-        FT_UInt      sid   = charset->sids[n];
+        FT_UInt      sid = charset->sids[n];
         const char*  gname;
 
 
@@ -191,7 +189,7 @@
       {
         /* there are no unicode characters in here! */
         FT_FREE( cmap->pairs );
-        error = FT_Err_Invalid_Argument;
+        error = CFF_Err_Invalid_Argument;
       }
       else
       {
diff --git a/reactos/lib/freetype/src/cff/cffcmap.h b/reactos/lib/freetype/src/cff/cffcmap.h
index e136d29e088..ceb32cd3c3a 100644
--- a/reactos/lib/freetype/src/cff/cffcmap.h
+++ b/reactos/lib/freetype/src/cff/cffcmap.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CFF character mapping table (cmap) support (specification).          */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -38,7 +38,6 @@ FT_BEGIN_HEADER
   typedef struct  CFF_CMapStdRec_
   {
     FT_CMapRec  cmap;
-    FT_UInt     count;
     FT_UShort*  gids;   /* up to 256 elements */
     
   } CFF_CMapStdRec;
diff --git a/reactos/lib/freetype/src/cff/cffdrivr.c b/reactos/lib/freetype/src/cff/cffdrivr.c
index 34ed2bf76e2..54929b7155f 100644
--- a/reactos/lib/freetype/src/cff/cffdrivr.c
+++ b/reactos/lib/freetype/src/cff/cffdrivr.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType font driver implementation (body).                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -165,7 +165,7 @@
   /*    glyph_index :: The index of the glyph in the font file.            */
   /*                                                                       */
   /*    load_flags  :: A flag indicating what to load for this glyph.  The */
-  /*                   FTLOAD_??? constants can be used to control the     */
+  /*                   FT_LOAD_??? constants can be used to control the    */
   /*                   glyph loading process (e.g., whether the outline    */
   /*                   should be scaled, whether to load bitmaps or not,   */
   /*                   whether to hint the outline, etc).                  */
@@ -255,7 +255,7 @@
     /* now, lookup the name itself */
     gname = cff_index_get_sid_string( &font->string_index, sid, psnames );
 
-    if ( buffer_max > 0 )
+    if ( gname && buffer_max > 0 )
     {
       FT_UInt  len = (FT_UInt)ft_strlen( gname );
 
@@ -267,7 +267,7 @@
       ((FT_Byte*)buffer)[len] = 0;
     }
 
-    FT_FREE ( gname );
+    FT_FREE( gname );
     error = CFF_Err_Ok;
 
     Exit:
@@ -275,7 +275,6 @@
   }
 
 
-
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ -378,9 +377,9 @@
   {
     /* begin with the FT_Module_Class fields */
     {
-      ft_module_font_driver       |
-      ft_module_driver_scalable   |
-      ft_module_driver_has_hinter,
+      FT_MODULE_FONT_DRIVER       |
+      FT_MODULE_DRIVER_SCALABLE   |
+      FT_MODULE_DRIVER_HAS_HINTER,
 
       sizeof( CFF_DriverRec ),
       "cff",
diff --git a/reactos/lib/freetype/src/cff/cffgload.c b/reactos/lib/freetype/src/cff/cffgload.c
index 0432aa021eb..43d68494147 100644
--- a/reactos/lib/freetype/src/cff/cffgload.c
+++ b/reactos/lib/freetype/src/cff/cffgload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType Glyph Loader (body).                                        */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -246,7 +246,6 @@
       builder->current = &loader->current.outline;
       FT_GlyphLoader_Rewind( loader );
 
-      builder->hint_flags    = FT_FACE(face)->internal->hint_flags;
       builder->hints_globals = 0;
       builder->hints_funcs   = 0;
 
@@ -818,7 +817,7 @@
     seed = (FT_Fixed)(char*)&seed           ^
            (FT_Fixed)(char*)&decoder        ^
            (FT_Fixed)(char*)&charstring_base;
-    seed = ( seed ^ ( seed >> 10 ) ^ ( seed >> 20 ) ) & 0xFFFF;
+    seed = ( seed ^ ( seed >> 10 ) ^ ( seed >> 20 ) ) & 0xFFFFL;
     if ( seed == 0 )
       seed = 0x7384;
 
@@ -903,7 +902,7 @@
         *decoder->top++ = val;
 
 #ifdef FT_DEBUG_LEVEL_TRACE
-        if ( !( val & 0xFFFF ) )
+        if ( !( val & 0xFFFFL ) )
           FT_TRACE4(( " %d", (FT_Int32)( val >> 16 ) ));
         else
           FT_TRACE4(( " %.2f", val / 65536.0 ));
@@ -1770,7 +1769,7 @@
             hinter->apply( hinter->hints,
                            builder->current,
                            (PSH_Globals)builder->hints_globals,
-                           builder->hint_flags );
+                           decoder->hint_mode );
           }
 
           /* add current outline to the glyph slot */
@@ -1824,7 +1823,7 @@
             FT_TRACE4(( " rand" ));
 
             Rand = seed;
-            if ( Rand >= 0x8000 )
+            if ( Rand >= 0x8000L )
               Rand++;
 
             args[0] = Rand;
@@ -2366,15 +2365,16 @@
  #ifdef FT_CONFIG_OPTION_INCREMENTAL
 
     /* Incremental fonts can optionally override the metrics. */
-    if ( !error                                       &&
-         face->root.internal->incremental_interface   &&
+    if ( !error                                                              &&
+         face->root.internal->incremental_interface                          &&
          face->root.internal->incremental_interface->funcs->get_glyph_metrics )
     {
       FT_Incremental_MetricsRec  metrics;
 
+
       metrics.bearing_x = decoder.builder.left_bearing.x;
-	  metrics.bearing_y = decoder.builder.left_bearing.y;
-	  metrics.advance   = decoder.builder.advance.x;
+      metrics.bearing_y = decoder.builder.left_bearing.y;
+      metrics.advance   = decoder.builder.advance.x;
       error = face->root.internal->incremental_interface->funcs->get_glyph_metrics(
                 face->root.internal->incremental_interface->object,
                 glyph_index, FALSE, &metrics );
@@ -2411,6 +2411,7 @@
       {
         FT_BBox            cbox;
         FT_Glyph_Metrics*  metrics = &glyph->root.metrics;
+        FT_Vector          advance;
 
 
         /* copy the _unscaled_ advance width */
@@ -2440,6 +2441,15 @@
                               font_offset.x,
                               font_offset.y );
 
+        advance.x = metrics->horiAdvance;
+        advance.y = 0;
+        FT_Vector_Transform( &advance, &font_matrix );
+        metrics->horiAdvance = advance.x + font_offset.x;
+        advance.x = 0;
+        advance.y = metrics->vertAdvance;
+        FT_Vector_Transform( &advance, &font_matrix );
+        metrics->vertAdvance = advance.y + font_offset.y;
+
         if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
         {
           /* scale the outline and the metrics */
diff --git a/reactos/lib/freetype/src/cff/cffgload.h b/reactos/lib/freetype/src/cff/cffgload.h
index a1be92cb001..3adfe7cc65f 100644
--- a/reactos/lib/freetype/src/cff/cffgload.h
+++ b/reactos/lib/freetype/src/cff/cffgload.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType Glyph Loader (specification).                               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -114,8 +114,6 @@ FT_BEGIN_HEADER
     FT_Error        error;         /* only used for memory errors */
     FT_Bool         metrics_only;
 
-    FT_UInt32       hint_flags;
-
     void*           hints_funcs;    /* hinter-specific */
     void*           hints_globals;  /* hinter-specific */
 
diff --git a/reactos/lib/freetype/src/cff/cffload.c b/reactos/lib/freetype/src/cff/cffload.c
index 66af469b857..cc95e790eb5 100644
--- a/reactos/lib/freetype/src/cff/cffload.c
+++ b/reactos/lib/freetype/src/cff/cffload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType and CFF data/program tables loader (body).                  */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -1505,8 +1505,8 @@
                     FT_ULong     base_offset,
                     FT_ULong     offset )
   {
-    FT_Memory  memory     = stream->memory;
-    FT_Error   error      = 0;
+    FT_Memory  memory = stream->memory;
+    FT_Error   error  = 0;
     FT_UShort  glyph_sid;
 
 
@@ -1557,7 +1557,6 @@
 
           while ( j < num_glyphs )
           {
-
             /* Read the first glyph sid of the range. */
             if ( FT_READ_USHORT( glyph_sid ) )
               goto Exit;
@@ -1595,7 +1594,7 @@
       /* In order to use a predefined charset, the following must be  */
       /* true: The charset constructed for the glyphs in the font's   */
       /* charstrings dictionary must match the predefined charset in  */
-      /* the first num_glyphs                                         */
+      /* the first num_glyphs.                                        */
 
       charset->offset = offset;  /* record charset type */
 
@@ -1680,7 +1679,6 @@
   }
 
 
-
   static void
   cff_encoding_done( CFF_Encoding  encoding )
   {
@@ -1690,7 +1688,6 @@
   }
 
 
-
   static FT_Error
   cff_encoding_load( CFF_Encoding  encoding,
                      CFF_Charset   charset,
@@ -1699,11 +1696,11 @@
                      FT_ULong      base_offset,
                      FT_ULong      offset )
   {
-    FT_Error    error  = 0;
-    FT_UInt     count;
-    FT_UInt     j;
-    FT_UShort   glyph_sid;
-    FT_UInt     glyph_code;
+    FT_Error   error = 0;
+    FT_UInt    count;
+    FT_UInt    j;
+    FT_UShort  glyph_sid;
+    FT_UInt    glyph_code;
 
 
     /* Check for charset->sids.  If we do not have this, we fail. */
@@ -1720,8 +1717,8 @@
       encoding->codes[j] = 0;
     }
 
-    /* Note: The encoding table in a CFF font is indexed by glyph index,  */
-    /* where the first encoded glyph index is 1.  Hence, we read the char */
+    /* Note: The encoding table in a CFF font is indexed by glyph index;  */
+    /* the first encoded glyph index is 1.  Hence, we read the character  */
     /* code (`glyph_code') at index j and make the assignment:            */
     /*                                                                    */
     /*    encoding->codes[glyph_code] = j + 1                             */
@@ -1734,7 +1731,6 @@
 
     if ( offset > 1 )
     {
-
       encoding->offset = base_offset + offset;
 
       /* we need to parse the table to determine its size */
@@ -1749,9 +1745,10 @@
         {
           FT_Byte*  p;
 
-          /* by convention, GID 0 is always ".notdef" and is never */
-          /* coded in the font. Hence, the number of codes found   */
-          /* in the table is 'count+1'                             */
+
+          /* By convention, GID 0 is always ".notdef" and is never */
+          /* coded in the font.  Hence, the number of codes found  */
+          /* in the table is `count+1'.                            */
           /*                                                       */
           encoding->count = count + 1;
 
@@ -1781,7 +1778,7 @@
 
       case 1:
         {
-          FT_Byte  nleft;
+          FT_UInt  nleft;
           FT_UInt  i = 1;
           FT_UInt  k;
 
@@ -1821,7 +1818,7 @@
             }
           }
 
-          /* simple check, one never knows what can be found in a font */
+          /* simple check; one never knows what can be found in a font */
           if ( encoding->count > 256 )
             encoding->count = 256;
         }
@@ -1856,13 +1853,13 @@
           /* Assign code to SID mapping. */
           encoding->sids[glyph_code] = glyph_sid;
 
-          /* First, lookup GID which has been assigned to */
-          /* SID glyph_sid.                               */
+          /* First, look up GID which has been assigned to */
+          /* SID glyph_sid.                                */
           for ( gindex = 0; gindex < num_glyphs; gindex++ )
           {
             if ( charset->sids[gindex] == glyph_sid )
             {
-              encoding->codes[glyph_code] = (FT_UShort) gindex;
+              encoding->codes[glyph_code] = (FT_UShort)gindex;
               break;
             }
           }
@@ -1874,10 +1871,10 @@
       FT_UInt i;
 
 
-      /* We take into account the fact a CFF font can use a predefined  */
-      /* encoding without containing all of the glyphs encoded by this  */
-      /* encoding (see the note at the end of section 12 in the CFF     */
-      /* specification).                                                */
+      /* We take into account the fact a CFF font can use a predefined */
+      /* encoding without containing all of the glyphs encoded by this */
+      /* encoding (see the note at the end of section 12 in the CFF    */
+      /* specification).                                               */
 
       switch ( (FT_UInt)offset )
       {
@@ -1899,7 +1896,6 @@
 
         encoding->count = 0;
 
-
         for ( j = 0; j < 256; j++ )
         {
           /* If j is encoded, find the GID for it. */
@@ -1923,8 +1919,8 @@
               encoding->codes[j] = (FT_UShort)i;
 
               /* update encoding count */
-              if ( encoding->count < j+1 )
-                encoding->count = j+1;
+              if ( encoding->count < j + 1 )
+                encoding->count = j + 1;
             }
           }
         }
@@ -1964,8 +1960,8 @@
     /* set defaults */
     FT_MEM_ZERO( top, sizeof ( *top ) );
 
-    top->underline_position  = -100;
-    top->underline_thickness = 50;
+    top->underline_position  = -100L << 16;
+    top->underline_thickness = 50L << 16;
     top->charstring_type     = 2;
     top->font_matrix.xx      = 0x10000L;
     top->font_matrix.yy      = 0x10000L;
@@ -1992,8 +1988,8 @@
       priv->blue_shift       = 7;
       priv->blue_fuzz        = 1;
       priv->lenIV            = -1;
-      priv->expansion_factor = (FT_Fixed)0.06 * 0x10000L;
-      priv->blue_scale       = (FT_Fixed)0.039625 * 0x10000L;
+      priv->expansion_factor = (FT_Fixed)( 0.06 * 0x10000L );
+      priv->blue_scale       = (FT_Fixed)( 0.039625 * 0x10000L * 1000 );
 
       cff_parser_init( &parser, CFF_CODE_PRIVATE, priv );
 
@@ -2207,7 +2203,7 @@
     if ( font->num_glyphs > 0 )
     {
       error = cff_charset_load( &font->charset, font->num_glyphs, stream,
-                              base_offset, dict->charset_offset );
+                                base_offset, dict->charset_offset );
       if ( error )
         goto Exit;
 
diff --git a/reactos/lib/freetype/src/cff/cffobjs.c b/reactos/lib/freetype/src/cff/cffobjs.c
index 830f46269fe..f0700d1890b 100644
--- a/reactos/lib/freetype/src/cff/cffobjs.c
+++ b/reactos/lib/freetype/src/cff/cffobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType objects manager (body).                                     */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -293,7 +293,7 @@
       sfnt_format = 1;
 
       /* now, the font can be either an OpenType/CFF font, or an SVG CEF */
-      /* font in the later case; it doesn't have a `head' table          */
+      /* font; in the later case it doesn't have a `head' table          */
       error = face->goto_table( face, TTAG_head, stream, 0 );
       if ( !error )
       {
@@ -396,6 +396,9 @@
         else
           root->units_per_EM = 1000;
 
+        root->underline_position  = dict->underline_position >> 16;
+        root->underline_thickness = dict->underline_thickness >> 16;
+
         /* retrieve font family & style name */
         root->family_name  = cff_index_get_name( &cff->name_index, face_index );
         if ( dict->cid_registry )
@@ -463,7 +466,7 @@
         CFF_Encoding   encoding = &cff->encoding;
 
 
-        for ( nn = 0; nn < (FT_UInt) root->num_charmaps; nn++ )
+        for ( nn = 0; nn < (FT_UInt)root->num_charmaps; nn++ )
         {
           cmap = root->charmaps[nn];
 
@@ -482,12 +485,12 @@
         cmaprec.encoding_id = 1;
         cmaprec.encoding    = FT_ENCODING_UNICODE;
 
-        nn = (FT_UInt) root->num_charmaps;
+        nn = (FT_UInt)root->num_charmaps;
 
         FT_CMap_New( &cff_cmap_unicode_class_rec, NULL, &cmaprec, NULL );
 
         /* if no Unicode charmap was previously selected, select this one */
-        if ( root->charmap == NULL && nn != (FT_UInt) root->num_charmaps )
+        if ( root->charmap == NULL && nn != (FT_UInt)root->num_charmaps )
           root->charmap = root->charmaps[nn];
 
       Skip_Unicode:
@@ -501,26 +504,25 @@
 
           if ( encoding->offset == 0 )
           {
-            cmaprec.encoding_id = 0;
+            cmaprec.encoding_id = TT_ADOBE_ID_STANDARD;
             cmaprec.encoding    = FT_ENCODING_ADOBE_STANDARD;
             clazz               = &cff_cmap_encoding_class_rec;
           }
           else if ( encoding->offset == 1 )
           {
-            cmaprec.encoding_id = 1;
+            cmaprec.encoding_id = TT_ADOBE_ID_EXPERT;
             cmaprec.encoding    = FT_ENCODING_ADOBE_EXPERT;
             clazz               = &cff_cmap_encoding_class_rec;
           }
           else
           {
-            cmaprec.encoding_id = 3;
+            cmaprec.encoding_id = TT_ADOBE_ID_CUSTOM;
             cmaprec.encoding    = FT_ENCODING_ADOBE_CUSTOM;
             clazz               = &cff_cmap_encoding_class_rec;
           }
 
           FT_CMap_New( clazz, NULL, &cmaprec, NULL );
         }
-
       }
     }
 
diff --git a/reactos/lib/freetype/src/cff/cffparse.c b/reactos/lib/freetype/src/cff/cffparse.c
index 3e1f8408e8f..a44e43e20de 100644
--- a/reactos/lib/freetype/src/cff/cffparse.c
+++ b/reactos/lib/freetype/src/cff/cffparse.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CFF token stream parser (body)                                       */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -38,6 +38,7 @@
     cff_kind_none = 0,
     cff_kind_num,
     cff_kind_fixed,
+    cff_kind_fixed_thousand,
     cff_kind_string,
     cff_kind_bool,
     cff_kind_delta,
@@ -429,6 +430,8 @@
           CFF_FIELD( code, name, cff_kind_num )
 #define CFF_FIELD_FIXED( code, name ) \
           CFF_FIELD( code, name, cff_kind_fixed )
+#define CFF_FIELD_FIXED_1000( code, name ) \
+          CFF_FIELD( code, name, cff_kind_fixed_thousand )
 #define CFF_FIELD_STRING( code, name ) \
           CFF_FIELD( code, name, cff_kind_string )
 #define CFF_FIELD_BOOL( code, name ) \
@@ -579,6 +582,10 @@
 
             case cff_kind_fixed:
               val = cff_parse_fixed( parser->stack );
+              goto Store_Number;
+
+            case cff_kind_fixed_thousand:
+              val = cff_parse_fixed_thousand( parser->stack );
 
             Store_Number:
               switch ( field->size )
diff --git a/reactos/lib/freetype/src/cff/cfftoken.h b/reactos/lib/freetype/src/cff/cfftoken.h
index 2cbb837b439..65a84683e8f 100644
--- a/reactos/lib/freetype/src/cff/cfftoken.h
+++ b/reactos/lib/freetype/src/cff/cfftoken.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CFF token definitions (specification only).                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,8 +30,8 @@
   CFF_FIELD_STRING  ( 4,     weight )
   CFF_FIELD_BOOL    ( 0x101, is_fixed_pitch )
   CFF_FIELD_FIXED   ( 0x102, italic_angle )
-  CFF_FIELD_NUM     ( 0x103, underline_position )
-  CFF_FIELD_NUM     ( 0x104, underline_thickness )
+  CFF_FIELD_FIXED   ( 0x103, underline_position )
+  CFF_FIELD_FIXED   ( 0x104, underline_thickness )
   CFF_FIELD_NUM     ( 0x105, paint_type )
   CFF_FIELD_NUM     ( 0x106, charstring_type )
   CFF_FIELD_CALLBACK( 0x107, font_matrix )
@@ -72,26 +72,26 @@
 #undef  CFFCODE
 #define CFFCODE       CFFCODE_PRIVATE
 
-  CFF_FIELD_DELTA( 6,     blue_values, 14 )
-  CFF_FIELD_DELTA( 7,     other_blues, 10 )
-  CFF_FIELD_DELTA( 8,     family_blues, 14 )
-  CFF_FIELD_DELTA( 9,     family_other_blues, 10 )
-  CFF_FIELD_FIXED( 0x109, blue_scale )
-  CFF_FIELD_NUM  ( 0x10A, blue_shift )
-  CFF_FIELD_NUM  ( 0x10B, blue_fuzz )
-  CFF_FIELD_NUM  ( 10,    standard_width )
-  CFF_FIELD_NUM  ( 11,    standard_height )
-  CFF_FIELD_DELTA( 0x10C, snap_widths, 13 )
-  CFF_FIELD_DELTA( 0x10D, snap_heights, 13 )
-  CFF_FIELD_BOOL ( 0x10E, force_bold )
-  CFF_FIELD_FIXED( 0x10F, force_bold_threshold )
-  CFF_FIELD_NUM  ( 0x110, lenIV )
-  CFF_FIELD_NUM  ( 0x111, language_group )
-  CFF_FIELD_FIXED( 0x112, expansion_factor )
-  CFF_FIELD_NUM  ( 0x113, initial_random_seed )
-  CFF_FIELD_NUM  ( 19,    local_subrs_offset )
-  CFF_FIELD_NUM  ( 20,    default_width )
-  CFF_FIELD_NUM  ( 21,    nominal_width )
+  CFF_FIELD_DELTA     ( 6,     blue_values, 14 )
+  CFF_FIELD_DELTA     ( 7,     other_blues, 10 )
+  CFF_FIELD_DELTA     ( 8,     family_blues, 14 )
+  CFF_FIELD_DELTA     ( 9,     family_other_blues, 10 )
+  CFF_FIELD_FIXED_1000( 0x109, blue_scale )
+  CFF_FIELD_NUM       ( 0x10A, blue_shift )
+  CFF_FIELD_NUM       ( 0x10B, blue_fuzz )
+  CFF_FIELD_NUM       ( 10,    standard_width )
+  CFF_FIELD_NUM       ( 11,    standard_height )
+  CFF_FIELD_DELTA     ( 0x10C, snap_widths, 13 )
+  CFF_FIELD_DELTA     ( 0x10D, snap_heights, 13 )
+  CFF_FIELD_BOOL      ( 0x10E, force_bold )
+  CFF_FIELD_FIXED     ( 0x10F, force_bold_threshold )
+  CFF_FIELD_NUM       ( 0x110, lenIV )
+  CFF_FIELD_NUM       ( 0x111, language_group )
+  CFF_FIELD_FIXED     ( 0x112, expansion_factor )
+  CFF_FIELD_NUM       ( 0x113, initial_random_seed )
+  CFF_FIELD_NUM       ( 19,    local_subrs_offset )
+  CFF_FIELD_NUM       ( 20,    default_width )
+  CFF_FIELD_NUM       ( 21,    nominal_width )
 
 
 /* END */
diff --git a/reactos/lib/freetype/src/cff/rules.mk b/reactos/lib/freetype/src/cff/rules.mk
index b53fdd83a2c..579f144e019 100644
--- a/reactos/lib/freetype/src/cff/rules.mk
+++ b/reactos/lib/freetype/src/cff/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001 by
+# Copyright 1996-2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,27 +15,26 @@
 
 # OpenType driver directory
 #
-CFF_DIR  := $(SRC_)cff
-CFF_DIR_ := $(CFF_DIR)$(SEP)
+CFF_DIR := $(SRC_DIR)/cff
 
 
-CFF_COMPILE := $(FT_COMPILE) $I$(CFF_DIR)
+CFF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(CFF_DIR))
 
 
 # CFF driver sources (i.e., C files)
 #
-CFF_DRV_SRC := $(CFF_DIR_)cffobjs.c   \
-               $(CFF_DIR_)cffload.c   \
-               $(CFF_DIR_)cffgload.c  \
-               $(CFF_DIR_)cffparse.c  \
-               $(CFF_DIR_)cffcmap.c   \
-               $(CFF_DIR_)cffdrivr.c
+CFF_DRV_SRC := $(CFF_DIR)/cffobjs.c  \
+               $(CFF_DIR)/cffload.c  \
+               $(CFF_DIR)/cffgload.c \
+               $(CFF_DIR)/cffparse.c \
+               $(CFF_DIR)/cffcmap.c  \
+               $(CFF_DIR)/cffdrivr.c
 
 # CFF driver headers
 #
 CFF_DRV_H := $(CFF_DRV_SRC:%.c=%.h) \
-             $(CFF_DIR_)cfftoken.h \
-             $(CFF_DIR_)cfferrs.h
+             $(CFF_DIR)/cfftoken.h  \
+             $(CFF_DIR)/cfferrs.h
 
 
 # CFF driver object(s)
@@ -43,24 +42,24 @@ CFF_DRV_H := $(CFF_DRV_SRC:%.c=%.h) \
 #   CFF_DRV_OBJ_M is used during `multi' builds
 #   CFF_DRV_OBJ_S is used during `single' builds
 #
-CFF_DRV_OBJ_M := $(CFF_DRV_SRC:$(CFF_DIR_)%.c=$(OBJ_)%.$O)
-CFF_DRV_OBJ_S := $(OBJ_)cff.$O
+CFF_DRV_OBJ_M := $(CFF_DRV_SRC:$(CFF_DIR)/%.c=$(OBJ_DIR)/%.$O)
+CFF_DRV_OBJ_S := $(OBJ_DIR)/cff.$O
 
 # CFF driver source file for single build
 #
-CFF_DRV_SRC_S := $(CFF_DIR_)cff.c
+CFF_DRV_SRC_S := $(CFF_DIR)/cff.c
 
 
 # CFF driver - single object
 #
 $(CFF_DRV_OBJ_S): $(CFF_DRV_SRC_S) $(CFF_DRV_SRC) $(FREETYPE_H) $(CFF_DRV_H)
-	$(CFF_COMPILE) $T$@ $(CFF_DRV_SRC_S)
+	$(CFF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(CFF_DRV_SRC_S))
 
 
 # CFF driver - multiple objects
 #
-$(OBJ_)%.$O: $(CFF_DIR_)%.c $(FREETYPE_H) $(CFF_DRV_H)
-	$(CFF_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(CFF_DIR)/%.c $(FREETYPE_H) $(CFF_DRV_H)
+	$(CFF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -68,4 +67,5 @@ $(OBJ_)%.$O: $(CFF_DIR_)%.c $(FREETYPE_H) $(CFF_DRV_H)
 DRV_OBJS_S += $(CFF_DRV_OBJ_S)
 DRV_OBJS_M += $(CFF_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/cid/cidgload.c b/reactos/lib/freetype/src/cid/cidgload.c
index 15231f86c4a..e07fb717c66 100644
--- a/reactos/lib/freetype/src/cid/cidgload.c
+++ b/reactos/lib/freetype/src/cid/cidgload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID-keyed Type1 Glyph Loader (body).                                 */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -40,15 +40,16 @@
   cid_load_glyph( T1_Decoder  decoder,
                   FT_UInt     glyph_index )
   {
-    CID_Face      face = (CID_Face)decoder->builder.face;
-    CID_FaceInfo  cid  = &face->cid;
-    FT_Byte*      p;
-    FT_UInt       fd_select;
-    FT_Stream     stream = face->root.stream;
-    FT_Error      error  = 0;
-    FT_Byte*      charstring = 0;
-    FT_Memory     memory = face->root.memory;
-    FT_UInt       glyph_length = 0;
+    CID_Face       face = (CID_Face)decoder->builder.face;
+    CID_FaceInfo   cid  = &face->cid;
+    FT_Byte*       p;
+    FT_UInt        fd_select;
+    FT_Stream      stream = face->root.stream;
+    FT_Error       error  = 0;
+    FT_Byte*       charstring = 0;
+    FT_Memory      memory = face->root.memory;
+    FT_ULong       glyph_length = 0;
+    PSAux_Service  psaux = (PSAux_Service)face->psaux;
 
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
@@ -107,8 +108,7 @@
       fd_select    = (FT_UInt) cid_get_offset( &p, (FT_Byte)cid->fd_bytes );
       off1         = (FT_ULong)cid_get_offset( &p, (FT_Byte)cid->gd_bytes );
       p           += cid->fd_bytes;
-      glyph_length = (FT_UInt) cid_get_offset(
-                                 &p, (FT_Byte)cid->gd_bytes ) - off1;
+      glyph_length = cid_get_offset( &p, (FT_Byte)cid->gd_bytes ) - off1;
       FT_FRAME_EXIT();
 
       if ( glyph_length == 0 )
@@ -146,11 +146,11 @@
 
       /* Decrypt only if lenIV >= 0. */
       if ( decoder->lenIV >= 0 )
-        cid_decrypt( charstring, glyph_length, 4330 );
+        psaux->t1_decrypt( charstring, glyph_length, 4330 );
 
-      error = decoder->funcs.parse_charstrings( decoder,
-                                                charstring + cs_offset,
-                                                glyph_length - cs_offset  );
+      error = decoder->funcs.parse_charstrings(
+                decoder, charstring + cs_offset,
+                (FT_Int)glyph_length - cs_offset  );
     }
 
     FT_FREE( charstring );
@@ -158,15 +158,16 @@
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
 
     /* Incremental fonts can optionally override the metrics. */
-    if ( !error                                       &&
-         face->root.internal->incremental_interface   &&
+    if ( !error                                                              &&
+         face->root.internal->incremental_interface                          &&
          face->root.internal->incremental_interface->funcs->get_glyph_metrics )
     {
       FT_Incremental_MetricsRec  metrics;
 
+
       metrics.bearing_x = decoder->builder.left_bearing.x;
-	  metrics.bearing_y = decoder->builder.left_bearing.y;
-	  metrics.advance   = decoder->builder.advance.x;
+      metrics.bearing_y = decoder->builder.left_bearing.y;
+      metrics.advance   = decoder->builder.advance.x;
       error = face->root.internal->incremental_interface->funcs->get_glyph_metrics(
                 face->root.internal->incremental_interface->object,
                 glyph_index, FALSE, &metrics );
@@ -347,6 +348,7 @@
       {
         FT_BBox            cbox;
         FT_Glyph_Metrics*  metrics = &glyph->root.metrics;
+        FT_Vector          advance;
 
 
         /* copy the _unscaled_ advance width */
@@ -372,6 +374,15 @@
                               font_offset.x,
                               font_offset.y );
 
+        advance.x = metrics->horiAdvance;
+        advance.y = 0;
+        FT_Vector_Transform( &advance, &font_matrix );
+        metrics->horiAdvance = advance.x + font_offset.x;
+        advance.x = 0;
+        advance.y = metrics->vertAdvance;
+        FT_Vector_Transform( &advance, &font_matrix );
+        metrics->vertAdvance = advance.y + font_offset.y;
+
         if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
         {
           /* scale the outline and the metrics */
diff --git a/reactos/lib/freetype/src/cid/cidload.c b/reactos/lib/freetype/src/cid/cidload.c
index 19cfab50ff0..7b0aba6af9f 100644
--- a/reactos/lib/freetype/src/cid/cidload.c
+++ b/reactos/lib/freetype/src/cid/cidload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID-keyed Type1 font loader (body).                                  */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -57,24 +57,6 @@
   }
 
 
-  FT_LOCAL_DEF( void )
-  cid_decrypt( FT_Byte*   buffer,
-               FT_Offset  length,
-               FT_UShort  seed )
-  {
-    while ( length > 0 )
-    {
-      FT_Byte  plain;
-
-
-      plain     = (FT_Byte)( *buffer ^ ( seed >> 8 ) );
-      seed      = (FT_UShort)( ( *buffer + seed ) * 52845U + 22719 );
-      *buffer++ = plain;
-      length--;
-    }
-  }
-
-
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
@@ -115,6 +97,10 @@
       object = (FT_Byte*)&cid->font_info;
       break;
 
+    case T1_FIELD_LOCATION_BBOX:
+      object = (FT_Byte*)&cid->font_bbox;
+      break;
+
     default:
       {
         CID_FaceDict  dict;
@@ -147,33 +133,15 @@
     if ( keyword->type == T1_FIELD_TYPE_INTEGER_ARRAY ||
          keyword->type == T1_FIELD_TYPE_FIXED_ARRAY   )
       error = cid_parser_load_field_table( &loader->parser, keyword,
-                                    &dummy_object );
+                                           &dummy_object );
     else
-      error = cid_parser_load_field( &loader->parser, keyword, &dummy_object );
+      error = cid_parser_load_field( &loader->parser,
+                                     keyword, &dummy_object );
   Exit:
     return error;
   }
 
 
-  FT_CALLBACK_DEF( FT_Error )
-  parse_font_bbox( CID_Face     face,
-                   CID_Parser*  parser )
-  {
-    FT_Fixed  temp[4];
-    FT_BBox*  bbox = &face->cid.font_bbox;
-
-
-    (void)cid_parser_to_fixed_array( parser, 4, temp, 0 );
-    bbox->xMin = FT_RoundFix( temp[0] );
-    bbox->yMin = FT_RoundFix( temp[1] );
-    bbox->xMax = FT_RoundFix( temp[2] );
-    bbox->yMax = FT_RoundFix( temp[3] );
-
-    return CID_Err_Ok;       /* this is a callback function; */
-                            /* we must return an error code */
-  }
-
-
   FT_CALLBACK_DEF( FT_Error )
   parse_font_matrix( CID_Face     face,
                      CID_Parser*  parser )
@@ -272,22 +240,13 @@
 
 #include "cidtoken.h"
 
-    T1_FIELD_CALLBACK( "FontBBox", parse_font_bbox )
-    T1_FIELD_CALLBACK( "FDArray", parse_fd_array )
+    T1_FIELD_CALLBACK( "FDArray",    parse_fd_array )
     T1_FIELD_CALLBACK( "FontMatrix", parse_font_matrix )
+
     { 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0 }
   };
 
 
-  static int
-  is_alpha( char  c )
-  {
-    return ( ft_isalnum( (int)c ) ||
-             c == '.'             ||
-             c == '_'             );
-  }
-
-
   static FT_Error
   cid_parse_dict( CID_Face     face,
                   CID_Loader*  loader,
@@ -322,17 +281,15 @@
         /* look for immediates */
         else if ( *cur == '/' && cur + 2 < limit )
         {
-          FT_Byte*  cur2;
-          FT_Int    len;
+          FT_Int  len;
 
 
           cur++;
 
-          cur2 = cur;
-          while ( cur2 < limit && is_alpha( *cur2 ) )
-            cur2++;
+          parser->root.cursor = cur;
+          cid_parser_skip_alpha( parser );
 
-          len = (FT_Int)( cur2 - cur );
+          len = (FT_Int)( parser->root.cursor - cur );
           if ( len > 0 && len < 22 )
           {
             /* now compare the immediate name to the keyword table */
@@ -361,7 +318,6 @@
                 if ( n >= len )
                 {
                   /* we found it - run the parsing callback */
-                  parser->root.cursor = cur2;
                   cid_parser_skip_spaces( parser );
                   parser->root.error = cid_load_keyword( face,
                                                          loader,
@@ -387,14 +343,15 @@
   static FT_Error
   cid_read_subrs( CID_Face  face )
   {
-    CID_FaceInfo  cid    = &face->cid;
-    FT_Memory     memory = face->root.memory;
-    FT_Stream     stream = face->root.stream;
-    FT_Error      error;
-    FT_Int        n;
-    CID_Subrs     subr;
-    FT_UInt       max_offsets = 0;
-    FT_ULong*     offsets = 0;
+    CID_FaceInfo   cid    = &face->cid;
+    FT_Memory      memory = face->root.memory;
+    FT_Stream      stream = face->root.stream;
+    FT_Error       error;
+    FT_Int         n;
+    CID_Subrs      subr;
+    FT_UInt        max_offsets = 0;
+    FT_ULong*      offsets = 0;
+    PSAux_Service  psaux = (PSAux_Service)face->psaux;
 
 
     if ( FT_NEW_ARRAY( face->subrs, cid->num_dicts ) )
@@ -464,7 +421,7 @@
 
 
           len = offsets[count + 1] - offsets[count];
-          cid_decrypt( subr->code[count], len, 4330 );
+          psaux->t1_decrypt( subr->code[count], len, 4330 );
         }
       }
 
diff --git a/reactos/lib/freetype/src/cid/cidload.h b/reactos/lib/freetype/src/cid/cidload.h
index 8fc577db5ee..a7f4bceab37 100644
--- a/reactos/lib/freetype/src/cid/cidload.h
+++ b/reactos/lib/freetype/src/cid/cidload.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID-keyed Type1 font loader (specification).                         */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -40,11 +40,6 @@ FT_BEGIN_HEADER
   cid_get_offset( FT_Byte**  start,
                   FT_Byte    offsize );
 
-  FT_LOCAL( void )
-  cid_decrypt( FT_Byte*   buffer,
-               FT_Offset  length,
-               FT_UShort  seed );
-
   FT_LOCAL( FT_Error )
   cid_face_open( CID_Face  face );
 
diff --git a/reactos/lib/freetype/src/cid/cidobjs.c b/reactos/lib/freetype/src/cid/cidobjs.c
index ac5f16e4a9f..313d315055b 100644
--- a/reactos/lib/freetype/src/cid/cidobjs.c
+++ b/reactos/lib/freetype/src/cid/cidobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID objects manager (body).                                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -19,8 +19,10 @@
 #include <ft2build.h>
 #include FT_INTERNAL_DEBUG_H
 #include FT_INTERNAL_STREAM_H
+
 #include "cidgload.h"
 #include "cidload.h"
+
 #include FT_INTERNAL_POSTSCRIPT_NAMES_H
 #include FT_INTERNAL_POSTSCRIPT_AUX_H
 #include FT_INTERNAL_POSTSCRIPT_HINTS_H
@@ -326,77 +328,106 @@
       goto Exit;
     }
 
-    /* Now, load the font program into the face object */
+    /* now load the font program into the face object */
+
+    /* initialize the face object fields */
+
+    /* set up root face fields */
     {
-      /* Init the face object fields */
-      /* Now set up root face fields */
+      FT_Face       root = (FT_Face)&face->root;
+      CID_FaceInfo  cid  = &face->cid;
+      PS_FontInfo   info = &cid->font_info;
+
+
+      root->num_glyphs   = cid->cid_count;
+      root->num_charmaps = 0;
+
+      root->face_index = face_index;
+      root->face_flags = FT_FACE_FLAG_SCALABLE;
+
+      root->face_flags |= FT_FACE_FLAG_HORIZONTAL;
+
+      if ( info->is_fixed_pitch )
+        root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
+
+      /* XXX: TODO: add kerning with .afm support */
+
+      /* get style name -- be careful, some broken fonts only */
+      /* have a /FontName dictionary entry!                   */
+      root->family_name = info->family_name;
+      /* assume "Regular" style if we don't know better */
+      root->style_name = (char *)"Regular";
+      if ( root->family_name )
       {
-        FT_Face  root = (FT_Face)&face->root;
+        char*  full   = info->full_name;
+        char*  family = root->family_name;
 
 
-        root->num_glyphs   = face->cid.cid_count;
-        root->num_charmaps = 0;
-
-        root->face_index = face_index;
-        root->face_flags = FT_FACE_FLAG_SCALABLE;
-
-        root->face_flags |= FT_FACE_FLAG_HORIZONTAL;
-
-        if ( face->cid.font_info.is_fixed_pitch )
-          root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
-
-        /* XXX: TODO: add kerning with .afm support */
-
-        /* get style name -- be careful, some broken fonts only */
-        /* have a /FontName dictionary entry!                   */
-        root->family_name = face->cid.font_info.family_name;
-        if ( root->family_name )
+        if ( full )
         {
-          char*  full   = face->cid.font_info.full_name;
-          char*  family = root->family_name;
-
-          while ( *family && *full == *family )
+          while ( *full )
           {
-            family++;
-            full++;
-          }
-
-          root->style_name = ( *full == ' ' ) ? full + 1
-                                              : (char *)"Regular";
-        }
-        else
-        {
-          /* do we have a `/FontName'? */
-          if ( face->cid.cid_font_name )
-          {
-            root->family_name = face->cid.cid_font_name;
-            root->style_name  = (char *)"Regular";
+            if ( *full == *family )
+            {
+              family++;
+              full++;
+            }
+            else
+            {
+              if ( *full == ' ' || *full == '-' )
+                full++;
+              else if ( *family == ' ' || *family == '-' )
+                family++;
+              else
+              {
+                if ( !*family )
+                  root->style_name = full;
+                break;
+              }
+            }
           }
         }
-
-        /* no embedded bitmap support */
-        root->num_fixed_sizes = 0;
-        root->available_sizes = 0;
-
-        root->bbox.xMin =   face->cid.font_bbox.xMin             >> 16;
-        root->bbox.yMin =   face->cid.font_bbox.yMin             >> 16;
-        root->bbox.xMax = ( face->cid.font_bbox.xMax + 0xFFFFU ) >> 16;
-        root->bbox.yMax = ( face->cid.font_bbox.yMax + 0xFFFFU ) >> 16;
-
-        if ( !root->units_per_EM )
-          root->units_per_EM  = 1000;
-
-        root->ascender  = (FT_Short)( root->bbox.yMax );
-        root->descender = (FT_Short)( root->bbox.yMin );
-        root->height    = (FT_Short)(
-          ( ( root->ascender + root->descender ) * 12 ) / 10 );
-
-        root->underline_position  = face->cid.font_info.underline_position;
-        root->underline_thickness = face->cid.font_info.underline_thickness;
-
-        root->internal->max_points   = 0;
-        root->internal->max_contours = 0;
       }
+      else
+      {
+        /* do we have a `/FontName'? */
+        if ( cid->cid_font_name )
+          root->family_name = cid->cid_font_name;
+      }
+
+      /* compute style flags */
+      root->style_flags = 0;
+      if ( info->italic_angle )
+        root->style_flags |= FT_STYLE_FLAG_ITALIC;
+      if ( info->weight )
+      {
+        if ( !ft_strcmp( info->weight, "Bold"  ) ||
+             !ft_strcmp( info->weight, "Black" ) )
+          root->style_flags |= FT_STYLE_FLAG_BOLD;
+      }
+
+      /* no embedded bitmap support */
+      root->num_fixed_sizes = 0;
+      root->available_sizes = 0;
+
+      root->bbox.xMin =   cid->font_bbox.xMin             >> 16;
+      root->bbox.yMin =   cid->font_bbox.yMin             >> 16;
+      root->bbox.xMax = ( cid->font_bbox.xMax + 0xFFFFU ) >> 16;
+      root->bbox.yMax = ( cid->font_bbox.yMax + 0xFFFFU ) >> 16;
+
+      if ( !root->units_per_EM )
+        root->units_per_EM = 1000;
+
+      root->ascender  = (FT_Short)( root->bbox.yMax );
+      root->descender = (FT_Short)( root->bbox.yMin );
+      root->height    = (FT_Short)(
+        ( ( root->ascender - root->descender ) * 12 ) / 10 );
+
+      root->underline_position  = info->underline_position >> 16;
+      root->underline_thickness = info->underline_thickness >> 16;
+
+      root->internal->max_points   = 0;
+      root->internal->max_contours = 0;
     }
 
   Exit:
diff --git a/reactos/lib/freetype/src/cid/cidriver.c b/reactos/lib/freetype/src/cid/cidriver.c
index 4d6f442c067..471f196379d 100644
--- a/reactos/lib/freetype/src/cid/cidriver.c
+++ b/reactos/lib/freetype/src/cid/cidriver.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID driver interface (body).                                         */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -69,9 +69,9 @@
   {
     /* first of all, the FT_Module_Class fields */
     {
-      ft_module_font_driver       |
-      ft_module_driver_scalable   |
-      ft_module_driver_has_hinter ,
+      FT_MODULE_FONT_DRIVER       |
+      FT_MODULE_DRIVER_SCALABLE   |
+      FT_MODULE_DRIVER_HAS_HINTER,
 
       sizeof( FT_DriverRec ),
       "t1cid",   /* module name           */
diff --git a/reactos/lib/freetype/src/cid/cidtoken.h b/reactos/lib/freetype/src/cid/cidtoken.h
index f0dac92523f..2070aa91bb4 100644
--- a/reactos/lib/freetype/src/cid/cidtoken.h
+++ b/reactos/lib/freetype/src/cid/cidtoken.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID token definitions (specification only).                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -21,7 +21,7 @@
 #undef  T1CODE
 #define T1CODE        T1_FIELD_LOCATION_CID_INFO
 
-  T1_FIELD_STRING( "CIDFontName", cid_font_name )
+  T1_FIELD_KEY   ( "CIDFontName", cid_font_name )
   T1_FIELD_NUM   ( "CIDFontVersion", cid_version )
   T1_FIELD_NUM   ( "CIDFontType", cid_font_type )
   T1_FIELD_STRING( "Registry", registry )
@@ -39,15 +39,15 @@
 #undef  T1CODE
 #define T1CODE        T1_FIELD_LOCATION_FONT_INFO
 
-  T1_FIELD_STRING   ( "version", version )
-  T1_FIELD_STRING   ( "Notice", notice )
-  T1_FIELD_STRING   ( "FullName", full_name )
-  T1_FIELD_STRING   ( "FamilyName", family_name )
-  T1_FIELD_STRING   ( "Weight", weight )
-  T1_FIELD_FIXED    ( "ItalicAngle", italic_angle )
-  T1_FIELD_TYPE_BOOL( "isFixedPitch", is_fixed_pitch )
-  T1_FIELD_NUM      ( "UnderlinePosition", underline_position )
-  T1_FIELD_NUM      ( "UnderlineThickness", underline_thickness )
+  T1_FIELD_STRING( "version", version )
+  T1_FIELD_STRING( "Notice", notice )
+  T1_FIELD_STRING( "FullName", full_name )
+  T1_FIELD_STRING( "FamilyName", family_name )
+  T1_FIELD_STRING( "Weight", weight )
+  T1_FIELD_NUM   ( "ItalicAngle", italic_angle )
+  T1_FIELD_BOOL  ( "isFixedPitch", is_fixed_pitch )
+  T1_FIELD_NUM   ( "UnderlinePosition", underline_position )
+  T1_FIELD_NUM   ( "UnderlineThickness", underline_thickness )
 
 
 #undef  FT_STRUCTURE
@@ -63,7 +63,7 @@
   T1_FIELD_NUM  ( "lenBuildCharArray", len_buildchar )
   T1_FIELD_FIXED( "ForceBoldThreshold", forcebold_threshold )
   T1_FIELD_FIXED( "ExpansionFactor", expansion_factor )
-  T1_FIELD_NUM  ( "StrokeWidth", stroke_width )
+  T1_FIELD_FIXED( "StrokeWidth", stroke_width )
 
 
 #undef  FT_STRUCTURE
@@ -76,7 +76,7 @@
   T1_FIELD_NUM       ( "LanguageGroup", language_group )
   T1_FIELD_NUM       ( "password", password )
 
-  T1_FIELD_FIXED     ( "BlueScale", blue_scale )
+  T1_FIELD_FIXED_1000( "BlueScale", blue_scale )
   T1_FIELD_NUM       ( "BlueShift", blue_shift )
   T1_FIELD_NUM       ( "BlueFuzz",  blue_fuzz )
 
@@ -92,5 +92,12 @@
   T1_FIELD_NUM_TABLE ( "StemSnapH", snap_widths, 12 )
   T1_FIELD_NUM_TABLE ( "StemSnapV", snap_heights, 12 )
 
+#undef  FT_STRUCTURE
+#define FT_STRUCTURE  FT_BBox
+#undef  T1CODE
+#define T1CODE        T1_FIELD_LOCATION_BBOX
+
+  T1_FIELD_BBOX( "FontBBox", xMin )
+
 
 /* END */
diff --git a/reactos/lib/freetype/src/cid/rules.mk b/reactos/lib/freetype/src/cid/rules.mk
index 809b20aeb65..f3627446126 100644
--- a/reactos/lib/freetype/src/cid/rules.mk
+++ b/reactos/lib/freetype/src/cid/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001 by
+# Copyright 1996-2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,26 +15,25 @@
 
 # CID driver directory
 #
-CID_DIR  := $(SRC_)cid
-CID_DIR_ := $(CID_DIR)$(SEP)
+CID_DIR := $(SRC_DIR)/cid
 
 
-CID_COMPILE := $(FT_COMPILE) $I$(CID_DIR)
+CID_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(CID_DIR))
 
 
 # CID driver sources (i.e., C files)
 #
-CID_DRV_SRC := $(CID_DIR_)cidparse.c \
-               $(CID_DIR_)cidload.c  \
-               $(CID_DIR_)cidriver.c \
-               $(CID_DIR_)cidgload.c \
-               $(CID_DIR_)cidobjs.c
+CID_DRV_SRC := $(CID_DIR)/cidparse.c \
+               $(CID_DIR)/cidload.c  \
+               $(CID_DIR)/cidriver.c \
+               $(CID_DIR)/cidgload.c \
+               $(CID_DIR)/cidobjs.c
 
 # CID driver headers
 #
 CID_DRV_H := $(CID_DRV_SRC:%.c=%.h) \
-             $(CID_DIR_)cidtoken.h  \
-             $(CID_DIR_)ciderrs.h
+             $(CID_DIR)/cidtoken.h  \
+             $(CID_DIR)/ciderrs.h
 
 
 # CID driver object(s)
@@ -42,24 +41,24 @@ CID_DRV_H := $(CID_DRV_SRC:%.c=%.h) \
 #   CID_DRV_OBJ_M is used during `multi' builds
 #   CID_DRV_OBJ_S is used during `single' builds
 #
-CID_DRV_OBJ_M := $(CID_DRV_SRC:$(CID_DIR_)%.c=$(OBJ_)%.$O)
-CID_DRV_OBJ_S := $(OBJ_)type1cid.$O
+CID_DRV_OBJ_M := $(CID_DRV_SRC:$(CID_DIR)/%.c=$(OBJ_DIR)/%.$O)
+CID_DRV_OBJ_S := $(OBJ_DIR)/type1cid.$O
 
 # CID driver source file for single build
 #
-CID_DRV_SRC_S := $(CID_DIR_)type1cid.c
+CID_DRV_SRC_S := $(CID_DIR)/type1cid.c
 
 
 # CID driver - single object
 #
 $(CID_DRV_OBJ_S): $(CID_DRV_SRC_S) $(CID_DRV_SRC) $(FREETYPE_H) $(CID_DRV_H)
-	$(CID_COMPILE) $T$@ $(CID_DRV_SRC_S)
+	$(CID_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(CID_DRV_SRC_S))
 
 
 # CID driver - multiple objects
 #
-$(OBJ_)%.$O: $(CID_DIR_)%.c $(FREETYPE_H) $(CID_DRV_H)
-	$(CID_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(CID_DIR)/%.c $(FREETYPE_H) $(CID_DRV_H)
+	$(CID_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -67,4 +66,5 @@ $(OBJ_)%.$O: $(CID_DIR_)%.c $(FREETYPE_H) $(CID_DRV_H)
 DRV_OBJS_S += $(CID_DRV_OBJ_S)
 DRV_OBJS_M += $(CID_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/gzip/adler32.c b/reactos/lib/freetype/src/gzip/adler32.c
index 1911e0836fd..77899a8643e 100644
--- a/reactos/lib/freetype/src/gzip/adler32.c
+++ b/reactos/lib/freetype/src/gzip/adler32.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: adler32.c,v 1.2 2003/04/18 10:44:17 gvg Exp $ */
+/* @(#) $Id: adler32.c,v 1.3 2004/01/21 19:23:46 gvg Exp $ */
 
 #include "zlib.h"
 
diff --git a/reactos/lib/freetype/src/gzip/ftgzip.c b/reactos/lib/freetype/src/gzip/ftgzip.c
index 45f934b19c5..0787d8095ac 100644
--- a/reactos/lib/freetype/src/gzip/ftgzip.c
+++ b/reactos/lib/freetype/src/gzip/ftgzip.c
@@ -2,13 +2,13 @@
 /*                                                                         */
 /*  ftgzip.c                                                               */
 /*                                                                         */
-/*    FreeType support for .gz compressed fileds                           */
+/*    FreeType support for .gz compressed files.                           */
 /*                                                                         */
 /*  this optional component relies on zlib. It should mainly be used to    */
 /*  parse compressed PCF fonts, as found with many X11 server              */
 /*  distributions.                                                         */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -19,45 +19,67 @@
 /*                                                                         */
 /***************************************************************************/
 
+
 #include <ft2build.h>
 #include FT_INTERNAL_MEMORY_H
 #include FT_INTERNAL_STREAM_H
 #include FT_INTERNAL_DEBUG_H
 #include <string.h>
 
+
+#include FT_MODULE_ERRORS_H
+
+#undef __FTERRORS_H__
+
+#define FT_ERR_PREFIX  Gzip_Err_
+#define FT_ERR_BASE    FT_Mod_Err_Gzip
+
+#include FT_ERRORS_H
+
+
 #ifdef FT_CONFIG_OPTION_USE_ZLIB
 
 #ifdef FT_CONFIG_OPTION_SYSTEM_ZLIB
 
-#  include <zlib.h>
+#include <zlib.h>
 
-#else /* !SYSTEM_ZLIB */
+#else /* !FT_CONFIG_OPTION_SYSTEM_ZLIB */
 
- /* in this case, we include our own modified sources of the ZLib   */
- /* within the "ftgzip" component. The modifications were necessary */
- /* to #include all files without conflicts, as well as preventing  */
- /* the definition of "extern" functions that may cause linking     */
- /* conflicts when a program is linked with both FreeType and the   */
- /* original ZLib                                                   */
+ /* In this case, we include our own modified sources of the ZLib    */
+ /* within the "ftgzip" component.  The modifications were necessary */
+ /* to #include all files without conflicts, as well as preventing   */
+ /* the definition of "extern" functions that may cause linking      */
+ /* conflicts when a program is linked with both FreeType and the    */
+ /* original ZLib.                                                   */
 
-#  define  NO_DUMMY_DECL
-#  define  BUILDFIXED    /* save code size */
-#  define  MY_ZCALLOC
+#define NO_DUMMY_DECL
+#define MY_ZCALLOC
 
-#  include "zlib.h"
+#include "zlib.h"
 
-#    undef   SLOW
-#    define  SLOW  1  /* we can't use asm-optimized sources here !! */
+#undef  SLOW
+#define SLOW  1  /* we can't use asm-optimized sources here! */
 
-#    include "zutil.c"
-#    include "inftrees.c"
-#    include "infcodes.c"
-#    include "infutil.c"
-#    include "infblock.c"
-#    include "inflate.c"
-#    include "adler32.c"
+  /* Urgh.  `inflate_mask' must not be declared twice -- C++ doesn't like
+     this.  We temporarily disable it and load all necessary header files. */
+#define NO_INFLATE_MASK
+#include "zutil.h"
+#include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
+#include "infutil.h"
+#undef  NO_INFLATE_MASK
 
-#endif /* !SYSTEM_ZLIB */
+  /* infutil.c must be included before infcodes.c */
+#include "zutil.c"
+#include "inftrees.c"
+#include "infutil.c"
+#include "infcodes.c"
+#include "infblock.c"
+#include "inflate.c"
+#include "adler32.c"
+
+#endif /* !FT_CONFIG_OPTION_SYSTEM_ZLIB */
 
 
 /***************************************************************************/
@@ -68,48 +90,48 @@
 /***************************************************************************/
 /***************************************************************************/
 
- /* it's better to use FreeType memory routines instead of raw 'malloc/free' */
+  /* it is better to use FreeType memory routines instead of raw
+     'malloc/free' */
+
+  static voidpf
+  ft_gzip_alloc( FT_Memory  memory,
+                 uInt       items,
+                 uInt       size )
+  {
+    FT_ULong    sz = (FT_ULong)size * items;
+    FT_Pointer  p;
 
 
- static voidpf
- ft_gzip_alloc( FT_Memory  memory,
-                uInt       items,
-                uInt       size )
- {
-   FT_ULong    sz = (FT_ULong)size * items;
-   FT_Pointer  p;
+    FT_MEM_ALLOC( p, sz );
 
-   FT_MEM_ALLOC( p, sz );
-
-   return (voidpf) p;
- }
+    return (voidpf) p;
+  }
 
 
- static void
- ft_gzip_free( FT_Memory  memory,
-               voidpf     address )
- {
-   FT_MEM_FREE( address );
- }
+  static void
+  ft_gzip_free( FT_Memory  memory,
+                voidpf     address )
+  {
+    FT_MEM_FREE( address );
+  }
 
 
 #ifndef FT_CONFIG_OPTION_SYSTEM_ZLIB
 
- local voidpf
- zcalloc ( /* opaque, items, size) */
-    voidpf opaque,
-    unsigned items,
-    unsigned size )
- {
-   return ft_gzip_alloc( opaque, items, size );
- }
+  local voidpf
+  zcalloc ( voidpf    opaque,
+            unsigned  items,
+            unsigned  size )
+  {
+    return ft_gzip_alloc( (FT_Memory)opaque, items, size );
+  }
 
- local void
- zcfree( voidpf  opaque,
-         voidpf  ptr )
- {
-   ft_gzip_free( opaque, ptr );
- }
+  local void
+  zcfree( voidpf  opaque,
+          voidpf  ptr )
+  {
+    ft_gzip_free( (FT_Memory)opaque, ptr );
+  }
 
 #endif /* !SYSTEM_ZLIB */
 
@@ -124,25 +146,25 @@
 
 #define  FT_GZIP_BUFFER_SIZE          4096
 
-  typedef struct FT_GZipFileRec_
+  typedef struct  FT_GZipFileRec_
   {
-    FT_Stream    source;         /* parent/source stream        */
-    FT_Stream    stream;         /* embedding stream            */
-    FT_Memory    memory;         /* memory allocator            */
-    z_stream     zstream;        /* zlib input stream           */
+    FT_Stream  source;         /* parent/source stream        */
+    FT_Stream  stream;         /* embedding stream            */
+    FT_Memory  memory;         /* memory allocator            */
+    z_stream   zstream;        /* zlib input stream           */
 
-    FT_ULong     start;          /* starting position, after .gz header */
-    FT_Byte      input[ FT_GZIP_BUFFER_SIZE ];  /* input read buffer */
+    FT_ULong   start;          /* starting position, after .gz header */
+    FT_Byte    input[FT_GZIP_BUFFER_SIZE];  /* input read buffer */
 
-    FT_Byte      buffer[ FT_GZIP_BUFFER_SIZE ];  /* output buffer      */
-    FT_ULong     pos;                            /* position in output */
-    FT_Byte*     cursor;
-    FT_Byte*     limit;
+    FT_Byte    buffer[FT_GZIP_BUFFER_SIZE];  /* output buffer      */
+    FT_ULong   pos;                          /* position in output */
+    FT_Byte*   cursor;
+    FT_Byte*   limit;
 
   } FT_GZipFileRec, *FT_GZipFile;
 
 
-/* gzip flag byte */
+  /* gzip flag byte */
 #define FT_GZIP_ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
 #define FT_GZIP_HEAD_CRC     0x02 /* bit 1 set: header CRC present */
 #define FT_GZIP_EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
@@ -151,25 +173,26 @@
 #define FT_GZIP_RESERVED     0xE0 /* bits 5..7: reserved */
 
 
- /* check and skip .gz header - we don't support "transparent" compression */
+  /* check and skip .gz header - we don't support "transparent" compression */
   static FT_Error
   ft_gzip_check_header( FT_Stream  stream )
   {
     FT_Error  error;
     FT_Byte   head[4];
 
+
     if ( FT_STREAM_SEEK( 0 )       ||
          FT_STREAM_READ( head, 4 ) )
       goto Exit;
 
-    /* head[0] && head[1] are the magic numbers     */
+    /* head[0] && head[1] are the magic numbers;    */
     /* head[2] is the method, and head[3] the flags */
     if ( head[0] != 0x1f              ||
          head[1] != 0x8b              ||
          head[2] != Z_DEFLATED        ||
         (head[3] & FT_GZIP_RESERVED)  )
     {
-      error = FT_Err_Invalid_File_Format;
+      error = Gzip_Err_Invalid_File_Format;
       goto Exit;
     }
 
@@ -181,6 +204,7 @@
     {
       FT_UInt  len;
 
+
       if ( FT_READ_USHORT_LE( len ) ||
            FT_STREAM_SKIP( len )    )
         goto Exit;
@@ -192,7 +216,8 @@
       {
         FT_UInt  c;
 
-        if ( FT_READ_BYTE( c) )
+
+        if ( FT_READ_BYTE( c ) )
           goto Exit;
 
         if ( c == 0 )
@@ -205,7 +230,8 @@
       {
         FT_UInt  c;
 
-        if ( FT_READ_BYTE( c) )
+
+        if ( FT_READ_BYTE( c ) )
           goto Exit;
 
         if ( c == 0 )
@@ -222,15 +248,15 @@
   }
 
 
-
   static FT_Error
-  ft_gzip_file_init( FT_GZipFile   zip,
-                     FT_Stream     stream,
-                     FT_Stream     source )
+  ft_gzip_file_init( FT_GZipFile  zip,
+                     FT_Stream    stream,
+                     FT_Stream    source )
   {
     z_stream*  zstream = &zip->zstream;
     FT_Error   error   = 0;
 
+
     zip->stream = stream;
     zip->source = source;
     zip->memory = stream->memory;
@@ -244,7 +270,7 @@
       stream = source;
 
       error = ft_gzip_check_header( stream );
-      if (error)
+      if ( error )
         goto Exit;
 
       zip->start = FT_STREAM_POS();
@@ -261,7 +287,7 @@
     if ( inflateInit2( zstream, -MAX_WBITS ) != Z_OK ||
          zstream->next_in == NULL                     )
     {
-      error = FT_Err_Invalid_File_Format;
+      error = Gzip_Err_Invalid_File_Format;
       goto Exit;
     }
 
@@ -270,7 +296,6 @@
   }
 
 
-
   static void
   ft_gzip_file_done( FT_GZipFile  zip )
   {
@@ -299,10 +324,12 @@
     FT_Stream  stream = zip->source;
     FT_Error   error;
 
+
     if ( !FT_STREAM_SEEK( zip->start ) )
     {
       z_stream*  zstream = &zip->zstream;
 
+
       inflateReset( zstream );
 
       zstream->avail_in  = 0;
@@ -325,11 +352,13 @@
     FT_Stream  stream  = zip->source;
     FT_ULong   size;
 
+
     if ( stream->read )
     {
-      size = stream->read( stream, stream->pos, zip->input, FT_GZIP_BUFFER_SIZE );
+      size = stream->read( stream, stream->pos, zip->input,
+                           FT_GZIP_BUFFER_SIZE );
       if ( size == 0 )
-        return FT_Err_Invalid_Stream_Operation;
+        return Gzip_Err_Invalid_Stream_Operation;
     }
     else
     {
@@ -338,7 +367,7 @@
         size = FT_GZIP_BUFFER_SIZE;
 
       if ( size == 0 )
-       return FT_Err_Invalid_Stream_Operation;
+        return Gzip_Err_Invalid_Stream_Operation;
 
       FT_MEM_COPY( zip->input, stream->base + stream->pos, size );
     }
@@ -351,13 +380,13 @@
   }
 
 
-
   static FT_Error
   ft_gzip_file_fill_output( FT_GZipFile  zip )
   {
     z_stream*  zstream = &zip->zstream;
     FT_Error   error   = 0;
 
+
     zip->cursor        = zip->buffer;
     zstream->next_out  = zip->cursor;
     zstream->avail_out = FT_GZIP_BUFFER_SIZE;
@@ -366,6 +395,7 @@
     {
       int  err;
 
+
       if ( zstream->avail_in == 0 )
       {
         error = ft_gzip_file_fill_input( zip );
@@ -378,12 +408,13 @@
       if ( err == Z_STREAM_END )
       {
         zip->limit = zstream->next_out;
-        error      = FT_Err_Invalid_Stream_Operation;
+        if ( zip->limit == zip->cursor )
+          error = Gzip_Err_Invalid_Stream_Operation;
         break;
       }
       else if ( err != Z_OK )
       {
-        error = FT_Err_Invalid_Stream_Operation;
+        error = Gzip_Err_Invalid_Stream_Operation;
         break;
       }
     }
@@ -391,7 +422,7 @@
   }
 
 
- /* fill output buffer, 'count' must be <= FT_GZIP_BUFFER_SIZE */
+  /* fill output buffer; `count' must be <= FT_GZIP_BUFFER_SIZE */
   static FT_Error
   ft_gzip_file_skip_output( FT_GZipFile  zip,
                             FT_ULong     count )
@@ -399,6 +430,7 @@
     FT_Error   error   = 0;
     FT_ULong   delta;
 
+
     for (;;)
     {
       delta = (FT_ULong)( zip->limit - zip->cursor );
@@ -422,27 +454,29 @@
 
 
   static FT_ULong
-  ft_gzip_file_io( FT_GZipFile   zip,
-                   FT_ULong      pos,
-                   FT_Byte*      buffer,
-                   FT_ULong      count )
+  ft_gzip_file_io( FT_GZipFile  zip,
+                   FT_ULong     pos,
+                   FT_Byte*     buffer,
+                   FT_ULong     count )
   {
-    FT_ULong   result = 0;
-    FT_Error   error;
+    FT_ULong  result = 0;
+    FT_Error  error;
 
-    /* reset inflate stream if we're seeking backwards        */
-    /* yes, that's not too efficient, but it saves memory :-) */
+
+    /* Reset inflate stream if we're seeking backwards.        */
+    /* Yes, that is not too efficient, but it saves memory :-) */
     if ( pos < zip->pos )
     {
       error = ft_gzip_file_reset( zip );
-      if ( error ) goto Exit;
+      if ( error )
+        goto Exit;
     }
 
     /* skip unwanted bytes */
     if ( pos > zip->pos )
     {
       error = ft_gzip_file_skip_output( zip, (FT_ULong)( pos - zip->pos ) );
-      if (error)
+      if ( error )
         goto Exit;
     }
 
@@ -452,7 +486,8 @@
     /* now read the data */
     for (;;)
     {
-      FT_ULong   delta;
+      FT_ULong  delta;
+
 
       delta = (FT_ULong)( zip->limit - zip->cursor );
       if ( delta >= count )
@@ -469,7 +504,7 @@
         break;
 
       error = ft_gzip_file_fill_output( zip );
-      if (error)
+      if ( error )
         break;
     }
 
@@ -489,9 +524,10 @@
   static void
   ft_gzip_stream_close( FT_Stream  stream )
   {
-    FT_GZipFile  zip    = stream->descriptor.pointer;
+    FT_GZipFile  zip    = (FT_GZipFile)stream->descriptor.pointer;
     FT_Memory    memory = stream->memory;
 
+
     if ( zip )
     {
       /* finalize gzip file descriptor */
@@ -505,25 +541,27 @@
 
 
   static FT_ULong
-  ft_gzip_stream_io( FT_Stream   stream,
-                     FT_ULong    pos,
-                     FT_Byte*    buffer,
-                     FT_ULong    count )
+  ft_gzip_stream_io( FT_Stream  stream,
+                     FT_ULong   pos,
+                     FT_Byte*   buffer,
+                     FT_ULong   count )
   {
-    FT_GZipFile  zip = stream->descriptor.pointer;
+    FT_GZipFile  zip = (FT_GZipFile)stream->descriptor.pointer;
+
 
     return ft_gzip_file_io( zip, pos, buffer, count );
   }
 
 
   FT_EXPORT_DEF( FT_Error )
-  FT_Stream_OpenGzip( FT_Stream    stream,
-                      FT_Stream    source )
+  FT_Stream_OpenGzip( FT_Stream  stream,
+                      FT_Stream  source )
   {
     FT_Error     error;
     FT_Memory    memory = source->memory;
     FT_GZipFile  zip;
 
+
     FT_ZERO( stream );
     stream->memory = memory;
 
@@ -539,7 +577,7 @@
       stream->descriptor.pointer = zip;
     }
 
-     stream->size = 0x7FFFFFFF;  /* don't know the real size !! */
+    stream->size  = 0x7FFFFFFFL;  /* don't know the real size! */
     stream->pos   = 0;
     stream->base  = 0;
     stream->read  = ft_gzip_stream_io;
@@ -552,13 +590,16 @@
 #else  /* !FT_CONFIG_OPTION_USE_ZLIB */
 
   FT_EXPORT_DEF( FT_Error )
-  FT_Stream_OpenGzip( FT_Stream    stream,
-                      FT_Stream    source )
+  FT_Stream_OpenGzip( FT_Stream  stream,
+                      FT_Stream  source )
   {
     FT_UNUSED( stream );
     FT_UNUSED( source );
 
-    return FT_Err_Unimplemented_Feature;
+    return Gzip_Err_Unimplemented_Feature;
   }
 
 #endif /* !FT_CONFIG_OPTION_USE_ZLIB */
+
+
+/* END */
diff --git a/reactos/lib/freetype/src/gzip/inftrees.c b/reactos/lib/freetype/src/gzip/inftrees.c
index c3fdc275907..2bceb467413 100644
--- a/reactos/lib/freetype/src/gzip/inftrees.c
+++ b/reactos/lib/freetype/src/gzip/inftrees.c
@@ -451,6 +451,8 @@ z_streamp z              /* for memory allocation */
     ZFREE(z, c);
     fixed_built = 1;
   }
+#else
+  FT_UNUSED(z);
 #endif
   *bl = fixed_bl;
   *bd = fixed_bd;
diff --git a/reactos/lib/freetype/src/gzip/infutil.h b/reactos/lib/freetype/src/gzip/infutil.h
index 820dcd32719..7174b6dd0ff 100644
--- a/reactos/lib/freetype/src/gzip/infutil.h
+++ b/reactos/lib/freetype/src/gzip/infutil.h
@@ -85,7 +85,9 @@ struct inflate_blocks_state {
 #define LOAD {LOADIN LOADOUT}
 
 /* masks for lower bits (size given to avoid silly warnings with Visual C++) */
+#ifndef NO_INFLATE_MASK
 local uInt inflate_mask[17];
+#endif
 
 /* copy as much as possible from the sliding window to the output area */
 local int inflate_flush OF((
diff --git a/reactos/lib/freetype/src/gzip/rules.mk b/reactos/lib/freetype/src/gzip/rules.mk
index 1332fb2068c..d2a43a6a890 100644
--- a/reactos/lib/freetype/src/gzip/rules.mk
+++ b/reactos/lib/freetype/src/gzip/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2002 by
+# Copyright 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,14 +15,13 @@
 
 # gzip driver directory
 #
-GZIP_DIR  := $(SRC_)gzip
-GZIP_DIR_ := $(GZIP_DIR)$(SEP)
+GZIP_DIR := $(SRC_DIR)/gzip
 
 
 # compilation flags for the driver
 #
 ifeq ($(SYSTEM_ZLIB),)
-  GZIP_COMPILE := $(FT_COMPILE) $I$(GZIP_DIR)
+  GZIP_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(GZIP_DIR))
 else
   GZIP_COMPILE := $(FT_COMPILE)
 endif
@@ -30,7 +29,7 @@ endif
 
 # gzip support sources (i.e., C files)
 #
-GZIP_DRV_SRC := $(GZIP_DIR_)ftgzip.c
+GZIP_DRV_SRC := $(GZIP_DIR)/ftgzip.c
 
 # gzip support headers
 #
@@ -43,27 +42,28 @@ GZIP_DRV_H :=
 #   GZIP_DRV_OBJ_S is used during `single' builds
 #
 ifeq ($(SYSTEM_ZLIB),)
-  GZIP_DRV_OBJ_M := $(GZIP_DRV_SRC:$(GZIP_DIR_)%.c=$(OBJ_)%.$O)
+  GZIP_DRV_OBJ_M := $(GZIP_DRV_SRC:$(GZIP_DIR)/%.c=$(OBJ_DIR)/%.$O)
 else
-  GZIP_DRV_OBJ_M := $(OBJ_)ftgzip.$O
+  GZIP_DRV_OBJ_M := $(OBJ_DIR)/ftgzip.$O
 endif
-GZIP_DRV_OBJ_S := $(OBJ_)ftgzip.$O
+GZIP_DRV_OBJ_S := $(OBJ_DIR)/ftgzip.$O
 
 # gzip support source file for single build
 #
-GZIP_DRV_SRC_S := $(GZIP_DIR_)ftgzip.c
+GZIP_DRV_SRC_S := $(GZIP_DIR)/ftgzip.c
 
 
 # gzip support - single object
 #
-$(GZIP_DRV_OBJ_S): $(GZIP_DRV_SRC_S) $(GZIP_DRV_SRC) $(FREETYPE_H) $(GZIP_DRV_H)
-	$(GZIP_COMPILE) $T$@ $(GZIP_DRV_SRC_S)
+$(GZIP_DRV_OBJ_S): $(GZIP_DRV_SRC_S) $(GZIP_DRV_SRC) $(FREETYPE_H) \
+                   $(GZIP_DRV_H)
+	$(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(GZIP_DRV_SRC_S))
 
 
 # gzip support - multiple objects
 #
-$(OBJ_)%.$O: $(GZIP_DIR_)%.c $(FREETYPE_H) $(GZIP_DRV_H)
-	$(GZIP_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(GZIP_DIR)/%.c $(FREETYPE_H) $(GZIP_DRV_H)
+	$(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -71,4 +71,5 @@ $(OBJ_)%.$O: $(GZIP_DIR_)%.c $(FREETYPE_H) $(GZIP_DRV_H)
 DRV_OBJS_S += $(GZIP_DRV_OBJ_S)
 DRV_OBJS_M += $(GZIP_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/gzip/zconf.h b/reactos/lib/freetype/src/gzip/zconf.h
index fc14a4cfccc..f81fca00d2e 100644
--- a/reactos/lib/freetype/src/gzip/zconf.h
+++ b/reactos/lib/freetype/src/gzip/zconf.h
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: zconf.h,v 1.2 2003/04/18 10:44:17 gvg Exp $ */
+/* @(#) $Id: zconf.h,v 1.3 2004/01/21 19:23:46 gvg Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
diff --git a/reactos/lib/freetype/src/gzip/zutil.c b/reactos/lib/freetype/src/gzip/zutil.c
index 5ecc0a96374..61b4667abd7 100644
--- a/reactos/lib/freetype/src/gzip/zutil.c
+++ b/reactos/lib/freetype/src/gzip/zutil.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: zutil.c,v 1.2 2003/04/18 10:44:17 gvg Exp $ */
+/* @(#) $Id: zutil.c,v 1.3 2004/01/21 19:23:46 gvg Exp $ */
 
 #include "zutil.h"
 
diff --git a/reactos/lib/freetype/src/gzip/zutil.h b/reactos/lib/freetype/src/gzip/zutil.h
index b5db223f5ae..9a1e3af5d20 100644
--- a/reactos/lib/freetype/src/gzip/zutil.h
+++ b/reactos/lib/freetype/src/gzip/zutil.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zutil.h,v 1.2 2003/04/18 10:44:17 gvg Exp $ */
+/* @(#) $Id: zutil.h,v 1.3 2004/01/21 19:23:46 gvg Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
@@ -173,8 +173,8 @@ typedef unsigned long  ulg;
 #    define zmemzero(dest, len) _fmemset(dest, 0, len)
 #  else
 #    define zmemcpy ft_memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
+#    define zmemcmp ft_memcmp
+#    define zmemzero(dest, len) ft_memset(dest, 0, len)
 #  endif
 #else
    extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
diff --git a/reactos/lib/freetype/src/otlayout/otlgsub.c b/reactos/lib/freetype/src/otlayout/otlgsub.c
index 817760a7c86..13a8eae98de 100644
--- a/reactos/lib/freetype/src/otlayout/otlgsub.c
+++ b/reactos/lib/freetype/src/otlayout/otlgsub.c
@@ -87,7 +87,7 @@
     OTL_Int    index;
     OTL_Bool   subst = 0;
 
-    if ( parser->context_len != 0xFFFF && parser->context_len < 1 )
+    if ( parser->context_len != 0xFFFFU && parser->context_len < 1 )
       goto Exit;
 
     gindex = otl_parser_get_gindex( parser );
@@ -107,7 +107,7 @@
           {
             OTL_Int  delta = OTL_NEXT_SHORT(p);
 
-            gindex = ( gindex + delta ) & 0xFFFF;
+            gindex = ( gindex + delta ) & 0xFFFFU;
             otl_parser_replace_1( parser, gindex );
             subst = 1;
           }
@@ -223,7 +223,7 @@
     OTL_Int    index;
     OTL_Bool   subst = 0;
 
-    if ( context_len != 0xFFFF && context_len < 1 )
+    if ( context_len != 0xFFFFU && context_len < 1 )
       goto Exit;
 
     gindex = otl_parser_get_gindex( parser );
@@ -341,7 +341,7 @@
 
     OTL_GSUB_Alternate  alternate = parser->alternate;
 
-    if ( context_len != 0xFFFF && context_len < 1 )
+    if ( context_len != 0xFFFFU && context_len < 1 )
       goto Exit;
 
     if ( alternate == NULL )
diff --git a/reactos/lib/freetype/src/pcf/Jamfile b/reactos/lib/freetype/src/pcf/Jamfile
index fd776258524..3a884f534fe 100644
--- a/reactos/lib/freetype/src/pcf/Jamfile
+++ b/reactos/lib/freetype/src/pcf/Jamfile
@@ -1,4 +1,4 @@
-# FreeType 2 src/pcf Jamfile (c) 2001 David Turner
+# FreeType 2 src/pcf Jamfile (c) 2001, 2003 David Turner
 #
 
 SubDir  FT2_TOP $(FT2_SRC_DIR) pcf ;
@@ -8,7 +8,7 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) pcf ;
 
   if $(FT2_MULTI)
   {
-    _sources = pcfdriver pcfread pcfutil ;
+    _sources = pcfdrivr pcfread pcfutil ;
   }
   else
   {
diff --git a/reactos/lib/freetype/src/pcf/pcf.c b/reactos/lib/freetype/src/pcf/pcf.c
index 315655e56c3..11d5b7b2a06 100644
--- a/reactos/lib/freetype/src/pcf/pcf.c
+++ b/reactos/lib/freetype/src/pcf/pcf.c
@@ -2,7 +2,7 @@
 
     FreeType font driver for pcf fonts
 
-  Copyright 2000-2001 by
+  Copyright 2000-2001, 2003 by
   Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -31,6 +31,6 @@ THE SOFTWARE.
 #include <ft2build.h>
 #include "pcfutil.c"
 #include "pcfread.c"
-#include "pcfdriver.c"
+#include "pcfdrivr.c"
 
 /* END */
diff --git a/reactos/lib/freetype/src/pcf/pcf.h b/reactos/lib/freetype/src/pcf/pcf.h
index 1b7b585efcd..64acefc4eef 100644
--- a/reactos/lib/freetype/src/pcf/pcf.h
+++ b/reactos/lib/freetype/src/pcf/pcf.h
@@ -2,7 +2,7 @@
 
   FreeType font driver for pcf fonts
 
-  Copyright (C) 2000-2001, 2002 by
+  Copyright (C) 2000, 2001, 2002, 2003 by
   Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -124,10 +124,10 @@ FT_BEGIN_HEADER
   } PCF_AccelRec, *PCF_Accel;
 
 
-  typedef struct  PCD_EncodingRec_
+  typedef struct  PCF_EncodingRec_
   {
-    FT_Long   enc;
-    FT_Short  glyph;
+    FT_Long    enc;
+    FT_UShort  glyph;
 
   } PCF_EncodingRec, *PCF_Encoding;
 
diff --git a/reactos/lib/freetype/src/pcf/pcfdriver.c b/reactos/lib/freetype/src/pcf/pcfdrivr.c
similarity index 91%
rename from reactos/lib/freetype/src/pcf/pcfdriver.c
rename to reactos/lib/freetype/src/pcf/pcfdrivr.c
index 6f0b9e18fdb..3681b1cbfc4 100644
--- a/reactos/lib/freetype/src/pcf/pcfdriver.c
+++ b/reactos/lib/freetype/src/pcf/pcfdrivr.c
@@ -1,8 +1,8 @@
-/*  pcfdriver.c
+/*  pcfdrivr.c
 
     FreeType font driver for pcf files
 
-    Copyright (C) 2000-2001, 2002 by
+    Copyright (C) 2000, 2001, 2002, 2003 by
     Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -35,7 +35,7 @@ THE SOFTWARE.
 #include FT_BDF_H
 
 #include "pcf.h"
-#include "pcfdriver.h"
+#include "pcfdrivr.h"
 #include "pcfutil.h"
 #include "pcfread.h"
 
@@ -63,7 +63,7 @@ THE SOFTWARE.
     cmap->num_encodings = (FT_UInt)face->nencodings;
     cmap->encodings     = face->encodings;
 
-    return FT_Err_Ok;
+    return PCF_Err_Ok;
   }
 
 
@@ -242,9 +242,10 @@ THE SOFTWARE.
     {
       FT_Error  error2;
 
-      /* this didn't work, try gzip support !! */
+
+      /* this didn't work, try gzip support! */
       error2 = FT_Stream_OpenGzip( &face->gzip_stream, stream );
-      if ( error2 == FT_Err_Unimplemented_Feature )
+      if ( error2 == PCF_Err_Unimplemented_Feature )
         goto Fail;
 
       error = error2;
@@ -273,10 +274,21 @@ THE SOFTWARE.
       if ( ( charset_registry != NULL ) &&
            ( charset_encoding != NULL ) )
       {
-        if ( !ft_strcmp( face->charset_registry, "ISO10646" )     ||
-             ( !ft_strcmp( face->charset_registry, "ISO8859" ) &&
-               !ft_strcmp( face->charset_encoding, "1" )       )  )
+        char*  s = face->charset_registry;
+
+
+        /* Uh, oh, compare first letters manually to avoid dependency
+           on locales. */
+        if ( ( s[0] == 'i' || s[0] == 'I' ) &&
+             ( s[1] == 's' || s[1] == 'S' ) &&
+             ( s[2] == 'o' || s[2] == 'O' ) )
+        {
+          s += 3;
+          if ( !ft_strcmp( s, "10646" )                      ||
+               ( !ft_strcmp( s, "8859" ) &&
+                 !ft_strcmp( face->charset_encoding, "1" ) ) )
           unicode_charmap = 1;
+        }
       }
 
       {
@@ -442,9 +454,9 @@ THE SOFTWARE.
     slot->bitmap_left = metric->leftSideBearing;
     slot->bitmap_top  = metric->ascent;
 
-    slot->metrics.horiAdvance  = metric->characterWidth << 6 ;
-    slot->metrics.horiBearingX = metric->leftSideBearing << 6 ;
-    slot->metrics.horiBearingY = metric->ascent << 6 ;
+    slot->metrics.horiAdvance  = metric->characterWidth << 6;
+    slot->metrics.horiBearingX = metric->leftSideBearing << 6;
+    slot->metrics.horiBearingY = metric->ascent << 6;
     slot->metrics.width        = ( metric->rightSideBearing -
                                    metric->leftSideBearing ) << 6;
     slot->metrics.height       = bitmap->rows << 6;
@@ -464,7 +476,8 @@ THE SOFTWARE.
                         const char*       prop_name,
                         BDF_PropertyRec  *aproperty )
   {
-    PCF_Property   prop;
+    PCF_Property  prop;
+
 
     prop = pcf_find_property( face, prop_name );
     if ( prop != NULL )
@@ -476,16 +489,17 @@ THE SOFTWARE.
       }
       else
       {
-       /* apparently, the PCF driver loads all properties as signed integers !
-        * this really doesn't seem to be a problem, because this is
-        * sufficient for any meaningful values
-        */
+        /* Apparently, the PCF driver loads all properties as signed integers!
+         * This really doesn't seem to be a problem, because this is
+         * sufficient for any meaningful values.
+         */
         aproperty->type      = BDF_PROPERTY_TYPE_INTEGER;
         aproperty->u.integer = prop->value.integer;
       }
       return 0;
     }
-    return FT_Err_Invalid_Argument;
+
+    return PCF_Err_Invalid_Argument;
   }
 
 
@@ -506,7 +520,8 @@ THE SOFTWARE.
   const FT_Driver_ClassRec  pcf_driver_class =
   {
     {
-      ft_module_font_driver,
+      FT_MODULE_FONT_DRIVER        |
+      FT_MODULE_DRIVER_NO_OUTLINES,
       sizeof ( FT_DriverRec ),
 
       "pcf",
diff --git a/reactos/lib/freetype/src/pcf/pcfdriver.h b/reactos/lib/freetype/src/pcf/pcfdrivr.h
similarity index 93%
rename from reactos/lib/freetype/src/pcf/pcfdriver.h
rename to reactos/lib/freetype/src/pcf/pcfdrivr.h
index 7c45b91811b..7ddf697e164 100644
--- a/reactos/lib/freetype/src/pcf/pcfdriver.h
+++ b/reactos/lib/freetype/src/pcf/pcfdrivr.h
@@ -1,4 +1,4 @@
-/*  pcfdriver.h
+/*  pcfdrivr.h
 
     FreeType font driver for pcf fonts
 
@@ -25,8 +25,8 @@ THE SOFTWARE.
 */
 
 
-#ifndef __PCFDRIVER_H__
-#define __PCFDRIVER_H__
+#ifndef __PCFDRIVR_H__
+#define __PCFDRIVR_H__
 
 #include <ft2build.h>
 #include FT_INTERNAL_DRIVER_H
@@ -38,7 +38,7 @@ FT_BEGIN_HEADER
 FT_END_HEADER
 
 
-#endif /* __PCFDRIVER_H__ */
+#endif /* __PCFDRIVR_H__ */
 
 
 /* END */
diff --git a/reactos/lib/freetype/src/pcf/pcfread.c b/reactos/lib/freetype/src/pcf/pcfread.c
index e3bbf060650..1b377b5b1e0 100644
--- a/reactos/lib/freetype/src/pcf/pcfread.c
+++ b/reactos/lib/freetype/src/pcf/pcfread.c
@@ -2,7 +2,7 @@
 
     FreeType font driver for pcf fonts
 
-  Copyright 2000-2001, 2002 by
+  Copyright 2000, 2001, 2002, 2003 by
   Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include FT_INTERNAL_OBJECTS_H
 
 #include "pcf.h"
-#include "pcfdriver.h"
+#include "pcfdrivr.h"
 #include "pcfread.h"
 
 #include "pcferror.h"
@@ -250,18 +250,22 @@ THE SOFTWARE.
                           FT_ULong  *aformat,
                           FT_ULong  *asize )
   {
-    FT_Error  error = 0;
+    FT_Error  error = PCF_Err_Invalid_File_Format;
     FT_Int    i;
 
 
     for ( i = 0; i < ntables; i++ )
       if ( tables[i].type == type )
       {
-        if ( stream->pos > tables[i].offset )
-          return PCF_Err_Invalid_Stream_Skip;
+        if ( stream->pos > tables[i].offset ) {
+          error = PCF_Err_Invalid_Stream_Skip;
+          goto Fail;
+        }
 
-        if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) )
-          return PCF_Err_Invalid_Stream_Skip;
+        if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) ) {
+          error = PCF_Err_Invalid_Stream_Skip;
+          goto Fail;
+        }
 
         *asize   = tables[i].size;  /* unused - to be removed */
         *aformat = tables[i].format;
@@ -269,7 +273,8 @@ THE SOFTWARE.
         return PCF_Err_Ok;
       }
 
-    return PCF_Err_Invalid_File_Format;
+  Fail:
+    return error;
   }
 
 
@@ -914,10 +919,9 @@ THE SOFTWARE.
     {
       FT_Face       root = FT_FACE( face );
       PCF_Property  prop;
-      int           size_set = 0;
 
 
-      root->num_faces = 1;
+      root->num_faces  = 1;
       root->face_index = 0;
       root->face_flags = FT_FACE_FLAG_FIXED_SIZES |
                          FT_FACE_FLAG_HORIZONTAL  |
@@ -931,13 +935,16 @@ THE SOFTWARE.
       if ( prop != NULL )
         if ( prop->isString )
           if ( ( *(prop->value.atom) == 'O' ) ||
-               ( *(prop->value.atom) == 'I' ) )
+               ( *(prop->value.atom) == 'o' ) ||
+               ( *(prop->value.atom) == 'I' ) ||
+               ( *(prop->value.atom) == 'i' ) )
             root->style_flags |= FT_STYLE_FLAG_ITALIC;
 
       prop = pcf_find_property( face, "WEIGHT_NAME" );
       if ( prop != NULL )
         if ( prop->isString )
-          if ( *(prop->value.atom) == 'B' )
+          if ( ( *(prop->value.atom) == 'B' ) ||
+               ( *(prop->value.atom) == 'b' ) )
             root->style_flags |= FT_STYLE_FLAG_BOLD;
 
       root->style_name = (char *)"Regular";
@@ -967,54 +974,56 @@ THE SOFTWARE.
       else
         root->family_name = 0;
 
-      root->num_glyphs = face->nmetrics;
+      /* Note: We shift all glyph indices by +1 since we must
+       * respect the convention that glyph 0 always corresponds
+       * to the "missing glyph".
+       *
+       * This implies bumping the number of "available" glyphs by 1.
+       */
+      root->num_glyphs = face->nmetrics + 1;
 
       root->num_fixed_sizes = 1;
       if ( FT_NEW_ARRAY( root->available_sizes, 1 ) )
         goto Exit;
 
-      prop = pcf_find_property( face, "PIXEL_SIZE" );
-      if ( prop != NULL )
       {
-        root->available_sizes->height =
-        root->available_sizes->width  = (FT_Short)( prop->value.integer );
+        FT_Bitmap_Size*  bsize = root->available_sizes;
+
+
+        FT_MEM_ZERO( bsize, sizeof ( FT_Bitmap_Size ) );
+
+        prop = pcf_find_property( face, "PIXEL_SIZE" );
+        if ( prop != NULL )
+          bsize->height = (FT_Short)prop->value.integer;
+
+        prop = pcf_find_property( face, "AVERAGE_WIDTH" );
+        if ( prop != NULL )
+          bsize->width = (FT_Short)( ( prop->value.integer + 5 ) / 10 );
 
-        size_set = 1;
-      }
-      else
-      {
         prop = pcf_find_property( face, "POINT_SIZE" );
         if ( prop != NULL )
-        {
-          PCF_Property  xres, yres, avgw;
+          /* convert from 722,7 decipoints to 72 points per inch */
+          bsize->size =
+            (FT_Pos)( ( prop->value.integer * 64 * 7200 + 36135L ) / 72270L );
 
+        prop = pcf_find_property( face, "RESOLUTION_X" );
+        if ( prop != NULL )
+          bsize->x_ppem =
+            (FT_Pos)( ( prop->value.integer * bsize->size + 36 ) / 72 );
 
-          xres = pcf_find_property( face, "RESOLUTION_X" );
-          yres = pcf_find_property( face, "RESOLUTION_Y" );
-          avgw = pcf_find_property( face, "AVERAGE_WIDTH" );
+        prop = pcf_find_property( face, "RESOLUTION_Y" );
+        if ( prop != NULL )
+          bsize->y_ppem =
+            (FT_Pos)( ( prop->value.integer * bsize->size + 36 ) / 72 );
 
-          if ( ( yres != NULL ) && ( xres != NULL ) )
-          {
-            root->available_sizes->height =
-              (FT_Short)( prop->value.integer *
-                          yres->value.integer / 720 );
+        if ( bsize->height == 0 )
+          bsize->height = (FT_Short)( ( bsize->y_ppem + 32 ) / 64 );
 
-              root->available_sizes->width =
-                (FT_Short)( prop->value.integer *
-                            xres->value.integer / 720 );
-
-            size_set = 1;
-          }
-        }
+        if ( bsize->height == 0 )
+          bsize->height = 12;
       }
 
-      if (size_set == 0 )
-      {
-        root->available_sizes->width  = 12;
-        root->available_sizes->height = 12;
-      }
-
-      /* set-up charset */
+      /* set up charset */
       {
         PCF_Property  charset_registry = 0, charset_encoding = 0;
 
diff --git a/reactos/lib/freetype/src/pcf/pcfread.h b/reactos/lib/freetype/src/pcf/pcfread.h
index 5f54ba6eb3c..c9524f13464 100644
--- a/reactos/lib/freetype/src/pcf/pcfread.h
+++ b/reactos/lib/freetype/src/pcf/pcfread.h
@@ -2,7 +2,7 @@
 
     FreeType font driver for pcf fonts
 
-  Copyright 2000-2001 by
+  Copyright 2003 by
   Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -39,7 +39,7 @@ FT_BEGIN_HEADER
 
 FT_END_HEADER
 
-#endif /* __PCFUTIL_H__ */
+#endif /* __PCFREAD_H__ */
 
 
 /* END */
diff --git a/reactos/lib/freetype/src/pcf/rules.mk b/reactos/lib/freetype/src/pcf/rules.mk
index 141f1b74420..1ad4ba897a3 100644
--- a/reactos/lib/freetype/src/pcf/rules.mk
+++ b/reactos/lib/freetype/src/pcf/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 2000, 2001 by
+# Copyright (C) 2000, 2001, 2003 by
 # Francesco Zappa Nardelli
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -27,49 +27,48 @@
 
 # pcf driver directory
 #
-PCF_DIR  := $(SRC_)pcf
-PCF_DIR_ := $(PCF_DIR)$(SEP)
+PCF_DIR := $(SRC_DIR)/pcf
 
 
-PCF_COMPILE := $(FT_COMPILE) $I$(PCF_DIR)
+PCF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PCF_DIR))
 
 
 # pcf driver sources (i.e., C files)
 #
-PCF_DRV_SRC := $(PCF_DIR_)pcfread.c   \
-               $(PCF_DIR_)pcfdriver.c \
-               $(PCF_DIR_)pcfutil.c
+PCF_DRV_SRC := $(PCF_DIR)/pcfread.c  \
+               $(PCF_DIR)/pcfdrivr.c \
+               $(PCF_DIR)/pcfutil.c
 
 # pcf driver headers
 #
-PCF_DRV_H := $(PCF_DIR_)pcf.h       \
-             $(PCF_DIR_)pcfdriver.h \
-             $(PCF_DIR_)pcfutil.h   \
-             $(PCF_DIR_)pcferror.h
+PCF_DRV_H := $(PCF_DIR)/pcf.h      \
+             $(PCF_DIR)/pcfdrivr.h \
+             $(PCF_DIR)/pcfutil.h  \
+             $(PCF_DIR)/pcferror.h
 
 # pcf driver object(s)
 #
 #   PCF_DRV_OBJ_M is used during `multi' builds
 #   PCF_DRV_OBJ_S is used during `single' builds
 #
-PCF_DRV_OBJ_M := $(PCF_DRV_SRC:$(PCF_DIR_)%.c=$(OBJ_)%.$O)
-PCF_DRV_OBJ_S := $(OBJ_)pcf.$O
+PCF_DRV_OBJ_M := $(PCF_DRV_SRC:$(PCF_DIR)/%.c=$(OBJ_DIR)/%.$O)
+PCF_DRV_OBJ_S := $(OBJ_DIR)/pcf.$O
 
-# Windows driver source file for single build
+# pcf driver source file for single build
 #
-PCF_DRV_SRC_S := $(PCF_DIR_)pcf.c
+PCF_DRV_SRC_S := $(PCF_DIR)/pcf.c
 
 
 # pcf driver - single object
 #
 $(PCF_DRV_OBJ_S): $(PCF_DRV_SRC_S) $(PCF_DRV_SRC) $(FREETYPE_H) $(PCF_DRV_H)
-	$(PCF_COMPILE) $T$@ $(PCF_DRV_SRC_S)
+	$(PCF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PCF_DRV_SRC_S))
 
 
 # pcf driver - multiple objects
 #
-$(OBJ_)%.$O: $(PCF_DIR_)%.c $(FREETYPE_H) $(PCF_DRV_H)
-	$(PCF_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(PCF_DIR)/%.c $(FREETYPE_H) $(PCF_DRV_H)
+	$(PCF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -77,4 +76,5 @@ $(OBJ_)%.$O: $(PCF_DIR_)%.c $(FREETYPE_H) $(PCF_DRV_H)
 DRV_OBJS_S += $(PCF_DRV_OBJ_S)
 DRV_OBJS_M += $(PCF_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/pfr/Jamfile b/reactos/lib/freetype/src/pfr/Jamfile
index 3ba0ee9af4a..4c38a2de948 100644
--- a/reactos/lib/freetype/src/pfr/Jamfile
+++ b/reactos/lib/freetype/src/pfr/Jamfile
@@ -8,7 +8,7 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) pfr ;
 
   if $(FT2_MULTI)
   {
-    _sources = pfrdrivr  pfrgload  pfrload  pfrobjs pfrcmap pfrsbit ;
+    _sources = pfrdrivr pfrgload pfrload pfrobjs pfrcmap pfrsbit ;
   }
   else
   {
diff --git a/reactos/lib/freetype/src/pfr/pfrdrivr.c b/reactos/lib/freetype/src/pfr/pfrdrivr.c
index 07ba9b4cd31..3935e2e544d 100644
--- a/reactos/lib/freetype/src/pfr/pfrdrivr.c
+++ b/reactos/lib/freetype/src/pfr/pfrdrivr.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PFR driver interface (body).                                */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,26 +30,24 @@
                    FT_UInt     right,
                    FT_Vector  *avector )
   {
-    FT_Error  error;
+    PFR_PhyFont  phys = &face->phy_font;
 
-    error = pfr_face_get_kerning( face, left, right, avector );
-    if ( !error )
+
+    pfr_face_get_kerning( face, left, right, avector );
+
+    /* convert from metrics to outline units when necessary */
+    if ( phys->outline_resolution != phys->metrics_resolution )
     {
-      PFR_PhyFont  phys = &face->phy_font;
+      if ( avector->x != 0 )
+        avector->x = FT_MulDiv( avector->x, phys->outline_resolution,
+                                            phys->metrics_resolution );
 
-      /* convert from metrics to outline units when necessary */
-      if ( phys->outline_resolution != phys->metrics_resolution )
-      {
-        if ( avector->x != 0 )
-          avector->x = FT_MulDiv( avector->x, phys->outline_resolution,
-                                              phys->metrics_resolution );
-
-        if ( avector->y != 0 )
-          avector->y = FT_MulDiv( avector->x, phys->outline_resolution,
-                                              phys->metrics_resolution );
-      }
+      if ( avector->y != 0 )
+        avector->y = FT_MulDiv( avector->x, phys->outline_resolution,
+                                            phys->metrics_resolution );
     }
-    return error;
+
+    return PFR_Err_Ok;
   }
 
 
@@ -58,13 +56,15 @@
                    FT_UInt    gindex,
                    FT_Pos    *aadvance )
   {
-    FT_Error     error = FT_Err_Bad_Argument;
+    FT_Error  error = PFR_Err_Bad_Argument;
+
 
     *aadvance = 0;
     if ( face )
     {
       PFR_PhyFont  phys  = &face->phy_font;
 
+
       if ( gindex < phys->num_chars )
       {
         *aadvance = phys->chars[ gindex ].advance;
@@ -87,6 +87,7 @@
     FT_Fixed     x_scale, y_scale;
     FT_Size      size = face->root.size;
 
+
     if ( aoutline_resolution )
       *aoutline_resolution = phys->outline_resolution;
 
@@ -128,8 +129,8 @@
   const FT_Driver_ClassRec  pfr_driver_class =
   {
     {
-      ft_module_font_driver      |
-      ft_module_driver_scalable,
+      FT_MODULE_FONT_DRIVER     |
+      FT_MODULE_DRIVER_SCALABLE,
 
       sizeof( FT_DriverRec ),
 
diff --git a/reactos/lib/freetype/src/pfr/pfrload.c b/reactos/lib/freetype/src/pfr/pfrload.c
index 87d07577a19..e92ead95b5f 100644
--- a/reactos/lib/freetype/src/pfr/pfrload.c
+++ b/reactos/lib/freetype/src/pfr/pfrload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PFR loader (body).                                          */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -153,7 +153,7 @@
   pfr_header_load( PFR_Header  header,
                    FT_Stream   stream )
   {
-    FT_Error   error;
+    FT_Error  error;
 
 
     /* read header directly */
@@ -201,9 +201,9 @@
                       FT_UInt32  section_offset,
                       FT_UInt   *acount )
   {
-    FT_Error   error;
-    FT_UInt    count;
-    FT_UInt    result = 0;
+    FT_Error  error;
+    FT_UInt   count;
+    FT_UInt   result = 0;
 
 
     if ( FT_STREAM_SEEK( section_offset ) || FT_READ_USHORT( count ) )
@@ -239,8 +239,8 @@
       return PFR_Err_Invalid_Argument;
 
     if ( FT_STREAM_SKIP( idx * 5 ) ||
-         FT_READ_USHORT( size )      ||
-         FT_READ_UOFF3 ( offset )    )
+         FT_READ_USHORT( size )    ||
+         FT_READ_UOFF3 ( offset )  )
       goto Exit;
 
     /* save logical font size and offset */
@@ -365,7 +365,8 @@
     /* re-allocate when needed */
     if ( phy_font->num_strikes + count > phy_font->max_strikes )
     {
-      FT_UInt  new_max = (phy_font->num_strikes + count + 3) & -4;
+      FT_UInt  new_max = ( phy_font->num_strikes + count + 3 ) & -4;
+
 
       if ( FT_RENEW_ARRAY( phy_font->strikes,
                            phy_font->num_strikes,
@@ -432,30 +433,30 @@
   }
 
 
- /* load font ID, this is a so-called "unique" name that is rather
-  * long and descriptive (like "Tiresias ScreenFont v7.51").
-  *
-  * note that a PFR font's family name is contained in an *undocumented*
-  * string of the "auxiliary data" portion of a physical font record. this
-  * may also contain the "real" style name !
-  *
-  * if no family name is present, the font id is used instead for the
-  * family
-  */
+  /* Load font ID.  This is a so-called "unique" name that is rather
+   * long and descriptive (like "Tiresias ScreenFont v7.51").
+   *
+   * Note that a PFR font's family name is contained in an *undocumented*
+   * string of the "auxiliary data" portion of a physical font record.  This
+   * may also contain the "real" style name!
+   *
+   * If no family name is present, the font ID is used instead for the
+   * family.
+   */
   FT_CALLBACK_DEF( FT_Error )
   pfr_extra_item_load_font_id( FT_Byte*     p,
                                FT_Byte*     limit,
                                PFR_PhyFont  phy_font )
   {
-    FT_Error   error  = 0;
-    FT_Memory  memory = phy_font->memory;
-    FT_UInt    len    = (FT_UInt)( limit - p );
+    FT_Error    error  = 0;
+    FT_Memory   memory = phy_font->memory;
+    FT_PtrDist  len    = limit - p;
 
 
     if ( phy_font->font_id != NULL )
       goto Exit;
 
-    if ( FT_ALLOC( phy_font->font_id, len+1 ) )
+    if ( FT_ALLOC( phy_font->font_id, len + 1 ) )
       goto Exit;
 
     /* copy font ID name, and terminate it for safety */
@@ -702,9 +703,9 @@
   };
 
 
- /* loads a name from the auxiliary data. Since this extracts undocumented
-  * strings from the font file, we need to be careful here
-  */
+  /* Loads a name from the auxiliary data.  Since this extracts undocumented
+   * strings from the font file, we need to be careful here.
+   */
   static FT_Error
   pfr_aux_name_load( FT_Byte*     p,
                      FT_UInt      len,
@@ -715,13 +716,14 @@
     FT_String*  result = NULL;
     FT_UInt     n, ok;
 
-    if ( len > 0 && p[len-1] == 0 )
+
+    if ( len > 0 && p[len - 1] == 0 )
       len--;
 
-   /* check that each character is ASCII, that's to be sure
-    * to not load garbage..
-    */
-    ok = (len > 0);
+    /* check that each character is ASCII for making sure not to
+       load garbage
+     */
+    ok = ( len > 0 );
     for ( n = 0; n < len; n++ )
       if ( p[n] < 32 || p[n] > 127 )
       {
@@ -731,7 +733,7 @@
 
     if ( ok )
     {
-      if ( FT_ALLOC( result, len+1 ) )
+      if ( FT_ALLOC( result, len + 1 ) )
         goto Exit;
 
       FT_MEM_COPY( result, p, len );
@@ -787,7 +789,6 @@
   }
 
 
-
   FT_LOCAL_DEF( FT_Error )
   pfr_phy_font_load( PFR_PhyFont  phy_font,
                      FT_Stream    stream,
@@ -842,9 +843,9 @@
         goto Fail;
     }
 
-    /* in certain fonts, the auxiliary bytes contain interesting  */
+    /* In certain fonts, the auxiliary bytes contain interesting  */
     /* information. These are not in the specification but can be */
-    /* guessed by looking at the content of a few PFR0 fonts      */
+    /* guessed by looking at the content of a few PFR0 fonts.     */
     PFR_CHECK( 3 );
     num_aux = PFR_NEXT_ULONG( p );
 
@@ -853,6 +854,7 @@
       FT_Byte*  q = p;
       FT_Byte*  q2;
 
+
       PFR_CHECK( num_aux );
       p += num_aux;
 
@@ -860,58 +862,54 @@
       {
         FT_UInt  length, type;
 
+
         if ( q + 4 > p )
           break;
 
-        length = PFR_NEXT_USHORT(q);
+        length = PFR_NEXT_USHORT( q );
         if ( length < 4 || length > num_aux )
           break;
 
         q2   = q + length - 2;
-        type = PFR_NEXT_USHORT(q);
+        type = PFR_NEXT_USHORT( q );
 
         switch ( type )
         {
-          case 1:
-            {
-             /* this seems to correspond to the font's family name,
-              * padded to 16-bits with one zero when necessary
-              */
-              error = pfr_aux_name_load( q, length-4U, memory,
-                                         &phy_font->family_name );
-              if ( error )
-                goto Exit;
-            }
+        case 1:
+          /* this seems to correspond to the font's family name,
+           * padded to 16-bits with one zero when necessary
+           */
+          error = pfr_aux_name_load( q, length - 4U, memory,
+                                     &phy_font->family_name );
+          if ( error )
+            goto Exit;
+          break;
+
+        case 2:
+          if ( q + 32 > q2 )
             break;
 
-          case 2:
-            {
-              if ( q + 32 > q2 )
-                break;
+          q += 10;
+          phy_font->ascent  = PFR_NEXT_SHORT( q );
+          phy_font->descent = PFR_NEXT_SHORT( q );
+          phy_font->leading = PFR_NEXT_SHORT( q );
+          q += 16;
+          break;
 
-              q += 10;
-              phy_font->ascent  = PFR_NEXT_SHORT(q);
-              phy_font->descent = PFR_NEXT_SHORT(q);
-              phy_font->leading = PFR_NEXT_SHORT(q);
-              q += 16;
-            }
-            break;
+        case 3:
+          /* this seems to correspond to the font's style name,
+           * padded to 16-bits with one zero when necessary
+           */
+          error = pfr_aux_name_load( q, length - 4U, memory,
+                                     &phy_font->style_name );
+          if ( error )
+            goto Exit;
+          break;
 
-          case 3:
-            {
-             /* this seems to correspond to the font's style name,
-              * padded to 16-bits with one zero when necessary
-              */
-              error = pfr_aux_name_load( q, length-4U, memory,
-                                         &phy_font->style_name );
-              if ( error )
-                goto Exit;
-            }
-            break;
-
-          default:
-            ;
+        default:
+          ;
         }
+
         q        = q2;
         num_aux -= length;
       }
@@ -921,6 +919,7 @@
     {
       FT_UInt  n, count;
 
+
       PFR_CHECK( 1 );
       phy_font->num_blue_values = count = PFR_NEXT_BYTE( p );
 
@@ -1000,7 +999,8 @@
       }
     }
 
-    /* that's it !! */
+    /* that's it! */
+
   Fail:
     FT_FRAME_EXIT();
 
diff --git a/reactos/lib/freetype/src/pfr/pfrobjs.c b/reactos/lib/freetype/src/pfr/pfrobjs.c
index 867644ab025..402db95d3d6 100644
--- a/reactos/lib/freetype/src/pfr/pfrobjs.c
+++ b/reactos/lib/freetype/src/pfr/pfrobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PFR object methods (body).                                  */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -41,7 +41,8 @@
   FT_LOCAL_DEF( void )
   pfr_face_done( PFR_Face  face )
   {
-    FT_Memory   memory = face->root.driver->root.memory;
+    FT_Memory  memory = face->root.driver->root.memory;
+
 
     /* we don't want dangling pointers */
     face->root.family_name = NULL;
@@ -113,128 +114,127 @@
       goto Exit;
 
     /* now load the physical font descriptor */
-     error = pfr_phy_font_load( &face->phy_font, stream,
-                                 face->log_font.phys_offset,
-                                 face->log_font.phys_size );
-     if ( error )
-       goto Exit;
+    error = pfr_phy_font_load( &face->phy_font, stream,
+                               face->log_font.phys_offset,
+                               face->log_font.phys_size );
+    if ( error )
+      goto Exit;
 
-     /* now, set-up all root face fields */
-     {
-       FT_Face      root     = FT_FACE( face );
-       PFR_PhyFont  phy_font = &face->phy_font;
+    /* now, set-up all root face fields */
+    {
+      FT_Face      root     = FT_FACE( face );
+      PFR_PhyFont  phy_font = &face->phy_font;
 
 
-       root->face_index = face_index;
-       root->num_glyphs = phy_font->num_chars;
-       root->face_flags = FT_FACE_FLAG_SCALABLE;
+      root->face_index = face_index;
+      root->num_glyphs = phy_font->num_chars;
+      root->face_flags = FT_FACE_FLAG_SCALABLE;
 
-       if ( (phy_font->flags & PFR_PHY_PROPORTIONAL) == 0 )
-         root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
+      if ( (phy_font->flags & PFR_PHY_PROPORTIONAL) == 0 )
+        root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
 
-       if ( phy_font->flags & PFR_PHY_VERTICAL )
-         root->face_flags |= FT_FACE_FLAG_VERTICAL;
-       else
-         root->face_flags |= FT_FACE_FLAG_HORIZONTAL;
+      if ( phy_font->flags & PFR_PHY_VERTICAL )
+        root->face_flags |= FT_FACE_FLAG_VERTICAL;
+      else
+        root->face_flags |= FT_FACE_FLAG_HORIZONTAL;
 
-       if ( phy_font->num_strikes > 0 )
-         root->face_flags |= FT_FACE_FLAG_FIXED_SIZES;
+      if ( phy_font->num_strikes > 0 )
+        root->face_flags |= FT_FACE_FLAG_FIXED_SIZES;
 
-       if ( phy_font->num_kern_pairs > 0 )
-         root->face_flags |= FT_FACE_FLAG_KERNING;
+      if ( phy_font->num_kern_pairs > 0 )
+        root->face_flags |= FT_FACE_FLAG_KERNING;
 
-      /* if no family name was found in the "undocumented" auxiliary
-       * data, use the font ID instead. This sucks but is better than
-       * nothing
+      /* If no family name was found in the "undocumented" auxiliary
+       * data, use the font ID instead.  This sucks but is better than
+       * nothing.
        */
-       root->family_name = phy_font->family_name;
-       if ( root->family_name == NULL )
-         root->family_name = phy_font->font_id;
+      root->family_name = phy_font->family_name;
+      if ( root->family_name == NULL )
+        root->family_name = phy_font->font_id;
 
       /* note that the style name can be NULL in certain PFR fonts,
        * probably meaning "Regular"
        */
-       root->style_name  = phy_font->style_name;
+      root->style_name = phy_font->style_name;
 
-       root->num_fixed_sizes = 0;
-       root->available_sizes = 0;
+      root->num_fixed_sizes = 0;
+      root->available_sizes = 0;
 
-       root->bbox         = phy_font->bbox;
-       root->units_per_EM = (FT_UShort)phy_font->outline_resolution;
-       root->ascender     = (FT_Short) phy_font->bbox.yMax;
-       root->descender    = (FT_Short) phy_font->bbox.yMin;
-       root->height       = (FT_Short)
-                              ( ( ( root->ascender - root->descender ) * 12 )
-                                / 10 );
+      root->bbox         = phy_font->bbox;
+      root->units_per_EM = (FT_UShort)phy_font->outline_resolution;
+      root->ascender     = (FT_Short) phy_font->bbox.yMax;
+      root->descender    = (FT_Short) phy_font->bbox.yMin;
+      root->height       = (FT_Short)(
+        ( ( root->ascender - root->descender ) * 12 ) / 10 );
 
-       if ( phy_font->num_strikes > 0 )
-       {
-         FT_UInt          n, count = phy_font->num_strikes;
-         FT_Bitmap_Size*  size;
-         PFR_Strike       strike;
-         FT_Memory        memory = root->stream->memory;
+      if ( phy_font->num_strikes > 0 )
+      {
+        FT_UInt          n, count = phy_font->num_strikes;
+        FT_Bitmap_Size*  size;
+        PFR_Strike       strike;
+        FT_Memory        memory = root->stream->memory;
          
          
-         if ( FT_NEW_ARRAY( root->available_sizes, count ) )
-           goto Exit;
+        if ( FT_NEW_ARRAY( root->available_sizes, count ) )
+          goto Exit;
          
-         size   = root->available_sizes;
-         strike = phy_font->strikes;
-         for ( n = 0; n < count; n++, size++, strike++ )
-         {
-           size->height = (FT_UShort) strike->y_ppm;
-           size->width  = (FT_UShort) strike->x_ppm;
-         }
-         root->num_fixed_sizes = count;
-       }
+        size   = root->available_sizes;
+        strike = phy_font->strikes;
+        for ( n = 0; n < count; n++, size++, strike++ )
+        {
+          size->height = (FT_UShort)strike->y_ppm;
+          size->width  = (FT_UShort)strike->x_ppm;
+        }
+        root->num_fixed_sizes = count;
+      }
 
-       /* now compute maximum advance width */
-       if ( ( phy_font->flags & PFR_PHY_PROPORTIONAL ) == 0 )
-         root->max_advance_width = (FT_Short)phy_font->standard_advance;
-       else
-       {
-         FT_Int    max = 0;
-         FT_UInt   count = phy_font->num_chars;
-         PFR_Char  gchar = phy_font->chars;
+      /* now compute maximum advance width */
+      if ( ( phy_font->flags & PFR_PHY_PROPORTIONAL ) == 0 )
+        root->max_advance_width = (FT_Short)phy_font->standard_advance;
+      else
+      {
+        FT_Int    max = 0;
+        FT_UInt   count = phy_font->num_chars;
+        PFR_Char  gchar = phy_font->chars;
 
 
-         for ( ; count > 0; count--, gchar++ )
-         {
-           if ( max < gchar->advance )
-             max = gchar->advance;
-         }
+        for ( ; count > 0; count--, gchar++ )
+        {
+          if ( max < gchar->advance )
+            max = gchar->advance;
+        }
 
-         root->max_advance_width = (FT_Short)max;
-       }
+        root->max_advance_width = (FT_Short)max;
+      }
 
-       root->max_advance_height = root->height;
+      root->max_advance_height = root->height;
 
-       root->underline_position  = (FT_Short)( - root->units_per_EM / 10 );
-       root->underline_thickness = (FT_Short)(   root->units_per_EM / 30 );
+      root->underline_position  = (FT_Short)( - root->units_per_EM / 10 );
+      root->underline_thickness = (FT_Short)(   root->units_per_EM / 30 );
 
-       /* create charmap */
-       {
-         FT_CharMapRec  charmap;
+      /* create charmap */
+      {
+        FT_CharMapRec  charmap;
 
 
-         charmap.face        = root;
-         charmap.platform_id = 3;
-         charmap.encoding_id = 1;
-         charmap.encoding    = FT_ENCODING_UNICODE;
+        charmap.face        = root;
+        charmap.platform_id = 3;
+        charmap.encoding_id = 1;
+        charmap.encoding    = FT_ENCODING_UNICODE;
 
-         FT_CMap_New( &pfr_cmap_class_rec, NULL, &charmap, NULL );
+        FT_CMap_New( &pfr_cmap_class_rec, NULL, &charmap, NULL );
 
 #if 0
-         /* Select default charmap */
-         if (root->num_charmaps)
-           root->charmap = root->charmaps[0];
+        /* Select default charmap */
+        if (root->num_charmaps)
+          root->charmap = root->charmaps[0];
 #endif
-       }
+      }
 
-       /* check whether we've loaded any kerning pairs */
-       if ( phy_font->num_kern_pairs )
-         root->face_flags |= FT_FACE_FLAG_KERNING;
-     }
+      /* check whether we've loaded any kerning pairs */
+      if ( phy_font->num_kern_pairs )
+        root->face_flags |= FT_FACE_FLAG_KERNING;
+    }
 
   Exit:
     return error;
@@ -279,7 +279,8 @@
     FT_Outline*  outline = &slot->root.outline;
     FT_ULong     gps_offset;
 
-    if (gindex > 0)
+
+    if ( gindex > 0 )
       gindex--;
 
     /* check that the glyph index is correct */
@@ -295,7 +296,7 @@
 
     if ( load_flags & FT_LOAD_SBITS_ONLY )
     {
-      error = FT_Err_Invalid_Argument;
+      error = PFR_Err_Invalid_Argument;
       goto Exit;
     }
 
@@ -352,6 +353,21 @@
       metrics->vertBearingX = 0;
       metrics->vertBearingY = 0;
 
+      /* Apply the font matrix, if any.                 */
+      /* TODO: Test existing fonts with unusual matrix  */
+      /* whether we have to adjust Units per EM.        */
+      {
+        FT_Matrix font_matrix;
+
+
+        font_matrix.xx = face->log_font.matrix[0] << 8;
+        font_matrix.yx = face->log_font.matrix[1] << 8;
+        font_matrix.xy = face->log_font.matrix[2] << 8;
+        font_matrix.yy = face->log_font.matrix[3] << 8;
+
+        FT_Outline_Transform( outline, &font_matrix );
+      }
+
       /* scale when needed */
       if ( scaling )
       {
@@ -395,17 +411,19 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  FT_LOCAL_DEF( FT_Error )
+  FT_LOCAL_DEF( void )
   pfr_face_get_kerning( PFR_Face    face,
                         FT_UInt     glyph1,
                         FT_UInt     glyph2,
                         FT_Vector*  kerning )
   {
-    FT_Error      error;
+    FT_Error      error    = PFR_Err_Ok;
     PFR_PhyFont   phy_font = &face->phy_font;
     PFR_KernItem  item     = phy_font->kern_items;
     FT_UInt32     idx      = PFR_KERN_INDEX( glyph1, glyph2 );
 
+    FT_UNUSED( error ); /* just needed as syntactical sugar */
+
 
     kerning->x = 0;
     kerning->y = 0;
@@ -420,7 +438,7 @@
     }
 
     /* not found */
-    goto Exit;
+    return;
 
   Found_Item:
     {
@@ -432,7 +450,7 @@
 
       if ( FT_STREAM_SEEK( item->offset )                       ||
            FT_FRAME_ENTER( item->pair_count * item->pair_size ) )
-        goto Exit;
+        return;
 
       min = 0;
       max = item->pair_count;
@@ -473,9 +491,7 @@
 
       FT_FRAME_EXIT();
     }
-
-  Exit:
-    return 0;
   }
 
+
 /* END */
diff --git a/reactos/lib/freetype/src/pfr/pfrobjs.h b/reactos/lib/freetype/src/pfr/pfrobjs.h
index b29b64c6cdd..efd7b7c6d35 100644
--- a/reactos/lib/freetype/src/pfr/pfrobjs.h
+++ b/reactos/lib/freetype/src/pfr/pfrobjs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PFR object methods (specification).                         */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -67,11 +67,11 @@ FT_BEGIN_HEADER
   pfr_face_done( PFR_Face  face );
 
 
-  FT_LOCAL( FT_Error )
-  pfr_face_get_kerning( PFR_Face   face,
-                        FT_UInt    glyph1,
-                        FT_UInt    glyph2,
-                        FT_Vector* kerning );
+  FT_LOCAL( void )
+  pfr_face_get_kerning( PFR_Face    face,
+                        FT_UInt     glyph1,
+                        FT_UInt     glyph2,
+                        FT_Vector*  kerning );
 
 
   FT_LOCAL( FT_Error )
diff --git a/reactos/lib/freetype/src/pfr/pfrsbit.c b/reactos/lib/freetype/src/pfr/pfrsbit.c
index 408b06323c7..84aeb7a047a 100644
--- a/reactos/lib/freetype/src/pfr/pfrsbit.c
+++ b/reactos/lib/freetype/src/pfr/pfrsbit.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PFR bitmap loader (body).                                   */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -49,7 +49,7 @@
   static void
   pfr_bitwriter_init( PFR_BitWriter  writer,
                       FT_Bitmap*     target,
-                      FT_UInt        decreasing )
+                      FT_Bool        decreasing )
   {
     writer->line   = target->buffer;
     writer->pitch  = target->pitch;
@@ -115,7 +115,7 @@
     }
 
     if ( mask != 0x80 )
-      cur[0] = (FT_Byte) c;
+      cur[0] = (FT_Byte)c;
   }
 
 
@@ -185,7 +185,7 @@
       }
       else if ( mask == 0 )
       {
-        cur[0] = (FT_Byte) c;
+        cur[0] = (FT_Byte)c;
         mask   = 0x80;
         c      = 0;
         cur ++;
@@ -249,7 +249,7 @@
       }
       else if ( mask == 0 )
       {
-        cur[0] = (FT_Byte) c;
+        cur[0] = (FT_Byte)c;
         c      = 0;
         mask   = 0x80;
         cur ++;
@@ -274,8 +274,8 @@
   static void
   pfr_lookup_bitmap_data( FT_Byte*   base,
                           FT_Byte*   limit,
-                          FT_Int     count,
-                          FT_Byte    flags,
+                          FT_UInt    count,
+                          FT_UInt    flags,
                           FT_UInt    char_code,
                           FT_ULong*  found_offset,
                           FT_ULong*  found_size )
@@ -481,7 +481,7 @@
   pfr_load_bitmap_bits( FT_Byte*    p,
                         FT_Byte*    limit,
                         FT_UInt     format,
-                        FT_UInt     decreasing,
+                        FT_Bool     decreasing,
                         FT_Bitmap*  target )
   {
     FT_Error          error = 0;
@@ -508,7 +508,7 @@
 
       default:
         FT_ERROR(( "pfr_read_bitmap_data: invalid image type\n" ));
-        error = FT_Err_Invalid_File_Format;
+        error = PFR_Err_Invalid_File_Format;
       }
     }
 
@@ -560,7 +560,7 @@
       }
 
       /* couldn't find it */
-      return FT_Err_Invalid_Argument;
+      return PFR_Err_Invalid_Argument;
     }
 
   Found_Strike:
@@ -583,7 +583,7 @@
       pfr_lookup_bitmap_data( stream->cursor,
                               stream->limit,
                               strike->num_bitmaps,
-                              (FT_Byte) strike->flags,
+                              strike->flags,
                               character->char_code,
                               &gps_offset,
                               &gps_size );
@@ -593,7 +593,7 @@
       if ( gps_size == 0 )
       {
         /* Could not find a bitmap program string for this glyph */
-        error = FT_Err_Invalid_Argument;
+        error = PFR_Err_Invalid_Argument;
         goto Exit;
       }
     }
@@ -645,7 +645,8 @@
 
         /* Allocate and read bitmap data */
         {
-          FT_ULong    len    = glyph->root.bitmap.pitch * ysize;
+          FT_ULong  len = glyph->root.bitmap.pitch * ysize;
+
 
           error = ft_glyphslot_alloc_bitmap( &glyph->root, len );
           if ( !error )
diff --git a/reactos/lib/freetype/src/pfr/pfrtypes.h b/reactos/lib/freetype/src/pfr/pfrtypes.h
index 96744fc653c..21b4e3d2ea9 100644
--- a/reactos/lib/freetype/src/pfr/pfrtypes.h
+++ b/reactos/lib/freetype/src/pfr/pfrtypes.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PFR data structures (specification only).                   */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
diff --git a/reactos/lib/freetype/src/pfr/rules.mk b/reactos/lib/freetype/src/pfr/rules.mk
index fe2f6eb9924..60b96c74154 100644
--- a/reactos/lib/freetype/src/pfr/rules.mk
+++ b/reactos/lib/freetype/src/pfr/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2002 by
+# Copyright 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,27 +15,28 @@
 
 # pfr driver directory
 #
-PFR_DIR  := $(SRC_)pfr
-PFR_DIR_ := $(PFR_DIR)$(SEP)
+PFR_DIR := $(SRC_DIR)/pfr
 
 
 # compilation flags for the driver
 #
-PFR_COMPILE := $(FT_COMPILE) $I$(PFR_DIR)
+PFR_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PFR_DIR))
 
 
 # pfr driver sources (i.e., C files)
 #
-PFR_DRV_SRC := $(PFR_DIR_)pfrload.c  \
-               $(PFR_DIR_)pfrgload.c \
-               $(PFR_DIR_)pfrcmap.c  \
-               $(PFR_DIR_)pfrdrivr.c \
-               $(PFR_DIR_)pfrobjs.c
+PFR_DRV_SRC := $(PFR_DIR)/pfrload.c  \
+               $(PFR_DIR)/pfrgload.c \
+               $(PFR_DIR)/pfrcmap.c  \
+               $(PFR_DIR)/pfrdrivr.c \
+               $(PFR_DIR)/pfrsbit.c  \
+               $(PFR_DIR)/pfrobjs.c
 
 # pfr driver headers
 #
 PFR_DRV_H := $(PFR_DRV_SRC:%.c=%.h) \
-             $(PFR_DIR_)pfrerror.h
+             $(PFR_DIR)/pfrerror.h  \
+             $(PFR_DIR)/pfrtypes.h
 
 
 # Pfr driver object(s)
@@ -43,24 +44,24 @@ PFR_DRV_H := $(PFR_DRV_SRC:%.c=%.h) \
 #   PFR_DRV_OBJ_M is used during `multi' builds
 #   PFR_DRV_OBJ_S is used during `single' builds
 #
-PFR_DRV_OBJ_M := $(PFR_DRV_SRC:$(PFR_DIR_)%.c=$(OBJ_)%.$O)
-PFR_DRV_OBJ_S := $(OBJ_)pfr.$O
+PFR_DRV_OBJ_M := $(PFR_DRV_SRC:$(PFR_DIR)/%.c=$(OBJ_DIR)/%.$O)
+PFR_DRV_OBJ_S := $(OBJ_DIR)/pfr.$O
 
 # pfr driver source file for single build
 #
-PFR_DRV_SRC_S := $(PFR_DIR_)pfr.c
+PFR_DRV_SRC_S := $(PFR_DIR)/pfr.c
 
 
 # pfr driver - single object
 #
 $(PFR_DRV_OBJ_S): $(PFR_DRV_SRC_S) $(PFR_DRV_SRC) $(FREETYPE_H) $(PFR_DRV_H)
-	$(PFR_COMPILE) $T$@ $(PFR_DRV_SRC_S)
+	$(PFR_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PFR_DRV_SRC_S))
 
 
 # pfr driver - multiple objects
 #
-$(OBJ_)%.$O: $(PFR_DIR_)%.c $(FREETYPE_H) $(PFR_DRV_H)
-	$(PFR_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(PFR_DIR)/%.c $(FREETYPE_H) $(PFR_DRV_H)
+	$(PFR_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -68,4 +69,5 @@ $(OBJ_)%.$O: $(PFR_DIR_)%.c $(FREETYPE_H) $(PFR_DRV_H)
 DRV_OBJS_S += $(PFR_DRV_OBJ_S)
 DRV_OBJS_M += $(PFR_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/psaux/psauxmod.c b/reactos/lib/freetype/src/psaux/psauxmod.c
index fa0c4aa8ce7..d6024178b87 100644
--- a/reactos/lib/freetype/src/psaux/psauxmod.c
+++ b/reactos/lib/freetype/src/psaux/psauxmod.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType auxiliary PostScript module implementation (body).          */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
+/*  Copyright 2000-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -42,6 +42,7 @@
     ps_parser_skip_alpha,
     ps_parser_to_int,
     ps_parser_to_fixed,
+    ps_parser_to_bytes,
     ps_parser_to_coord_array,
     ps_parser_to_fixed_array,
     ps_parser_to_token,
@@ -104,7 +105,7 @@
     0,
     sizeof( FT_ModuleRec ),
     "psaux",
-    0x10000L,
+    0x20000L,
     0x20000L,
 
     &psaux_interface,  /* module-specific interface */
diff --git a/reactos/lib/freetype/src/psaux/psobjs.c b/reactos/lib/freetype/src/psaux/psobjs.c
index e930b7134dc..fca38baf589 100644
--- a/reactos/lib/freetype/src/psaux/psobjs.c
+++ b/reactos/lib/freetype/src/psaux/psobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auxiliary functions for PostScript fonts (body).                     */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -153,10 +153,10 @@
   /*    reallocation fails.                                                */
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
-  ps_table_add( PS_Table  table,
-                FT_Int    idx,
-                void*     object,
-                FT_Int    length )
+  ps_table_add( PS_Table    table,
+                FT_Int      idx,
+                void*       object,
+                FT_PtrDist  length )
   {
     if ( idx < 0 || idx > table->max_elems )
     {
@@ -178,8 +178,9 @@
 
       while ( new_size < table->cursor + length )
       {
-        /* increase size by 25% and round up to the nearest multiple of 1024 */
-        new_size += (new_size >> 2) + 1;
+        /* increase size by 25% and round up to the nearest multiple
+           of 1024 */
+        new_size += ( new_size >> 2 ) + 1;
         new_size  = ( new_size + 1023 ) & -1024;
       }
 
@@ -265,18 +266,24 @@
   /*************************************************************************/
   /*************************************************************************/
 
-
+  /* In the PostScript Language Reference Manual (PLRM) the following */
+  /* characters are called `white-space characters'.                  */
 #define IS_T1_WHITESPACE( c )  ( (c) == ' '  || (c) == '\t' )
-#define IS_T1_LINESPACE( c )   ( (c) == '\r' || (c) == '\n' )
+#define IS_T1_LINESPACE( c )   ( (c) == '\r' || (c) == '\n' || (c) == '\f' )
+#define IS_T1_NULLSPACE( c )   ( (c) == '\0' )
 
-#define IS_T1_SPACE( c )  ( IS_T1_WHITESPACE( c ) || IS_T1_LINESPACE( c ) )
+  /* According to the PLRM all white-space characters are equivalent, */
+  /* except in comments and strings.                                  */
+#define IS_T1_SPACE( c )  ( IS_T1_WHITESPACE( c ) || \
+                            IS_T1_LINESPACE( c )  || \
+                            IS_T1_NULLSPACE( c )  )
 
 
-  FT_LOCAL_DEF( void )
-  ps_parser_skip_spaces( PS_Parser  parser )
+  static void
+  skip_spaces( FT_Byte**  acur,
+               FT_Byte*   limit )
   {
-    FT_Byte* cur   = parser->cursor;
-    FT_Byte* limit = parser->limit;
+    FT_Byte* cur = *acur;
 
 
     while ( cur < limit )
@@ -288,15 +295,16 @@
         break;
       cur++;
     }
-    parser->cursor = cur;
+
+    *acur = cur;
   }
 
 
-  FT_LOCAL_DEF( void )
-  ps_parser_skip_alpha( PS_Parser  parser )
+  static void
+  skip_alpha( FT_Byte**  acur,
+              FT_Byte*   limit )
   {
-    FT_Byte* cur   = parser->cursor;
-    FT_Byte* limit = parser->limit;
+    FT_Byte*  cur = *acur;
 
 
     while ( cur < limit )
@@ -308,7 +316,22 @@
         break;
       cur++;
     }
-    parser->cursor = cur;
+
+    *acur = cur;
+  }
+
+
+  FT_LOCAL_DEF( void )
+  ps_parser_skip_spaces( PS_Parser  parser )
+  {
+    skip_spaces( &parser->cursor, parser->limit );
+  }
+
+
+  FT_LOCAL_DEF( void )
+  ps_parser_skip_alpha( PS_Parser  parser )
+  {
+    skip_alpha( &parser->cursor, parser->limit );
   }
 
 
@@ -530,6 +553,69 @@
   }
 
 
+  /* <...>: hexadecimal string */
+  static FT_Error
+  ps_tobytes( FT_Byte**  cursor,
+              FT_Byte*   limit,
+              FT_Int     max_bytes,
+              FT_Byte*   bytes,
+              FT_Int*    pnum_bytes )
+  {
+    FT_Error  error = PSaux_Err_Ok;
+
+    FT_Byte*  cur = *cursor;
+    FT_Int    n   = 0;
+    FT_Byte   b;
+
+
+    skip_spaces( &cur, limit );
+
+    if ( *cur != '<' )
+    {
+      error = PSaux_Err_Invalid_File_Format;
+      goto Exit;
+    }
+
+    cur++;
+
+    for ( ; cur < limit; n++ )
+    {
+      FT_Byte*  cur2 = cur;
+
+
+      if ( n + 1 > max_bytes * 2 )
+        goto Exit;
+
+      /* All white-space charcters are ignored. */
+      skip_spaces( &cur, limit );
+
+      b = T1Radix( 16, &cur, cur + 1 );
+
+      if ( cur == cur2 )
+        break;
+
+      /* <f> == <f0> != <0f> */
+      bytes[n / 2] = ( n % 2 ) ? bytes[n / 2] + b
+                               : b * 16;
+    }
+
+    skip_spaces( &cur, limit );
+
+    if ( *cur != '>' )
+    {
+      error = PSaux_Err_Invalid_File_Format;
+      goto Exit;
+    }
+
+    *cursor = ++cur;
+
+  Exit:
+    *pnum_bytes = ( n + 1 ) / 2;
+
+    return error;
+  }
+
+
   static FT_Long
   t1_tofixed( FT_Byte**  cursor,
               FT_Byte*   limit,
@@ -902,11 +988,16 @@
         goto Store_Integer;
 
       case T1_FIELD_TYPE_FIXED:
+        val = t1_tofixed( &cur, limit, 0 );
+        goto Store_Integer;
+
+      case T1_FIELD_TYPE_FIXED_1000:
         val = t1_tofixed( &cur, limit, 3 );
         goto Store_Integer;
 
       case T1_FIELD_TYPE_INTEGER:
         val = t1_toint( &cur, limit );
+        goto Store_Integer;
 
       Store_Integer:
         switch ( field->size )
@@ -929,15 +1020,22 @@
         break;
 
       case T1_FIELD_TYPE_STRING:
+      case T1_FIELD_TYPE_KEY:
         {
           FT_Memory  memory = parser->memory;
           FT_UInt    len    = (FT_UInt)( limit - cur );
 
 
+          /* with synthetic fonts, it's possible to find a field twice */
           if ( *(FT_String**)q )
-            /* with synthetic fonts, it's possible to find a field twice */
             break;
 
+          if ( field->type == T1_FIELD_TYPE_KEY )
+          {
+            len--;
+            cur++;
+          }
+
           if ( FT_ALLOC( string, len + 1 ) )
             goto Exit;
 
@@ -1065,6 +1163,20 @@
   }
 
 
+  FT_LOCAL_DEF( FT_Error )
+  ps_parser_to_bytes( PS_Parser  parser,
+                      FT_Byte*   bytes,
+                      FT_Int     max_bytes,
+                      FT_Int*    pnum_bytes )
+  {
+    return ps_tobytes( &parser->cursor,
+                       parser->limit,
+                       max_bytes,
+                       bytes,
+                       pnum_bytes );
+  }
+
+
   FT_LOCAL_DEF( FT_Fixed )
   ps_parser_to_fixed( PS_Parser  parser,
                       FT_Int     power_ten )
diff --git a/reactos/lib/freetype/src/psaux/psobjs.h b/reactos/lib/freetype/src/psaux/psobjs.h
index 9e81675bb12..8b214f652ba 100644
--- a/reactos/lib/freetype/src/psaux/psobjs.h
+++ b/reactos/lib/freetype/src/psaux/psobjs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auxiliary functions for PostScript fonts (specification).            */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -52,10 +52,10 @@ FT_BEGIN_HEADER
                 FT_Memory  memory );
 
   FT_LOCAL( FT_Error )
-  ps_table_add( PS_Table  table,
-                FT_Int    idx,
-                void*     object,
-                FT_Int    length );
+  ps_table_add( PS_Table    table,
+                FT_Int      idx,
+                void*       object,
+                FT_PtrDist  length );
 
   FT_LOCAL( void )
   ps_table_done( PS_Table  table );
diff --git a/reactos/lib/freetype/src/psaux/rules.mk b/reactos/lib/freetype/src/psaux/rules.mk
index 04730852fe4..7338d3657af 100644
--- a/reactos/lib/freetype/src/psaux/rules.mk
+++ b/reactos/lib/freetype/src/psaux/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2002 by
+# Copyright 1996-2000, 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,26 +15,25 @@
 
 # PSAUX driver directory
 #
-PSAUX_DIR  := $(SRC_)psaux
-PSAUX_DIR_ := $(PSAUX_DIR)$(SEP)
+PSAUX_DIR := $(SRC_DIR)/psaux
 
 
 # compilation flags for the driver
 #
-PSAUX_COMPILE := $(FT_COMPILE) $I$(PSAUX_DIR)
+PSAUX_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PSAUX_DIR))
 
 
 # PSAUX driver sources (i.e., C files)
 #
-PSAUX_DRV_SRC := $(PSAUX_DIR_)psobjs.c   \
-                 $(PSAUX_DIR_)t1decode.c \
-                 $(PSAUX_DIR_)t1cmap.c   \
-                 $(PSAUX_DIR_)psauxmod.c
+PSAUX_DRV_SRC := $(PSAUX_DIR)/psobjs.c   \
+                 $(PSAUX_DIR)/t1decode.c \
+                 $(PSAUX_DIR)/t1cmap.c   \
+                 $(PSAUX_DIR)/psauxmod.c
 
 # PSAUX driver headers
 #
 PSAUX_DRV_H := $(PSAUX_DRV_SRC:%c=%h)  \
-               $(PSAUX_DIR_)psauxerr.h
+               $(PSAUX_DIR)/psauxerr.h
 
 
 # PSAUX driver object(s)
@@ -42,25 +41,25 @@ PSAUX_DRV_H := $(PSAUX_DRV_SRC:%c=%h)  \
 #   PSAUX_DRV_OBJ_M is used during `multi' builds.
 #   PSAUX_DRV_OBJ_S is used during `single' builds.
 #
-PSAUX_DRV_OBJ_M := $(PSAUX_DRV_SRC:$(PSAUX_DIR_)%.c=$(OBJ_)%.$O)
-PSAUX_DRV_OBJ_S := $(OBJ_)psaux.$O
+PSAUX_DRV_OBJ_M := $(PSAUX_DRV_SRC:$(PSAUX_DIR)/%.c=$(OBJ_DIR)/%.$O)
+PSAUX_DRV_OBJ_S := $(OBJ_DIR)/psaux.$O
 
 # PSAUX driver source file for single build
 #
-PSAUX_DRV_SRC_S := $(PSAUX_DIR_)psaux.c
+PSAUX_DRV_SRC_S := $(PSAUX_DIR)/psaux.c
 
 
 # PSAUX driver - single object
 #
 $(PSAUX_DRV_OBJ_S): $(PSAUX_DRV_SRC_S) $(PSAUX_DRV_SRC) \
                    $(FREETYPE_H) $(PSAUX_DRV_H)
-	$(PSAUX_COMPILE) $T$@ $(PSAUX_DRV_SRC_S)
+	$(PSAUX_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PSAUX_DRV_SRC_S))
 
 
 # PSAUX driver - multiple objects
 #
-$(OBJ_)%.$O: $(PSAUX_DIR_)%.c $(FREETYPE_H) $(PSAUX_DRV_H)
-	$(PSAUX_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(PSAUX_DIR)/%.c $(FREETYPE_H) $(PSAUX_DRV_H)
+	$(PSAUX_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
diff --git a/reactos/lib/freetype/src/psaux/t1cmap.c b/reactos/lib/freetype/src/psaux/t1cmap.c
index 0ddd3f5daed..3fdf2ee3ce3 100644
--- a/reactos/lib/freetype/src/psaux/t1cmap.c
+++ b/reactos/lib/freetype/src/psaux/t1cmap.c
@@ -20,6 +20,8 @@
 
 #include FT_INTERNAL_DEBUG_H
 
+#include "psauxerr.h"
+
 
   /*************************************************************************/
   /*************************************************************************/
@@ -320,7 +322,7 @@
       {
         /* there are no unicode characters in here! */
         FT_FREE( cmap->pairs );
-        error = FT_Err_Invalid_Argument;
+        error = PSaux_Err_Invalid_Argument;
       }
       else
       {
diff --git a/reactos/lib/freetype/src/psaux/t1decode.c b/reactos/lib/freetype/src/psaux/t1decode.c
index 27b4e877c61..dd8719f12af 100644
--- a/reactos/lib/freetype/src/psaux/t1decode.c
+++ b/reactos/lib/freetype/src/psaux/t1decode.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    PostScript Type 1 decoding routines (body).                          */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
+/*  Copyright 2000-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -241,8 +241,8 @@
       /* subglyph 1 = accent character */
       subg->index = achar_index;
       subg->flags = FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES;
-      subg->arg1  = adx - asb;
-      subg->arg2  = ady;
+      subg->arg1  = (FT_Int)( adx - asb );
+      subg->arg2  = (FT_Int)ady;
 
       /* set up remaining glyph fields */
       glyph->num_subglyphs = 2;
@@ -565,7 +565,7 @@
           goto Stack_Underflow;
 
         top -= 2;
-        switch ( top[1] )
+        switch ( (FT_Int)top[1] )
         {
         case 1:                     /* start flex feature */
           if ( top[0] != 0 )
@@ -706,7 +706,7 @@
             values = top;
             for ( nn = 0; nn < num_points; nn++ )
             {
-              FT_Int  tmp = values[0];
+              FT_Long  tmp = values[0];
 
 
               for ( mm = 1; mm < blend->num_designs; mm++ )
@@ -785,8 +785,8 @@
 
         case op_seac:
           /* return immediately after the processing */
-          return t1operator_seac( decoder, top[0], top[1],
-                                           top[2], top[3], top[4] );
+          return t1operator_seac( decoder, top[0], top[1], top[2],
+                                           (FT_Int)top[3], (FT_Int)top[4] );
 
         case op_sbw:
           FT_TRACE4(( " sbw" ));
@@ -945,7 +945,7 @@
 
             FT_TRACE4(( " callsubr" ));
 
-            idx = top[0];
+            idx = (FT_Int)top[0];
             if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs )
             {
               FT_ERROR(( "t1_decoder_parse_charstrings: "
@@ -1148,7 +1148,6 @@
 
     decoder->num_glyphs     = (FT_UInt)face->num_glyphs;
     decoder->glyph_names    = glyph_names;
-    decoder->hint_flags     = face->internal->hint_flags;
     decoder->hint_mode      = hint_mode;
     decoder->blend          = blend;
     decoder->parse_callback = parse_callback;
diff --git a/reactos/lib/freetype/src/pshinter/Jamfile b/reactos/lib/freetype/src/pshinter/Jamfile
index 8eb3dea8b52..bdde744b0ed 100644
--- a/reactos/lib/freetype/src/pshinter/Jamfile
+++ b/reactos/lib/freetype/src/pshinter/Jamfile
@@ -8,7 +8,7 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) pshinter ;
 
   if $(FT2_MULTI)
   {
-    _sources = pshrec pshglob pshalgo1 pshalgo2 pshalgo3 pshmod ;
+    _sources = pshrec pshglob pshalgo pshmod ;
   }
   else
   {
diff --git a/reactos/lib/freetype/src/pshinter/pshalgo3.c b/reactos/lib/freetype/src/pshinter/pshalgo.c
similarity index 68%
rename from reactos/lib/freetype/src/pshinter/pshalgo3.c
rename to reactos/lib/freetype/src/pshinter/pshalgo.c
index 77f39bd64d6..3e76529ac92 100644
--- a/reactos/lib/freetype/src/pshinter/pshalgo3.c
+++ b/reactos/lib/freetype/src/pshinter/pshalgo.c
@@ -1,10 +1,10 @@
 /***************************************************************************/
 /*                                                                         */
-/*  pshalgo3.c                                                             */
+/*  pshalgo.c                                                              */
 /*                                                                         */
 /*    PostScript hinting algorithm 3 (body).                               */
 /*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
+/*  Copyright 2001, 2002, 2003 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used        */
@@ -19,7 +19,9 @@
 #include <ft2build.h>
 #include FT_INTERNAL_OBJECTS_H
 #include FT_INTERNAL_DEBUG_H
-#include "pshalgo3.h"
+#include "pshalgo.h"
+
+#include "pshnterr.h"
 
 
 #undef  FT_COMPONENT
@@ -27,9 +29,9 @@
 
 
 #ifdef DEBUG_HINTER
-  PSH3_Hint_Table  ps3_debug_hint_table = 0;
-  PSH3_HintFunc    ps3_debug_hint_func  = 0;
-  PSH3_Glyph       ps3_debug_glyph      = 0;
+  PSH_Hint_Table  ps_debug_hint_table = 0;
+  PSH_HintFunc    ps_debug_hint_func  = 0;
+  PSH_Glyph       ps_debug_glyph      = 0;
 #endif
 
 
@@ -46,8 +48,8 @@
 
   /* return true iff two stem hints overlap */
   static FT_Int
-  psh3_hint_overlap( PSH3_Hint  hint1,
-                     PSH3_Hint  hint2 )
+  psh_hint_overlap( PSH_Hint  hint1,
+                    PSH_Hint  hint2 )
   {
     return ( hint1->org_pos + hint1->org_len >= hint2->org_pos &&
              hint2->org_pos + hint2->org_len >= hint1->org_pos );
@@ -56,8 +58,8 @@
 
   /* destroy hints table */
   static void
-  psh3_hint_table_done( PSH3_Hint_Table  table,
-                        FT_Memory        memory )
+  psh_hint_table_done( PSH_Hint_Table  table,
+                       FT_Memory       memory )
   {
     FT_FREE( table->zones );
     table->num_zones = 0;
@@ -73,15 +75,15 @@
 
   /* deactivate all hints in a table */
   static void
-  psh3_hint_table_deactivate( PSH3_Hint_Table  table )
+  psh_hint_table_deactivate( PSH_Hint_Table  table )
   {
-    FT_UInt    count = table->max_hints;
-    PSH3_Hint  hint  = table->hints;
+    FT_UInt   count = table->max_hints;
+    PSH_Hint  hint  = table->hints;
 
 
     for ( ; count > 0; count--, hint++ )
     {
-      psh3_hint_deactivate( hint );
+      psh_hint_deactivate( hint );
       hint->order = -1;
     }
   }
@@ -89,30 +91,30 @@
 
   /* internal function used to record a new hint */
   static void
-  psh3_hint_table_record( PSH3_Hint_Table  table,
-                          FT_UInt          idx )
+  psh_hint_table_record( PSH_Hint_Table  table,
+                         FT_UInt         idx )
   {
-    PSH3_Hint  hint = table->hints + idx;
+    PSH_Hint  hint = table->hints + idx;
 
 
     if ( idx >= table->max_hints )
     {
-      FT_ERROR(( "psh3_hint_table_record: invalid hint index %d\n", idx ));
+      FT_ERROR(( "psh_hint_table_record: invalid hint index %d\n", idx ));
       return;
     }
 
     /* ignore active hints */
-    if ( psh3_hint_is_active( hint ) )
+    if ( psh_hint_is_active( hint ) )
       return;
 
-    psh3_hint_activate( hint );
+    psh_hint_activate( hint );
 
     /* now scan the current active hint set in order to determine */
     /* if we are overlapping with another segment                 */
     {
-      PSH3_Hint*  sorted = table->sort_global;
-      FT_UInt     count  = table->num_hints;
-      PSH3_Hint   hint2;
+      PSH_Hint*  sorted = table->sort_global;
+      FT_UInt    count  = table->num_hints;
+      PSH_Hint   hint2;
 
 
       hint->parent = 0;
@@ -120,7 +122,7 @@
       {
         hint2 = sorted[0];
 
-        if ( psh3_hint_overlap( hint, hint2 ) )
+        if ( psh_hint_overlap( hint, hint2 ) )
         {
           hint->parent = hint2;
           break;
@@ -131,13 +133,13 @@
     if ( table->num_hints < table->max_hints )
       table->sort_global[table->num_hints++] = hint;
     else
-      FT_ERROR(( "psh3_hint_table_record: too many sorted hints!  BUG!\n" ));
+      FT_ERROR(( "psh_hint_table_record: too many sorted hints!  BUG!\n" ));
   }
 
 
   static void
-  psh3_hint_table_record_mask( PSH3_Hint_Table  table,
-                               PS_Mask          hint_mask )
+  psh_hint_table_record_mask( PSH_Hint_Table  table,
+                              PS_Mask         hint_mask )
   {
     FT_Int    mask = 0, val = 0;
     FT_Byte*  cursor = hint_mask->bytes;
@@ -155,7 +157,7 @@
       }
 
       if ( val & mask )
-        psh3_hint_table_record( table, idx );
+        psh_hint_table_record( table, idx );
 
       mask >>= 1;
     }
@@ -164,11 +166,11 @@
 
   /* create hints table */
   static FT_Error
-  psh3_hint_table_init( PSH3_Hint_Table  table,
-                        PS_Hint_Table    hints,
-                        PS_Mask_Table    hint_masks,
-                        PS_Mask_Table    counter_masks,
-                        FT_Memory        memory )
+  psh_hint_table_init( PSH_Hint_Table  table,
+                       PS_Hint_Table   hints,
+                       PS_Mask_Table   hint_masks,
+                       PS_Mask_Table   counter_masks,
+                       FT_Memory       memory )
   {
     FT_UInt   count = hints->num_hints;
     FT_Error  error;
@@ -190,8 +192,8 @@
 
     /* now, initialize the "hints" array */
     {
-      PSH3_Hint  write = table->hints;
-      PS_Hint    read  = hints->hints;
+      PSH_Hint  write = table->hints;
+      PS_Hint   read  = hints->hints;
 
 
       for ( ; count > 0; count--, write++, read++ )
@@ -213,7 +215,7 @@
       table->hint_masks = hint_masks;
 
       for ( ; Count > 0; Count--, Mask++ )
-        psh3_hint_table_record_mask( table, Mask );
+        psh_hint_table_record_mask( table, Mask );
     }
 
     /* now, do a linear parse in case some hints were left alone */
@@ -222,10 +224,10 @@
       FT_UInt  Index, Count;
 
 
-      FT_ERROR(( "psh3_hint_table_init: missing/incorrect hint masks!\n" ));
+      FT_ERROR(( "psh_hint_table_init: missing/incorrect hint masks!\n" ));
       Count = table->max_hints;
       for ( Index = 0; Index < Count; Index++ )
-        psh3_hint_table_record( table, Index );
+        psh_hint_table_record( table, Index );
     }
 
   Exit:
@@ -234,8 +236,8 @@
 
 
   static void
-  psh3_hint_table_activate_mask( PSH3_Hint_Table  table,
-                                 PS_Mask          hint_mask )
+  psh_hint_table_activate_mask( PSH_Hint_Table  table,
+                                PS_Mask         hint_mask )
   {
     FT_Int    mask = 0, val = 0;
     FT_Byte*  cursor = hint_mask->bytes;
@@ -245,7 +247,7 @@
     limit = hint_mask->num_bits;
     count = 0;
 
-    psh3_hint_table_deactivate( table );
+    psh_hint_table_deactivate( table );
 
     for ( idx = 0; idx < limit; idx++ )
     {
@@ -257,23 +259,23 @@
 
       if ( val & mask )
       {
-        PSH3_Hint  hint = &table->hints[idx];
+        PSH_Hint  hint = &table->hints[idx];
 
 
-        if ( !psh3_hint_is_active( hint ) )
+        if ( !psh_hint_is_active( hint ) )
         {
           FT_UInt     count2;
 
 #if 0
-          PSH3_Hint*  sort = table->sort;
-          PSH3_Hint   hint2;
+          PSH_Hint*  sort = table->sort;
+          PSH_Hint   hint2;
 
 
           for ( count2 = count; count2 > 0; count2--, sort++ )
           {
             hint2 = sort[0];
-            if ( psh3_hint_overlap( hint, hint2 ) )
-              FT_ERROR(( "psh3_hint_table_activate_mask:"
+            if ( psh_hint_overlap( hint, hint2 ) )
+              FT_ERROR(( "psh_hint_table_activate_mask:"
                          " found overlapping hints\n" ))
           }
 #else
@@ -282,11 +284,11 @@
 
           if ( count2 == 0 )
           {
-            psh3_hint_activate( hint );
+            psh_hint_activate( hint );
             if ( count < table->max_hints )
               table->sort[count++] = hint;
             else
-              FT_ERROR(( "psh3_hint_tableactivate_mask:"
+              FT_ERROR(( "psh_hint_tableactivate_mask:"
                          " too many active hints\n" ));
           }
         }
@@ -299,9 +301,9 @@
     /* now, sort the hints; they are guaranteed to not overlap */
     /* so we can compare their "org_pos" field directly        */
     {
-      FT_Int      i1, i2;
-      PSH3_Hint   hint1, hint2;
-      PSH3_Hint*  sort = table->sort;
+      FT_Int     i1, i2;
+      PSH_Hint   hint1, hint2;
+      PSH_Hint*  sort = table->sort;
 
 
       /* a simple bubble sort will do, since in 99% of cases, the hints */
@@ -334,9 +336,9 @@
 
 #if 1
   static FT_Pos
-  psh3_dimension_quantize_len( PSH_Dimension  dim,
-                               FT_Pos         len,
-                               FT_Bool        do_snapping )
+  psh_dimension_quantize_len( PSH_Dimension  dim,
+                              FT_Pos         len,
+                              FT_Bool        do_snapping )
   {
     if ( len <= 64 )
       len = 64;
@@ -387,13 +389,13 @@
 #ifdef DEBUG_HINTER
 
   static void
-  ps3_simple_scale( PSH3_Hint_Table  table,
-                    FT_Fixed         scale,
-                    FT_Fixed         delta,
-                    FT_Int           dimension )
+  ps_simple_scale( PSH_Hint_Table  table,
+                   FT_Fixed        scale,
+                   FT_Fixed        delta,
+                   FT_Int          dimension )
   {
-    PSH3_Hint  hint;
-    FT_UInt    count;
+    PSH_Hint  hint;
+    FT_UInt   count;
 
 
     for ( count = 0; count < table->max_hints; count++ )
@@ -403,8 +405,8 @@
       hint->cur_pos = FT_MulFix( hint->org_pos, scale ) + delta;
       hint->cur_len = FT_MulFix( hint->org_len, scale );
 
-      if ( ps3_debug_hint_func )
-        ps3_debug_hint_func( hint, dimension );
+      if ( ps_debug_hint_func )
+        ps_debug_hint_func( hint, dimension );
     }
   }
 
@@ -412,8 +414,8 @@
 
 
   static FT_Fixed
-  psh3_hint_snap_stem_side_delta( FT_Fixed  pos,
-                                  FT_Fixed  len )
+  psh_hint_snap_stem_side_delta( FT_Fixed  pos,
+                                 FT_Fixed  len )
   {
     FT_Fixed  delta1 = ( ( pos + 32 ) & -64 ) - pos;
     FT_Fixed  delta2 = ( ( pos + len + 32 ) & -64  ) - pos - len;
@@ -427,17 +429,17 @@
 
 
   static void
-  psh3_hint_align( PSH3_Hint    hint,
-                   PSH_Globals  globals,
-                   FT_Int       dimension,
-                   PSH3_Glyph   glyph )
+  psh_hint_align( PSH_Hint     hint,
+                  PSH_Globals  globals,
+                  FT_Int       dimension,
+                  PSH_Glyph    glyph )
   {
     PSH_Dimension  dim   = &globals->dimension[dimension];
     FT_Fixed       scale = dim->scale_mult;
     FT_Fixed       delta = dim->scale_delta;
 
 
-    if ( !psh3_hint_is_fitted( hint ) )
+    if ( !psh_hint_is_fitted( hint ) )
     {
       FT_Pos  pos = FT_MulFix( hint->org_pos, scale ) + delta;
       FT_Pos  len = FT_MulFix( hint->org_len, scale );
@@ -454,13 +456,13 @@
         hint->cur_pos = pos;
         hint->cur_len = len;
 
-        psh3_hint_set_fitted( hint );
+        psh_hint_set_fitted( hint );
         return;
       }
 
-     /* perform stem snapping when requested - this is necessary
-      * for monochrome and LCD hinting modes only
-      */
+      /* perform stem snapping when requested - this is necessary
+       * for monochrome and LCD hinting modes only
+       */
       do_snapping = ( dimension == 0 && glyph->do_horz_snapping ) ||
                     ( dimension == 1 && glyph->do_vert_snapping );
 
@@ -496,7 +498,7 @@
 
       default:
         {
-          PSH3_Hint  parent = hint->parent;
+          PSH_Hint  parent = hint->parent;
 
 
           if ( parent )
@@ -506,8 +508,8 @@
 
 
             /* ensure that parent is already fitted */
-            if ( !psh3_hint_is_fitted( parent ) )
-              psh3_hint_align( parent, globals, dimension, glyph );
+            if ( !psh_hint_is_fitted( parent ) )
+              psh_hint_align( parent, globals, dimension, glyph );
 
             par_org_center = parent->org_pos + ( parent->org_len >> 1 );
             par_cur_center = parent->cur_pos + ( parent->cur_len >> 1 );
@@ -520,34 +522,34 @@
           hint->cur_pos = pos;
           hint->cur_len = fit_len;
 
-         /* stem adjustment tries to snap stem widths to standard
-          * ones. this is important to prevent unpleasant rounding
-          * artefacts...
-          */
+          /* Stem adjustment tries to snap stem widths to standard
+           * ones.  This is important to prevent unpleasant rounding
+           * artefacts.
+           */
           if ( glyph->do_stem_adjust )
           {
             if ( len <= 64 )
             {
-             /* the stem is less than one pixel, we will center it
-              * around the nearest pixel center
-              */
+              /* the stem is less than one pixel; we will center it
+               * around the nearest pixel center
+               */
 #if 1
-              pos = ( pos + (len >> 1) ) & -64;
+              pos = ( pos + ( len >> 1 ) ) & -64;
 #else
-             /* this seems to be a bug !! */
-              pos = ( pos + ( (len >> 1) & -64 ) );
+             /* this seems to be a bug! */
+              pos = ( pos + ( ( len >> 1 ) & -64 ) );
 #endif
               len = 64;
             }
             else
             {
-              len = psh3_dimension_quantize_len( dim, len, 0 );
+              len = psh_dimension_quantize_len( dim, len, 0 );
             }
           }
 
           /* now that we have a good hinted stem width, try to position */
           /* the stem along a pixel grid integer coordinate             */
-          hint->cur_pos = pos + psh3_hint_snap_stem_side_delta( pos, len );
+          hint->cur_pos = pos + psh_hint_snap_stem_side_delta( pos, len );
           hint->cur_len = len;
         }
       }
@@ -590,11 +592,11 @@
         }
       }
 
-      psh3_hint_set_fitted( hint );
+      psh_hint_set_fitted( hint );
 
 #ifdef DEBUG_HINTER
-      if ( ps3_debug_hint_func )
-        ps3_debug_hint_func( hint, dimension );
+      if ( ps_debug_hint_func )
+        ps_debug_hint_func( hint, dimension );
 #endif
     }
   }
@@ -607,17 +609,17 @@
   *  of stems
   */
   static void
-  psh3_hint_align_light( PSH3_Hint    hint,
-                         PSH_Globals  globals,
-                         FT_Int       dimension,
-                         PSH3_Glyph   glyph )
+  psh_hint_align_light( PSH_Hint     hint,
+                        PSH_Globals  globals,
+                        FT_Int       dimension,
+                        PSH_Glyph    glyph )
   {
     PSH_Dimension  dim   = &globals->dimension[dimension];
     FT_Fixed       scale = dim->scale_mult;
     FT_Fixed       delta = dim->scale_delta;
 
 
-    if ( !psh3_hint_is_fitted(hint) )
+    if ( !psh_hint_is_fitted( hint ) )
     {
       FT_Pos  pos = FT_MulFix( hint->org_pos, scale ) + delta;
       FT_Pos  len = FT_MulFix( hint->org_len, scale );
@@ -626,6 +628,7 @@
 
       PSH_AlignmentRec  align;
 
+
       /* ignore stem alignments when requested through the hint flags */
       if ( ( dimension == 0 && !glyph->do_horz_hints ) ||
            ( dimension == 1 && !glyph->do_vert_hints ) )
@@ -633,7 +636,7 @@
         hint->cur_pos = pos;
         hint->cur_len = len;
 
-        psh3_hint_set_fitted( hint );
+        psh_hint_set_fitted( hint );
         return;
       }
 
@@ -671,7 +674,7 @@
 
       default:
         {
-          PSH3_Hint  parent = hint->parent;
+          PSH_Hint  parent = hint->parent;
 
 
           if ( parent )
@@ -681,56 +684,58 @@
 
 
             /* ensure that parent is already fitted */
-            if ( !psh3_hint_is_fitted( parent ) )
-              psh3_hint_align_light( parent, globals, dimension, glyph );
+            if ( !psh_hint_is_fitted( parent ) )
+              psh_hint_align_light( parent, globals, dimension, glyph );
 
-            par_org_center = parent->org_pos + ( parent->org_len / 2);
-            par_cur_center = parent->cur_pos + ( parent->cur_len / 2);
-            cur_org_center = hint->org_pos   + ( hint->org_len   / 2);
+            par_org_center = parent->org_pos + ( parent->org_len / 2 );
+            par_cur_center = parent->cur_pos + ( parent->cur_len / 2 );
+            cur_org_center = hint->org_pos   + ( hint->org_len   / 2 );
 
             cur_delta = FT_MulFix( cur_org_center - par_org_center, scale );
             pos       = par_cur_center + cur_delta - ( len >> 1 );
           }
 
-         /* Stems less than one pixel wide are easy - we want to
-          * make them as dark as possible, so they must fall within
-          * one pixel. If the stem is split between two pixels
-          * then snap the edge that is nearer to the pixel boundary
-          * to the pixel boundary
-          */
-          if (len <= 64)
+          /* Stems less than one pixel wide are easy -- we want to
+           * make them as dark as possible, so they must fall within
+           * one pixel.  If the stem is split between two pixels
+           * then snap the edge that is nearer to the pixel boundary
+           * to the pixel boundary.
+           */
+          if ( len <= 64 )
           {
             if ( ( pos + len + 63 ) / 64  != pos / 64 + 1 )
-              pos += psh3_hint_snap_stem_side_delta ( pos, len );
+              pos += psh_hint_snap_stem_side_delta ( pos, len );
           }
-         /* Position stems other to minimize the amount of mid-grays.
-          * There are, in general, two positions that do this,
-          * illustrated as A) and B) below.
-          *
-          *   +                   +                   +                   +
-          *
-          * A)             |--------------------------------|
-          * B)   |--------------------------------|
-          * C)       |--------------------------------|
-          *
-          * Position A) (split the excess stem equally) should be better
-          * for stems of width N + f where f < 0.5
-          *
-          * Position B) (split the deficiency equally) should be better
-          * for stems of width N + f where f > 0.5
-          *
-          * It turns out though that minimizing the total number of lit
-          * pixels is also important, so position C), with one edge
-          * aligned with a pixel boundary is actually preferable
-          * to A). There are also more possibile positions for C) than
-          * for A) or B), so it involves less distortion of the overall
-          * character shape.
-          */
+
+          /* Position stems other to minimize the amount of mid-grays.
+           * There are, in general, two positions that do this,
+           * illustrated as A) and B) below.
+           *
+           *   +                   +                   +                   +
+           *
+           * A)             |--------------------------------|
+           * B)   |--------------------------------|
+           * C)       |--------------------------------|
+           *
+           * Position A) (split the excess stem equally) should be better
+           * for stems of width N + f where f < 0.5.
+           *
+           * Position B) (split the deficiency equally) should be better
+           * for stems of width N + f where f > 0.5.
+           *
+           * It turns out though that minimizing the total number of lit
+           * pixels is also important, so position C), with one edge
+           * aligned with a pixel boundary is actually preferable
+           * to A).  There are also more possibile positions for C) than
+           * for A) or B), so it involves less distortion of the overall
+           * character shape.
+           */
           else /* len > 64 */
           {
-            FT_Fixed frac_len = len & 63;
-            FT_Fixed center = pos + ( len >> 1 );
-            FT_Fixed delta_a, delta_b;
+            FT_Fixed  frac_len = len & 63;
+            FT_Fixed  center = pos + ( len >> 1 );
+            FT_Fixed  delta_a, delta_b;
+
 
             if ( ( len / 64 ) & 1 )
             {
@@ -743,18 +748,20 @@
               delta_b = ( center & -64 ) + 32 - center;
             }
 
-           /* We choose between B) and C) above based on the amount
-            * of fractinal stem width; for small amounts, choose
-            * C) always, for large amounts, B) always, and inbetween,
-            * pick whichever one involves less stem movement.
-            */
-            if (frac_len < 32)
+            /* We choose between B) and C) above based on the amount
+             * of fractinal stem width; for small amounts, choose
+             * C) always, for large amounts, B) always, and inbetween,
+             * pick whichever one involves less stem movement.
+             */
+            if ( frac_len < 32 )
             {
-              pos += psh3_hint_snap_stem_side_delta ( pos, len );
+              pos += psh_hint_snap_stem_side_delta ( pos, len );
             }
-            else if (frac_len < 48)
+            else if ( frac_len < 48 )
             {
-              FT_Fixed side_delta = psh3_hint_snap_stem_side_delta ( pos, len );
+              FT_Fixed  side_delta = psh_hint_snap_stem_side_delta ( pos,
+                                                                     len );
+
 
               if ( ABS( side_delta ) < ABS( delta_b ) )
                 pos += side_delta;
@@ -771,11 +778,11 @@
         }
       }  /* switch */
 
-      psh3_hint_set_fitted( hint );
+      psh_hint_set_fitted( hint );
 
 #ifdef DEBUG_HINTER
-      if ( ps3_debug_hint_func )
-        ps3_debug_hint_func( hint, dimension );
+      if ( ps_debug_hint_func )
+        ps_debug_hint_func( hint, dimension );
 #endif
     }
   }
@@ -784,12 +791,12 @@
 
 
   static void
-  psh3_hint_table_align_hints( PSH3_Hint_Table  table,
-                               PSH_Globals      globals,
-                               FT_Int           dimension,
-                               PSH3_Glyph       glyph )
+  psh_hint_table_align_hints( PSH_Hint_Table  table,
+                              PSH_Globals     globals,
+                              FT_Int          dimension,
+                              PSH_Glyph       glyph )
   {
-    PSH3_Hint      hint;
+    PSH_Hint       hint;
     FT_UInt        count;
 
 #ifdef DEBUG_HINTER
@@ -801,13 +808,13 @@
 
     if ( ps_debug_no_vert_hints && dimension == 0 )
     {
-      ps3_simple_scale( table, scale, delta, dimension );
+      ps_simple_scale( table, scale, delta, dimension );
       return;
     }
 
     if ( ps_debug_no_horz_hints && dimension == 1 )
     {
-      ps3_simple_scale( table, scale, delta, dimension );
+      ps_simple_scale( table, scale, delta, dimension );
       return;
     }
 
@@ -817,7 +824,7 @@
     count = table->max_hints;
 
     for ( ; count > 0; count--, hint++ )
-      psh3_hint_align( hint, globals, dimension, glyph );
+      psh_hint_align( hint, globals, dimension, glyph );
   }
 
 
@@ -829,8 +836,8 @@
   /*************************************************************************/
   /*************************************************************************/
 
-#define PSH3_ZONE_MIN  -3200000L
-#define PSH3_ZONE_MAX  +3200000L
+#define PSH_ZONE_MIN  -3200000L
+#define PSH_ZONE_MAX  +3200000L
 
 #define xxDEBUG_ZONES
 
@@ -840,7 +847,7 @@
 #include <stdio.h>
 
   static void
-  psh3_print_zone( PSH3_Zone  zone )
+  psh_print_zone( PSH_Zone  zone )
   {
     printf( "zone [scale,delta,min,max] = [%.3f,%.3f,%d,%d]\n",
              zone->scale / 65536.0,
@@ -851,7 +858,7 @@
 
 #else
 
-#define psh3_print_zone( x )  do { } while ( 0 )
+#define psh_print_zone( x )  do { } while ( 0 )
 
 #endif /* DEBUG_ZONES */
 
@@ -868,17 +875,17 @@
 
   /* compute all inflex points in a given glyph */
   static void
-  psh3_glyph_compute_inflections( PSH3_Glyph  glyph )
+  psh_glyph_compute_inflections( PSH_Glyph  glyph )
   {
     FT_UInt  n;
 
 
     for ( n = 0; n < glyph->num_contours; n++ )
     {
-      PSH3_Point  first, start, end, before, after;
-      FT_Angle    angle_in, angle_seg, angle_out;
-      FT_Angle    diff_in, diff_out;
-      FT_Int      finished = 0;
+      PSH_Point  first, start, end, before, after;
+      FT_Angle   angle_in, angle_seg, angle_out;
+      FT_Angle   diff_in, diff_out;
+      FT_Int     finished = 0;
 
 
       /* we need at least 4 points to create an inflection point */
@@ -895,9 +902,9 @@
         if ( end == first )
           goto Skip;
 
-      } while ( PSH3_POINT_EQUAL_ORG( end, first ) );
+      } while ( PSH_POINT_EQUAL_ORG( end, first ) );
 
-      angle_seg = PSH3_POINT_ANGLE( start, end );
+      angle_seg = PSH_POINT_ANGLE( start, end );
 
       /* extend the segment start whenever possible */
       before = start;
@@ -910,9 +917,9 @@
           if ( before == first )
             goto Skip;
 
-        } while ( PSH3_POINT_EQUAL_ORG( before, start ) );
+        } while ( PSH_POINT_EQUAL_ORG( before, start ) );
 
-        angle_in = PSH3_POINT_ANGLE( before, start );
+        angle_in = PSH_POINT_ANGLE( before, start );
 
       } while ( angle_in == angle_seg );
 
@@ -933,9 +940,9 @@
             if ( after == first )
               finished = 1;
 
-          } while ( PSH3_POINT_EQUAL_ORG( end, after ) );
+          } while ( PSH_POINT_EQUAL_ORG( end, after ) );
 
-          angle_out = PSH3_POINT_ANGLE( end, after );
+          angle_out = PSH_POINT_ANGLE( end, after );
 
         } while ( angle_out == angle_seg );
 
@@ -948,12 +955,12 @@
 
           do
           {
-            psh3_point_set_inflex( start );
+            psh_point_set_inflex( start );
             start = start->next;
           }
           while ( start != end );
 
-          psh3_point_set_inflex( start );
+          psh_point_set_inflex( start );
         }
 
         start     = end;
@@ -972,13 +979,13 @@
 
 
   static void
-  psh3_glyph_done( PSH3_Glyph  glyph )
+  psh_glyph_done( PSH_Glyph  glyph )
   {
     FT_Memory  memory = glyph->memory;
 
 
-    psh3_hint_table_done( &glyph->hint_tables[1], memory );
-    psh3_hint_table_done( &glyph->hint_tables[0], memory );
+    psh_hint_table_done( &glyph->hint_tables[1], memory );
+    psh_hint_table_done( &glyph->hint_tables[0], memory );
 
     FT_FREE( glyph->points );
     FT_FREE( glyph->contours );
@@ -991,11 +998,11 @@
 
 
   static int
-  psh3_compute_dir( FT_Pos  dx,
-                    FT_Pos  dy )
+  psh_compute_dir( FT_Pos  dx,
+                   FT_Pos  dy )
   {
     FT_Pos  ax, ay;
-    int     result = PSH3_DIR_NONE;
+    int     result = PSH_DIR_NONE;
 
 
     ax = ( dx >= 0 ) ? dx : -dx;
@@ -1004,12 +1011,12 @@
     if ( ay * 12 < ax )
     {
       /* |dy| <<< |dx|  means a near-horizontal segment */
-      result = ( dx >= 0 ) ? PSH3_DIR_RIGHT : PSH3_DIR_LEFT;
+      result = ( dx >= 0 ) ? PSH_DIR_RIGHT : PSH_DIR_LEFT;
     }
     else if ( ax * 12 < ay )
     {
       /* |dx| <<< |dy|  means a near-vertical segment */
-      result = ( dy >= 0 ) ? PSH3_DIR_UP : PSH3_DIR_DOWN;
+      result = ( dy >= 0 ) ? PSH_DIR_UP : PSH_DIR_DOWN;
     }
 
     return result;
@@ -1018,11 +1025,11 @@
 
   /* load outline point coordinates into hinter glyph */
   static void
-  psh3_glyph_load_points( PSH3_Glyph  glyph,
-                          FT_Int      dimension )
+  psh_glyph_load_points( PSH_Glyph  glyph,
+                         FT_Int     dimension )
   {
     FT_Vector*  vec   = glyph->outline->points;
-    PSH3_Point  point = glyph->points;
+    PSH_Point   point = glyph->points;
     FT_UInt     count = glyph->num_points;
 
 
@@ -1052,11 +1059,11 @@
 
   /* save hinted point coordinates back to outline */
   static void
-  psh3_glyph_save_points( PSH3_Glyph  glyph,
-                          FT_Int      dimension )
+  psh_glyph_save_points( PSH_Glyph  glyph,
+                         FT_Int     dimension )
   {
     FT_UInt     n;
-    PSH3_Point  point = glyph->points;
+    PSH_Point   point = glyph->points;
     FT_Vector*  vec   = glyph->outline->points;
     char*       tags  = glyph->outline->tags;
 
@@ -1068,7 +1075,7 @@
       else
         vec[n].y = point->cur_u;
 
-      if ( psh3_point_is_strong( point ) )
+      if ( psh_point_is_strong( point ) )
         tags[n] |= (char)( ( dimension == 0 ) ? 32 : 64 );
 
 #ifdef DEBUG_HINTER
@@ -1092,10 +1099,10 @@
 
 
   static FT_Error
-  psh3_glyph_init( PSH3_Glyph   glyph,
-                   FT_Outline*  outline,
-                   PS_Hints     ps_hints,
-                   PSH_Globals  globals )
+  psh_glyph_init( PSH_Glyph    glyph,
+                  FT_Outline*  outline,
+                  PS_Hints     ps_hints,
+                  PSH_Globals  globals )
   {
     FT_Error   error;
     FT_Memory  memory;
@@ -1115,15 +1122,15 @@
     glyph->num_contours = outline->n_contours;
 
     {
-      FT_UInt       first = 0, next, n;
-      PSH3_Point    points  = glyph->points;
-      PSH3_Contour  contour = glyph->contours;
+      FT_UInt      first = 0, next, n;
+      PSH_Point    points  = glyph->points;
+      PSH_Contour  contour = glyph->contours;
 
 
       for ( n = 0; n < glyph->num_contours; n++ )
       {
-        FT_Int      count;
-        PSH3_Point  point;
+        FT_Int     count;
+        PSH_Point  point;
 
 
         next  = outline->contours[n] + 1;
@@ -1155,40 +1162,40 @@
     }
 
     {
-      PSH3_Point  points = glyph->points;
-      PSH3_Point  point  = points;
+      PSH_Point   points = glyph->points;
+      PSH_Point   point  = points;
       FT_Vector*  vec    = outline->points;
       FT_UInt     n;
 
 
       for ( n = 0; n < glyph->num_points; n++, point++ )
       {
-        FT_Int  n_prev = point->prev - points;
-        FT_Int  n_next = point->next - points;
+        FT_Int  n_prev = (FT_Int)( point->prev - points );
+        FT_Int  n_next = (FT_Int)( point->next - points );
         FT_Pos  dxi, dyi, dxo, dyo;
 
 
         if ( !( outline->tags[n] & FT_CURVE_TAG_ON ) )
-          point->flags = PSH3_POINT_OFF;
+          point->flags = PSH_POINT_OFF;
 
         dxi = vec[n].x - vec[n_prev].x;
         dyi = vec[n].y - vec[n_prev].y;
 
-        point->dir_in = (FT_Char)psh3_compute_dir( dxi, dyi );
+        point->dir_in = (FT_Char)psh_compute_dir( dxi, dyi );
 
         dxo = vec[n_next].x - vec[n].x;
         dyo = vec[n_next].y - vec[n].y;
 
-        point->dir_out = (FT_Char)psh3_compute_dir( dxo, dyo );
+        point->dir_out = (FT_Char)psh_compute_dir( dxo, dyo );
 
         /* detect smooth points */
-        if ( point->flags & PSH3_POINT_OFF )
-          point->flags |= PSH3_POINT_SMOOTH;
-        else if ( point->dir_in  != PSH3_DIR_NONE ||
-                  point->dir_out != PSH3_DIR_NONE )
+        if ( point->flags & PSH_POINT_OFF )
+          point->flags |= PSH_POINT_SMOOTH;
+        else if ( point->dir_in  != PSH_DIR_NONE ||
+                  point->dir_out != PSH_DIR_NONE )
         {
           if ( point->dir_in == point->dir_out )
-            point->flags |= PSH3_POINT_SMOOTH;
+            point->flags |= PSH_POINT_SMOOTH;
         }
         else
         {
@@ -1206,7 +1213,7 @@
             diff = FT_ANGLE_2PI - diff;
 
           if ( diff < FT_ANGLE_PI / 16 )
-            point->flags |= PSH3_POINT_SMOOTH;
+            point->flags |= PSH_POINT_SMOOTH;
         }
       }
     }
@@ -1216,24 +1223,24 @@
     glyph->globals = globals;
 
 #ifdef COMPUTE_INFLEXS
-    psh3_glyph_load_points( glyph, 0 );
-    psh3_glyph_compute_inflections( glyph );
+    psh_glyph_load_points( glyph, 0 );
+    psh_glyph_compute_inflections( glyph );
 #endif /* COMPUTE_INFLEXS */
 
     /* now deal with hints tables */
-    error = psh3_hint_table_init( &glyph->hint_tables [0],
-                                  &ps_hints->dimension[0].hints,
-                                  &ps_hints->dimension[0].masks,
-                                  &ps_hints->dimension[0].counters,
-                                  memory );
+    error = psh_hint_table_init( &glyph->hint_tables [0],
+                                 &ps_hints->dimension[0].hints,
+                                 &ps_hints->dimension[0].masks,
+                                 &ps_hints->dimension[0].counters,
+                                 memory );
     if ( error )
       goto Exit;
 
-    error = psh3_hint_table_init( &glyph->hint_tables [1],
-                                  &ps_hints->dimension[1].hints,
-                                  &ps_hints->dimension[1].masks,
-                                  &ps_hints->dimension[1].counters,
-                                  memory );
+    error = psh_hint_table_init( &glyph->hint_tables [1],
+                                 &ps_hints->dimension[1].hints,
+                                 &ps_hints->dimension[1].masks,
+                                 &ps_hints->dimension[1].counters,
+                                 memory );
     if ( error )
       goto Exit;
 
@@ -1244,7 +1251,7 @@
 
   /* compute all extrema in a glyph for a given dimension */
   static void
-  psh3_glyph_compute_extrema( PSH3_Glyph  glyph )
+  psh_glyph_compute_extrema( PSH_Glyph  glyph )
   {
     FT_UInt  n;
 
@@ -1252,10 +1259,13 @@
     /* first of all, compute all local extrema */
     for ( n = 0; n < glyph->num_contours; n++ )
     {
-      PSH3_Point  first = glyph->contours[n].start;
-      PSH3_Point  point, before, after;
+      PSH_Point  first = glyph->contours[n].start;
+      PSH_Point  point, before, after;
 
 
+      if ( glyph->contours[n].count == 0 )
+        continue;
+
       point  = first;
       before = point;
       after  = point;
@@ -1297,7 +1307,7 @@
           Extremum:
             do
             {
-              psh3_point_set_extremum( point );
+              psh_point_set_extremum( point );
               point = point->next;
 
             } while ( point != after );
@@ -1317,14 +1327,14 @@
     /* orthogonal axis                                     */
     for ( n = 0; n < glyph->num_points; n++ )
     {
-      PSH3_Point  point, before, after;
+      PSH_Point  point, before, after;
 
 
       point  = &glyph->points[n];
       before = point;
       after  = point;
 
-      if ( psh3_point_is_extremum( point ) )
+      if ( psh_point_is_extremum( point ) )
       {
         do
         {
@@ -1346,12 +1356,12 @@
       if ( before->org_v < point->org_v &&
            after->org_v  > point->org_v )
       {
-        psh3_point_set_positive( point );
+        psh_point_set_positive( point );
       }
       else if ( before->org_v > point->org_v &&
                 after->org_v  < point->org_v )
       {
-        psh3_point_set_negative( point );
+        psh_point_set_negative( point );
       }
 
     Skip:
@@ -1360,7 +1370,7 @@
   }
 
 
-#define PSH3_STRONG_THRESHOLD  30
+#define PSH_STRONG_THRESHOLD  30
 
 
   /* major_dir is the direction for points on the bottom/left of the stem; */
@@ -1368,19 +1378,19 @@
   /* -major_dir.                                                           */
 
   static void
-  psh3_hint_table_find_strong_point( PSH3_Hint_Table  table,
-                                     PSH3_Point       point,
-                                     FT_Int           major_dir )
+  psh_hint_table_find_strong_point( PSH_Hint_Table  table,
+                                    PSH_Point       point,
+                                    FT_Int          major_dir )
   {
-    PSH3_Hint*  sort      = table->sort;
-    FT_UInt     num_hints = table->num_hints;
-    FT_Int      point_dir = 0;
+    PSH_Hint*  sort      = table->sort;
+    FT_UInt    num_hints = table->num_hints;
+    FT_Int     point_dir = 0;
 
 
-    if ( PSH3_DIR_COMPARE( point->dir_in, major_dir ) )
+    if ( PSH_DIR_COMPARE( point->dir_in, major_dir ) )
       point_dir = point->dir_in;
 
-    else if ( PSH3_DIR_COMPARE( point->dir_out, major_dir ) )
+    else if ( PSH_DIR_COMPARE( point->dir_out, major_dir ) )
       point_dir = point->dir_out;
 
     if ( point_dir )
@@ -1390,19 +1400,19 @@
 
       for ( ; num_hints > 0; num_hints--, sort++ )
       {
-        PSH3_Hint  hint = sort[0];
-        FT_Pos     d;
+        PSH_Hint  hint = sort[0];
+        FT_Pos    d;
 
 
         if ( point_dir == major_dir )
         {
-          flag = PSH3_POINT_EDGE_MIN;
+          flag = PSH_POINT_EDGE_MIN;
           d    = point->org_u - hint->org_pos;
 
-          if ( ABS( d ) < PSH3_STRONG_THRESHOLD )
+          if ( ABS( d ) < PSH_STRONG_THRESHOLD )
           {
           Is_Strong:
-            psh3_point_set_strong( point );
+            psh_point_set_strong( point );
             point->flags2 |= flag;
             point->hint    = hint;
             break;
@@ -1410,59 +1420,60 @@
         }
         else if ( point_dir == -major_dir )
         {
-          flag  = PSH3_POINT_EDGE_MAX;
-          d     = point->org_u - hint->org_pos - hint->org_len;
+          flag = PSH_POINT_EDGE_MAX;
+          d    = point->org_u - hint->org_pos - hint->org_len;
 
-          if ( ABS( d ) < PSH3_STRONG_THRESHOLD )
+          if ( ABS( d ) < PSH_STRONG_THRESHOLD )
             goto Is_Strong;
         }
       }
     }
 
 #if 1
-    else if ( psh3_point_is_extremum( point ) )
+    else if ( psh_point_is_extremum( point ) )
     {
       /* treat extrema as special cases for stem edge alignment */
       FT_UInt  min_flag, max_flag;
 
 
-      if ( major_dir == PSH3_DIR_HORIZONTAL )
+      if ( major_dir == PSH_DIR_HORIZONTAL )
       {
-        min_flag = PSH3_POINT_POSITIVE;
-        max_flag = PSH3_POINT_NEGATIVE;
+        min_flag = PSH_POINT_POSITIVE;
+        max_flag = PSH_POINT_NEGATIVE;
       }
       else
       {
-        min_flag = PSH3_POINT_NEGATIVE;
-        max_flag = PSH3_POINT_POSITIVE;
+        min_flag = PSH_POINT_NEGATIVE;
+        max_flag = PSH_POINT_POSITIVE;
       }
 
       for ( ; num_hints > 0; num_hints--, sort++ )
       {
-        PSH3_Hint  hint = sort[0];
-        FT_Pos     d, flag;
+        PSH_Hint  hint = sort[0];
+        FT_Pos    d;
+        FT_Int    flag;
 
 
         if ( point->flags2 & min_flag )
         {
-          flag = PSH3_POINT_EDGE_MIN;
+          flag = PSH_POINT_EDGE_MIN;
           d    = point->org_u - hint->org_pos;
 
-          if ( ABS( d ) < PSH3_STRONG_THRESHOLD )
+          if ( ABS( d ) < PSH_STRONG_THRESHOLD )
           {
           Is_Strong2:
             point->flags2 |= flag;
             point->hint    = hint;
-            psh3_point_set_strong( point );
+            psh_point_set_strong( point );
             break;
           }
         }
         else if ( point->flags2 & max_flag )
         {
-          flag = PSH3_POINT_EDGE_MAX;
+          flag = PSH_POINT_EDGE_MAX;
           d    = point->org_u - hint->org_pos - hint->org_len;
 
-          if ( ABS( d ) < PSH3_STRONG_THRESHOLD )
+          if ( ABS( d ) < PSH_STRONG_THRESHOLD )
             goto Is_Strong2;
         }
 
@@ -1480,18 +1491,18 @@
 
   /* find strong points in a glyph */
   static void
-  psh3_glyph_find_strong_points( PSH3_Glyph  glyph,
-                                 FT_Int      dimension )
+  psh_glyph_find_strong_points( PSH_Glyph  glyph,
+                                FT_Int     dimension )
   {
     /* a point is strong if it is located on a stem                   */
     /* edge and has an "in" or "out" tangent to the hint's direction  */
     {
-      PSH3_Hint_Table  table     = &glyph->hint_tables[dimension];
-      PS_Mask          mask      = table->hint_masks->masks;
-      FT_UInt          num_masks = table->hint_masks->num_masks;
-      FT_UInt          first     = 0;
-      FT_Int           major_dir = dimension == 0 ? PSH3_DIR_VERTICAL
-                                                  : PSH3_DIR_HORIZONTAL;
+      PSH_Hint_Table  table     = &glyph->hint_tables[dimension];
+      PS_Mask         mask      = table->hint_masks->masks;
+      FT_UInt         num_masks = table->hint_masks->num_masks;
+      FT_UInt         first     = 0;
+      FT_Int          major_dir = dimension == 0 ? PSH_DIR_VERTICAL
+                                                 : PSH_DIR_HORIZONTAL;
 
 
       /* process secondary hints to "selected" points */
@@ -1509,13 +1520,13 @@
           count = next - first;
           if ( count > 0 )
           {
-            PSH3_Point  point = glyph->points + first;
+            PSH_Point  point = glyph->points + first;
 
 
-            psh3_hint_table_activate_mask( table, mask );
+            psh_hint_table_activate_mask( table, mask );
 
             for ( ; count > 0; count--, point++ )
-              psh3_hint_table_find_strong_point( table, point, major_dir );
+              psh_hint_table_find_strong_point( table, point, major_dir );
           }
           first = next;
         }
@@ -1524,28 +1535,28 @@
       /* process primary hints for all points */
       if ( num_masks == 1 )
       {
-        FT_UInt     count = glyph->num_points;
-        PSH3_Point  point = glyph->points;
+        FT_UInt    count = glyph->num_points;
+        PSH_Point  point = glyph->points;
 
 
-        psh3_hint_table_activate_mask( table, table->hint_masks->masks );
+        psh_hint_table_activate_mask( table, table->hint_masks->masks );
         for ( ; count > 0; count--, point++ )
         {
-          if ( !psh3_point_is_strong( point ) )
-            psh3_hint_table_find_strong_point( table, point, major_dir );
+          if ( !psh_point_is_strong( point ) )
+            psh_hint_table_find_strong_point( table, point, major_dir );
         }
       }
 
       /* now, certain points may have been attached to hint and */
       /* not marked as strong; update their flags then          */
       {
-        FT_UInt     count = glyph->num_points;
-        PSH3_Point  point = glyph->points;
+        FT_UInt    count = glyph->num_points;
+        PSH_Point  point = glyph->points;
 
 
         for ( ; count > 0; count--, point++ )
-          if ( point->hint && !psh3_point_is_strong( point ) )
-            psh3_point_set_strong( point );
+          if ( point->hint && !psh_point_is_strong( point ) )
+            psh_point_set_strong( point );
       }
     }
   }
@@ -1553,21 +1564,21 @@
 
   /* interpolate strong points with the help of hinted coordinates */
   static void
-  psh3_glyph_interpolate_strong_points( PSH3_Glyph  glyph,
-                                        FT_Int      dimension )
+  psh_glyph_interpolate_strong_points( PSH_Glyph  glyph,
+                                       FT_Int     dimension )
   {
     PSH_Dimension  dim   = &glyph->globals->dimension[dimension];
     FT_Fixed       scale = dim->scale_mult;
 
 
     {
-      FT_UInt     count = glyph->num_points;
-      PSH3_Point  point = glyph->points;
+      FT_UInt    count = glyph->num_points;
+      PSH_Point  point = glyph->points;
 
 
       for ( ; count > 0; count--, point++ )
       {
-        PSH3_Hint  hint = point->hint;
+        PSH_Hint  hint = point->hint;
 
 
         if ( hint )
@@ -1575,11 +1586,11 @@
           FT_Pos  delta;
 
 
-          if ( psh3_point_is_edge_min( point ) )
+          if ( psh_point_is_edge_min( point ) )
           {
             point->cur_u = hint->cur_pos;
           }
-          else if ( psh3_point_is_edge_max( point ) )
+          else if ( psh_point_is_edge_max( point ) )
           {
             point->cur_u = hint->cur_pos + hint->cur_len;
           }
@@ -1601,7 +1612,7 @@
             else
               point->cur_u = hint->cur_pos;
           }
-          psh3_point_set_fitted( point );
+          psh_point_set_fitted( point );
         }
       }
     }
@@ -1609,8 +1620,8 @@
 
 
   static void
-  psh3_glyph_interpolate_normal_points( PSH3_Glyph  glyph,
-                                        FT_Int      dimension )
+  psh_glyph_interpolate_normal_points( PSH_Glyph  glyph,
+                                       FT_Int     dimension )
   {
 
 #if 1
@@ -1621,45 +1632,45 @@
 
     /* first technique: a point is strong if it is a local extrema */
     {
-      FT_UInt     count = glyph->num_points;
-      PSH3_Point  point = glyph->points;
+      FT_UInt    count = glyph->num_points;
+      PSH_Point  point = glyph->points;
 
 
       for ( ; count > 0; count--, point++ )
       {
-        if ( psh3_point_is_strong( point ) )
+        if ( psh_point_is_strong( point ) )
           continue;
 
         /* sometimes, some local extremas are smooth points */
-        if ( psh3_point_is_smooth( point ) )
+        if ( psh_point_is_smooth( point ) )
         {
-          if ( point->dir_in == PSH3_DIR_NONE  ||
+          if ( point->dir_in == PSH_DIR_NONE   ||
                point->dir_in != point->dir_out )
             continue;
 
-          if ( !psh3_point_is_extremum( point )   &&
-               !psh3_point_is_inflex( point ) )
+          if ( !psh_point_is_extremum( point )   &&
+               !psh_point_is_inflex( point ) )
             continue;
 
-          point->flags &= ~PSH3_POINT_SMOOTH;
+          point->flags &= ~PSH_POINT_SMOOTH;
         }
 
         /* find best enclosing point coordinates */
         {
-          PSH3_Point  before = 0;
-          PSH3_Point  after  = 0;
+          PSH_Point  before = 0;
+          PSH_Point  after  = 0;
 
-          FT_Pos      diff_before = -32000;
-          FT_Pos      diff_after  =  32000;
-          FT_Pos      u = point->org_u;
+          FT_Pos     diff_before = -32000;
+          FT_Pos     diff_after  =  32000;
+          FT_Pos     u = point->org_u;
 
-          FT_Int      count2 = glyph->num_points;
-          PSH3_Point  cur    = glyph->points;
+          FT_Int     count2 = glyph->num_points;
+          PSH_Point  cur    = glyph->points;
 
 
           for ( ; count2 > 0; count2--, cur++ )
           {
-            if ( psh3_point_is_strong( cur ) )
+            if ( psh_point_is_strong( cur ) )
             {
               FT_Pos  diff = cur->org_u - u;;
 
@@ -1715,7 +1726,7 @@
                                         after->org_u - before->org_u );
           }
 
-          psh3_point_set_fitted( point );
+          psh_point_set_fitted( point );
         }
       }
     }
@@ -1727,21 +1738,21 @@
 
   /* interpolate other points */
   static void
-  psh3_glyph_interpolate_other_points( PSH3_Glyph  glyph,
-                                       FT_Int      dimension )
+  psh_glyph_interpolate_other_points( PSH_Glyph  glyph,
+                                      FT_Int     dimension )
   {
     PSH_Dimension  dim          = &glyph->globals->dimension[dimension];
     FT_Fixed       scale        = dim->scale_mult;
     FT_Fixed       delta        = dim->scale_delta;
-    PSH3_Contour   contour      = glyph->contours;
+    PSH_Contour    contour      = glyph->contours;
     FT_UInt        num_contours = glyph->num_contours;
 
 
     for ( ; num_contours > 0; num_contours--, contour++ )
     {
-      PSH3_Point  start = contour->start;
-      PSH3_Point  first, next, point;
-      FT_UInt     fit_count;
+      PSH_Point  start = contour->start;
+      PSH_Point  first, next, point;
+      FT_UInt    fit_count;
 
 
       /* count the number of strong points in this contour */
@@ -1750,7 +1761,7 @@
       first     = 0;
 
       for ( point = start; point < next; point++ )
-        if ( psh3_point_is_fitted( point ) )
+        if ( psh_point_is_fitted( point ) )
         {
           if ( !first )
             first = point;
@@ -1786,7 +1797,7 @@
           if ( next == start )
             goto Next_Contour;
 
-          if ( !psh3_point_is_fitted( next ) )
+          if ( !psh_point_is_fitted( next ) )
             break;
 
           first = next;
@@ -1796,7 +1807,7 @@
         for (;;)
         {
           next = next->next;
-          if ( psh3_point_is_fitted( next ) )
+          if ( psh_point_is_fitted( next ) )
             break;
         }
 
@@ -1875,41 +1886,72 @@
   /*************************************************************************/
 
   FT_Error
-  ps3_hints_apply( PS_Hints        ps_hints,
-                   FT_Outline*     outline,
-                   PSH_Globals     globals,
-                   FT_Render_Mode  hint_mode )
+  ps_hints_apply( PS_Hints        ps_hints,
+                  FT_Outline*     outline,
+                  PSH_Globals     globals,
+                  FT_Render_Mode  hint_mode )
   {
-    PSH3_GlyphRec  glyphrec;
-    PSH3_Glyph     glyph = &glyphrec;
-    FT_Error       error;
+    PSH_GlyphRec  glyphrec;
+    PSH_Glyph     glyph = &glyphrec;
+    FT_Error      error;
 #ifdef DEBUG_HINTER
-    FT_Memory      memory;
+    FT_Memory     memory;
 #endif
-    FT_Int         dimension;
+    FT_Int        dimension;
 
 
+    /* something to do? */
+    if ( outline->n_points == 0 || outline->n_contours == 0 )
+      return PSH_Err_Ok;
+
 #ifdef DEBUG_HINTER
 
     memory = globals->memory;
 
-    if ( ps3_debug_glyph )
+    if ( ps_debug_glyph )
     {
-      psh3_glyph_done( ps3_debug_glyph );
-      FT_FREE( ps3_debug_glyph );
+      psh_glyph_done( ps_debug_glyph );
+      FT_FREE( ps_debug_glyph );
     }
 
     if ( FT_NEW( glyph ) )
       return error;
 
-    ps3_debug_glyph = glyph;
+    ps_debug_glyph = glyph;
 
 #endif /* DEBUG_HINTER */
 
-    error = psh3_glyph_init( glyph, outline, ps_hints, globals );
+    error = psh_glyph_init( glyph, outline, ps_hints, globals );
     if ( error )
       goto Exit;
 
+    /* try to optimize the y_scale so that the top of non-capital letters
+     * is aligned on a pixel boundary whenever possible
+     */
+    {
+      PSH_Dimension  dim_x = &glyph->globals->dimension[0];
+      PSH_Dimension  dim_y = &glyph->globals->dimension[1];
+
+      FT_Fixed x_scale = dim_x->scale_mult;
+      FT_Fixed y_scale = dim_y->scale_mult;
+
+      FT_Fixed scaled;
+      FT_Fixed fitted;
+
+
+      scaled = FT_MulFix( globals->blues.normal_top.zones->org_ref, y_scale );
+      fitted = ( scaled + 32 ) & -64;
+
+      if (scaled != fitted ) {
+        y_scale = FT_MulDiv( y_scale, fitted, scaled );
+
+        if ( fitted < scaled )
+          x_scale -= x_scale / 50;
+
+        psh_globals_set_scale( glyph->globals, x_scale, y_scale, 0, 0 );
+      }
+    }
+
     glyph->do_horz_hints = 1;
     glyph->do_vert_hints = 1;
 
@@ -1924,31 +1966,31 @@
     for ( dimension = 0; dimension < 2; dimension++ )
     {
       /* load outline coordinates into glyph */
-      psh3_glyph_load_points( glyph, dimension );
+      psh_glyph_load_points( glyph, dimension );
 
       /* compute local extrema */
-      psh3_glyph_compute_extrema( glyph );
+      psh_glyph_compute_extrema( glyph );
 
       /* compute aligned stem/hints positions */
-      psh3_hint_table_align_hints( &glyph->hint_tables[dimension],
-                                   glyph->globals,
-                                   dimension,
-                                   glyph );
+      psh_hint_table_align_hints( &glyph->hint_tables[dimension],
+                                  glyph->globals,
+                                  dimension,
+                                  glyph );
 
       /* find strong points, align them, then interpolate others */
-      psh3_glyph_find_strong_points( glyph, dimension );
-      psh3_glyph_interpolate_strong_points( glyph, dimension );
-      psh3_glyph_interpolate_normal_points( glyph, dimension );
-      psh3_glyph_interpolate_other_points( glyph, dimension );
+      psh_glyph_find_strong_points( glyph, dimension );
+      psh_glyph_interpolate_strong_points( glyph, dimension );
+      psh_glyph_interpolate_normal_points( glyph, dimension );
+      psh_glyph_interpolate_other_points( glyph, dimension );
 
       /* save hinted coordinates back to outline */
-      psh3_glyph_save_points( glyph, dimension );
+      psh_glyph_save_points( glyph, dimension );
     }
 
   Exit:
 
 #ifndef DEBUG_HINTER
-    psh3_glyph_done( glyph );
+    psh_glyph_done( glyph );
 #endif
 
     return error;
diff --git a/reactos/lib/freetype/src/pshinter/pshalgo.h b/reactos/lib/freetype/src/pshinter/pshalgo.h
index e79ad029554..f68de71202e 100644
--- a/reactos/lib/freetype/src/pshinter/pshalgo.h
+++ b/reactos/lib/freetype/src/pshinter/pshalgo.h
@@ -2,13 +2,13 @@
 /*                                                                         */
 /*  pshalgo.h                                                              */
 /*                                                                         */
-/*    This header file defines the used hinting algorithm.                 */
+/*    PostScript hinting algorithm (specification).                        */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2002, 2003 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
-/*  This file is part of the FreeType project, and may only be used        */
-/*  modified and distributed under the terms of the FreeType project       */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
 /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
 /*  this file you indicate that you have read the license and              */
 /*  understand and accept it fully.                                        */
@@ -19,34 +19,236 @@
 #ifndef __PSHALGO_H__
 #define __PSHALGO_H__
 
+
+#include "pshrec.h"
+#include "pshglob.h"
+#include FT_TRIGONOMETRY_H
+
+
 FT_BEGIN_HEADER
 
-/* define to choose hinting algorithm */
-#define PSH_ALGORITHM_3
 
-#if defined(PSH_ALGORITHM_1)
+  /* handle to Hint structure */
+  typedef struct PSH_HintRec_*  PSH_Hint;
 
-#  include "pshalgo1.h"
-#  define PS_HINTS_APPLY_FUNC  ps1_hints_apply
+  /* hint bit-flags */
+  typedef enum
+  {
+    PSH_HINT_GHOST  = PS_HINT_FLAG_GHOST,
+    PSH_HINT_BOTTOM = PS_HINT_FLAG_BOTTOM,
+    PSH_HINT_ACTIVE = 4,
+    PSH_HINT_FITTED = 8
 
-#elif defined(PSH_ALGORITHM_2)
+  } PSH_Hint_Flags;
 
-#  include "pshalgo2.h"
-#  define PS_HINTS_APPLY_FUNC  ps2_hints_apply
 
-#elif defined(PSH_ALGORITHM_3)
+#define psh_hint_is_active( x )  ( ( (x)->flags & PSH_HINT_ACTIVE ) != 0 )
+#define psh_hint_is_ghost( x )   ( ( (x)->flags & PSH_HINT_GHOST  ) != 0 )
+#define psh_hint_is_fitted( x )  ( ( (x)->flags & PSH_HINT_FITTED ) != 0 )
 
-#  include "pshalgo3.h"
-#  define PS_HINTS_APPLY_FUNC  ps3_hints_apply
+#define psh_hint_activate( x )    (x)->flags |=  PSH_HINT_ACTIVE
+#define psh_hint_deactivate( x )  (x)->flags &= ~PSH_HINT_ACTIVE
+#define psh_hint_set_fitted( x )  (x)->flags |=  PSH_HINT_FITTED
 
-#else
+  /* hint structure */
+  typedef struct  PSH_HintRec_
+  {
+    FT_Int    org_pos;
+    FT_Int    org_len;
+    FT_Pos    cur_pos;
+    FT_Pos    cur_len;
+    FT_UInt   flags;
+    PSH_Hint  parent;
+    FT_Int    order;
 
-#  error "invalid Postscript Hinter algorithm selection"
+  } PSH_HintRec;
 
+
+  /* this is an interpolation zone used for strong points;  */
+  /* weak points are interpolated according to their strong */
+  /* neighbours                                             */
+  typedef struct  PSH_ZoneRec_
+  {
+    FT_Fixed  scale;
+    FT_Fixed  delta;
+    FT_Pos    min;
+    FT_Pos    max;
+
+  } PSH_ZoneRec, *PSH_Zone;
+
+
+  typedef struct  PSH_Hint_TableRec_
+  {
+    FT_UInt        max_hints;
+    FT_UInt        num_hints;
+    PSH_Hint       hints;
+    PSH_Hint*      sort;
+    PSH_Hint*      sort_global;
+    FT_UInt        num_zones;
+    PSH_ZoneRec*   zones;
+    PSH_Zone       zone;
+    PS_Mask_Table  hint_masks;
+    PS_Mask_Table  counter_masks;
+
+  } PSH_Hint_TableRec, *PSH_Hint_Table;
+
+
+  typedef struct PSH_PointRec_*    PSH_Point;
+  typedef struct PSH_ContourRec_*  PSH_Contour;
+
+  enum
+  {
+    PSH_DIR_NONE  =  4,
+    PSH_DIR_UP    = -1,
+    PSH_DIR_DOWN  =  1,
+    PSH_DIR_LEFT  = -2,
+    PSH_DIR_RIGHT =  2
+  };
+
+#define PSH_DIR_HORIZONTAL  2
+#define PSH_DIR_VERTICAL    1
+
+#define PSH_DIR_COMPARE( d1, d2 )   ( (d1) == (d2) || (d1) == -(d2) )
+#define PSH_DIR_IS_HORIZONTAL( d )  PSH_DIR_COMPARE( d, PSH_DIR_HORIZONTAL )
+#define PSH_DIR_IS_VERTICAL( d )    PSH_DIR_COMPARE( d, PSH_DIR_VERTICAL )
+
+
+ /* the following bit-flags are computed once by the glyph */
+ /* analyzer, for both dimensions                          */
+  enum
+  {
+    PSH_POINT_OFF    = 1,   /* point is off the curve */
+    PSH_POINT_SMOOTH = 2,   /* point is smooth        */
+    PSH_POINT_INFLEX = 4    /* point is inflection    */
+  };
+
+#define psh_point_is_smooth( p )  ( (p)->flags & PSH_POINT_SMOOTH )
+#define psh_point_is_off( p )     ( (p)->flags & PSH_POINT_OFF    )
+#define psh_point_is_inflex( p )  ( (p)->flags & PSH_POINT_INFLEX )
+
+#define psh_point_set_smooth( p )  (p)->flags |= PSH_POINT_SMOOTH
+#define psh_point_set_off( p )     (p)->flags |= PSH_POINT_OFF
+#define psh_point_set_inflex( p )  (p)->flags |= PSH_POINT_INFLEX
+
+  /* the following bit-flags are re-computed for each dimension */
+  enum
+  {
+    PSH_POINT_STRONG   = 16,   /* point is strong                           */
+    PSH_POINT_FITTED   = 32,   /* point is already fitted                   */
+    PSH_POINT_EXTREMUM = 64,   /* point is local extremum                   */
+    PSH_POINT_POSITIVE = 128,  /* extremum has positive contour flow        */
+    PSH_POINT_NEGATIVE = 256,  /* extremum has negative contour flow        */
+    PSH_POINT_EDGE_MIN = 512,  /* point is aligned to left/bottom stem edge */
+    PSH_POINT_EDGE_MAX = 1024  /* point is aligned to top/right stem edge   */
+  };
+
+#define psh_point_is_strong( p )    ( (p)->flags2 & PSH_POINT_STRONG )
+#define psh_point_is_fitted( p )    ( (p)->flags2 & PSH_POINT_FITTED )
+#define psh_point_is_extremum( p )  ( (p)->flags2 & PSH_POINT_EXTREMUM )
+#define psh_point_is_positive( p )  ( (p)->flags2 & PSH_POINT_POSITIVE )
+#define psh_point_is_negative( p )  ( (p)->flags2 & PSH_POINT_NEGATIVE )
+#define psh_point_is_edge_min( p )  ( (p)->flags2 & PSH_POINT_EDGE_MIN )
+#define psh_point_is_edge_max( p )  ( (p)->flags2 & PSH_POINT_EDGE_MAX )
+
+#define psh_point_set_strong( p )    (p)->flags2 |= PSH_POINT_STRONG
+#define psh_point_set_fitted( p )    (p)->flags2 |= PSH_POINT_FITTED
+#define psh_point_set_extremum( p )  (p)->flags2 |= PSH_POINT_EXTREMUM
+#define psh_point_set_positive( p )  (p)->flags2 |= PSH_POINT_POSITIVE
+#define psh_point_set_negative( p )  (p)->flags2 |= PSH_POINT_NEGATIVE
+#define psh_point_set_edge_min( p )  (p)->flags2 |= PSH_POINT_EDGE_MIN
+#define psh_point_set_edge_max( p )  (p)->flags2 |= PSH_POINT_EDGE_MAX
+
+
+  typedef struct  PSH_PointRec_
+  {
+    PSH_Point    prev;
+    PSH_Point    next;
+    PSH_Contour  contour;
+    FT_UInt      flags;
+    FT_UInt      flags2;
+    FT_Char      dir_in;
+    FT_Char      dir_out;
+    FT_Angle     angle_in;
+    FT_Angle     angle_out;
+    PSH_Hint     hint;
+    FT_Pos       org_u;
+    FT_Pos       org_v;
+    FT_Pos       cur_u;
+#ifdef DEBUG_HINTER
+    FT_Pos       org_x;
+    FT_Pos       cur_x;
+    FT_Pos       org_y;
+    FT_Pos       cur_y;
+    FT_UInt      flags_x;
+    FT_UInt      flags_y;
 #endif
 
+  } PSH_PointRec;
+
+
+#define PSH_POINT_EQUAL_ORG( a, b )  ( (a)->org_u == (b)->org_u && \
+                                       (a)->org_v == (b)->org_v )
+
+#define PSH_POINT_ANGLE( a, b )  FT_Atan2( (b)->org_u - (a)->org_u,  \
+                                           (b)->org_v - (a)->org_v )
+
+  typedef struct  PSH_ContourRec_
+  {
+    PSH_Point  start;
+    FT_UInt    count;
+
+  } PSH_ContourRec;
+
+
+  typedef struct  PSH_GlyphRec_
+  {
+    FT_UInt            num_points;
+    FT_UInt            num_contours;
+
+    PSH_Point          points;
+    PSH_Contour        contours;
+
+    FT_Memory          memory;
+    FT_Outline*        outline;
+    PSH_Globals        globals;
+    PSH_Hint_TableRec  hint_tables[2];
+
+    FT_Bool            vertical;
+    FT_Int             major_dir;
+    FT_Int             minor_dir;
+
+    FT_Bool            do_horz_hints;
+    FT_Bool            do_vert_hints;
+    FT_Bool            do_horz_snapping;
+    FT_Bool            do_vert_snapping;
+    FT_Bool            do_stem_adjust;
+
+  } PSH_GlyphRec, *PSH_Glyph;
+
+
+#ifdef DEBUG_HINTER
+  extern PSH_Hint_Table  ps_debug_hint_table;
+
+  typedef void
+  (*PSH_HintFunc)( PSH_Hint  hint,
+                   FT_Bool   vertical );
+
+  extern PSH_HintFunc    ps_debug_hint_func;
+
+  extern PSH_Glyph       ps_debug_glyph;
+#endif
+
+
+  extern FT_Error
+  ps_hints_apply( PS_Hints        ps_hints,
+                  FT_Outline*     outline,
+                  PSH_Globals     globals,
+                  FT_Render_Mode  hint_mode );
+
+
 FT_END_HEADER
 
+
 #endif /* __PSHALGO_H__ */
 
 
diff --git a/reactos/lib/freetype/src/pshinter/pshalgo1.c b/reactos/lib/freetype/src/pshinter/pshalgo1.c
deleted file mode 100644
index 06da5977d0e..00000000000
--- a/reactos/lib/freetype/src/pshinter/pshalgo1.c
+++ /dev/null
@@ -1,785 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  pshalgo1.c                                                             */
-/*                                                                         */
-/*    PostScript hinting algorithm 1 (body).                               */
-/*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used        */
-/*  modified and distributed under the terms of the FreeType project       */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
-#include "pshalgo1.h"
-
-#undef  FT_COMPONENT
-#define FT_COMPONENT  trace_pshalgo1
-
-#ifdef DEBUG_HINTER
-  PSH1_Hint_Table  ps1_debug_hint_table = 0;
-  PSH1_HintFunc    ps1_debug_hint_func  = 0;
-#endif
-
-
- /************************************************************************/
- /************************************************************************/
- /*****                                                              *****/
- /*****                 BASIC HINTS RECORDINGS                       *****/
- /*****                                                              *****/
- /************************************************************************/
- /************************************************************************/
-
-  /* return true iff two stem hints overlap */
-  static FT_Int
-  psh1_hint_overlap( PSH1_Hint  hint1,
-                     PSH1_Hint  hint2 )
-  {
-    return ( hint1->org_pos + hint1->org_len >= hint2->org_pos &&
-             hint2->org_pos + hint2->org_len >= hint1->org_pos );
-  }
-
-
-  /* destroy hints table */
-  static void
-  psh1_hint_table_done( PSH1_Hint_Table  table,
-                        FT_Memory        memory )
-  {
-    FT_FREE( table->zones );
-    table->num_zones = 0;
-    table->zone      = 0;
-
-    FT_FREE( table->sort );
-    FT_FREE( table->hints );
-    table->num_hints   = 0;
-    table->max_hints   = 0;
-    table->sort_global = 0;
-  }
-
-
-  /* deactivate all hints in a table */
-  static void
-  psh1_hint_table_deactivate( PSH1_Hint_Table  table )
-  {
-    FT_UInt    count = table->max_hints;
-    PSH1_Hint  hint  = table->hints;
-
-
-    for ( ; count > 0; count--, hint++ )
-    {
-      psh1_hint_deactivate( hint );
-      hint->order = -1;
-    }
-  }
-
-
-  /* internal function used to record a new hint */
-  static void
-  psh1_hint_table_record( PSH1_Hint_Table  table,
-                          FT_UInt          idx )
-  {
-    PSH1_Hint  hint = table->hints + idx;
-
-
-    if ( idx >= table->max_hints )
-    {
-      FT_ERROR(( "%s.activate: invalid hint index %d\n", idx ));
-      return;
-    }
-
-    /* ignore active hints */
-    if ( psh1_hint_is_active( hint ) )
-      return;
-
-    psh1_hint_activate( hint );
-
-    /* now scan the current active hint set in order to determine */
-    /* if we are overlapping with another segment                 */
-    {
-      PSH1_Hint*  sorted = table->sort_global;
-      FT_UInt     count  = table->num_hints;
-      PSH1_Hint   hint2;
-
-
-      hint->parent = 0;
-      for ( ; count > 0; count--, sorted++ )
-      {
-        hint2 = sorted[0];
-
-        if ( psh1_hint_overlap( hint, hint2 ) )
-        {
-          hint->parent = hint2;
-          break;
-        }
-      }
-    }
-
-    if ( table->num_hints < table->max_hints )
-      table->sort_global[table->num_hints++] = hint;
-    else
-      FT_ERROR(( "%s.activate: too many sorted hints!  BUG!\n",
-                 "ps.fitter" ));
-  }
-
-
-  static void
-  psh1_hint_table_record_mask( PSH1_Hint_Table  table,
-                               PS_Mask          hint_mask )
-  {
-    FT_Int    mask = 0, val = 0;
-    FT_Byte*  cursor = hint_mask->bytes;
-    FT_UInt   idx, limit;
-
-
-    limit = hint_mask->num_bits;
-
-    if ( limit != table->max_hints )
-      FT_ERROR(( "%s.activate_mask: invalid bit count (%d instead of %d)\n",
-                 "ps.fitter", hint_mask->num_bits, table->max_hints ));
-
-    for ( idx = 0; idx < limit; idx++ )
-    {
-      if ( mask == 0 )
-      {
-        val  = *cursor++;
-        mask = 0x80;
-      }
-
-      if ( val & mask )
-        psh1_hint_table_record( table, idx );
-
-      mask >>= 1;
-    }
-  }
-
-
-  /* create hints table */
-  static FT_Error
-  psh1_hint_table_init( PSH1_Hint_Table  table,
-                        PS_Hint_Table    hints,
-                        PS_Mask_Table    hint_masks,
-                        PS_Mask_Table    counter_masks,
-                        FT_Memory        memory )
-  {
-    FT_UInt   count = hints->num_hints;
-    FT_Error  error;
-
-    FT_UNUSED( counter_masks );
-
-
-    /* allocate our tables */
-    if ( FT_NEW_ARRAY( table->sort,  2 * count     ) ||
-         FT_NEW_ARRAY( table->hints,     count     ) ||
-         FT_NEW_ARRAY( table->zones, 2 * count + 1 ) )
-      goto Exit;
-
-    table->max_hints   = count;
-    table->sort_global = table->sort + count;
-    table->num_hints   = 0;
-    table->num_zones   = 0;
-    table->zone        = 0;
-
-    /* now, initialize the "hints" array */
-    {
-      PSH1_Hint  write = table->hints;
-      PS_Hint    read  = hints->hints;
-
-
-      for ( ; count > 0; count--, write++, read++ )
-      {
-        write->org_pos = read->pos;
-        write->org_len = read->len;
-        write->flags   = read->flags;
-      }
-    }
-
-    /* we now need to determine the initial "parent" stems; first  */
-    /* activate the hints that are given by the initial hint masks */
-    if ( hint_masks )
-    {
-      FT_UInt  Count = hint_masks->num_masks;
-      PS_Mask  Mask  = hint_masks->masks;
-
-
-      table->hint_masks = hint_masks;
-
-      for ( ; Count > 0; Count--, Mask++ )
-        psh1_hint_table_record_mask( table, Mask );
-    }
-
-    /* now, do a linear parse in case some hints were left alone */
-    if ( table->num_hints != table->max_hints )
-    {
-      FT_UInt   Index, Count;
-
-
-      FT_ERROR(( "%s.init: missing/incorrect hint masks!\n" ));
-      Count = table->max_hints;
-      for ( Index = 0; Index < Count; Index++ )
-        psh1_hint_table_record( table, Index );
-    }
-
-  Exit:
-    return error;
-  }
-
-
-  static void
-  psh1_hint_table_activate_mask( PSH1_Hint_Table  table,
-                                 PS_Mask          hint_mask )
-  {
-    FT_Int    mask = 0, val = 0;
-    FT_Byte*  cursor = hint_mask->bytes;
-    FT_UInt   idx, limit, count;
-
-
-    limit = hint_mask->num_bits;
-    count = 0;
-
-    psh1_hint_table_deactivate( table );
-
-    for ( idx = 0; idx < limit; idx++ )
-    {
-      if ( mask == 0 )
-      {
-        val  = *cursor++;
-        mask = 0x80;
-      }
-
-      if ( val & mask )
-      {
-        PSH1_Hint  hint = &table->hints[idx];
-
-
-        if ( !psh1_hint_is_active( hint ) )
-        {
-          PSH1_Hint*  sort = table->sort;
-          FT_UInt     count2;
-          PSH1_Hint   hint2;
-
-
-          for ( count2 = count; count2 > 0; count2--, sort++ )
-          {
-            hint2 = sort[0];
-            if ( psh1_hint_overlap( hint, hint2 ) )
-            {
-              FT_ERROR(( "%s.activate_mask: found overlapping hints\n",
-                         "psf.hint" ));
-              break;
-            }
-          }
-
-          if ( count2 == 0 )
-          {
-            psh1_hint_activate( hint );
-            if ( count < table->max_hints )
-              table->sort[count++] = hint;
-            else
-              FT_ERROR(( "%s.activate_mask: too many active hints\n",
-                         "psf.hint" ));
-          }
-        }
-      }
-
-      mask >>= 1;
-    }
-    table->num_hints = count;
-
-    /* now, sort the hints; they are guaranteed to not overlap */
-    /* so we can compare their "org_pos" field directly        */
-    {
-      FT_Int      i1, i2;
-      PSH1_Hint   hint1, hint2;
-      PSH1_Hint*  sort = table->sort;
-
-
-      /* a simple bubble sort will do, since in 99% of cases, the hints */
-      /* will be already sorted; and the sort will be linear            */
-      for ( i1 = 1; i1 < (FT_Int)count; i1++ )
-      {
-        hint1 = sort[i1];
-
-        for ( i2 = i1 - 1; i2 >= 0; i2-- )
-        {
-          hint2 = sort[i2];
-          if ( hint2->org_pos < hint1->org_pos )
-            break;
-
-          sort[i2 + 1] = hint2;
-          sort[i2]     = hint1;
-        }
-      }
-    }
-  }
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****               HINTS GRID-FITTING AND OPTIMIZATION             *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#ifdef DEBUG_HINTER
-  void
-  ps_simple_scale( PSH1_Hint_Table  table,
-                   FT_Fixed         scale,
-                   FT_Fixed         delta,
-                   FT_Int           vertical )
-  {
-    PSH1_Hint  hint;
-    FT_UInt    count;
-
-
-    for ( count = 0; count < table->num_hints; count++ )
-    {
-      hint = table->sort[count];
-      if ( psh1_hint_is_active( hint ) )
-      {
-        hint->cur_pos = FT_MulFix( hint->org_pos, scale ) + delta;
-        hint->cur_len = FT_MulFix( hint->org_len, scale );
-
-        if ( ps1_debug_hint_func )
-          ps1_debug_hint_func( hint, vertical );
-      }
-    }
-  }
-#endif
-
-
-  FT_LOCAL_DEF( FT_Error )
-  psh1_hint_table_optimize( PSH1_Hint_Table  table,
-                            PSH_Globals      globals,
-                            FT_Outline*      outline,
-                            FT_Int           vertical )
-  {
-    PSH_Dimension  dim   = &globals->dimension[vertical];
-    FT_Fixed       scale = dim->scale_mult;
-    FT_Fixed       delta = dim->scale_delta;
-
-    FT_UNUSED( outline );
-
-
-#ifdef DEBUG_HINTER
-    if ( ps_debug_no_vert_hints && vertical )
-    {
-      ps_simple_scale( table, scale, delta, vertical );
-      return 0;
-    }
-
-    if ( ps_debug_no_horz_hints && !vertical )
-    {
-      ps_simple_scale( table, scale, delta, vertical );
-      return 0;
-    }
-#endif
-
-    /* XXXX: for now, we only scale the hints to test all other aspects */
-    /*       of the PostScript hinter                                   */
-    {
-      PSH1_Hint  hint;
-      FT_UInt   count;
-
-
-      for ( count = 0; count < table->num_hints; count++ )
-      {
-        hint = table->sort[count];
-        if ( psh1_hint_is_active( hint ) )
-        {
-#if 1
-          FT_Pos  pos = FT_MulFix( hint->org_pos, scale ) + delta;
-          FT_Pos  len = FT_MulFix( hint->org_len, scale );
-
-          FT_Pos  fit_center;
-          FT_Pos  fit_len;
-
-          PSH_AlignmentRec  align;
-
-
-          /* compute fitted width/height */
-          fit_len = psh_dimension_snap_width( dim, hint->org_len );
-          if ( fit_len < 64 )
-            fit_len = 64;
-          else
-            fit_len = ( fit_len + 32 ) & -64;
-
-          hint->cur_len = fit_len;
-
-          /* check blue zones for horizontal stems */
-          align.align     = PSH_BLUE_ALIGN_NONE;
-          align.align_bot = align.align_top = 0;
-          if ( !vertical )
-          {
-            psh_blues_snap_stem( &globals->blues,
-                                 hint->org_pos + hint->org_len,
-                                 hint->org_pos,
-                                 &align );
-          }
-
-          switch ( align.align )
-          {
-          case PSH_BLUE_ALIGN_TOP:
-            /* the top of the stem is aligned against a blue zone */
-            hint->cur_pos = align.align_top - fit_len;
-            break;
-
-          case PSH_BLUE_ALIGN_BOT:
-            /* the bottom of the stem is aligned against a blue zone */
-            hint->cur_pos = align.align_bot;
-            break;
-
-          case PSH_BLUE_ALIGN_TOP | PSH_BLUE_ALIGN_BOT:
-            /* both edges of the stem are aligned against blue zones */
-            hint->cur_pos = align.align_bot;
-            hint->cur_len = align.align_top - align.align_bot;
-            break;
-
-          default:
-            /* normal processing */
-            if ( ( fit_len / 64 ) & 1 )
-            {
-              /* odd number of pixels */
-              fit_center = ( ( pos + ( len >> 1 ) ) & -64 ) + 32;
-            }
-            else
-            {
-              /* even number of pixels */
-              fit_center = ( pos + ( len >> 1 ) + 32 ) & -64;
-            }
-
-            hint->cur_pos = fit_center - ( fit_len >> 1 );
-          }
-
-# else
-
-          hint->cur_pos = ( FT_MulFix( hint->org_pos, scale ) + delta + 32 )
-                          & -64;
-          hint->cur_len = FT_MulFix( hint->org_len, scale );
-
-# endif
-
-#ifdef DEBUG_HINTER
-        if ( ps1_debug_hint_func )
-          ps1_debug_hint_func( hint, vertical );
-#endif
-        }
-      }
-    }
-
-    return 0;
-  }
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****               POINTS INTERPOLATION ROUTINES                   *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#define PSH1_ZONE_MIN  -3200000
-#define PSH1_ZONE_MAX  +3200000
-
-#define xxDEBUG_ZONES
-
-
-#ifdef DEBUG_ZONES
-
-#include <stdio.h>
-
-  static void
-  psh1_print_zone( PSH1_Zone  zone )
-  {
-    printf( "zone [scale,delta,min,max] = [%.3f,%.3f,%d,%d]\n",
-             zone->scale / 65536.0,
-             zone->delta / 64.0,
-             zone->min,
-             zone->max );
-  }
-
-#else
-#define psh1_print_zone( x )  do { } while ( 0 )
-#endif
-
-  /* setup interpolation zones once the hints have been grid-fitted */
-  /* by the optimizer                                               */
-  static void
-  psh1_hint_table_setup_zones( PSH1_Hint_Table  table,
-                               FT_Fixed         scale,
-                               FT_Fixed         delta )
-  {
-    FT_UInt     count;
-    PSH1_Zone   zone;
-    PSH1_Hint  *sort, hint, hint2;
-
-
-    zone  = table->zones;
-
-    /* special case, no hints defined */
-    if ( table->num_hints == 0 )
-    {
-      zone->scale = scale;
-      zone->delta = delta;
-      zone->min   = PSH1_ZONE_MIN;
-      zone->max   = PSH1_ZONE_MAX;
-
-      table->num_zones = 1;
-      table->zone      = zone;
-      return;
-    }
-
-    /* the first zone is before the first hint    */
-    /* x' = (x-x0)*s + x0' = x*s + ( x0' - x0*s ) */
-
-    sort = table->sort;
-    hint = sort[0];
-
-    zone->scale = scale;
-    zone->delta = hint->cur_pos - FT_MulFix( hint->org_pos, scale );
-    zone->min   = PSH1_ZONE_MIN;
-    zone->max   = hint->org_pos;
-
-    psh1_print_zone( zone );
-
-    zone++;
-
-    for ( count = table->num_hints; count > 0; count-- )
-    {
-      FT_Fixed  scale2;
-
-
-      if ( hint->org_len > 0 )
-      {
-        /* setup a zone for inner-stem interpolation */
-        /* (x' - x0') = (x - x0)*(x1'-x0')/(x1-x0)   */
-        /* x' = x*s2 + x0' - x0*s2                   */
-
-        scale2      = FT_DivFix( hint->cur_len, hint->org_len );
-        zone->scale = scale2;
-        zone->min   = hint->org_pos;
-        zone->max   = hint->org_pos + hint->org_len;
-        zone->delta = hint->cur_pos - FT_MulFix( zone->min, scale2 );
-
-        psh1_print_zone( zone );
-
-        zone++;
-      }
-
-      if ( count == 1 )
-        break;
-
-      sort++;
-      hint2 = sort[0];
-
-      /* setup zone for inter-stem interpolation */
-      /* (x'-x1') = (x-x1)*(x2'-x1')/(x2-x1)     */
-      /* x' = x*s3 + x1' - x1*s3                 */
-
-      scale2 = FT_DivFix( hint2->cur_pos - (hint->cur_pos + hint->cur_len),
-                          hint2->org_pos - (hint->org_pos + hint->org_len) );
-      zone->scale = scale2;
-      zone->min   = hint->org_pos + hint->org_len;
-      zone->max   = hint2->org_pos;
-      zone->delta = hint->cur_pos + hint->cur_len -
-                    FT_MulFix( zone->min, scale2 );
-
-      psh1_print_zone( zone );
-
-      zone++;
-
-      hint = hint2;
-    }
-
-    /* the last zone */
-    zone->scale = scale;
-    zone->min   = hint->org_pos + hint->org_len;
-    zone->max   = PSH1_ZONE_MAX;
-    zone->delta = hint->cur_pos + hint->cur_len -
-                  FT_MulFix( zone->min, scale );
-
-    psh1_print_zone( zone );
-
-    zone++;
-
-    table->num_zones = zone - table->zones;
-    table->zone      = table->zones;
-  }
-
-
-  /* tune a single coordinate with the current interpolation zones */
-  static FT_Pos
-  psh1_hint_table_tune_coord( PSH1_Hint_Table  table,
-                              FT_Int           coord )
-  {
-    PSH1_Zone   zone;
-
-
-    zone = table->zone;
-
-    if ( coord < zone->min )
-    {
-      do
-      {
-        if ( zone == table->zones )
-          break;
-
-        zone--;
-
-      } while ( coord < zone->min );
-      table->zone = zone;
-    }
-    else if ( coord > zone->max )
-    {
-      do
-      {
-        if ( zone == table->zones + table->num_zones - 1 )
-          break;
-
-        zone++;
-
-      } while ( coord > zone->max );
-      table->zone = zone;
-    }
-
-    return FT_MulFix( coord, zone->scale ) + zone->delta;
-  }
-
-
-  /* tune a given outline with current interpolation zones. */
-  /* The function only works in a single dimension.         */
-  static void
-  psh1_hint_table_tune_outline( PSH1_Hint_Table  table,
-                                FT_Outline*      outline,
-                                PSH_Globals      globals,
-                                FT_Int           vertical )
-
-  {
-    FT_UInt         count, first, last;
-    PS_Mask_Table   hint_masks = table->hint_masks;
-    PS_Mask         mask;
-    PSH_Dimension   dim        = &globals->dimension[vertical];
-    FT_Fixed        scale      = dim->scale_mult;
-    FT_Fixed        delta      = dim->scale_delta;
-
-
-    if ( hint_masks && hint_masks->num_masks > 0 )
-    {
-      first = 0;
-      mask  = hint_masks->masks;
-      count = hint_masks->num_masks;
-
-      for ( ; count > 0; count--, mask++ )
-      {
-        last = mask->end_point;
-
-        if ( last > first )
-        {
-          FT_Vector*   vec;
-          FT_Int       count2;
-
-
-          psh1_hint_table_activate_mask( table, mask );
-          psh1_hint_table_optimize( table, globals, outline, vertical );
-          psh1_hint_table_setup_zones( table, scale, delta );
-          last = mask->end_point;
-
-          vec    = outline->points + first;
-          count2 = last - first;
-
-          for ( ; count2 > 0; count2--, vec++ )
-          {
-            FT_Pos  x, *px;
-
-
-            px  = vertical ? &vec->x : &vec->y;
-            x   = *px;
-
-            *px = psh1_hint_table_tune_coord( table, (FT_Int)x );
-          }
-        }
-
-        first = last;
-      }
-    }
-    else    /* no hints in this glyph, simply scale the outline */
-    {
-      FT_Vector*  vec;
-
-
-      vec   = outline->points;
-      count = outline->n_points;
-
-      if ( vertical )
-      {
-        for ( ; count > 0; count--, vec++ )
-          vec->x = FT_MulFix( vec->x, scale ) + delta;
-      }
-      else
-      {
-        for ( ; count > 0; count--, vec++ )
-          vec->y = FT_MulFix( vec->y, scale ) + delta;
-      }
-    }
-  }
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                     HIGH-LEVEL INTERFACE                      *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  FT_Error
-  ps1_hints_apply( PS_Hints        ps_hints,
-                   FT_Outline*     outline,
-                   PSH_Globals     globals,
-                   FT_Render_Mode  hint_mode )
-  {
-    PSH1_Hint_TableRec  hints;
-    FT_Error            error = 0;
-    FT_Int              dimension;
-
-
-    FT_UNUSED( hint_mode );
-
-    for ( dimension = 1; dimension >= 0; dimension-- )
-    {
-      PS_Dimension  dim = &ps_hints->dimension[dimension];
-
-
-      /* initialize hints table */
-      FT_MEM_ZERO( &hints, sizeof ( hints ) );
-      error = psh1_hint_table_init( &hints,
-                                    &dim->hints,
-                                    &dim->masks,
-                                    &dim->counters,
-                                    ps_hints->memory );
-      if ( error )
-        goto Exit;
-
-      psh1_hint_table_tune_outline( &hints,
-                                    outline,
-                                    globals,
-                                    dimension );
-
-      psh1_hint_table_done( &hints, ps_hints->memory );
-    }
-
-  Exit:
-    return error;
-  }
-
-
-/* END */
diff --git a/reactos/lib/freetype/src/pshinter/pshalgo1.h b/reactos/lib/freetype/src/pshinter/pshalgo1.h
deleted file mode 100644
index 2f795a6a587..00000000000
--- a/reactos/lib/freetype/src/pshinter/pshalgo1.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  pshalgo1.h                                                             */
-/*                                                                         */
-/*    PostScript hinting algorithm 1 (specification).                      */
-/*                                                                         */
-/*  Copyright 2001 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __PSHALGO1_H__
-#define __PSHALGO1_H__
-
-#include "pshrec.h"
-
-FT_BEGIN_HEADER
-
-  typedef struct PSH1_HintRec_*  PSH1_Hint;
-
-  typedef enum
-  {
-    PSH1_HINT_FLAG_GHOST  = PS_HINT_FLAG_GHOST,
-    PSH1_HINT_FLAG_BOTTOM = PS_HINT_FLAG_BOTTOM,
-    PSH1_HINT_FLAG_ACTIVE = 4
-
-  } PSH1_Hint_Flags;
-
-#define psh1_hint_is_active( x )                          \
-          ( ( (x)->flags & PSH1_HINT_FLAG_ACTIVE ) != 0 )
-#define psh1_hint_is_ghost( x )                          \
-          ( ( (x)->flags & PSH1_HINT_FLAG_GHOST ) != 0 )
-
-#define psh1_hint_activate( x )    (x)->flags |= PSH1_HINT_FLAG_ACTIVE
-#define psh1_hint_deactivate( x )  (x)->flags &= ~PSH1_HINT_FLAG_ACTIVE
-
-  typedef struct  PSH1_HintRec_
-  {
-    FT_Int     org_pos;
-    FT_Int     org_len;
-    FT_Pos     cur_pos;
-    FT_Pos     cur_len;
-
-    FT_UInt    flags;
-
-    PSH1_Hint  parent;
-    FT_Int     order;
-
-  } PSH1_HintRec;
-
-
-  /* this is an interpolation zone used for strong points;  */
-  /* weak points are interpolated according to their strong */
-  /* neighbours                                             */
-  typedef struct  PSH1_ZoneRec_
-  {
-    FT_Fixed  scale;
-    FT_Fixed  delta;
-    FT_Pos    min;
-    FT_Pos    max;
-
-  } PSH1_ZoneRec, *PSH1_Zone;
-
-
-  typedef struct  PSH1_Hint_TableRec_
-  {
-    FT_UInt        max_hints;
-    FT_UInt        num_hints;
-    PSH1_Hint      hints;
-    PSH1_Hint*     sort;
-    PSH1_Hint*     sort_global;
-    FT_UInt        num_zones;
-    PSH1_Zone      zones;
-    PSH1_Zone      zone;
-    PS_Mask_Table  hint_masks;
-    PS_Mask_Table  counter_masks;
-
-  } PSH1_Hint_TableRec, *PSH1_Hint_Table;
-
-
-  extern FT_Error
-  ps1_hints_apply( PS_Hints        ps_hints,
-                   FT_Outline*     outline,
-                   PSH_Globals     globals,
-                   FT_Render_Mode  hint_mode );
-
-
-#ifdef DEBUG_HINTER
-  extern  PSH1_Hint_Table  ps1_debug_hint_table;
-
-  typedef void
-  (*PSH1_HintFunc)( PSH1_Hint  hint,
-                    FT_Bool    vertical );
-
-  extern PSH1_HintFunc  ps1_debug_hint_func;
-#endif
-
-FT_END_HEADER
-
-#endif /* __PSHALGO1_H__ */
-
-
-/* END */
diff --git a/reactos/lib/freetype/src/pshinter/pshalgo2.c b/reactos/lib/freetype/src/pshinter/pshalgo2.c
deleted file mode 100644
index c0a9265b616..00000000000
--- a/reactos/lib/freetype/src/pshinter/pshalgo2.c
+++ /dev/null
@@ -1,1557 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  pshalgo2.c                                                             */
-/*                                                                         */
-/*    PostScript hinting algorithm 2 (body).                               */
-/*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used        */
-/*  modified and distributed under the terms of the FreeType project       */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
-#include "pshalgo2.h"
-
-#undef  FT_COMPONENT
-#define FT_COMPONENT  trace_pshalgo2
-
-#ifdef DEBUG_HINTER
-  PSH2_Hint_Table  ps2_debug_hint_table = 0;
-  PSH2_HintFunc    ps2_debug_hint_func  = 0;
-  PSH2_Glyph       ps2_debug_glyph      = 0;
-#endif
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                  BASIC HINTS RECORDINGS                       *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* return true iff two stem hints overlap */
-  static FT_Int
-  psh2_hint_overlap( PSH2_Hint  hint1,
-                     PSH2_Hint  hint2 )
-  {
-    return ( hint1->org_pos + hint1->org_len >= hint2->org_pos &&
-             hint2->org_pos + hint2->org_len >= hint1->org_pos );
-  }
-
-
-  /* destroy hints table */
-  static void
-  psh2_hint_table_done( PSH2_Hint_Table  table,
-                        FT_Memory        memory )
-  {
-    FT_FREE( table->zones );
-    table->num_zones = 0;
-    table->zone      = 0;
-
-    FT_FREE( table->sort );
-    FT_FREE( table->hints );
-    table->num_hints   = 0;
-    table->max_hints   = 0;
-    table->sort_global = 0;
-  }
-
-
-  /* deactivate all hints in a table */
-  static void
-  psh2_hint_table_deactivate( PSH2_Hint_Table  table )
-  {
-    FT_UInt   count = table->max_hints;
-    PSH2_Hint  hint  = table->hints;
-
-
-    for ( ; count > 0; count--, hint++ )
-    {
-      psh2_hint_deactivate( hint );
-      hint->order = -1;
-    }
-  }
-
-
-  /* internal function used to record a new hint */
-  static void
-  psh2_hint_table_record( PSH2_Hint_Table  table,
-                          FT_UInt          idx )
-  {
-    PSH2_Hint  hint = table->hints + idx;
-
-
-    if ( idx >= table->max_hints )
-    {
-      FT_ERROR(( "%s.activate: invalid hint index %d\n", idx ));
-      return;
-    }
-
-    /* ignore active hints */
-    if ( psh2_hint_is_active( hint ) )
-      return;
-
-    psh2_hint_activate( hint );
-
-    /* now scan the current active hint set in order to determine */
-    /* if we are overlapping with another segment                 */
-    {
-      PSH2_Hint*  sorted = table->sort_global;
-      FT_UInt     count  = table->num_hints;
-      PSH2_Hint   hint2;
-
-
-      hint->parent = 0;
-      for ( ; count > 0; count--, sorted++ )
-      {
-        hint2 = sorted[0];
-
-        if ( psh2_hint_overlap( hint, hint2 ) )
-        {
-          hint->parent = hint2;
-          break;
-        }
-      }
-    }
-
-    if ( table->num_hints < table->max_hints )
-      table->sort_global[table->num_hints++] = hint;
-    else
-      FT_ERROR(( "%s.activate: too many sorted hints!  BUG!\n",
-                 "ps.fitter" ));
-  }
-
-
-  static void
-  psh2_hint_table_record_mask( PSH2_Hint_Table  table,
-                               PS_Mask          hint_mask )
-  {
-    FT_Int    mask = 0, val = 0;
-    FT_Byte*  cursor = hint_mask->bytes;
-    FT_UInt   idx, limit;
-
-
-    limit = hint_mask->num_bits;
-
-    for ( idx = 0; idx < limit; idx++ )
-    {
-      if ( mask == 0 )
-      {
-        val  = *cursor++;
-        mask = 0x80;
-      }
-
-      if ( val & mask )
-        psh2_hint_table_record( table, idx );
-
-      mask >>= 1;
-    }
-  }
-
-
-  /* create hints table */
-  static FT_Error
-  psh2_hint_table_init( PSH2_Hint_Table  table,
-                        PS_Hint_Table    hints,
-                        PS_Mask_Table    hint_masks,
-                        PS_Mask_Table    counter_masks,
-                        FT_Memory        memory )
-  {
-    FT_UInt   count = hints->num_hints;
-    FT_Error  error;
-
-    FT_UNUSED( counter_masks );
-
-
-    /* allocate our tables */
-    if ( FT_NEW_ARRAY( table->sort,  2 * count     ) ||
-         FT_NEW_ARRAY( table->hints,     count     ) ||
-         FT_NEW_ARRAY( table->zones, 2 * count + 1 ) )
-      goto Exit;
-
-    table->max_hints   = count;
-    table->sort_global = table->sort + count;
-    table->num_hints   = 0;
-    table->num_zones   = 0;
-    table->zone        = 0;
-
-    /* now, initialize the "hints" array */
-    {
-      PSH2_Hint  write = table->hints;
-      PS_Hint    read  = hints->hints;
-
-
-      for ( ; count > 0; count--, write++, read++ )
-      {
-        write->org_pos = read->pos;
-        write->org_len = read->len;
-        write->flags   = read->flags;
-      }
-    }
-
-    /* we now need to determine the initial "parent" stems; first  */
-    /* activate the hints that are given by the initial hint masks */
-    if ( hint_masks )
-    {
-      FT_UInt  Count = hint_masks->num_masks;
-      PS_Mask  Mask  = hint_masks->masks;
-
-
-      table->hint_masks = hint_masks;
-
-      for ( ; Count > 0; Count--, Mask++ )
-        psh2_hint_table_record_mask( table, Mask );
-    }
-
-    /* now, do a linear parse in case some hints were left alone */
-    if ( table->num_hints != table->max_hints )
-    {
-      FT_UInt   Index, Count;
-
-
-      FT_ERROR(( "%s.init: missing/incorrect hint masks!\n" ));
-      Count = table->max_hints;
-      for ( Index = 0; Index < Count; Index++ )
-        psh2_hint_table_record( table, Index );
-    }
-
-  Exit:
-    return error;
-  }
-
-
-  static void
-  psh2_hint_table_activate_mask( PSH2_Hint_Table  table,
-                                 PS_Mask          hint_mask )
-  {
-    FT_Int    mask = 0, val = 0;
-    FT_Byte*  cursor = hint_mask->bytes;
-    FT_UInt   idx, limit, count;
-
-
-    limit = hint_mask->num_bits;
-    count = 0;
-
-    psh2_hint_table_deactivate( table );
-
-    for ( idx = 0; idx < limit; idx++ )
-    {
-      if ( mask == 0 )
-      {
-        val  = *cursor++;
-        mask = 0x80;
-      }
-
-      if ( val & mask )
-      {
-        PSH2_Hint  hint = &table->hints[idx];
-
-
-        if ( !psh2_hint_is_active( hint ) )
-        {
-          FT_UInt     count2;
-
-#if 0
-          PSH2_Hint*  sort = table->sort;
-          PSH2_Hint   hint2;
-
-          for ( count2 = count; count2 > 0; count2--, sort++ )
-          {
-            hint2 = sort[0];
-            if ( psh2_hint_overlap( hint, hint2 ) )
-              FT_ERROR(( "%s.activate_mask: found overlapping hints\n",
-                         "psf.hint" ));
-          }
-#else
-          count2 = 0;
-#endif
-
-          if ( count2 == 0 )
-          {
-            psh2_hint_activate( hint );
-            if ( count < table->max_hints )
-              table->sort[count++] = hint;
-            else
-              FT_ERROR(( "%s.activate_mask: too many active hints\n",
-                         "psf.hint" ));
-          }
-        }
-      }
-
-      mask >>= 1;
-    }
-    table->num_hints = count;
-
-    /* now, sort the hints; they are guaranteed to not overlap */
-    /* so we can compare their "org_pos" field directly        */
-    {
-      FT_Int      i1, i2;
-      PSH2_Hint   hint1, hint2;
-      PSH2_Hint*  sort = table->sort;
-
-
-      /* a simple bubble sort will do, since in 99% of cases, the hints */
-      /* will be already sorted -- and the sort will be linear          */
-      for ( i1 = 1; i1 < (FT_Int)count; i1++ )
-      {
-        hint1 = sort[i1];
-        for ( i2 = i1 - 1; i2 >= 0; i2-- )
-        {
-          hint2 = sort[i2];
-
-          if ( hint2->org_pos < hint1->org_pos )
-            break;
-
-          sort[i2 + 1] = hint2;
-          sort[i2]     = hint1;
-        }
-      }
-    }
-  }
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****               HINTS GRID-FITTING AND OPTIMIZATION             *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#ifdef DEBUG_HINTER
-  static void
-  ps2_simple_scale( PSH2_Hint_Table  table,
-                    FT_Fixed         scale,
-                    FT_Fixed         delta,
-                    FT_Int           dimension )
-  {
-    PSH2_Hint  hint;
-    FT_UInt    count;
-
-
-    for ( count = 0; count < table->max_hints; count++ )
-    {
-      hint = table->hints + count;
-
-      hint->cur_pos = FT_MulFix( hint->org_pos, scale ) + delta;
-      hint->cur_len = FT_MulFix( hint->org_len, scale );
-
-      if ( ps2_debug_hint_func )
-        ps2_debug_hint_func( hint, dimension );
-    }
-  }
-#endif
-
-
-  static void
-  psh2_hint_align( PSH2_Hint    hint,
-                   PSH_Globals  globals,
-                   FT_Int       dimension )
-  {
-    PSH_Dimension  dim   = &globals->dimension[dimension];
-    FT_Fixed       scale = dim->scale_mult;
-    FT_Fixed       delta = dim->scale_delta;
-
-
-    if ( !psh2_hint_is_fitted(hint) )
-    {
-      FT_Pos  pos = FT_MulFix( hint->org_pos, scale ) + delta;
-      FT_Pos  len = FT_MulFix( hint->org_len, scale );
-
-      FT_Pos  fit_center;
-      FT_Pos  fit_len;
-
-      PSH_AlignmentRec  align;
-
-
-      /* compute fitted width/height */
-      fit_len = 0;
-      if ( hint->org_len )
-      {
-        fit_len = psh_dimension_snap_width( dim, hint->org_len );
-        if ( fit_len < 64 )
-          fit_len = 64;
-        else
-          fit_len = ( fit_len + 32 ) & -64;
-      }
-
-      hint->cur_len = fit_len;
-
-      /* check blue zones for horizontal stems */
-      align.align = PSH_BLUE_ALIGN_NONE;
-      align.align_bot = align.align_top = 0;
-
-      if ( dimension == 1 )
-        psh_blues_snap_stem( &globals->blues,
-                             hint->org_pos + hint->org_len,
-                             hint->org_pos,
-                             &align );
-
-      switch ( align.align )
-      {
-      case PSH_BLUE_ALIGN_TOP:
-        /* the top of the stem is aligned against a blue zone */
-        hint->cur_pos = align.align_top - fit_len;
-        break;
-
-      case PSH_BLUE_ALIGN_BOT:
-        /* the bottom of the stem is aligned against a blue zone */
-        hint->cur_pos = align.align_bot;
-        break;
-
-      case PSH_BLUE_ALIGN_TOP | PSH_BLUE_ALIGN_BOT:
-        /* both edges of the stem are aligned against blue zones */
-        hint->cur_pos = align.align_bot;
-        hint->cur_len = align.align_top - align.align_bot;
-        break;
-
-      default:
-        {
-          PSH2_Hint  parent = hint->parent;
-
-
-          if ( parent )
-          {
-            FT_Pos  par_org_center, par_cur_center;
-            FT_Pos  cur_org_center, cur_delta;
-
-
-            /* ensure that parent is already fitted */
-            if ( !psh2_hint_is_fitted( parent ) )
-              psh2_hint_align( parent, globals, dimension );
-
-            par_org_center = parent->org_pos + ( parent->org_len / 2);
-            par_cur_center = parent->cur_pos + ( parent->cur_len / 2);
-            cur_org_center = hint->org_pos   + ( hint->org_len   / 2);
-
-            cur_delta = FT_MulFix( cur_org_center - par_org_center, scale );
-#if 0
-            if ( cur_delta >= 0 )
-              cur_delta = ( cur_delta + 16 ) & -64;
-            else
-              cur_delta = -( (-cur_delta + 16 ) & -64 );
-#endif
-            pos = par_cur_center + cur_delta - ( len >> 1 );
-          }
-
-          /* normal processing */
-          if ( ( fit_len / 64 ) & 1 )
-          {
-            /* odd number of pixels */
-            fit_center = ( ( pos + ( len >> 1 ) ) & -64 ) + 32;
-          }
-          else
-          {
-            /* even number of pixels */
-            fit_center = ( pos + ( len >> 1 ) + 32 ) & -64;
-          }
-
-          hint->cur_pos = fit_center - ( fit_len >> 1 );
-        }
-      }
-
-      psh2_hint_set_fitted( hint );
-
-#ifdef DEBUG_HINTER
-      if ( ps2_debug_hint_func )
-        ps2_debug_hint_func( hint, dimension );
-#endif
-    }
-  }
-
-
-  static void
-  psh2_hint_table_align_hints( PSH2_Hint_Table  table,
-                               PSH_Globals      globals,
-                               FT_Int           dimension )
-  {
-    PSH2_Hint      hint;
-    FT_UInt        count;
-
-#ifdef DEBUG_HINTER
-    PSH_Dimension  dim   = &globals->dimension[dimension];
-    FT_Fixed       scale = dim->scale_mult;
-    FT_Fixed       delta = dim->scale_delta;
-
-
-    if ( ps_debug_no_vert_hints && dimension == 0 )
-    {
-      ps2_simple_scale( table, scale, delta, dimension );
-      return;
-    }
-
-    if ( ps_debug_no_horz_hints && dimension == 1 )
-    {
-      ps2_simple_scale( table, scale, delta, dimension );
-      return;
-    }
-#endif
-
-    hint  = table->hints;
-    count = table->max_hints;
-
-    for ( ; count > 0; count--, hint++ )
-      psh2_hint_align( hint, globals, dimension );
-  }
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                POINTS INTERPOLATION ROUTINES                  *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#define PSH2_ZONE_MIN  -3200000
-#define PSH2_ZONE_MAX  +3200000
-
-#define xxDEBUG_ZONES
-
-
-#ifdef DEBUG_ZONES
-
-#include <stdio.h>
-
-  static void
-  psh2_print_zone( PSH2_Zone  zone )
-  {
-    printf( "zone [scale,delta,min,max] = [%.3f,%.3f,%d,%d]\n",
-             zone->scale/65536.0,
-             zone->delta/64.0,
-             zone->min,
-             zone->max );
-  }
-
-#else
-
-#define psh2_print_zone( x )   do { } while ( 0 )
-
-#endif
-
-#if 0
-  /* setup interpolation zones once the hints have been grid-fitted */
-  /* by the optimizer                                               */
-  static void
-  psh2_hint_table_setup_zones( PSH2_Hint_Table  table,
-                               FT_Fixed         scale,
-                               FT_Fixed         delta )
-  {
-    FT_UInt     count;
-    PSH2_Zone   zone;
-    PSH2_Hint  *sort, hint, hint2;
-
-
-    zone = table->zones;
-
-    /* special case, no hints defined */
-    if ( table->num_hints == 0 )
-    {
-      zone->scale = scale;
-      zone->delta = delta;
-      zone->min   = PSH2_ZONE_MIN;
-      zone->max   = PSH2_ZONE_MAX;
-
-      table->num_zones = 1;
-      table->zone      = zone;
-      return;
-    }
-
-    /* the first zone is before the first hint */
-    /* x' = (x-x0)*s + x0' = x*s + ( x0' - x0*s ) */
-    sort = table->sort;
-    hint = sort[0];
-
-    zone->scale = scale;
-    zone->delta = hint->cur_pos - FT_MulFix( hint->org_pos, scale );
-    zone->min   = PSH2_ZONE_MIN;
-    zone->max   = hint->org_pos;
-
-    psh2_print_zone( zone );
-
-    zone++;
-
-    for ( count = table->num_hints; count > 0; count-- )
-    {
-      FT_Fixed  scale2;
-
-
-      if ( hint->org_len > 0 )
-      {
-        /* setup a zone for inner-stem interpolation */
-        /* (x' - x0') = (x - x0)*(x1'-x0')/(x1-x0)   */
-        /* x' = x*s2 + x0' - x0*s2                   */
-
-        scale2      = FT_DivFix( hint->cur_len, hint->org_len );
-        zone->scale = scale2;
-        zone->min   = hint->org_pos;
-        zone->max   = hint->org_pos + hint->org_len;
-        zone->delta = hint->cur_pos - FT_MulFix( zone->min, scale2 );
-
-        psh2_print_zone( zone );
-
-        zone++;
-      }
-
-      if ( count == 1 )
-        break;
-
-      sort++;
-      hint2 = sort[0];
-
-      /* setup zone for inter-stem interpolation */
-      /* (x'-x1') = (x-x1)*(x2'-x1')/(x2-x1)     */
-      /* x' = x*s3 + x1' - x1*s3                 */
-
-      scale2 = FT_DivFix( hint2->cur_pos - (hint->cur_pos + hint->cur_len),
-                          hint2->org_pos - (hint->org_pos + hint->org_len) );
-      zone->scale = scale2;
-      zone->min   = hint->org_pos + hint->org_len;
-      zone->max   = hint2->org_pos;
-      zone->delta = hint->cur_pos + hint->cur_len -
-                    FT_MulFix( zone->min, scale2 );
-
-      psh2_print_zone( zone );
-
-      zone++;
-
-      hint = hint2;
-    }
-
-    /* the last zone */
-    zone->scale = scale;
-    zone->min   = hint->org_pos + hint->org_len;
-    zone->max   = PSH2_ZONE_MAX;
-    zone->delta = hint->cur_pos + hint->cur_len -
-                  FT_MulFix( zone->min, scale );
-
-    psh2_print_zone( zone );
-
-    zone++;
-
-    table->num_zones = zone - table->zones;
-    table->zone      = table->zones;
-  }
-#endif
-
-#if 0
-  /* tune a single coordinate with the current interpolation zones */
-  static FT_Pos
-  psh2_hint_table_tune_coord( PSH2_Hint_Table  table,
-                              FT_Int           coord )
-  {
-    PSH2_Zone   zone;
-
-
-    zone = table->zone;
-
-    if ( coord < zone->min )
-    {
-      do
-      {
-        if ( zone == table->zones )
-          break;
-
-        zone--;
-
-      } while ( coord < zone->min );
-      table->zone = zone;
-    }
-    else if ( coord > zone->max )
-    {
-      do
-      {
-        if ( zone == table->zones + table->num_zones - 1 )
-          break;
-
-        zone++;
-
-      } while ( coord > zone->max );
-      table->zone = zone;
-    }
-
-    return FT_MulFix( coord, zone->scale ) + zone->delta;
-  }
-#endif
-
-#if 0
- /* tune a given outline with current interpolation zones */
- /* the function only works in a single dimension..       */
-  static void
-  psh2_hint_table_tune_outline( PSH2_Hint_Table  table,
-                                FT_Outline*      outline,
-                                PSH_Globals      globals,
-                                FT_Int           dimension )
-
-  {
-    FT_UInt        count, first, last;
-    PS_Mask_Table  hint_masks = table->hint_masks;
-    PS_Mask        mask;
-    PSH_Dimension  dim        = &globals->dimension[dimension];
-    FT_Fixed       scale      = dim->scale_mult;
-    FT_Fixed       delta      = dim->scale_delta;
-
-
-    if ( hint_masks && hint_masks->num_masks > 0 )
-    {
-      first = 0;
-      mask  = hint_masks->masks;
-      count = hint_masks->num_masks;
-
-      for ( ; count > 0; count--, mask++ )
-      {
-        last = mask->end_point;
-
-        if ( last > first )
-        {
-          FT_Vector*   vec;
-          FT_Int       count2;
-
-
-          psh2_hint_table_activate_mask( table, mask );
-          psh2_hint_table_optimize( table, globals, outline, dimension );
-          psh2_hint_table_setup_zones( table, scale, delta );
-          last = mask->end_point;
-
-          vec    = outline->points + first;
-          count2 = last - first;
-
-          for ( ; count2 > 0; count2--, vec++ )
-          {
-            FT_Pos  x, *px;
-
-
-            px  = dimension ? &vec->y : &vec->x;
-            x   = *px;
-
-            *px = psh2_hint_table_tune_coord( table, (FT_Int)x );
-          }
-        }
-
-        first = last;
-      }
-    }
-    else    /* no hints in this glyph, simply scale the outline */
-    {
-      FT_Vector*  vec;
-
-
-      vec   = outline->points;
-      count = outline->n_points;
-
-      if ( dimension == 0 )
-      {
-        for ( ; count > 0; count--, vec++ )
-          vec->x = FT_MulFix( vec->x, scale ) + delta;
-      }
-      else
-      {
-        for ( ; count > 0; count--, vec++ )
-          vec->y = FT_MulFix( vec->y, scale ) + delta;
-      }
-    }
-  }
-#endif
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                    HINTER GLYPH MANAGEMENT                    *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  static int
-  psh2_point_is_extremum( PSH2_Point  point )
-  {
-    PSH2_Point  before = point;
-    PSH2_Point  after  = point;
-    FT_Pos      d_before;
-    FT_Pos      d_after;
-
-
-    do
-    {
-      before = before->prev;
-      if ( before == point )
-        return 0;
-
-      d_before = before->org_u - point->org_u;
-
-    } while ( d_before == 0 );
-
-    do
-    {
-      after = after->next;
-      if ( after == point )
-        return 0;
-
-      d_after = after->org_u - point->org_u;
-
-    } while ( d_after == 0 );
-
-    return ( ( d_before > 0 && d_after > 0 ) ||
-             ( d_before < 0 && d_after < 0 ) );
-  }
-
-
-  static void
-  psh2_glyph_done( PSH2_Glyph  glyph )
-  {
-    FT_Memory  memory = glyph->memory;
-
-
-    psh2_hint_table_done( &glyph->hint_tables[1], memory );
-    psh2_hint_table_done( &glyph->hint_tables[0], memory );
-
-    FT_FREE( glyph->points );
-    FT_FREE( glyph->contours );
-
-    glyph->num_points   = 0;
-    glyph->num_contours = 0;
-
-    glyph->memory = 0;
-  }
-
-
-  static int
-  psh2_compute_dir( FT_Pos  dx,
-                    FT_Pos  dy )
-  {
-    FT_Pos  ax, ay;
-    int     result = PSH2_DIR_NONE;
-
-
-    ax = ( dx >= 0 ) ? dx : -dx;
-    ay = ( dy >= 0 ) ? dy : -dy;
-
-    if ( ay * 12 < ax )
-    {
-      /* |dy| <<< |dx|  means a near-horizontal segment */
-      result = ( dx >= 0 ) ? PSH2_DIR_RIGHT : PSH2_DIR_LEFT;
-    }
-    else if ( ax * 12 < ay )
-    {
-      /* |dx| <<< |dy|  means a near-vertical segment */
-      result = ( dy >= 0 ) ? PSH2_DIR_UP : PSH2_DIR_DOWN;
-    }
-
-    return result;
-  }
-
-
-  static FT_Error
-  psh2_glyph_init( PSH2_Glyph   glyph,
-                   FT_Outline*  outline,
-                   PS_Hints     ps_hints,
-                   PSH_Globals  globals )
-  {
-    FT_Error   error;
-    FT_Memory  memory;
-
-
-    /* clear all fields */
-    FT_MEM_ZERO( glyph, sizeof ( *glyph ) );
-
-    memory = globals->memory;
-
-    /* allocate and setup points + contours arrays */
-    if ( FT_NEW_ARRAY( glyph->points,   outline->n_points   ) ||
-         FT_NEW_ARRAY( glyph->contours, outline->n_contours ) )
-      goto Exit;
-
-    glyph->num_points   = outline->n_points;
-    glyph->num_contours = outline->n_contours;
-
-    {
-      FT_UInt       first = 0, next, n;
-      PSH2_Point    points  = glyph->points;
-      PSH2_Contour  contour = glyph->contours;
-
-
-      for ( n = 0; n < glyph->num_contours; n++ )
-      {
-        FT_Int      count;
-        PSH2_Point  point;
-
-
-        next  = outline->contours[n] + 1;
-        count = next - first;
-
-        contour->start = points + first;
-        contour->count = (FT_UInt)count;
-
-        if ( count > 0 )
-        {
-          point = points + first;
-
-          point->prev    = points + next - 1;
-          point->contour = contour;
-
-          for ( ; count > 1; count-- )
-          {
-            point[0].next = point + 1;
-            point[1].prev = point;
-            point++;
-            point->contour = contour;
-          }
-          point->next = points + first;
-        }
-
-        contour++;
-        first = next;
-      }
-    }
-
-    {
-      PSH2_Point  points = glyph->points;
-      PSH2_Point  point  = points;
-      FT_Vector*  vec    = outline->points;
-      FT_UInt     n;
-
-
-      for ( n = 0; n < glyph->num_points; n++, point++ )
-      {
-        FT_Int  n_prev = point->prev - points;
-        FT_Int  n_next = point->next - points;
-        FT_Pos  dxi, dyi, dxo, dyo;
-
-
-        if ( !( outline->tags[n] & FT_CURVE_TAG_ON ) )
-          point->flags = PSH2_POINT_OFF;
-
-        dxi = vec[n].x - vec[n_prev].x;
-        dyi = vec[n].y - vec[n_prev].y;
-
-        point->dir_in = (FT_Char)psh2_compute_dir( dxi, dyi );
-
-        dxo = vec[n_next].x - vec[n].x;
-        dyo = vec[n_next].y - vec[n].y;
-
-        point->dir_out = (FT_Char)psh2_compute_dir( dxo, dyo );
-
-        /* detect smooth points */
-        if ( point->flags & PSH2_POINT_OFF )
-          point->flags |= PSH2_POINT_SMOOTH;
-        else if ( point->dir_in  != PSH2_DIR_NONE ||
-                  point->dir_out != PSH2_DIR_NONE )
-        {
-          if ( point->dir_in == point->dir_out )
-            point->flags |= PSH2_POINT_SMOOTH;
-        }
-        else
-        {
-          FT_Angle  angle_in, angle_out, diff;
-
-
-          angle_in  = FT_Atan2( dxi, dyi );
-          angle_out = FT_Atan2( dxo, dyo );
-
-          diff = angle_in - angle_out;
-          if ( diff < 0 )
-            diff = -diff;
-
-          if ( diff > FT_ANGLE_PI )
-            diff = FT_ANGLE_2PI - diff;
-
-          if ( diff < FT_ANGLE_PI / 16 )
-            point->flags |= PSH2_POINT_SMOOTH;
-        }
-      }
-    }
-
-    glyph->memory  = memory;
-    glyph->outline = outline;
-    glyph->globals = globals;
-
-    /* now deal with hints tables */
-    error = psh2_hint_table_init( &glyph->hint_tables [0],
-                                  &ps_hints->dimension[0].hints,
-                                  &ps_hints->dimension[0].masks,
-                                  &ps_hints->dimension[0].counters,
-                                  memory );
-    if ( error )
-      goto Exit;
-
-    error = psh2_hint_table_init( &glyph->hint_tables [1],
-                                  &ps_hints->dimension[1].hints,
-                                  &ps_hints->dimension[1].masks,
-                                  &ps_hints->dimension[1].counters,
-                                  memory );
-    if ( error )
-      goto Exit;
-
-  Exit:
-    return error;
-  }
-
-
-  /* load outline point coordinates into hinter glyph */
-  static void
-  psh2_glyph_load_points( PSH2_Glyph  glyph,
-                          FT_Int      dimension )
-  {
-    FT_Vector*  vec   = glyph->outline->points;
-    PSH2_Point  point = glyph->points;
-    FT_UInt     count = glyph->num_points;
-
-
-    for ( ; count > 0; count--, point++, vec++ )
-    {
-      point->flags &= PSH2_POINT_OFF | PSH2_POINT_SMOOTH;
-      point->hint   = 0;
-      if ( dimension == 0 )
-        point->org_u = vec->x;
-      else
-        point->org_u = vec->y;
-
-#ifdef DEBUG_HINTER
-      point->org_x = vec->x;
-      point->org_y = vec->y;
-#endif
-    }
-  }
-
-
-  /* save hinted point coordinates back to outline */
-  static void
-  psh2_glyph_save_points( PSH2_Glyph  glyph,
-                          FT_Int      dimension )
-  {
-    FT_UInt     n;
-    PSH2_Point  point = glyph->points;
-    FT_Vector*  vec   = glyph->outline->points;
-    char*       tags  = glyph->outline->tags;
-
-
-    for ( n = 0; n < glyph->num_points; n++ )
-    {
-      if ( dimension == 0 )
-        vec[n].x = point->cur_u;
-      else
-        vec[n].y = point->cur_u;
-
-      if ( psh2_point_is_strong( point ) )
-        tags[n] |= (char)( ( dimension == 0 ) ? 32 : 64 );
-
-#ifdef DEBUG_HINTER
-      if ( dimension == 0 )
-      {
-        point->cur_x   = point->cur_u;
-        point->flags_x = point->flags;
-      }
-      else
-      {
-        point->cur_y   = point->cur_u;
-        point->flags_y = point->flags;
-      }
-#endif
-      point++;
-    }
-  }
-
-
-#define PSH2_STRONG_THRESHOLD  10
-
-
-  static void
-  psh2_hint_table_find_strong_point( PSH2_Hint_Table  table,
-                                     PSH2_Point       point,
-                                     FT_Int           major_dir )
-  {
-    PSH2_Hint*   sort      = table->sort;
-    FT_UInt      num_hints = table->num_hints;
-
-
-    for ( ; num_hints > 0; num_hints--, sort++ )
-    {
-      PSH2_Hint  hint = sort[0];
-
-
-      if ( ABS( point->dir_in )  == major_dir ||
-           ABS( point->dir_out ) == major_dir )
-      {
-        FT_Pos  d;
-
-
-        d = point->org_u - hint->org_pos;
-        if ( ABS( d ) < PSH2_STRONG_THRESHOLD )
-        {
-        Is_Strong:
-          psh2_point_set_strong( point );
-          point->hint = hint;
-          break;
-        }
-
-        d -= hint->org_len;
-        if ( ABS( d ) < PSH2_STRONG_THRESHOLD )
-          goto Is_Strong;
-      }
-
-#if 1
-      if ( point->org_u >= hint->org_pos &&
-           point->org_u <= hint->org_pos + hint->org_len &&
-           psh2_point_is_extremum( point ) )
-      {
-        /* attach to hint, but don't mark as strong */
-        point->hint = hint;
-        break;
-      }
-#endif
-    }
-  }
-
-
-  /* find strong points in a glyph */
-  static void
-  psh2_glyph_find_strong_points( PSH2_Glyph  glyph,
-                                 FT_Int      dimension )
-  {
-    /* a point is strong if it is located on a stem                   */
-    /* edge and has an "in" or "out" tangent to the hint's direction  */
-    {
-      PSH2_Hint_Table  table     = &glyph->hint_tables[dimension];
-      PS_Mask          mask      = table->hint_masks->masks;
-      FT_UInt          num_masks = table->hint_masks->num_masks;
-      FT_UInt          first     = 0;
-      FT_Int           major_dir = dimension == 0 ? PSH2_DIR_UP : PSH2_DIR_RIGHT;
-
-
-      /* process secondary hints to "selected" points */
-      if ( num_masks > 1 && glyph->num_points > 0 )
-      {
-        first = mask->end_point;
-        mask++;
-        for ( ; num_masks > 1; num_masks--, mask++ )
-        {
-          FT_UInt  next;
-          FT_Int   count;
-
-
-          next  = mask->end_point;
-          count = next - first;
-          if ( count > 0 )
-          {
-            PSH2_Point  point = glyph->points + first;
-
-
-            psh2_hint_table_activate_mask( table, mask );
-
-            for ( ; count > 0; count--, point++ )
-              psh2_hint_table_find_strong_point( table, point, major_dir );
-          }
-          first = next;
-        }
-      }
-
-      /* process primary hints for all points */
-      if ( num_masks == 1 )
-      {
-        FT_UInt     count = glyph->num_points;
-        PSH2_Point  point = glyph->points;
-
-
-        psh2_hint_table_activate_mask( table, table->hint_masks->masks );
-        for ( ; count > 0; count--, point++ )
-        {
-          if ( !psh2_point_is_strong( point ) )
-            psh2_hint_table_find_strong_point( table, point, major_dir );
-        }
-      }
-
-      /* now, certain points may have been attached to hint and */
-      /* not marked as strong; update their flags then          */
-      {
-        FT_UInt     count = glyph->num_points;
-        PSH2_Point  point = glyph->points;
-
-
-        for ( ; count > 0; count--, point++ )
-          if ( point->hint && !psh2_point_is_strong( point ) )
-            psh2_point_set_strong( point );
-      }
-    }
-  }
-
-
-  /* interpolate strong points with the help of hinted coordinates */
-  static void
-  psh2_glyph_interpolate_strong_points( PSH2_Glyph  glyph,
-                                        FT_Int      dimension )
-  {
-    PSH_Dimension    dim   = &glyph->globals->dimension[dimension];
-    FT_Fixed         scale = dim->scale_mult;
-
-
-    {
-      FT_UInt     count = glyph->num_points;
-      PSH2_Point  point = glyph->points;
-
-
-      for ( ; count > 0; count--, point++ )
-      {
-        PSH2_Hint  hint = point->hint;
-
-
-        if ( hint )
-        {
-          FT_Pos  delta;
-
-
-          delta = point->org_u - hint->org_pos;
-
-          if ( delta <= 0 )
-            point->cur_u = hint->cur_pos + FT_MulFix( delta, scale );
-
-          else if ( delta >= hint->org_len )
-            point->cur_u = hint->cur_pos + hint->cur_len +
-                           FT_MulFix( delta - hint->org_len, scale );
-
-          else if ( hint->org_len > 0 )
-            point->cur_u = hint->cur_pos +
-                           FT_MulDiv( delta, hint->cur_len, hint->org_len );
-          else
-            point->cur_u = hint->cur_pos;
-
-          psh2_point_set_fitted( point );
-        }
-      }
-    }
-  }
-
-
-  static void
-  psh2_glyph_interpolate_normal_points( PSH2_Glyph  glyph,
-                                        FT_Int      dimension )
-  {
-#if 1
-    PSH_Dimension    dim   = &glyph->globals->dimension[dimension];
-    FT_Fixed         scale = dim->scale_mult;
-
-
-    /* first technique: a point is strong if it is a local extrema */
-    {
-      FT_UInt     count = glyph->num_points;
-      PSH2_Point  point = glyph->points;
-
-
-      for ( ; count > 0; count--, point++ )
-      {
-        if ( psh2_point_is_strong( point ) )
-          continue;
-
-        /* sometimes, some local extremas are smooth points */
-        if ( psh2_point_is_smooth( point ) )
-        {
-          if ( point->dir_in == PSH2_DIR_NONE  ||
-               point->dir_in != point->dir_out )
-            continue;
-
-          if ( !psh2_point_is_extremum( point ) )
-            continue;
-
-          point->flags &= ~PSH2_POINT_SMOOTH;
-        }
-
-        /* find best enclosing point coordinates */
-        {
-          PSH2_Point  before = 0;
-          PSH2_Point  after  = 0;
-
-          FT_Pos      diff_before = -32000;
-          FT_Pos      diff_after  =  32000;
-          FT_Pos      u = point->org_u;
-
-          FT_Int      count2 = glyph->num_points;
-          PSH2_Point  cur    = glyph->points;
-
-
-          for ( ; count2 > 0; count2--, cur++ )
-          {
-            if ( psh2_point_is_strong( cur ) )
-            {
-              FT_Pos   diff = cur->org_u - u;;
-
-
-              if ( diff <= 0 )
-              {
-                if ( diff > diff_before )
-                {
-                  diff_before = diff;
-                  before      = cur;
-                }
-              }
-              else if ( diff >= 0 )
-              {
-                if ( diff < diff_after )
-                {
-                  diff_after = diff;
-                  after      = cur;
-                }
-              }
-            }
-          }
-
-          if ( !before )
-          {
-            if ( !after )
-              continue;
-
-            /* we are before the first strong point coordinate; */
-            /* simply translate the point                       */
-            point->cur_u = after->cur_u +
-                           FT_MulFix( point->org_u - after->org_u, scale );
-          }
-          else if ( !after )
-          {
-            /* we are after the last strong point coordinate; */
-            /* simply translate the point                     */
-            point->cur_u = before->cur_u +
-                           FT_MulFix( point->org_u - before->org_u, scale );
-          }
-          else
-          {
-            if ( diff_before == 0 )
-              point->cur_u = before->cur_u;
-
-            else if ( diff_after == 0 )
-              point->cur_u = after->cur_u;
-
-            else
-              point->cur_u = before->cur_u +
-                             FT_MulDiv( u - before->org_u,
-                                        after->cur_u - before->cur_u,
-                                        after->org_u - before->org_u );
-          }
-
-          psh2_point_set_fitted( point );
-        }
-      }
-    }
-#endif
-  }
-
-
-  /* interpolate other points */
-  static void
-  psh2_glyph_interpolate_other_points( PSH2_Glyph  glyph,
-                                       FT_Int      dimension )
-  {
-    PSH_Dimension dim          = &glyph->globals->dimension[dimension];
-    FT_Fixed      scale        = dim->scale_mult;
-    FT_Fixed      delta        = dim->scale_delta;
-    PSH2_Contour  contour      = glyph->contours;
-    FT_UInt       num_contours = glyph->num_contours;
-
-
-    for ( ; num_contours > 0; num_contours--, contour++ )
-    {
-      PSH2_Point   start = contour->start;
-      PSH2_Point   first, next, point;
-      FT_UInt      fit_count;
-
-
-      /* count the number of strong points in this contour */
-      next      = start + contour->count;
-      fit_count = 0;
-      first     = 0;
-
-      for ( point = start; point < next; point++ )
-        if ( psh2_point_is_fitted( point ) )
-        {
-          if ( !first )
-            first = point;
-
-          fit_count++;
-        }
-
-      /* if there are less than 2 fitted points in the contour, we */
-      /* simply scale and eventually translate the contour points  */
-      if ( fit_count < 2 )
-      {
-        if ( fit_count == 1 )
-          delta = first->cur_u - FT_MulFix( first->org_u, scale );
-
-        for ( point = start; point < next; point++ )
-          if ( point != first )
-            point->cur_u = FT_MulFix( point->org_u, scale ) + delta;
-
-        goto Next_Contour;
-      }
-
-      /* there are more than 2 strong points in this contour; we */
-      /* need to interpolate weak points between them            */
-      start = first;
-      do
-      {
-        point = first;
-
-        /* skip consecutive fitted points */
-        for (;;)
-        {
-          next = first->next;
-          if ( next == start )
-            goto Next_Contour;
-
-          if ( !psh2_point_is_fitted( next ) )
-            break;
-
-          first = next;
-        }
-
-        /* find next fitted point after unfitted one */
-        for (;;)
-        {
-          next = next->next;
-          if ( psh2_point_is_fitted( next ) )
-            break;
-        }
-
-        /* now interpolate between them */
-        {
-          FT_Pos    org_a, org_ab, cur_a, cur_ab;
-          FT_Pos    org_c, org_ac, cur_c;
-          FT_Fixed  scale_ab;
-
-
-          if ( first->org_u <= next->org_u )
-          {
-            org_a  = first->org_u;
-            cur_a  = first->cur_u;
-            org_ab = next->org_u - org_a;
-            cur_ab = next->cur_u - cur_a;
-          }
-          else
-          {
-            org_a  = next->org_u;
-            cur_a  = next->cur_u;
-            org_ab = first->org_u - org_a;
-            cur_ab = first->cur_u - cur_a;
-          }
-
-          scale_ab = 0x10000L;
-          if ( org_ab > 0 )
-            scale_ab = FT_DivFix( cur_ab, org_ab );
-
-          point = first->next;
-          do
-          {
-            org_c  = point->org_u;
-            org_ac = org_c - org_a;
-
-            if ( org_ac <= 0 )
-            {
-              /* on the left of the interpolation zone */
-              cur_c = cur_a + FT_MulFix( org_ac, scale );
-            }
-            else if ( org_ac >= org_ab )
-            {
-              /* on the right on the interpolation zone */
-              cur_c = cur_a + cur_ab + FT_MulFix( org_ac - org_ab, scale );
-            }
-            else
-            {
-              /* within the interpolation zone */
-              cur_c = cur_a + FT_MulFix( org_ac, scale_ab );
-            }
-
-            point->cur_u = cur_c;
-
-            point = point->next;
-
-          } while ( point != next );
-        }
-
-        /* keep going until all points in the contours have been processed */
-        first = next;
-
-      } while ( first != start );
-
-    Next_Contour:
-      ;
-    }
-  }
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                     HIGH-LEVEL INTERFACE                      *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  FT_Error
-  ps2_hints_apply( PS_Hints        ps_hints,
-                   FT_Outline*     outline,
-                   PSH_Globals     globals,
-                   FT_Render_Mode  hint_mode )
-  {
-    PSH2_GlyphRec  glyphrec;
-    PSH2_Glyph     glyph = &glyphrec;
-    FT_Error       error;
-#ifdef DEBUG_HINTER
-    FT_Memory      memory;
-#endif
-    FT_Int         dimension;
-
-    FT_UNUSED( hint_mode );
-
-#ifdef DEBUG_HINTER
-    memory = globals->memory;
-
-    if ( ps2_debug_glyph )
-    {
-      psh2_glyph_done( ps2_debug_glyph );
-      FT_FREE( ps2_debug_glyph );
-    }
-
-    if ( FT_NEW( glyph ) )
-      return error;
-
-    ps2_debug_glyph = glyph;
-#endif
-
-    error = psh2_glyph_init( glyph, outline, ps_hints, globals );
-    if ( error )
-      goto Exit;
-
-    for ( dimension = 0; dimension < 2; dimension++ )
-    {
-      /* load outline coordinates into glyph */
-      psh2_glyph_load_points( glyph, dimension );
-
-      /* compute aligned stem/hints positions */
-      psh2_hint_table_align_hints( &glyph->hint_tables[dimension],
-                                   glyph->globals,
-                                   dimension );
-
-      /* find strong points, align them, then interpolate others */
-      psh2_glyph_find_strong_points( glyph, dimension );
-      psh2_glyph_interpolate_strong_points( glyph, dimension );
-      psh2_glyph_interpolate_normal_points( glyph, dimension );
-      psh2_glyph_interpolate_other_points( glyph, dimension );
-
-      /* save hinted coordinates back to outline */
-      psh2_glyph_save_points( glyph, dimension );
-    }
-
-  Exit:
-#ifndef DEBUG_HINTER
-    psh2_glyph_done( glyph );
-#endif
-    return error;
-  }
-
-
-/* END */
diff --git a/reactos/lib/freetype/src/pshinter/pshalgo2.h b/reactos/lib/freetype/src/pshinter/pshalgo2.h
deleted file mode 100644
index 405d34b565a..00000000000
--- a/reactos/lib/freetype/src/pshinter/pshalgo2.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  pshalgo2.h                                                             */
-/*                                                                         */
-/*    PostScript hinting algorithm 2 (specification).                      */
-/*                                                                         */
-/*  Copyright 2001 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __PSHALGO2_H__
-#define __PSHALGO2_H__
-
-
-#include "pshrec.h"
-#include "pshglob.h"
-#include FT_TRIGONOMETRY_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef struct PSH2_HintRec_*  PSH2_Hint;
-
-  typedef enum
-  {
-    PSH2_HINT_GHOST  = PS_HINT_FLAG_GHOST,
-    PSH2_HINT_BOTTOM = PS_HINT_FLAG_BOTTOM,
-    PSH2_HINT_ACTIVE = 4,
-    PSH2_HINT_FITTED = 8
-
-  } PSH2_Hint_Flags;
-
-
-#define psh2_hint_is_active( x )  ( ( (x)->flags & PSH2_HINT_ACTIVE ) != 0 )
-#define psh2_hint_is_ghost( x )   ( ( (x)->flags & PSH2_HINT_GHOST  ) != 0 )
-#define psh2_hint_is_fitted( x )  ( ( (x)->flags & PSH2_HINT_FITTED ) != 0 )
-
-#define psh2_hint_activate( x )    (x)->flags |=  PSH2_HINT_ACTIVE
-#define psh2_hint_deactivate( x )  (x)->flags &= ~PSH2_HINT_ACTIVE
-#define psh2_hint_set_fitted( x )  (x)->flags |=  PSH2_HINT_FITTED
-
-
-  typedef struct  PSH2_HintRec_
-  {
-    FT_Int     org_pos;
-    FT_Int     org_len;
-    FT_Pos     cur_pos;
-    FT_Pos     cur_len;
-    FT_UInt    flags;
-    PSH2_Hint  parent;
-    FT_Int     order;
-
-  } PSH2_HintRec;
-
-
-  /* this is an interpolation zone used for strong points;  */
-  /* weak points are interpolated according to their strong */
-  /* neighbours                                             */
-  typedef struct  PSH2_ZoneRec_
-  {
-    FT_Fixed  scale;
-    FT_Fixed  delta;
-    FT_Pos    min;
-    FT_Pos    max;
-
-  } PSH2_ZoneRec, *PSH2_Zone;
-
-
-  typedef struct  PSH2_Hint_TableRec_
-  {
-    FT_UInt        max_hints;
-    FT_UInt        num_hints;
-    PSH2_Hint      hints;
-    PSH2_Hint*     sort;
-    PSH2_Hint*     sort_global;
-    FT_UInt        num_zones;
-    PSH2_Zone      zones;
-    PSH2_Zone      zone;
-    PS_Mask_Table  hint_masks;
-    PS_Mask_Table  counter_masks;
-
-  } PSH2_Hint_TableRec, *PSH2_Hint_Table;
-
-
-  typedef struct PSH2_PointRec_*    PSH2_Point;
-  typedef struct PSH2_ContourRec_*  PSH2_Contour;
-
-  enum
-  {
-    PSH2_DIR_NONE  =  4,
-    PSH2_DIR_UP    =  1,
-    PSH2_DIR_DOWN  = -1,
-    PSH2_DIR_LEFT  = -2,
-    PSH2_DIR_RIGHT =  2
-  };
-
-  enum
-  {
-    PSH2_POINT_OFF    = 1,   /* point is off the curve  */
-    PSH2_POINT_STRONG = 2,   /* point is strong         */
-    PSH2_POINT_SMOOTH = 4,   /* point is smooth         */
-    PSH2_POINT_FITTED = 8    /* point is already fitted */
-  };
-
-
-  typedef struct  PSH2_PointRec_
-  {
-    PSH2_Point    prev;
-    PSH2_Point    next;
-    PSH2_Contour  contour;
-    FT_UInt       flags;
-    FT_Char       dir_in;
-    FT_Char       dir_out;
-    FT_Angle      angle_in;
-    FT_Angle      angle_out;
-    PSH2_Hint     hint;
-    FT_Pos        org_u;
-    FT_Pos        cur_u;
-#ifdef DEBUG_HINTER
-    FT_Pos        org_x;
-    FT_Pos        cur_x;
-    FT_Pos        org_y;
-    FT_Pos        cur_y;
-    FT_UInt       flags_x;
-    FT_UInt       flags_y;
-#endif
-
-  } PSH2_PointRec;
-
-
-#define psh2_point_is_strong( p )   ( (p)->flags & PSH2_POINT_STRONG )
-#define psh2_point_is_fitted( p )   ( (p)->flags & PSH2_POINT_FITTED )
-#define psh2_point_is_smooth( p )   ( (p)->flags & PSH2_POINT_SMOOTH )
-
-#define psh2_point_set_strong( p )  (p)->flags |= PSH2_POINT_STRONG
-#define psh2_point_set_fitted( p )  (p)->flags |= PSH2_POINT_FITTED
-#define psh2_point_set_smooth( p )  (p)->flags |= PSH2_POINT_SMOOTH
-
-
-  typedef struct  PSH2_ContourRec_
-  {
-    PSH2_Point  start;
-    FT_UInt     count;
-
-  } PSH2_ContourRec;
-
-
-  typedef struct  PSH2_GlyphRec_
-  {
-    FT_UInt             num_points;
-    FT_UInt             num_contours;
-
-    PSH2_Point          points;
-    PSH2_Contour        contours;
-
-    FT_Memory           memory;
-    FT_Outline*         outline;
-    PSH_Globals         globals;
-    PSH2_Hint_TableRec  hint_tables[2];
-
-    FT_Bool             vertical;
-    FT_Int              major_dir;
-    FT_Int              minor_dir;
-
-  } PSH2_GlyphRec, *PSH2_Glyph;
-
-
-#ifdef DEBUG_HINTER
-  extern PSH2_Hint_Table  ps2_debug_hint_table;
-
-  typedef void
-  (*PSH2_HintFunc)( PSH2_Hint  hint,
-                    FT_Bool    vertical );
-
-  extern PSH2_HintFunc    ps2_debug_hint_func;
-
-  extern PSH2_Glyph       ps2_debug_glyph;
-#endif
-
-
-  extern FT_Error
-  ps2_hints_apply( PS_Hints        ps_hints,
-                   FT_Outline*     outline,
-                   PSH_Globals     globals,
-                   FT_Render_Mode  hint_mode );
-
-
-FT_END_HEADER
-
-
-#endif /* __PSHALGO2_H__ */
-
-
-/* END */
diff --git a/reactos/lib/freetype/src/pshinter/pshalgo3.h b/reactos/lib/freetype/src/pshinter/pshalgo3.h
deleted file mode 100644
index 7b69bb0cec1..00000000000
--- a/reactos/lib/freetype/src/pshinter/pshalgo3.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  pshalgo3.h                                                             */
-/*                                                                         */
-/*    PostScript hinting algorithm 3 (specification).                      */
-/*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __PSHALGO3_H__
-#define __PSHALGO3_H__
-
-
-#include "pshrec.h"
-#include "pshglob.h"
-#include FT_TRIGONOMETRY_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* handle to Hint structure */
-  typedef struct PSH3_HintRec_*  PSH3_Hint;
-
-  /* hint bit-flags */
-  typedef enum
-  {
-    PSH3_HINT_GHOST  = PS_HINT_FLAG_GHOST,
-    PSH3_HINT_BOTTOM = PS_HINT_FLAG_BOTTOM,
-    PSH3_HINT_ACTIVE = 4,
-    PSH3_HINT_FITTED = 8
-
-  } PSH3_Hint_Flags;
-
-
-#define psh3_hint_is_active( x )  ( ( (x)->flags & PSH3_HINT_ACTIVE ) != 0 )
-#define psh3_hint_is_ghost( x )   ( ( (x)->flags & PSH3_HINT_GHOST  ) != 0 )
-#define psh3_hint_is_fitted( x )  ( ( (x)->flags & PSH3_HINT_FITTED ) != 0 )
-
-#define psh3_hint_activate( x )    (x)->flags |=  PSH3_HINT_ACTIVE
-#define psh3_hint_deactivate( x )  (x)->flags &= ~PSH3_HINT_ACTIVE
-#define psh3_hint_set_fitted( x )  (x)->flags |=  PSH3_HINT_FITTED
-
-  /* hint structure */
-  typedef struct  PSH3_HintRec_
-  {
-    FT_Int     org_pos;
-    FT_Int     org_len;
-    FT_Pos     cur_pos;
-    FT_Pos     cur_len;
-    FT_UInt    flags;
-    PSH3_Hint  parent;
-    FT_Int     order;
-
-  } PSH3_HintRec;
-
-
-  /* this is an interpolation zone used for strong points;  */
-  /* weak points are interpolated according to their strong */
-  /* neighbours                                             */
-  typedef struct  PSH3_ZoneRec_
-  {
-    FT_Fixed  scale;
-    FT_Fixed  delta;
-    FT_Pos    min;
-    FT_Pos    max;
-
-  } PSH3_ZoneRec, *PSH3_Zone;
-
-
-  typedef struct  PSH3_Hint_TableRec_
-  {
-    FT_UInt        max_hints;
-    FT_UInt        num_hints;
-    PSH3_Hint      hints;
-    PSH3_Hint*     sort;
-    PSH3_Hint*     sort_global;
-    FT_UInt        num_zones;
-    PSH3_ZoneRec*  zones;
-    PSH3_Zone      zone;
-    PS_Mask_Table  hint_masks;
-    PS_Mask_Table  counter_masks;
-
-  } PSH3_Hint_TableRec, *PSH3_Hint_Table;
-
-
-  typedef struct PSH3_PointRec_*    PSH3_Point;
-  typedef struct PSH3_ContourRec_*  PSH3_Contour;
-
-  enum
-  {
-    PSH3_DIR_NONE  =  4,
-    PSH3_DIR_UP    = -1,
-    PSH3_DIR_DOWN  =  1,
-    PSH3_DIR_LEFT  = -2,
-    PSH3_DIR_RIGHT =  2
-  };
-
-#define PSH3_DIR_HORIZONTAL  2
-#define PSH3_DIR_VERTICAL    1
-
-#define PSH3_DIR_COMPARE( d1, d2 )  ( (d1) == (d2) || (d1) == -(d2) )
-#define PSH3_DIR_IS_HORIZONTAL( d )  PSH3_DIR_COMPARE( d, PSH3_DIR_HORIZONTAL )
-#define PSH3_DIR_IS_VERTICAL( d )    PSH3_DIR_COMPARE( d, PSH3_DIR_VERTICAL )
-
-
- /* the following bit-flags are computed once by the glyph */
- /* analyzer, for both dimensions                          */
-  enum
-  {
-    PSH3_POINT_OFF         = 1,   /* point is off the curve          */
-    PSH3_POINT_SMOOTH      = 2,   /* point is smooth                 */
-    PSH3_POINT_INFLEX      = 4    /* point is inflection             */
-  };
-
-#define psh3_point_is_smooth( p )  ( (p)->flags & PSH3_POINT_SMOOTH )
-#define psh3_point_is_off( p )     ( (p)->flags & PSH3_POINT_OFF    )
-#define psh3_point_is_inflex( p )  ( (p)->flags & PSH3_POINT_INFLEX )
-
-#define psh3_point_set_smooth( p )  (p)->flags |= PSH3_POINT_SMOOTH
-#define psh3_point_set_off( p )     (p)->flags |= PSH3_POINT_OFF
-#define psh3_point_set_inflex( p )  (p)->flags |= PSH3_POINT_INFLEX
-
-  /* the following bit-flags are re-computed for each dimension */
-  enum
-  {
-    PSH3_POINT_STRONG   = 16,   /* point is strong                             */
-    PSH3_POINT_FITTED   = 32,   /* point is already fitted                     */
-    PSH3_POINT_EXTREMUM = 64,   /* point is local extremum                     */
-    PSH3_POINT_POSITIVE = 128,  /* extremum has positive contour flow          */
-    PSH3_POINT_NEGATIVE = 256,  /* extremum has negative contour flow          */
-    PSH3_POINT_EDGE_MIN = 512,  /* point is aligned to left/bottom stem edge   */
-    PSH3_POINT_EDGE_MAX = 1024  /* point is aligned to top/right stem edge     */
-  };
-
-#define psh3_point_is_strong( p )    ( (p)->flags2 & PSH3_POINT_STRONG )
-#define psh3_point_is_fitted( p )    ( (p)->flags2 & PSH3_POINT_FITTED )
-#define psh3_point_is_extremum( p )  ( (p)->flags2 & PSH3_POINT_EXTREMUM )
-#define psh3_point_is_positive( p )  ( (p)->flags2 & PSH3_POINT_POSITIVE )
-#define psh3_point_is_negative( p )  ( (p)->flags2 & PSH3_POINT_NEGATIVE )
-#define psh3_point_is_edge_min( p )  ( (p)->flags2 & PSH3_POINT_EDGE_MIN )
-#define psh3_point_is_edge_max( p )  ( (p)->flags2 & PSH3_POINT_EDGE_MAX )
-
-#define psh3_point_set_strong( p )    (p)->flags2 |= PSH3_POINT_STRONG
-#define psh3_point_set_fitted( p )    (p)->flags2 |= PSH3_POINT_FITTED
-#define psh3_point_set_extremum( p )  (p)->flags2 |= PSH3_POINT_EXTREMUM
-#define psh3_point_set_positive( p )  (p)->flags2 |= PSH3_POINT_POSITIVE
-#define psh3_point_set_negative( p )  (p)->flags2 |= PSH3_POINT_NEGATIVE
-#define psh3_point_set_edge_min( p )  (p)->flags2 |= PSH3_POINT_EDGE_MIN
-#define psh3_point_set_edge_max( p )  (p)->flags2 |= PSH3_POINT_EDGE_MAX
-
-
-  typedef struct  PSH3_PointRec_
-  {
-    PSH3_Point    prev;
-    PSH3_Point    next;
-    PSH3_Contour  contour;
-    FT_UInt       flags;
-    FT_UInt       flags2;
-    FT_Char       dir_in;
-    FT_Char       dir_out;
-    FT_Angle      angle_in;
-    FT_Angle      angle_out;
-    PSH3_Hint     hint;
-    FT_Pos        org_u;
-    FT_Pos        org_v;
-    FT_Pos        cur_u;
-#ifdef DEBUG_HINTER
-    FT_Pos        org_x;
-    FT_Pos        cur_x;
-    FT_Pos        org_y;
-    FT_Pos        cur_y;
-    FT_UInt       flags_x;
-    FT_UInt       flags_y;
-#endif
-
-  } PSH3_PointRec;
-
-
-#define PSH3_POINT_EQUAL_ORG( a, b )  ( (a)->org_u == (b)->org_u && \
-                                        (a)->org_v == (b)->org_v )
-
-#define PSH3_POINT_ANGLE( a, b )  FT_Atan2( (b)->org_u - (a)->org_u,  \
-                                            (b)->org_v - (a)->org_v )
-
-  typedef struct  PSH3_ContourRec_
-  {
-    PSH3_Point  start;
-    FT_UInt     count;
-
-  } PSH3_ContourRec;
-
-
-  typedef struct  PSH3_GlyphRec_
-  {
-    FT_UInt             num_points;
-    FT_UInt             num_contours;
-
-    PSH3_Point          points;
-    PSH3_Contour        contours;
-
-    FT_Memory           memory;
-    FT_Outline*         outline;
-    PSH_Globals         globals;
-    PSH3_Hint_TableRec  hint_tables[2];
-
-    FT_Bool             vertical;
-    FT_Int              major_dir;
-    FT_Int              minor_dir;
-
-    FT_Bool             do_horz_hints;
-    FT_Bool             do_vert_hints;
-    FT_Bool             do_horz_snapping;
-    FT_Bool             do_vert_snapping;
-    FT_Bool             do_stem_adjust;
-
-  } PSH3_GlyphRec, *PSH3_Glyph;
-
-
-#ifdef DEBUG_HINTER
-  extern PSH3_Hint_Table  ps3_debug_hint_table;
-
-  typedef void
-  (*PSH3_HintFunc)( PSH3_Hint  hint,
-                    FT_Bool    vertical );
-
-  extern PSH3_HintFunc    ps3_debug_hint_func;
-
-  extern PSH3_Glyph       ps3_debug_glyph;
-#endif
-
-
-  extern FT_Error
-  ps3_hints_apply( PS_Hints        ps_hints,
-                   FT_Outline*     outline,
-                   PSH_Globals     globals,
-                   FT_Render_Mode  hint_mode );
-
-
-FT_END_HEADER
-
-
-#endif /* __PSHALGO3_H__ */
-
-
-/* END */
diff --git a/reactos/lib/freetype/src/pshinter/pshglob.c b/reactos/lib/freetype/src/pshinter/pshglob.c
index e5ead545102..3ae57283cd6 100644
--- a/reactos/lib/freetype/src/pshinter/pshglob.c
+++ b/reactos/lib/freetype/src/pshinter/pshglob.c
@@ -5,7 +5,7 @@
 /*    PostScript hinter global hinting management (body).                  */
 /*    Inspired by the new auto-hinter module.                              */
 /*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
+/*  Copyright 2001, 2002, 2003 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used        */
@@ -78,6 +78,8 @@
   }
 
 
+#if 0
+
   /* org_width is is font units, result in device pixels, 26.6 format */
   FT_LOCAL_DEF( FT_Pos )
   psh_dimension_snap_width( PSH_Dimension  dimension,
@@ -122,6 +124,8 @@
     return width;
   }
 
+#endif /* 0 */
+
 
   /*************************************************************************/
   /*************************************************************************/
@@ -640,7 +644,7 @@
           read++;
         }
 
-        dim->stdw.count = write - dim->stdw.widths;
+        dim->stdw.count = priv->num_snap_widths;
       }
 
       /* copy standard heights */
@@ -659,7 +663,7 @@
           read++;
         }
 
-        dim->stdw.count = write - dim->stdw.widths;
+        dim->stdw.count = priv->num_snap_heights;
       }
 
       /* copy blue zones */
@@ -673,7 +677,7 @@
 
       globals->blues.blue_scale = priv->blue_scale
                                   ? priv->blue_scale
-                                  : 0x28937L;   /* 0.039625 * 0x400000L */
+                                  : 0x27A000L; /* 0.039625 * 0x10000 * 1000 */
 
       globals->blues.blue_shift = priv->blue_shift
                                   ? priv->blue_shift
@@ -696,7 +700,7 @@
   }
 
 
-  static FT_Error
+  FT_LOCAL_DEF( FT_Error )
   psh_globals_set_scale( PSH_Globals  globals,
                          FT_Fixed     x_scale,
                          FT_Fixed     y_scale,
diff --git a/reactos/lib/freetype/src/pshinter/pshglob.h b/reactos/lib/freetype/src/pshinter/pshglob.h
index 0a3a96ab155..c511626157a 100644
--- a/reactos/lib/freetype/src/pshinter/pshglob.h
+++ b/reactos/lib/freetype/src/pshinter/pshglob.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    PostScript hinter global hinting management.                         */
 /*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
+/*  Copyright 2001, 2002, 2003 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -159,11 +159,20 @@ FT_BEGIN_HEADER
   psh_globals_funcs_init( PSH_Globals_FuncsRec*  funcs );
 
 
+#if 0
   /* snap a stem width to fitter coordinates.  `org_width' is in font */
   /* units.  The result is in device pixels (26.6 format).            */
   FT_LOCAL( FT_Pos )
   psh_dimension_snap_width( PSH_Dimension  dimension,
                             FT_Int         org_width );
+#endif
+
+  FT_LOCAL( FT_Error )
+  psh_globals_set_scale( PSH_Globals  globals,
+                         FT_Fixed     x_scale,
+                         FT_Fixed     y_scale,
+                         FT_Fixed     x_delta,
+                         FT_Fixed     y_delta );
 
   /* snap a stem to one or two blue zones */
   FT_LOCAL( void )
diff --git a/reactos/lib/freetype/src/pshinter/pshinter.c b/reactos/lib/freetype/src/pshinter/pshinter.c
index 180f6c89c46..8e3f193093b 100644
--- a/reactos/lib/freetype/src/pshinter/pshinter.c
+++ b/reactos/lib/freetype/src/pshinter/pshinter.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PostScript Hinting module                                   */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -21,9 +21,7 @@
 #include <ft2build.h>
 #include "pshrec.c"
 #include "pshglob.c"
-#include "pshalgo1.c"
-#include "pshalgo2.c"
-#include "pshalgo3.c"
+#include "pshalgo.c"
 #include "pshmod.c"
 
 
diff --git a/reactos/lib/freetype/src/pshinter/pshnterr.h b/reactos/lib/freetype/src/pshinter/pshnterr.h
new file mode 100644
index 00000000000..3c0029fbf39
--- /dev/null
+++ b/reactos/lib/freetype/src/pshinter/pshnterr.h
@@ -0,0 +1,40 @@
+/***************************************************************************/
+/*                                                                         */
+/*  pshnterr.h                                                             */
+/*                                                                         */
+/*    PS Hinter error codes (specification only).                          */
+/*                                                                         */
+/*  Copyright 2003 by                                                      */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* This file is used to define the PSHinter error enumeration constants. */
+  /*                                                                       */
+  /*************************************************************************/
+
+#ifndef __PSHNTERR_H__
+#define __PSHNTERR_H__
+
+#include FT_MODULE_ERRORS_H
+
+#undef __FTERRORS_H__
+
+#define FT_ERR_PREFIX  PSH_Err_
+#define FT_ERR_BASE    FT_Mod_Err_PShinter
+
+#include FT_ERRORS_H
+
+#endif /* __PSHNTERR_H__ */
+
+
+/* END */
diff --git a/reactos/lib/freetype/src/pshinter/pshrec.c b/reactos/lib/freetype/src/pshinter/pshrec.c
index 21ced1e2984..b0fee3d9530 100644
--- a/reactos/lib/freetype/src/pshinter/pshrec.c
+++ b/reactos/lib/freetype/src/pshinter/pshrec.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PostScript hints recorder (body).                           */
 /*                                                                         */
-/*  Copyright 2001, 2002 by                                                */
+/*  Copyright 2001, 2002, 2003 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -23,6 +23,8 @@
 #include "pshrec.h"
 #include "pshalgo.h"
 
+#include "pshnterr.h"
+
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_pshrec
 
@@ -820,7 +822,7 @@
       break;
 
     default:
-      hints->error     = FT_Err_Invalid_Argument;
+      hints->error     = PSH_Err_Invalid_Argument;
       hints->hint_type = hint_type;
 
       FT_ERROR(( "ps_hints_open: invalid charstring type!\n" ));
@@ -861,8 +863,9 @@
             FT_Memory  memory = hints->memory;
 
 
-            error = ps_dimension_add_t1stem( dim, stems[0], stems[1],
-                                             memory, NULL );
+            error = ps_dimension_add_t1stem(
+                      dim, (FT_Int)stems[0], (FT_Int)stems[1],
+                      memory, NULL );
             if ( error )
             {
               FT_ERROR(( "ps_hints_stem: could not add stem"
@@ -917,8 +920,9 @@
         /* add the three stems to our hints/masks table */
         for ( count = 0; count < 3; count++, stems += 2 )
         {
-          error = ps_dimension_add_t1stem( dim, stems[0], stems[1],
-                                           memory, &idx[count] );
+          error = ps_dimension_add_t1stem(
+                    dim, (FT_Int)stems[0], (FT_Int)stems[1],
+                    memory, &idx[count] );
           if ( error )
             goto Fail;
         }
@@ -932,7 +936,7 @@
       else
       {
         FT_ERROR(( "ps_hints_t1stem3: called with invalid hint type!\n" ));
-        error = FT_Err_Invalid_Argument;
+        error = PSH_Err_Invalid_Argument;
         goto Fail;
       }
     }
@@ -973,7 +977,7 @@
       else
       {
         /* invalid hint type */
-        error = FT_Err_Invalid_Argument;
+        error = PSH_Err_Invalid_Argument;
         goto Fail;
       }
     }
@@ -1139,7 +1143,7 @@
     funcs->stem  = (T1_Hints_SetStemFunc) t1_hints_stem;
     funcs->stem3 = (T1_Hints_SetStem3Func)ps_hints_t1stem3;
     funcs->reset = (T1_Hints_ResetFunc)   ps_hints_t1reset;
-    funcs->apply = (T1_Hints_ApplyFunc)   PS_HINTS_APPLY_FUNC;
+    funcs->apply = (T1_Hints_ApplyFunc)   ps_hints_apply;
   }
 
 
@@ -1164,7 +1168,8 @@
                   FT_Int     count,
                   FT_Fixed*  coords )
   {
-    FT_Pos  stems[32], y, n, total = count;
+    FT_Pos  stems[32], y, n;
+    FT_Int  total = count;
 
 
     y = 0;
@@ -1179,7 +1184,7 @@
       for ( n = 0; n < count * 2; n++ )
       {
         y       += coords[n];
-        stems[n] = ( y + 0x8000 ) >> 16;
+        stems[n] = ( y + 0x8000L ) >> 16;
       }
 
       /* compute lengths */
@@ -1204,7 +1209,7 @@
     funcs->stems   = (T2_Hints_StemsFunc)  t2_hints_stems;
     funcs->hintmask= (T2_Hints_MaskFunc)   ps_hints_t2mask;
     funcs->counter = (T2_Hints_CounterFunc)ps_hints_t2counter;
-    funcs->apply   = (T2_Hints_ApplyFunc)  PS_HINTS_APPLY_FUNC;
+    funcs->apply   = (T2_Hints_ApplyFunc)  ps_hints_apply;
   }
 
 
diff --git a/reactos/lib/freetype/src/pshinter/pshrec.h b/reactos/lib/freetype/src/pshinter/pshrec.h
index 884aa5c5df4..29d3718901f 100644
--- a/reactos/lib/freetype/src/pshinter/pshrec.h
+++ b/reactos/lib/freetype/src/pshinter/pshrec.h
@@ -125,10 +125,6 @@ FT_BEGIN_HEADER
   } PS_DimensionRec, *PS_Dimension;
 
 
-  /* magic value used within PS_HintsRec */
-#define PS_HINTS_MAGIC  0x68696e74   /* "hint" */
-
-
   /* glyph hints descriptor                                */
   /* dimension 0 => X coordinates + vertical hints/stems   */
   /* dimension 1 => Y coordinates + horizontal hints/stems */
diff --git a/reactos/lib/freetype/src/pshinter/rules.mk b/reactos/lib/freetype/src/pshinter/rules.mk
index 207d3494aed..57773394ac6 100644
--- a/reactos/lib/freetype/src/pshinter/rules.mk
+++ b/reactos/lib/freetype/src/pshinter/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2001 by
+# Copyright 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,28 +15,26 @@
 
 # PSHINTER driver directory
 #
-PSHINTER_DIR  := $(SRC_)pshinter
-PSHINTER_DIR_ := $(PSHINTER_DIR)$(SEP)
+PSHINTER_DIR := $(SRC_DIR)/pshinter
 
 
 # compilation flags for the driver
 #
-PSHINTER_COMPILE := $(FT_COMPILE) $I$(PSHINTER_DIR)
+PSHINTER_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PSHINTER_DIR))
 
 
 # PSHINTER driver sources (i.e., C files)
 #
-PSHINTER_DRV_SRC := $(PSHINTER_DIR_)pshrec.c   \
-                    $(PSHINTER_DIR_)pshglob.c  \
-                    $(PSHINTER_DIR_)pshmod.c   \
-                    $(PSHINTER_DIR_)pshalgo1.c \
-                    $(PSHINTER_DIR_)pshalgo2.c \
-                    $(PSHINTER_DIR_)pshalgo3.c
+PSHINTER_DRV_SRC := $(PSHINTER_DIR)/pshrec.c  \
+                    $(PSHINTER_DIR)/pshglob.c \
+                    $(PSHINTER_DIR)/pshmod.c  \
+                    $(PSHINTER_DIR)/pshalgo.c
 
 
 # PSHINTER driver headers
 #
-PSHINTER_DRV_H := $(PSHINTER_DRV_SRC:%c=%h)
+PSHINTER_DRV_H := $(PSHINTER_DRV_SRC:%c=%h) \
+                  $(PSHINTER_DIR)/pshnterr.h
 
 
 # PSHINTER driver object(s)
@@ -44,25 +42,25 @@ PSHINTER_DRV_H := $(PSHINTER_DRV_SRC:%c=%h)
 #   PSHINTER_DRV_OBJ_M is used during `multi' builds.
 #   PSHINTER_DRV_OBJ_S is used during `single' builds.
 #
-PSHINTER_DRV_OBJ_M := $(PSHINTER_DRV_SRC:$(PSHINTER_DIR_)%.c=$(OBJ_)%.$O)
-PSHINTER_DRV_OBJ_S := $(OBJ_)pshinter.$O
+PSHINTER_DRV_OBJ_M := $(PSHINTER_DRV_SRC:$(PSHINTER_DIR)/%.c=$(OBJ_DIR)/%.$O)
+PSHINTER_DRV_OBJ_S := $(OBJ_DIR)/pshinter.$O
 
 # PSHINTER driver source file for single build
 #
-PSHINTER_DRV_SRC_S := $(PSHINTER_DIR_)pshinter.c
+PSHINTER_DRV_SRC_S := $(PSHINTER_DIR)/pshinter.c
 
 
 # PSHINTER driver - single object
 #
 $(PSHINTER_DRV_OBJ_S): $(PSHINTER_DRV_SRC_S) $(PSHINTER_DRV_SRC) \
                        $(FREETYPE_H) $(PSHINTER_DRV_H)
-	$(PSHINTER_COMPILE) $T$@ $(PSHINTER_DRV_SRC_S)
+	$(PSHINTER_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PSHINTER_DRV_SRC_S))
 
 
 # PSHINTER driver - multiple objects
 #
-$(OBJ_)%.$O: $(PSHINTER_DIR_)%.c $(FREETYPE_H) $(PSHINTER_DRV_H)
-	$(PSHINTER_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(PSHINTER_DIR)/%.c $(FREETYPE_H) $(PSHINTER_DRV_H)
+	$(PSHINTER_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
diff --git a/reactos/lib/freetype/src/psnames/psmodule.c b/reactos/lib/freetype/src/psnames/psmodule.c
index b2ddcb7e4d2..af364285c09 100644
--- a/reactos/lib/freetype/src/psnames/psmodule.c
+++ b/reactos/lib/freetype/src/psnames/psmodule.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    PSNames module implementation (body).                                */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -44,7 +44,7 @@
     char    temp[64];
 
 
-    /* if the name begins with `uni', then the glyph name may be a */
+    /* If the name begins with `uni', then the glyph name may be a */
     /* hard-coded unicode character code.                          */
     if ( glyph_name[0] == 'u' &&
          glyph_name[1] == 'n' &&
@@ -83,7 +83,44 @@
 
         value = ( value << 4 ) + d;
       }
-      if ( count == 0 )
+
+      /* there must be exactly four hex digits */
+      if ( ( *p == '\0' || *p == '.' ) && count == 0 )
+        return value;
+    }
+
+    /* If the name begins with `u', followed by four to six uppercase */
+    /* hexadicimal digits, it is a hard-coded unicode character code. */
+    if ( glyph_name[0] == 'u' )
+    {
+      FT_Int       count;
+      FT_ULong     value = 0;
+      const char*  p     = glyph_name + 1;
+
+
+      for ( count = 6; count > 0; count--, p++ )
+      {
+        char          c = *p;
+        unsigned int  d;
+
+
+        d = (unsigned char)c - '0';
+        if ( d >= 10 )
+        {
+          d = (unsigned char)c - 'A';
+          if ( d >= 6 )
+            d = 16;
+          else
+            d += 10;
+        }
+
+        if ( d >= 16 )
+          break;
+
+        value = ( value << 4 ) + d;
+      }
+
+      if ( ( *p == '\0' || *p == '.' ) && count <= 2 )
         return value;
     }
 
@@ -170,9 +207,9 @@
         {
           uni_char = ps_unicode_value( gname );
 
-          if ( uni_char != 0 && uni_char != 0xFFFF )
+          if ( uni_char != 0 && uni_char != 0xFFFFL )
           {
-            map->unicode     = uni_char;
+            map->unicode     = (FT_UInt)uni_char;
             map->glyph_index = n;
             map++;
           }
@@ -231,7 +268,7 @@
         max = mid - 1;
     }
 
-    return 0xFFFF;
+    return 0xFFFFU;
   }
 
 
diff --git a/reactos/lib/freetype/src/psnames/pstables.h b/reactos/lib/freetype/src/psnames/pstables.h
index 39c838a1232..7c073937576 100644
--- a/reactos/lib/freetype/src/psnames/pstables.h
+++ b/reactos/lib/freetype/src/psnames/pstables.h
@@ -1,10 +1,10 @@
 /***************************************************************************/
 /*                                                                         */
-/*  pstables.h                                                             */
+/*  pstables.h.new                                                         */
 /*                                                                         */
 /*    PostScript glyph names (specification only).                         */
 /*                                                                         */
-/*  Copyright 2000-2001 by                                                 */
+/*  Copyright 2000-2001, 2003 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -23,8 +23,6 @@
   {
     ".null",
     "nonmarkingreturn",
-    "nonbreakingspace",
-    "apple",
     ".notdef",
     "space",
     "exclam",
@@ -420,95 +418,404 @@
 #ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
 
     "AEacute",
+    "AEmacron",
     "Abreve",
+    "Abreveacute",
+    "Abrevecyrillic",
+    "Abrevedotbelow",
+    "Abrevegrave",
+    "Abrevehookabove",
+    "Abrevetilde",
+    "Acaron",
+    "Acircle",
+    "Acircumflexacute",
+    "Acircumflexdotbelow",
+    "Acircumflexgrave",
+    "Acircumflexhookabove",
+    "Acircumflextilde",
     "Acute",
+    "Acyrillic",
+    "Adblgrave",
+    "Adieresiscyrillic",
+    "Adieresismacron",
+    "Adotbelow",
+    "Adotmacron",
+    "Ahookabove",
+    "Aiecyrillic",
+    "Ainvertedbreve",
     "Alpha",
     "Alphatonos",
     "Amacron",
+    "Amonospace",
     "Aogonek",
     "Aringacute",
+    "Aringbelow",
+    "Aybarmenian",
+    "Bcircle",
+    "Bdotaccent",
+    "Bdotbelow",
+    "Becyrillic",
+    "Benarmenian",
     "Beta",
+    "Bhook",
+    "Blinebelow",
+    "Bmonospace",
+    "Btopbar",
+    "Caarmenian",
     "Cacute",
     "Caron",
     "Ccaron",
+    "Ccedillaacute",
+    "Ccircle",
     "Ccircumflex",
+    "Cdot",
     "Cdotaccent",
+    "Chaarmenian",
+    "Cheabkhasiancyrillic",
+    "Checyrillic",
+    "Chedescenderabkhasiancyrillic",
+    "Chedescendercyrillic",
+    "Chedieresiscyrillic",
+    "Cheharmenian",
+    "Chekhakassiancyrillic",
+    "Cheverticalstrokecyrillic",
     "Chi",
+    "Chook",
+    "Cmonospace",
+    "Coarmenian",
+    "DZ",
+    "DZcaron",
+    "Daarmenian",
+    "Dafrican",
     "Dcaron",
+    "Dcedilla",
+    "Dcircle",
+    "Dcircumflexbelow",
     "Dcroat",
+    "Ddotaccent",
+    "Ddotbelow",
+    "Decyrillic",
+    "Deicoptic",
     "Delta",
-    "Delta",
+    "Deltagreek",
+    "Dhook",
     "Dieresis",
     "DieresisAcute",
     "DieresisGrave",
+    "Digammagreek",
+    "Djecyrillic",
+    "Dlinebelow",
+    "Dmonospace",
+    "Dslash",
+    "Dtopbar",
+    "Dz",
+    "Dzcaron",
+    "Dzeabkhasiancyrillic",
+    "Dzecyrillic",
+    "Dzhecyrillic",
     "Ebreve",
     "Ecaron",
+    "Ecedillabreve",
+    "Echarmenian",
+    "Ecircle",
+    "Ecircumflexacute",
+    "Ecircumflexbelow",
+    "Ecircumflexdotbelow",
+    "Ecircumflexgrave",
+    "Ecircumflexhookabove",
+    "Ecircumflextilde",
+    "Ecyrillic",
+    "Edblgrave",
+    "Edot",
     "Edotaccent",
+    "Edotbelow",
+    "Efcyrillic",
+    "Eharmenian",
+    "Ehookabove",
+    "Eightroman",
+    "Einvertedbreve",
+    "Eiotifiedcyrillic",
+    "Elcyrillic",
+    "Elevenroman",
     "Emacron",
+    "Emacronacute",
+    "Emacrongrave",
+    "Emcyrillic",
+    "Emonospace",
+    "Encyrillic",
+    "Endescendercyrillic",
     "Eng",
+    "Enghecyrillic",
+    "Enhookcyrillic",
     "Eogonek",
+    "Eopen",
     "Epsilon",
     "Epsilontonos",
+    "Ercyrillic",
+    "Ereversed",
+    "Ereversedcyrillic",
+    "Escyrillic",
+    "Esdescendercyrillic",
+    "Esh",
     "Eta",
+    "Etarmenian",
     "Etatonos",
+    "Etilde",
+    "Etildebelow",
     "Euro",
+    "Ezh",
+    "Ezhcaron",
+    "Ezhreversed",
+    "Fcircle",
+    "Fdotaccent",
+    "Feharmenian",
+    "Feicoptic",
+    "Fhook",
+    "Fitacyrillic",
+    "Fiveroman",
+    "Fmonospace",
+    "Fourroman",
+    "GBsquare",
+    "Gacute",
     "Gamma",
+    "Gammaafrican",
+    "Gangiacoptic",
     "Gbreve",
     "Gcaron",
+    "Gcedilla",
+    "Gcircle",
     "Gcircumflex",
     "Gcommaaccent",
+    "Gdot",
     "Gdotaccent",
+    "Gecyrillic",
+    "Ghadarmenian",
+    "Ghemiddlehookcyrillic",
+    "Ghestrokecyrillic",
+    "Gheupturncyrillic",
+    "Ghook",
+    "Gimarmenian",
+    "Gjecyrillic",
+    "Gmacron",
+    "Gmonospace",
     "Grave",
+    "Gsmallhook",
+    "Gstroke",
     "H18533",
     "H18543",
     "H18551",
     "H22073",
+    "HPsquare",
+    "Haabkhasiancyrillic",
+    "Hadescendercyrillic",
+    "Hardsigncyrillic",
     "Hbar",
+    "Hbrevebelow",
+    "Hcedilla",
+    "Hcircle",
     "Hcircumflex",
+    "Hdieresis",
+    "Hdotaccent",
+    "Hdotbelow",
+    "Hmonospace",
+    "Hoarmenian",
+    "Horicoptic",
     "Hungarumlaut",
+    "Hzsquare",
+    "IAcyrillic",
     "IJ",
+    "IUcyrillic",
     "Ibreve",
+    "Icaron",
+    "Icircle",
+    "Icyrillic",
+    "Idblgrave",
+    "Idieresisacute",
+    "Idieresiscyrillic",
+    "Idot",
     "Idotaccent",
+    "Idotbelow",
+    "Iebrevecyrillic",
+    "Iecyrillic",
     "Ifraktur",
+    "Ihookabove",
+    "Iicyrillic",
+    "Iinvertedbreve",
+    "Iishortcyrillic",
     "Imacron",
+    "Imacroncyrillic",
+    "Imonospace",
+    "Iniarmenian",
+    "Iocyrillic",
     "Iogonek",
     "Iota",
+    "Iotaafrican",
     "Iotadieresis",
     "Iotatonos",
+    "Istroke",
     "Itilde",
+    "Itildebelow",
+    "Izhitsacyrillic",
+    "Izhitsadblgravecyrillic",
+    "Jaarmenian",
+    "Jcircle",
     "Jcircumflex",
+    "Jecyrillic",
+    "Jheharmenian",
+    "Jmonospace",
+    "KBsquare",
+    "KKsquare",
+    "Kabashkircyrillic",
+    "Kacute",
+    "Kacyrillic",
+    "Kadescendercyrillic",
+    "Kahookcyrillic",
     "Kappa",
+    "Kastrokecyrillic",
+    "Kaverticalstrokecyrillic",
+    "Kcaron",
+    "Kcedilla",
+    "Kcircle",
     "Kcommaaccent",
+    "Kdotbelow",
+    "Keharmenian",
+    "Kenarmenian",
+    "Khacyrillic",
+    "Kheicoptic",
+    "Khook",
+    "Kjecyrillic",
+    "Klinebelow",
+    "Kmonospace",
+    "Koppacyrillic",
+    "Koppagreek",
+    "Ksicyrillic",
+    "LJ",
     "LL",
     "Lacute",
     "Lambda",
     "Lcaron",
+    "Lcedilla",
+    "Lcircle",
+    "Lcircumflexbelow",
     "Lcommaaccent",
     "Ldot",
+    "Ldotaccent",
+    "Ldotbelow",
+    "Ldotbelowmacron",
+    "Liwnarmenian",
+    "Lj",
+    "Ljecyrillic",
+    "Llinebelow",
+    "Lmonospace",
+    "MBsquare",
     "Macron",
+    "Macute",
+    "Mcircle",
+    "Mdotaccent",
+    "Mdotbelow",
+    "Menarmenian",
+    "Mmonospace",
+    "Mturned",
     "Mu",
+    "NJ",
     "Nacute",
     "Ncaron",
+    "Ncedilla",
+    "Ncircle",
+    "Ncircumflexbelow",
     "Ncommaaccent",
+    "Ndotaccent",
+    "Ndotbelow",
+    "Nhookleft",
+    "Nineroman",
+    "Nj",
+    "Njecyrillic",
+    "Nlinebelow",
+    "Nmonospace",
+    "Nowarmenian",
     "Nu",
+    "Obarredcyrillic",
+    "Obarreddieresiscyrillic",
     "Obreve",
+    "Ocaron",
+    "Ocenteredtilde",
+    "Ocircle",
+    "Ocircumflexacute",
+    "Ocircumflexdotbelow",
+    "Ocircumflexgrave",
+    "Ocircumflexhookabove",
+    "Ocircumflextilde",
+    "Ocyrillic",
+    "Odblacute",
+    "Odblgrave",
+    "Odieresiscyrillic",
+    "Odotbelow",
+    "Oharmenian",
+    "Ohm",
+    "Ohookabove",
     "Ohorn",
+    "Ohornacute",
+    "Ohorndotbelow",
+    "Ohorngrave",
+    "Ohornhookabove",
+    "Ohorntilde",
     "Ohungarumlaut",
+    "Oi",
+    "Oinvertedbreve",
     "Omacron",
+    "Omacronacute",
+    "Omacrongrave",
     "Omega",
-    "Omega",
+    "Omegacyrillic",
+    "Omegagreek",
+    "Omegaroundcyrillic",
+    "Omegatitlocyrillic",
     "Omegatonos",
     "Omicron",
     "Omicrontonos",
+    "Omonospace",
+    "Oneroman",
+    "Oogonek",
+    "Oogonekmacron",
+    "Oopen",
     "Oslashacute",
+    "Ostrokeacute",
+    "Otcyrillic",
+    "Otildeacute",
+    "Otildedieresis",
+    "Pacute",
+    "Pcircle",
+    "Pdotaccent",
+    "Pecyrillic",
+    "Peharmenian",
+    "Pemiddlehookcyrillic",
     "Phi",
+    "Phook",
     "Pi",
+    "Piwrarmenian",
+    "Pmonospace",
     "Psi",
+    "Psicyrillic",
+    "Qcircle",
+    "Qmonospace",
+    "Raarmenian",
     "Racute",
     "Rcaron",
+    "Rcedilla",
+    "Rcircle",
     "Rcommaaccent",
+    "Rdblgrave",
+    "Rdotaccent",
+    "Rdotbelow",
+    "Rdotbelowmacron",
+    "Reharmenian",
     "Rfraktur",
     "Rho",
+    "Rinvertedbreve",
+    "Rlinebelow",
+    "Rmonospace",
+    "Rsmallinverted",
+    "Rsmallinvertedsuperior",
     "SF010000",
     "SF020000",
     "SF030000",
@@ -550,42 +857,211 @@
     "SF530000",
     "SF540000",
     "Sacute",
+    "Sacutedotaccent",
+    "Sampigreek",
+    "Scarondotaccent",
     "Scedilla",
-    "Scedilla",
+    "Schwa",
+    "Schwacyrillic",
+    "Schwadieresiscyrillic",
+    "Scircle",
     "Scircumflex",
     "Scommaaccent",
+    "Sdotaccent",
+    "Sdotbelow",
+    "Sdotbelowdotaccent",
+    "Seharmenian",
+    "Sevenroman",
+    "Shaarmenian",
+    "Shacyrillic",
+    "Shchacyrillic",
+    "Sheicoptic",
+    "Shhacyrillic",
+    "Shimacoptic",
     "Sigma",
+    "Sixroman",
+    "Smonospace",
+    "Softsigncyrillic",
+    "Stigmagreek",
     "Tau",
     "Tbar",
     "Tcaron",
+    "Tcedilla",
+    "Tcircle",
+    "Tcircumflexbelow",
     "Tcommaaccent",
-    "Tcommaaccent",
+    "Tdotaccent",
+    "Tdotbelow",
+    "Tecyrillic",
+    "Tedescendercyrillic",
+    "Tenroman",
+    "Tetsecyrillic",
     "Theta",
+    "Thook",
+    "Threeroman",
+    "Tiwnarmenian",
+    "Tlinebelow",
+    "Tmonospace",
+    "Toarmenian",
+    "Tonefive",
+    "Tonesix",
+    "Tonetwo",
+    "Tretroflexhook",
+    "Tsecyrillic",
+    "Tshecyrillic",
+    "Twelveroman",
+    "Tworoman",
     "Ubreve",
+    "Ucaron",
+    "Ucircle",
+    "Ucircumflexbelow",
+    "Ucyrillic",
+    "Udblacute",
+    "Udblgrave",
+    "Udieresisacute",
+    "Udieresisbelow",
+    "Udieresiscaron",
+    "Udieresiscyrillic",
+    "Udieresisgrave",
+    "Udieresismacron",
+    "Udotbelow",
+    "Uhookabove",
     "Uhorn",
+    "Uhornacute",
+    "Uhorndotbelow",
+    "Uhorngrave",
+    "Uhornhookabove",
+    "Uhorntilde",
     "Uhungarumlaut",
+    "Uhungarumlautcyrillic",
+    "Uinvertedbreve",
+    "Ukcyrillic",
     "Umacron",
+    "Umacroncyrillic",
+    "Umacrondieresis",
+    "Umonospace",
     "Uogonek",
     "Upsilon",
     "Upsilon1",
+    "Upsilonacutehooksymbolgreek",
+    "Upsilonafrican",
     "Upsilondieresis",
+    "Upsilondieresishooksymbolgreek",
+    "Upsilonhooksymbol",
     "Upsilontonos",
     "Uring",
+    "Ushortcyrillic",
+    "Ustraightcyrillic",
+    "Ustraightstrokecyrillic",
     "Utilde",
+    "Utildeacute",
+    "Utildebelow",
+    "Vcircle",
+    "Vdotbelow",
+    "Vecyrillic",
+    "Vewarmenian",
+    "Vhook",
+    "Vmonospace",
+    "Voarmenian",
+    "Vtilde",
     "Wacute",
+    "Wcircle",
     "Wcircumflex",
     "Wdieresis",
+    "Wdotaccent",
+    "Wdotbelow",
     "Wgrave",
+    "Wmonospace",
+    "Xcircle",
+    "Xdieresis",
+    "Xdotaccent",
+    "Xeharmenian",
     "Xi",
+    "Xmonospace",
+    "Yatcyrillic",
+    "Ycircle",
     "Ycircumflex",
+    "Ydotaccent",
+    "Ydotbelow",
+    "Yericyrillic",
+    "Yerudieresiscyrillic",
     "Ygrave",
+    "Yhook",
+    "Yhookabove",
+    "Yiarmenian",
+    "Yicyrillic",
+    "Yiwnarmenian",
+    "Ymonospace",
+    "Ytilde",
+    "Yusbigcyrillic",
+    "Yusbigiotifiedcyrillic",
+    "Yuslittlecyrillic",
+    "Yuslittleiotifiedcyrillic",
+    "Zaarmenian",
     "Zacute",
+    "Zcircle",
+    "Zcircumflex",
+    "Zdot",
     "Zdotaccent",
+    "Zdotbelow",
+    "Zecyrillic",
+    "Zedescendercyrillic",
+    "Zedieresiscyrillic",
     "Zeta",
+    "Zhearmenian",
+    "Zhebrevecyrillic",
+    "Zhecyrillic",
+    "Zhedescendercyrillic",
+    "Zhedieresiscyrillic",
+    "Zlinebelow",
+    "Zmonospace",
+    "Zstroke",
+    "aabengali",
+    "aadeva",
+    "aagujarati",
+    "aagurmukhi",
+    "aamatragurmukhi",
+    "aarusquare",
+    "aavowelsignbengali",
+    "aavowelsigndeva",
+    "aavowelsigngujarati",
+    "abbreviationmarkarmenian",
+    "abbreviationsigndeva",
+    "abengali",
+    "abopomofo",
     "abreve",
+    "abreveacute",
+    "abrevecyrillic",
+    "abrevedotbelow",
+    "abrevegrave",
+    "abrevehookabove",
+    "abrevetilde",
+    "acaron",
+    "acircle",
+    "acircumflexacute",
+    "acircumflexdotbelow",
+    "acircumflexgrave",
+    "acircumflexhookabove",
+    "acircumflextilde",
+    "acutebelowcmb",
+    "acutecmb",
     "acutecomb",
+    "acutedeva",
+    "acutelowmod",
+    "acutetonecmb",
+    "acyrillic",
+    "adblgrave",
+    "addakgurmukhi",
+    "adeva",
+    "adieresiscyrillic",
+    "adieresismacron",
+    "adotbelow",
+    "adotmacron",
     "aeacute",
+    "aekorean",
+    "aemacron",
     "afii00208",
+    "afii08941",
     "afii10017",
     "afii10018",
     "afii10019",
@@ -830,262 +1306,3020 @@
     "afii61664",
     "afii63167",
     "afii64937",
+    "agujarati",
+    "agurmukhi",
+    "ahiragana",
+    "ahookabove",
+    "aibengali",
+    "aibopomofo",
+    "aideva",
+    "aiecyrillic",
+    "aigujarati",
+    "aigurmukhi",
+    "aimatragurmukhi",
+    "ainarabic",
+    "ainfinalarabic",
+    "aininitialarabic",
+    "ainmedialarabic",
+    "ainvertedbreve",
+    "aivowelsignbengali",
+    "aivowelsigndeva",
+    "aivowelsigngujarati",
+    "akatakana",
+    "akatakanahalfwidth",
+    "akorean",
+    "alef",
+    "alefarabic",
+    "alefdageshhebrew",
+    "aleffinalarabic",
+    "alefhamzaabovearabic",
+    "alefhamzaabovefinalarabic",
+    "alefhamzabelowarabic",
+    "alefhamzabelowfinalarabic",
+    "alefhebrew",
+    "aleflamedhebrew",
+    "alefmaddaabovearabic",
+    "alefmaddaabovefinalarabic",
+    "alefmaksuraarabic",
+    "alefmaksurafinalarabic",
+    "alefmaksurainitialarabic",
+    "alefmaksuramedialarabic",
+    "alefpatahhebrew",
+    "alefqamatshebrew",
     "aleph",
+    "allequal",
     "alpha",
     "alphatonos",
     "amacron",
+    "amonospace",
+    "ampersandmonospace",
+    "amsquare",
+    "anbopomofo",
+    "angbopomofo",
+    "angkhankhuthai",
     "angle",
+    "anglebracketleft",
+    "anglebracketleftvertical",
+    "anglebracketright",
+    "anglebracketrightvertical",
     "angleleft",
     "angleright",
+    "angstrom",
     "anoteleia",
+    "anudattadeva",
+    "anusvarabengali",
+    "anusvaradeva",
+    "anusvaragujarati",
     "aogonek",
+    "apaatosquare",
+    "aparen",
+    "apostrophearmenian",
+    "apostrophemod",
+    "apple",
+    "approaches",
     "approxequal",
+    "approxequalorimage",
+    "approximatelyequal",
+    "araeaekorean",
+    "araeakorean",
+    "arc",
+    "arighthalfring",
     "aringacute",
+    "aringbelow",
     "arrowboth",
+    "arrowdashdown",
+    "arrowdashleft",
+    "arrowdashright",
+    "arrowdashup",
     "arrowdblboth",
     "arrowdbldown",
     "arrowdblleft",
     "arrowdblright",
     "arrowdblup",
     "arrowdown",
+    "arrowdownleft",
+    "arrowdownright",
+    "arrowdownwhite",
+    "arrowheaddownmod",
+    "arrowheadleftmod",
+    "arrowheadrightmod",
+    "arrowheadupmod",
     "arrowhorizex",
     "arrowleft",
+    "arrowleftdbl",
+    "arrowleftdblstroke",
+    "arrowleftoverright",
+    "arrowleftwhite",
     "arrowright",
+    "arrowrightdblstroke",
+    "arrowrightheavy",
+    "arrowrightoverleft",
+    "arrowrightwhite",
+    "arrowtableft",
+    "arrowtabright",
     "arrowup",
     "arrowupdn",
     "arrowupdnbse",
+    "arrowupdownbase",
+    "arrowupleft",
+    "arrowupleftofdown",
+    "arrowupright",
+    "arrowupwhite",
     "arrowvertex",
+    "asciicircummonospace",
+    "asciitildemonospace",
+    "ascript",
+    "ascriptturned",
+    "asmallhiragana",
+    "asmallkatakana",
+    "asmallkatakanahalfwidth",
+    "asteriskaltonearabic",
+    "asteriskarabic",
     "asteriskmath",
+    "asteriskmonospace",
+    "asterisksmall",
+    "asterism",
+    "asymptoticallyequal",
+    "atmonospace",
+    "atsmall",
+    "aturned",
+    "aubengali",
+    "aubopomofo",
+    "audeva",
+    "augujarati",
+    "augurmukhi",
+    "aulengthmarkbengali",
+    "aumatragurmukhi",
+    "auvowelsignbengali",
+    "auvowelsigndeva",
+    "auvowelsigngujarati",
+    "avagrahadeva",
+    "aybarmenian",
+    "ayin",
+    "ayinaltonehebrew",
+    "ayinhebrew",
+    "babengali",
+    "backslashmonospace",
+    "badeva",
+    "bagujarati",
+    "bagurmukhi",
+    "bahiragana",
+    "bahtthai",
+    "bakatakana",
+    "barmonospace",
+    "bbopomofo",
+    "bcircle",
+    "bdotaccent",
+    "bdotbelow",
+    "beamedsixteenthnotes",
+    "because",
+    "becyrillic",
+    "beharabic",
+    "behfinalarabic",
+    "behinitialarabic",
+    "behiragana",
+    "behmedialarabic",
+    "behmeeminitialarabic",
+    "behmeemisolatedarabic",
+    "behnoonfinalarabic",
+    "bekatakana",
+    "benarmenian",
+    "bet",
     "beta",
+    "betasymbolgreek",
+    "betdagesh",
+    "betdageshhebrew",
+    "bethebrew",
+    "betrafehebrew",
+    "bhabengali",
+    "bhadeva",
+    "bhagujarati",
+    "bhagurmukhi",
+    "bhook",
+    "bihiragana",
+    "bikatakana",
+    "bilabialclick",
+    "bindigurmukhi",
+    "birusquare",
+    "blackcircle",
+    "blackdiamond",
+    "blackdownpointingtriangle",
+    "blackleftpointingpointer",
+    "blackleftpointingtriangle",
+    "blacklenticularbracketleft",
+    "blacklenticularbracketleftvertical",
+    "blacklenticularbracketright",
+    "blacklenticularbracketrightvertical",
+    "blacklowerlefttriangle",
+    "blacklowerrighttriangle",
+    "blackrectangle",
+    "blackrightpointingpointer",
+    "blackrightpointingtriangle",
+    "blacksmallsquare",
+    "blacksmilingface",
+    "blacksquare",
+    "blackstar",
+    "blackupperlefttriangle",
+    "blackupperrighttriangle",
+    "blackuppointingsmalltriangle",
+    "blackuppointingtriangle",
+    "blank",
+    "blinebelow",
     "block",
+    "bmonospace",
+    "bobaimaithai",
+    "bohiragana",
+    "bokatakana",
+    "bparen",
+    "bqsquare",
     "braceex",
     "braceleftbt",
     "braceleftmid",
+    "braceleftmonospace",
+    "braceleftsmall",
     "bracelefttp",
+    "braceleftvertical",
     "bracerightbt",
     "bracerightmid",
+    "bracerightmonospace",
+    "bracerightsmall",
     "bracerighttp",
+    "bracerightvertical",
     "bracketleftbt",
     "bracketleftex",
+    "bracketleftmonospace",
     "bracketlefttp",
     "bracketrightbt",
     "bracketrightex",
+    "bracketrightmonospace",
     "bracketrighttp",
+    "brevebelowcmb",
+    "brevecmb",
+    "breveinvertedbelowcmb",
+    "breveinvertedcmb",
+    "breveinverteddoublecmb",
+    "bridgebelowcmb",
+    "bridgeinvertedbelowcmb",
+    "bstroke",
+    "btopbar",
+    "buhiragana",
+    "bukatakana",
+    "bulletinverse",
+    "bulletoperator",
+    "bullseye",
+    "caarmenian",
+    "cabengali",
     "cacute",
+    "cadeva",
+    "cagujarati",
+    "cagurmukhi",
+    "calsquare",
+    "candrabindubengali",
+    "candrabinducmb",
+    "candrabindudeva",
+    "candrabindugujarati",
+    "capslock",
+    "careof",
+    "caronbelowcmb",
+    "caroncmb",
     "carriagereturn",
+    "cbopomofo",
     "ccaron",
+    "ccedillaacute",
+    "ccircle",
     "ccircumflex",
+    "ccurl",
+    "cdot",
     "cdotaccent",
+    "cdsquare",
+    "cedillacmb",
+    "centigrade",
+    "centmonospace",
+    "chaarmenian",
+    "chabengali",
+    "chadeva",
+    "chagujarati",
+    "chagurmukhi",
+    "chbopomofo",
+    "cheabkhasiancyrillic",
+    "checkmark",
+    "checyrillic",
+    "chedescenderabkhasiancyrillic",
+    "chedescendercyrillic",
+    "chedieresiscyrillic",
+    "cheharmenian",
+    "chekhakassiancyrillic",
+    "cheverticalstrokecyrillic",
     "chi",
+    "chieuchacirclekorean",
+    "chieuchaparenkorean",
+    "chieuchcirclekorean",
+    "chieuchkorean",
+    "chieuchparenkorean",
+    "chochangthai",
+    "chochanthai",
+    "chochingthai",
+    "chochoethai",
+    "chook",
+    "cieucacirclekorean",
+    "cieucaparenkorean",
+    "cieuccirclekorean",
+    "cieuckorean",
+    "cieucparenkorean",
+    "cieucuparenkorean",
     "circle",
     "circlemultiply",
+    "circleot",
     "circleplus",
+    "circlepostalmark",
+    "circlewithlefthalfblack",
+    "circlewithrighthalfblack",
+    "circumflexbelowcmb",
+    "circumflexcmb",
+    "clear",
+    "clickalveolar",
+    "clickdental",
+    "clicklateral",
+    "clickretroflex",
     "club",
+    "clubsuitblack",
+    "clubsuitwhite",
+    "cmcubedsquare",
+    "cmonospace",
+    "cmsquaredsquare",
+    "coarmenian",
+    "colonmonospace",
+    "colonsign",
+    "colonsmall",
+    "colontriangularhalfmod",
+    "colontriangularmod",
+    "commaabovecmb",
+    "commaaboverightcmb",
     "commaaccent",
+    "commaarabic",
+    "commaarmenian",
+    "commamonospace",
+    "commareversedabovecmb",
+    "commareversedmod",
+    "commasmall",
+    "commaturnedabovecmb",
+    "commaturnedmod",
+    "compass",
     "congruent",
+    "contourintegral",
+    "control",
+    "controlACK",
+    "controlBEL",
+    "controlBS",
+    "controlCAN",
+    "controlCR",
+    "controlDC1",
+    "controlDC2",
+    "controlDC3",
+    "controlDC4",
+    "controlDEL",
+    "controlDLE",
+    "controlEM",
+    "controlENQ",
+    "controlEOT",
+    "controlESC",
+    "controlETB",
+    "controlETX",
+    "controlFF",
+    "controlFS",
+    "controlGS",
+    "controlHT",
+    "controlLF",
+    "controlNAK",
+    "controlRS",
+    "controlSI",
+    "controlSO",
+    "controlSOT",
+    "controlSTX",
+    "controlSUB",
+    "controlSYN",
+    "controlUS",
+    "controlVT",
     "copyrightsans",
     "copyrightserif",
+    "cornerbracketleft",
+    "cornerbracketlefthalfwidth",
+    "cornerbracketleftvertical",
+    "cornerbracketright",
+    "cornerbracketrighthalfwidth",
+    "cornerbracketrightvertical",
+    "corporationsquare",
+    "cosquare",
+    "coverkgsquare",
+    "cparen",
+    "cruzeiro",
+    "cstretched",
+    "curlyand",
+    "curlyor",
     "cyrBreve",
     "cyrFlex",
     "cyrbreve",
     "cyrflex",
+    "daarmenian",
+    "dabengali",
+    "dadarabic",
+    "dadeva",
+    "dadfinalarabic",
+    "dadinitialarabic",
+    "dadmedialarabic",
+    "dagesh",
+    "dageshhebrew",
+    "dagujarati",
+    "dagurmukhi",
+    "dahiragana",
+    "dakatakana",
+    "dalarabic",
+    "dalet",
+    "daletdagesh",
+    "daletdageshhebrew",
+    "dalethatafpatah",
+    "dalethatafpatahhebrew",
+    "dalethatafsegol",
+    "dalethatafsegolhebrew",
+    "dalethebrew",
+    "dalethiriq",
+    "dalethiriqhebrew",
+    "daletholam",
+    "daletholamhebrew",
+    "daletpatah",
+    "daletpatahhebrew",
+    "daletqamats",
+    "daletqamatshebrew",
+    "daletqubuts",
+    "daletqubutshebrew",
+    "daletsegol",
+    "daletsegolhebrew",
+    "daletsheva",
+    "daletshevahebrew",
+    "dalettsere",
+    "dalettserehebrew",
+    "dalfinalarabic",
+    "dammaarabic",
+    "dammalowarabic",
+    "dammatanaltonearabic",
+    "dammatanarabic",
+    "danda",
+    "dargahebrew",
+    "dargalefthebrew",
+    "dasiapneumatacyrilliccmb",
     "dblGrave",
+    "dblanglebracketleft",
+    "dblanglebracketleftvertical",
+    "dblanglebracketright",
+    "dblanglebracketrightvertical",
+    "dblarchinvertedbelowcmb",
+    "dblarrowleft",
+    "dblarrowright",
+    "dbldanda",
     "dblgrave",
+    "dblgravecmb",
+    "dblintegral",
+    "dbllowline",
+    "dbllowlinecmb",
+    "dbloverlinecmb",
+    "dblprimemod",
+    "dblverticalbar",
+    "dblverticallineabovecmb",
+    "dbopomofo",
+    "dbsquare",
     "dcaron",
+    "dcedilla",
+    "dcircle",
+    "dcircumflexbelow",
     "dcroat",
+    "ddabengali",
+    "ddadeva",
+    "ddagujarati",
+    "ddagurmukhi",
+    "ddalarabic",
+    "ddalfinalarabic",
+    "dddhadeva",
+    "ddhabengali",
+    "ddhadeva",
+    "ddhagujarati",
+    "ddhagurmukhi",
+    "ddotaccent",
+    "ddotbelow",
+    "decimalseparatorarabic",
+    "decimalseparatorpersian",
+    "decyrillic",
+    "dehihebrew",
+    "dehiragana",
+    "deicoptic",
+    "dekatakana",
+    "deleteleft",
+    "deleteright",
     "delta",
+    "deltaturned",
+    "denominatorminusonenumeratorbengali",
+    "dezh",
+    "dhabengali",
+    "dhadeva",
+    "dhagujarati",
+    "dhagurmukhi",
+    "dhook",
+    "dialytikatonos",
+    "dialytikatonoscmb",
     "diamond",
+    "diamondsuitwhite",
     "dieresisacute",
+    "dieresisbelowcmb",
+    "dieresiscmb",
     "dieresisgrave",
     "dieresistonos",
+    "dihiragana",
+    "dikatakana",
+    "dittomark",
+    "divides",
+    "divisionslash",
+    "djecyrillic",
     "dkshade",
+    "dlinebelow",
+    "dlsquare",
+    "dmacron",
+    "dmonospace",
     "dnblock",
+    "dochadathai",
+    "dodekthai",
+    "dohiragana",
+    "dokatakana",
+    "dollarmonospace",
+    "dollarsmall",
     "dong",
+    "dorusquare",
+    "dotaccentcmb",
+    "dotbelowcmb",
     "dotbelowcomb",
+    "dotkatakana",
     "dotlessj",
+    "dotlessjstrokehook",
     "dotmath",
+    "dottedcircle",
+    "doubleyodpatah",
+    "doubleyodpatahhebrew",
+    "downtackbelowcmb",
+    "downtackmod",
+    "dparen",
+    "dtail",
+    "dtopbar",
+    "duhiragana",
+    "dukatakana",
+    "dz",
+    "dzaltone",
+    "dzcaron",
+    "dzcurl",
+    "dzeabkhasiancyrillic",
+    "dzecyrillic",
+    "dzhecyrillic",
+    "earth",
+    "ebengali",
+    "ebopomofo",
     "ebreve",
+    "ecandradeva",
+    "ecandragujarati",
+    "ecandravowelsigndeva",
+    "ecandravowelsigngujarati",
     "ecaron",
+    "ecedillabreve",
+    "echarmenian",
+    "echyiwnarmenian",
+    "ecircle",
+    "ecircumflexacute",
+    "ecircumflexbelow",
+    "ecircumflexdotbelow",
+    "ecircumflexgrave",
+    "ecircumflexhookabove",
+    "ecircumflextilde",
+    "ecyrillic",
+    "edblgrave",
+    "edeva",
+    "edot",
     "edotaccent",
+    "edotbelow",
+    "eegurmukhi",
+    "eematragurmukhi",
+    "efcyrillic",
+    "egujarati",
+    "eharmenian",
+    "ehbopomofo",
+    "ehiragana",
+    "ehookabove",
+    "eibopomofo",
+    "eightarabic",
+    "eightbengali",
+    "eightcircle",
+    "eightcircleinversesansserif",
+    "eightdeva",
+    "eighteencircle",
+    "eighteenparen",
+    "eighteenperiod",
+    "eightgujarati",
+    "eightgurmukhi",
+    "eighthackarabic",
+    "eighthangzhou",
+    "eighthnotebeamed",
+    "eightideographicparen",
+    "eightmonospace",
+    "eightparen",
+    "eightperiod",
+    "eightpersian",
+    "eightroman",
+    "eightthai",
+    "einvertedbreve",
+    "eiotifiedcyrillic",
+    "ekatakana",
+    "ekatakanahalfwidth",
+    "ekonkargurmukhi",
+    "ekorean",
+    "elcyrillic",
     "element",
+    "elevencircle",
+    "elevenparen",
+    "elevenperiod",
+    "elevenroman",
+    "ellipsisvertical",
     "emacron",
+    "emacronacute",
+    "emacrongrave",
+    "emcyrillic",
+    "emdashvertical",
+    "emonospace",
+    "emphasismarkarmenian",
     "emptyset",
+    "enbopomofo",
+    "encyrillic",
+    "endashvertical",
+    "endescendercyrillic",
     "eng",
+    "engbopomofo",
+    "enghecyrillic",
+    "enhookcyrillic",
+    "enspace",
     "eogonek",
+    "eokorean",
+    "eopen",
+    "eopenclosed",
+    "eopenreversed",
+    "eopenreversedclosed",
+    "eopenreversedhook",
+    "eparen",
     "epsilon",
     "epsilontonos",
+    "equalmonospace",
+    "equalsmall",
+    "equalsuperior",
     "equivalence",
+    "erbopomofo",
+    "ercyrillic",
+    "ereversed",
+    "ereversedcyrillic",
+    "escyrillic",
+    "esdescendercyrillic",
+    "esh",
+    "eshcurl",
+    "eshortdeva",
+    "eshortvowelsigndeva",
+    "eshreversedloop",
+    "eshsquatreversed",
+    "esmallhiragana",
+    "esmallkatakana",
+    "esmallkatakanahalfwidth",
     "estimated",
     "eta",
+    "etarmenian",
     "etatonos",
+    "etilde",
+    "etildebelow",
+    "etnahtafoukhhebrew",
+    "etnahtafoukhlefthebrew",
+    "etnahtahebrew",
+    "etnahtalefthebrew",
+    "eturned",
+    "eukorean",
+    "euro",
+    "evowelsignbengali",
+    "evowelsigndeva",
+    "evowelsigngujarati",
+    "exclamarmenian",
     "exclamdbl",
+    "exclammonospace",
     "existential",
+    "ezh",
+    "ezhcaron",
+    "ezhcurl",
+    "ezhreversed",
+    "ezhtail",
+    "fadeva",
+    "fagurmukhi",
+    "fahrenheit",
+    "fathaarabic",
+    "fathalowarabic",
+    "fathatanarabic",
+    "fbopomofo",
+    "fcircle",
+    "fdotaccent",
+    "feharabic",
+    "feharmenian",
+    "fehfinalarabic",
+    "fehinitialarabic",
+    "fehmedialarabic",
+    "feicoptic",
     "female",
+    "fifteencircle",
+    "fifteenparen",
+    "fifteenperiod",
     "filledbox",
     "filledrect",
+    "finalkaf",
+    "finalkafdagesh",
+    "finalkafdageshhebrew",
+    "finalkafhebrew",
+    "finalkafqamats",
+    "finalkafqamatshebrew",
+    "finalkafsheva",
+    "finalkafshevahebrew",
+    "finalmem",
+    "finalmemhebrew",
+    "finalnun",
+    "finalnunhebrew",
+    "finalpe",
+    "finalpehebrew",
+    "finaltsadi",
+    "finaltsadihebrew",
+    "firsttonechinese",
+    "fisheye",
+    "fitacyrillic",
+    "fivearabic",
+    "fivebengali",
+    "fivecircle",
+    "fivecircleinversesansserif",
+    "fivedeva",
+    "fivegujarati",
+    "fivegurmukhi",
+    "fivehackarabic",
+    "fivehangzhou",
+    "fiveideographicparen",
+    "fivemonospace",
+    "fiveparen",
+    "fiveperiod",
+    "fivepersian",
+    "fiveroman",
+    "fivethai",
+    "fmonospace",
+    "fmsquare",
+    "fofanthai",
+    "fofathai",
+    "fongmanthai",
+    "forall",
+    "fourarabic",
+    "fourbengali",
+    "fourcircle",
+    "fourcircleinversesansserif",
+    "fourdeva",
+    "fourgujarati",
+    "fourgurmukhi",
+    "fourhackarabic",
+    "fourhangzhou",
+    "fourideographicparen",
+    "fourmonospace",
+    "fournumeratorbengali",
+    "fourparen",
+    "fourperiod",
+    "fourpersian",
+    "fourroman",
+    "fourteencircle",
+    "fourteenparen",
+    "fourteenperiod",
+    "fourthai",
+    "fourthtonechinese",
+    "fparen",
     "franc",
+    "gabengali",
+    "gacute",
+    "gadeva",
+    "gafarabic",
+    "gaffinalarabic",
+    "gafinitialarabic",
+    "gafmedialarabic",
+    "gagujarati",
+    "gagurmukhi",
+    "gahiragana",
+    "gakatakana",
     "gamma",
+    "gammalatinsmall",
+    "gammasuperior",
+    "gangiacoptic",
+    "gbopomofo",
     "gbreve",
     "gcaron",
+    "gcedilla",
+    "gcircle",
     "gcircumflex",
     "gcommaaccent",
+    "gdot",
     "gdotaccent",
+    "gecyrillic",
+    "gehiragana",
+    "gekatakana",
+    "geometricallyequal",
+    "gereshaccenthebrew",
+    "gereshhebrew",
+    "gereshmuqdamhebrew",
+    "gershayimaccenthebrew",
+    "gershayimhebrew",
+    "getamark",
+    "ghabengali",
+    "ghadarmenian",
+    "ghadeva",
+    "ghagujarati",
+    "ghagurmukhi",
+    "ghainarabic",
+    "ghainfinalarabic",
+    "ghaininitialarabic",
+    "ghainmedialarabic",
+    "ghemiddlehookcyrillic",
+    "ghestrokecyrillic",
+    "gheupturncyrillic",
+    "ghhadeva",
+    "ghhagurmukhi",
+    "ghook",
+    "ghzsquare",
+    "gihiragana",
+    "gikatakana",
+    "gimarmenian",
+    "gimel",
+    "gimeldagesh",
+    "gimeldageshhebrew",
+    "gimelhebrew",
+    "gjecyrillic",
+    "glottalinvertedstroke",
+    "glottalstop",
+    "glottalstopinverted",
+    "glottalstopmod",
+    "glottalstopreversed",
+    "glottalstopreversedmod",
+    "glottalstopreversedsuperior",
+    "glottalstopstroke",
+    "glottalstopstrokereversed",
+    "gmacron",
+    "gmonospace",
+    "gohiragana",
+    "gokatakana",
+    "gparen",
+    "gpasquare",
     "gradient",
+    "gravebelowcmb",
+    "gravecmb",
     "gravecomb",
+    "gravedeva",
+    "gravelowmod",
+    "gravemonospace",
+    "gravetonecmb",
     "greaterequal",
+    "greaterequalorless",
+    "greatermonospace",
+    "greaterorequivalent",
+    "greaterorless",
+    "greateroverequal",
+    "greatersmall",
+    "gscript",
+    "gstroke",
+    "guhiragana",
+    "gukatakana",
+    "guramusquare",
+    "gysquare",
+    "haabkhasiancyrillic",
+    "haaltonearabic",
+    "habengali",
+    "hadescendercyrillic",
+    "hadeva",
+    "hagujarati",
+    "hagurmukhi",
+    "haharabic",
+    "hahfinalarabic",
+    "hahinitialarabic",
+    "hahiragana",
+    "hahmedialarabic",
+    "haitusquare",
+    "hakatakana",
+    "hakatakanahalfwidth",
+    "halantgurmukhi",
+    "hamzaarabic",
+    "hamzadammaarabic",
+    "hamzadammatanarabic",
+    "hamzafathaarabic",
+    "hamzafathatanarabic",
+    "hamzalowarabic",
+    "hamzalowkasraarabic",
+    "hamzalowkasratanarabic",
+    "hamzasukunarabic",
+    "hangulfiller",
+    "hardsigncyrillic",
+    "harpoonleftbarbup",
+    "harpoonrightbarbup",
+    "hasquare",
+    "hatafpatah",
+    "hatafpatah16",
+    "hatafpatah23",
+    "hatafpatah2f",
+    "hatafpatahhebrew",
+    "hatafpatahnarrowhebrew",
+    "hatafpatahquarterhebrew",
+    "hatafpatahwidehebrew",
+    "hatafqamats",
+    "hatafqamats1b",
+    "hatafqamats28",
+    "hatafqamats34",
+    "hatafqamatshebrew",
+    "hatafqamatsnarrowhebrew",
+    "hatafqamatsquarterhebrew",
+    "hatafqamatswidehebrew",
+    "hatafsegol",
+    "hatafsegol17",
+    "hatafsegol24",
+    "hatafsegol30",
+    "hatafsegolhebrew",
+    "hatafsegolnarrowhebrew",
+    "hatafsegolquarterhebrew",
+    "hatafsegolwidehebrew",
     "hbar",
+    "hbopomofo",
+    "hbrevebelow",
+    "hcedilla",
+    "hcircle",
     "hcircumflex",
+    "hdieresis",
+    "hdotaccent",
+    "hdotbelow",
+    "he",
     "heart",
+    "heartsuitblack",
+    "heartsuitwhite",
+    "hedagesh",
+    "hedageshhebrew",
+    "hehaltonearabic",
+    "heharabic",
+    "hehebrew",
+    "hehfinalaltonearabic",
+    "hehfinalalttwoarabic",
+    "hehfinalarabic",
+    "hehhamzaabovefinalarabic",
+    "hehhamzaaboveisolatedarabic",
+    "hehinitialaltonearabic",
+    "hehinitialarabic",
+    "hehiragana",
+    "hehmedialaltonearabic",
+    "hehmedialarabic",
+    "heiseierasquare",
+    "hekatakana",
+    "hekatakanahalfwidth",
+    "hekutaarusquare",
+    "henghook",
+    "herutusquare",
+    "het",
+    "hethebrew",
+    "hhook",
+    "hhooksuperior",
+    "hieuhacirclekorean",
+    "hieuhaparenkorean",
+    "hieuhcirclekorean",
+    "hieuhkorean",
+    "hieuhparenkorean",
+    "hihiragana",
+    "hikatakana",
+    "hikatakanahalfwidth",
+    "hiriq",
+    "hiriq14",
+    "hiriq21",
+    "hiriq2d",
+    "hiriqhebrew",
+    "hiriqnarrowhebrew",
+    "hiriqquarterhebrew",
+    "hiriqwidehebrew",
+    "hlinebelow",
+    "hmonospace",
+    "hoarmenian",
+    "hohipthai",
+    "hohiragana",
+    "hokatakana",
+    "hokatakanahalfwidth",
+    "holam",
+    "holam19",
+    "holam26",
+    "holam32",
+    "holamhebrew",
+    "holamnarrowhebrew",
+    "holamquarterhebrew",
+    "holamwidehebrew",
+    "honokhukthai",
     "hookabovecomb",
+    "hookcmb",
+    "hookpalatalizedbelowcmb",
+    "hookretroflexbelowcmb",
+    "hoonsquare",
+    "horicoptic",
+    "horizontalbar",
+    "horncmb",
+    "hotsprings",
     "house",
+    "hparen",
+    "hsuperior",
+    "hturned",
+    "huhiragana",
+    "huiitosquare",
+    "hukatakana",
+    "hukatakanahalfwidth",
+    "hungarumlautcmb",
+    "hv",
+    "hyphenmonospace",
+    "hyphensmall",
+    "hyphentwo",
+    "iacyrillic",
+    "ibengali",
+    "ibopomofo",
     "ibreve",
+    "icaron",
+    "icircle",
+    "icyrillic",
+    "idblgrave",
+    "ideographearthcircle",
+    "ideographfirecircle",
+    "ideographicallianceparen",
+    "ideographiccallparen",
+    "ideographiccentrecircle",
+    "ideographicclose",
+    "ideographiccomma",
+    "ideographiccommaleft",
+    "ideographiccongratulationparen",
+    "ideographiccorrectcircle",
+    "ideographicearthparen",
+    "ideographicenterpriseparen",
+    "ideographicexcellentcircle",
+    "ideographicfestivalparen",
+    "ideographicfinancialcircle",
+    "ideographicfinancialparen",
+    "ideographicfireparen",
+    "ideographichaveparen",
+    "ideographichighcircle",
+    "ideographiciterationmark",
+    "ideographiclaborcircle",
+    "ideographiclaborparen",
+    "ideographicleftcircle",
+    "ideographiclowcircle",
+    "ideographicmedicinecircle",
+    "ideographicmetalparen",
+    "ideographicmoonparen",
+    "ideographicnameparen",
+    "ideographicperiod",
+    "ideographicprintcircle",
+    "ideographicreachparen",
+    "ideographicrepresentparen",
+    "ideographicresourceparen",
+    "ideographicrightcircle",
+    "ideographicsecretcircle",
+    "ideographicselfparen",
+    "ideographicsocietyparen",
+    "ideographicspace",
+    "ideographicspecialparen",
+    "ideographicstockparen",
+    "ideographicstudyparen",
+    "ideographicsunparen",
+    "ideographicsuperviseparen",
+    "ideographicwaterparen",
+    "ideographicwoodparen",
+    "ideographiczero",
+    "ideographmetalcircle",
+    "ideographmooncircle",
+    "ideographnamecircle",
+    "ideographsuncircle",
+    "ideographwatercircle",
+    "ideographwoodcircle",
+    "ideva",
+    "idieresisacute",
+    "idieresiscyrillic",
+    "idotbelow",
+    "iebrevecyrillic",
+    "iecyrillic",
+    "ieungacirclekorean",
+    "ieungaparenkorean",
+    "ieungcirclekorean",
+    "ieungkorean",
+    "ieungparenkorean",
+    "igujarati",
+    "igurmukhi",
+    "ihiragana",
+    "ihookabove",
+    "iibengali",
+    "iicyrillic",
+    "iideva",
+    "iigujarati",
+    "iigurmukhi",
+    "iimatragurmukhi",
+    "iinvertedbreve",
+    "iishortcyrillic",
+    "iivowelsignbengali",
+    "iivowelsigndeva",
+    "iivowelsigngujarati",
     "ij",
+    "ikatakana",
+    "ikatakanahalfwidth",
+    "ikorean",
+    "ilde",
+    "iluyhebrew",
     "imacron",
+    "imacroncyrillic",
+    "imageorapproximatelyequal",
+    "imatragurmukhi",
+    "imonospace",
+    "increment",
     "infinity",
+    "iniarmenian",
     "integral",
+    "integralbottom",
     "integralbt",
     "integralex",
+    "integraltop",
     "integraltp",
     "intersection",
+    "intisquare",
     "invbullet",
     "invcircle",
     "invsmileface",
+    "iocyrillic",
     "iogonek",
     "iota",
     "iotadieresis",
     "iotadieresistonos",
+    "iotalatin",
     "iotatonos",
+    "iparen",
+    "irigurmukhi",
+    "ismallhiragana",
+    "ismallkatakana",
+    "ismallkatakanahalfwidth",
+    "issharbengali",
+    "istroke",
+    "iterationhiragana",
+    "iterationkatakana",
     "itilde",
+    "itildebelow",
+    "iubopomofo",
+    "iucyrillic",
+    "ivowelsignbengali",
+    "ivowelsigndeva",
+    "ivowelsigngujarati",
+    "izhitsacyrillic",
+    "izhitsadblgravecyrillic",
+    "jaarmenian",
+    "jabengali",
+    "jadeva",
+    "jagujarati",
+    "jagurmukhi",
+    "jbopomofo",
+    "jcaron",
+    "jcircle",
     "jcircumflex",
+    "jcrossedtail",
+    "jdotlessstroke",
+    "jecyrillic",
+    "jeemarabic",
+    "jeemfinalarabic",
+    "jeeminitialarabic",
+    "jeemmedialarabic",
+    "jeharabic",
+    "jehfinalarabic",
+    "jhabengali",
+    "jhadeva",
+    "jhagujarati",
+    "jhagurmukhi",
+    "jheharmenian",
+    "jis",
+    "jmonospace",
+    "jparen",
+    "jsuperior",
+    "kabashkircyrillic",
+    "kabengali",
+    "kacute",
+    "kacyrillic",
+    "kadescendercyrillic",
+    "kadeva",
+    "kaf",
+    "kafarabic",
+    "kafdagesh",
+    "kafdageshhebrew",
+    "kaffinalarabic",
+    "kafhebrew",
+    "kafinitialarabic",
+    "kafmedialarabic",
+    "kafrafehebrew",
+    "kagujarati",
+    "kagurmukhi",
+    "kahiragana",
+    "kahookcyrillic",
+    "kakatakana",
+    "kakatakanahalfwidth",
     "kappa",
+    "kappasymbolgreek",
+    "kapyeounmieumkorean",
+    "kapyeounphieuphkorean",
+    "kapyeounpieupkorean",
+    "kapyeounssangpieupkorean",
+    "karoriisquare",
+    "kashidaautoarabic",
+    "kashidaautonosidebearingarabic",
+    "kasmallkatakana",
+    "kasquare",
+    "kasraarabic",
+    "kasratanarabic",
+    "kastrokecyrillic",
+    "katahiraprolongmarkhalfwidth",
+    "kaverticalstrokecyrillic",
+    "kbopomofo",
+    "kcalsquare",
+    "kcaron",
+    "kcedilla",
+    "kcircle",
     "kcommaaccent",
+    "kdotbelow",
+    "keharmenian",
+    "kehiragana",
+    "kekatakana",
+    "kekatakanahalfwidth",
+    "kenarmenian",
+    "kesmallkatakana",
     "kgreenlandic",
+    "khabengali",
+    "khacyrillic",
+    "khadeva",
+    "khagujarati",
+    "khagurmukhi",
+    "khaharabic",
+    "khahfinalarabic",
+    "khahinitialarabic",
+    "khahmedialarabic",
+    "kheicoptic",
+    "khhadeva",
+    "khhagurmukhi",
+    "khieukhacirclekorean",
+    "khieukhaparenkorean",
+    "khieukhcirclekorean",
+    "khieukhkorean",
+    "khieukhparenkorean",
+    "khokhaithai",
+    "khokhonthai",
+    "khokhuatthai",
+    "khokhwaithai",
+    "khomutthai",
+    "khook",
+    "khorakhangthai",
+    "khzsquare",
+    "kihiragana",
+    "kikatakana",
+    "kikatakanahalfwidth",
+    "kiroguramusquare",
+    "kiromeetorusquare",
+    "kirosquare",
+    "kiyeokacirclekorean",
+    "kiyeokaparenkorean",
+    "kiyeokcirclekorean",
+    "kiyeokkorean",
+    "kiyeokparenkorean",
+    "kiyeoksioskorean",
+    "kjecyrillic",
+    "klinebelow",
+    "klsquare",
+    "kmcubedsquare",
+    "kmonospace",
+    "kmsquaredsquare",
+    "kohiragana",
+    "kohmsquare",
+    "kokaithai",
+    "kokatakana",
+    "kokatakanahalfwidth",
+    "kooposquare",
+    "koppacyrillic",
+    "koreanstandardsymbol",
+    "koroniscmb",
+    "kparen",
+    "kpasquare",
+    "ksicyrillic",
+    "ktsquare",
+    "kturned",
+    "kuhiragana",
+    "kukatakana",
+    "kukatakanahalfwidth",
+    "kvsquare",
+    "kwsquare",
+    "labengali",
     "lacute",
+    "ladeva",
+    "lagujarati",
+    "lagurmukhi",
+    "lakkhangyaothai",
+    "lamaleffinalarabic",
+    "lamalefhamzaabovefinalarabic",
+    "lamalefhamzaaboveisolatedarabic",
+    "lamalefhamzabelowfinalarabic",
+    "lamalefhamzabelowisolatedarabic",
+    "lamalefisolatedarabic",
+    "lamalefmaddaabovefinalarabic",
+    "lamalefmaddaaboveisolatedarabic",
+    "lamarabic",
     "lambda",
+    "lambdastroke",
+    "lamed",
+    "lameddagesh",
+    "lameddageshhebrew",
+    "lamedhebrew",
+    "lamedholam",
+    "lamedholamdagesh",
+    "lamedholamdageshhebrew",
+    "lamedholamhebrew",
+    "lamfinalarabic",
+    "lamhahinitialarabic",
+    "laminitialarabic",
+    "lamjeeminitialarabic",
+    "lamkhahinitialarabic",
+    "lamlamhehisolatedarabic",
+    "lammedialarabic",
+    "lammeemhahinitialarabic",
+    "lammeeminitialarabic",
+    "lammeemjeeminitialarabic",
+    "lammeemkhahinitialarabic",
+    "largecircle",
+    "lbar",
+    "lbelt",
+    "lbopomofo",
     "lcaron",
+    "lcedilla",
+    "lcircle",
+    "lcircumflexbelow",
     "lcommaaccent",
     "ldot",
+    "ldotaccent",
+    "ldotbelow",
+    "ldotbelowmacron",
+    "leftangleabovecmb",
+    "lefttackbelowcmb",
     "lessequal",
+    "lessequalorgreater",
+    "lessmonospace",
+    "lessorequivalent",
+    "lessorgreater",
+    "lessoverequal",
+    "lesssmall",
+    "lezh",
     "lfblock",
+    "lhookretroflex",
     "lira",
+    "liwnarmenian",
+    "lj",
+    "ljecyrillic",
     "ll",
+    "lladeva",
+    "llagujarati",
+    "llinebelow",
+    "llladeva",
+    "llvocalicbengali",
+    "llvocalicdeva",
+    "llvocalicvowelsignbengali",
+    "llvocalicvowelsigndeva",
+    "lmiddletilde",
+    "lmonospace",
+    "lmsquare",
+    "lochulathai",
     "logicaland",
+    "logicalnotreversed",
     "logicalor",
+    "lolingthai",
     "longs",
+    "lowlinecenterline",
+    "lowlinecmb",
+    "lowlinedashed",
     "lozenge",
+    "lparen",
+    "lsquare",
     "ltshade",
+    "luthai",
+    "lvocalicbengali",
+    "lvocalicdeva",
+    "lvocalicvowelsignbengali",
+    "lvocalicvowelsigndeva",
+    "lxsquare",
+    "mabengali",
+    "macronbelowcmb",
+    "macroncmb",
+    "macronlowmod",
+    "macronmonospace",
+    "macute",
+    "madeva",
+    "magujarati",
+    "magurmukhi",
+    "mahapakhhebrew",
+    "mahapakhlefthebrew",
+    "mahiragana",
+    "maichattawalowleftthai",
+    "maichattawalowrightthai",
+    "maichattawathai",
+    "maichattawaupperleftthai",
+    "maieklowleftthai",
+    "maieklowrightthai",
+    "maiekthai",
+    "maiekupperleftthai",
+    "maihanakatleftthai",
+    "maihanakatthai",
+    "maitaikhuleftthai",
+    "maitaikhuthai",
+    "maitholowleftthai",
+    "maitholowrightthai",
+    "maithothai",
+    "maithoupperleftthai",
+    "maitrilowleftthai",
+    "maitrilowrightthai",
+    "maitrithai",
+    "maitriupperleftthai",
+    "maiyamokthai",
+    "makatakana",
+    "makatakanahalfwidth",
     "male",
+    "mansyonsquare",
+    "maqafhebrew",
+    "mars",
+    "masoracirclehebrew",
+    "masquare",
+    "mbopomofo",
+    "mbsquare",
+    "mcircle",
+    "mcubedsquare",
+    "mdotaccent",
+    "mdotbelow",
+    "meemarabic",
+    "meemfinalarabic",
+    "meeminitialarabic",
+    "meemmedialarabic",
+    "meemmeeminitialarabic",
+    "meemmeemisolatedarabic",
+    "meetorusquare",
+    "mehiragana",
+    "meizierasquare",
+    "mekatakana",
+    "mekatakanahalfwidth",
+    "mem",
+    "memdagesh",
+    "memdageshhebrew",
+    "memhebrew",
+    "menarmenian",
+    "merkhahebrew",
+    "merkhakefulahebrew",
+    "merkhakefulalefthebrew",
+    "merkhalefthebrew",
+    "mhook",
+    "mhzsquare",
+    "middledotkatakanahalfwidth",
+    "middot",
+    "mieumacirclekorean",
+    "mieumaparenkorean",
+    "mieumcirclekorean",
+    "mieumkorean",
+    "mieumpansioskorean",
+    "mieumparenkorean",
+    "mieumpieupkorean",
+    "mieumsioskorean",
+    "mihiragana",
+    "mikatakana",
+    "mikatakanahalfwidth",
+    "minusbelowcmb",
+    "minuscircle",
+    "minusmod",
+    "minusplus",
     "minute",
+    "miribaarusquare",
+    "mirisquare",
+    "mlonglegturned",
+    "mlsquare",
+    "mmcubedsquare",
+    "mmonospace",
+    "mmsquaredsquare",
+    "mohiragana",
+    "mohmsquare",
+    "mokatakana",
+    "mokatakanahalfwidth",
+    "molsquare",
+    "momathai",
+    "moverssquare",
+    "moverssquaredsquare",
+    "mparen",
+    "mpasquare",
+    "mssquare",
+    "mturned",
+    "mu1",
+    "muasquare",
+    "muchgreater",
+    "muchless",
+    "mufsquare",
+    "mugreek",
+    "mugsquare",
+    "muhiragana",
+    "mukatakana",
+    "mukatakanahalfwidth",
+    "mulsquare",
+    "mumsquare",
+    "munahhebrew",
+    "munahlefthebrew",
     "musicalnote",
     "musicalnotedbl",
+    "musicflatsign",
+    "musicsharpsign",
+    "mussquare",
+    "muvsquare",
+    "muwsquare",
+    "mvmegasquare",
+    "mvsquare",
+    "mwmegasquare",
+    "mwsquare",
+    "nabengali",
+    "nabla",
     "nacute",
+    "nadeva",
+    "nagujarati",
+    "nagurmukhi",
+    "nahiragana",
+    "nakatakana",
+    "nakatakanahalfwidth",
     "napostrophe",
+    "nasquare",
+    "nbopomofo",
+    "nbspace",
     "ncaron",
+    "ncedilla",
+    "ncircle",
+    "ncircumflexbelow",
     "ncommaaccent",
+    "ndotaccent",
+    "ndotbelow",
+    "nehiragana",
+    "nekatakana",
+    "nekatakanahalfwidth",
+    "newsheqelsign",
+    "nfsquare",
+    "ngabengali",
+    "ngadeva",
+    "ngagujarati",
+    "ngagurmukhi",
+    "ngonguthai",
+    "nhiragana",
+    "nhookleft",
+    "nhookretroflex",
+    "nieunacirclekorean",
+    "nieunaparenkorean",
+    "nieuncieuckorean",
+    "nieuncirclekorean",
+    "nieunhieuhkorean",
+    "nieunkorean",
+    "nieunpansioskorean",
+    "nieunparenkorean",
+    "nieunsioskorean",
+    "nieuntikeutkorean",
+    "nihiragana",
+    "nikatakana",
+    "nikatakanahalfwidth",
+    "nikhahitleftthai",
+    "nikhahitthai",
+    "ninearabic",
+    "ninebengali",
+    "ninecircle",
+    "ninecircleinversesansserif",
+    "ninedeva",
+    "ninegujarati",
+    "ninegurmukhi",
+    "ninehackarabic",
+    "ninehangzhou",
+    "nineideographicparen",
+    "ninemonospace",
+    "nineparen",
+    "nineperiod",
+    "ninepersian",
+    "nineroman",
+    "nineteencircle",
+    "nineteenparen",
+    "nineteenperiod",
+    "ninethai",
+    "nj",
+    "njecyrillic",
+    "nkatakana",
+    "nkatakanahalfwidth",
+    "nlegrightlong",
+    "nlinebelow",
+    "nmonospace",
+    "nmsquare",
+    "nnabengali",
+    "nnadeva",
+    "nnagujarati",
+    "nnagurmukhi",
+    "nnnadeva",
+    "nohiragana",
+    "nokatakana",
+    "nokatakanahalfwidth",
+    "nonbreakingspace",
+    "nonenthai",
+    "nonuthai",
+    "noonarabic",
+    "noonfinalarabic",
+    "noonghunnaarabic",
+    "noonghunnafinalarabic",
+    "noonhehinitialarabic",
+    "nooninitialarabic",
+    "noonjeeminitialarabic",
+    "noonjeemisolatedarabic",
+    "noonmedialarabic",
+    "noonmeeminitialarabic",
+    "noonmeemisolatedarabic",
+    "noonnoonfinalarabic",
+    "notcontains",
     "notelement",
+    "notelementof",
     "notequal",
+    "notgreater",
+    "notgreaternorequal",
+    "notgreaternorless",
+    "notidentical",
+    "notless",
+    "notlessnorequal",
+    "notparallel",
+    "notprecedes",
     "notsubset",
+    "notsucceeds",
+    "notsuperset",
+    "nowarmenian",
+    "nparen",
+    "nssquare",
     "nu",
+    "nuhiragana",
+    "nukatakana",
+    "nukatakanahalfwidth",
+    "nuktabengali",
+    "nuktadeva",
+    "nuktagujarati",
+    "nuktagurmukhi",
+    "numbersignmonospace",
+    "numbersignsmall",
+    "numeralsigngreek",
+    "numeralsignlowergreek",
+    "numero",
+    "nun",
+    "nundagesh",
+    "nundageshhebrew",
+    "nunhebrew",
+    "nvsquare",
+    "nwsquare",
+    "nyabengali",
+    "nyadeva",
+    "nyagujarati",
+    "nyagurmukhi",
+    "oangthai",
+    "obarred",
+    "obarredcyrillic",
+    "obarreddieresiscyrillic",
+    "obengali",
+    "obopomofo",
     "obreve",
+    "ocandradeva",
+    "ocandragujarati",
+    "ocandravowelsigndeva",
+    "ocandravowelsigngujarati",
+    "ocaron",
+    "ocircle",
+    "ocircumflexacute",
+    "ocircumflexdotbelow",
+    "ocircumflexgrave",
+    "ocircumflexhookabove",
+    "ocircumflextilde",
+    "ocyrillic",
+    "odblacute",
+    "odblgrave",
+    "odeva",
+    "odieresiscyrillic",
+    "odotbelow",
+    "oekorean",
+    "ogonekcmb",
+    "ogujarati",
+    "oharmenian",
+    "ohiragana",
+    "ohookabove",
     "ohorn",
+    "ohornacute",
+    "ohorndotbelow",
+    "ohorngrave",
+    "ohornhookabove",
+    "ohorntilde",
     "ohungarumlaut",
+    "oi",
+    "oinvertedbreve",
+    "okatakana",
+    "okatakanahalfwidth",
+    "okorean",
+    "olehebrew",
     "omacron",
+    "omacronacute",
+    "omacrongrave",
+    "omdeva",
     "omega",
     "omega1",
+    "omegacyrillic",
+    "omegalatinclosed",
+    "omegaroundcyrillic",
+    "omegatitlocyrillic",
     "omegatonos",
+    "omgujarati",
     "omicron",
     "omicrontonos",
+    "omonospace",
+    "onearabic",
+    "onebengali",
+    "onecircle",
+    "onecircleinversesansserif",
+    "onedeva",
+    "onegujarati",
+    "onegurmukhi",
+    "onehackarabic",
+    "onehangzhou",
+    "oneideographicparen",
+    "onemonospace",
+    "onenumeratorbengali",
+    "oneparen",
+    "oneperiod",
+    "onepersian",
+    "oneroman",
+    "onethai",
+    "oogonek",
+    "oogonekmacron",
+    "oogurmukhi",
+    "oomatragurmukhi",
+    "oopen",
+    "oparen",
     "openbullet",
+    "option",
     "orthogonal",
+    "oshortdeva",
+    "oshortvowelsigndeva",
     "oslashacute",
+    "osmallhiragana",
+    "osmallkatakana",
+    "osmallkatakanahalfwidth",
+    "ostrokeacute",
+    "otcyrillic",
+    "otildeacute",
+    "otildedieresis",
+    "oubopomofo",
+    "overline",
+    "overlinecenterline",
+    "overlinecmb",
+    "overlinedashed",
+    "overlinedblwavy",
+    "overlinewavy",
+    "overscore",
+    "ovowelsignbengali",
+    "ovowelsigndeva",
+    "ovowelsigngujarati",
+    "paampssquare",
+    "paasentosquare",
+    "pabengali",
+    "pacute",
+    "padeva",
+    "pagedown",
+    "pageup",
+    "pagujarati",
+    "pagurmukhi",
+    "pahiragana",
+    "paiyannoithai",
+    "pakatakana",
+    "palatalizationcyrilliccmb",
+    "palochkacyrillic",
+    "pansioskorean",
+    "parallel",
+    "parenleftaltonearabic",
     "parenleftbt",
     "parenleftex",
+    "parenleftmonospace",
+    "parenleftsmall",
     "parenlefttp",
+    "parenleftvertical",
+    "parenrightaltonearabic",
     "parenrightbt",
     "parenrightex",
+    "parenrightmonospace",
+    "parenrightsmall",
     "parenrighttp",
+    "parenrightvertical",
     "partialdiff",
+    "paseqhebrew",
+    "pashtahebrew",
+    "pasquare",
+    "patah",
+    "patah11",
+    "patah1d",
+    "patah2a",
+    "patahhebrew",
+    "patahnarrowhebrew",
+    "patahquarterhebrew",
+    "patahwidehebrew",
+    "pazerhebrew",
+    "pbopomofo",
+    "pcircle",
+    "pdotaccent",
+    "pe",
+    "pecyrillic",
+    "pedagesh",
+    "pedageshhebrew",
+    "peezisquare",
+    "pefinaldageshhebrew",
+    "peharabic",
+    "peharmenian",
+    "pehebrew",
+    "pehfinalarabic",
+    "pehinitialarabic",
+    "pehiragana",
+    "pehmedialarabic",
+    "pekatakana",
+    "pemiddlehookcyrillic",
+    "perafehebrew",
+    "percentarabic",
+    "percentmonospace",
+    "percentsmall",
+    "periodarmenian",
+    "periodhalfwidth",
+    "periodmonospace",
+    "periodsmall",
+    "perispomenigreekcmb",
     "perpendicular",
     "peseta",
+    "pfsquare",
+    "phabengali",
+    "phadeva",
+    "phagujarati",
+    "phagurmukhi",
     "phi",
     "phi1",
+    "phieuphacirclekorean",
+    "phieuphaparenkorean",
+    "phieuphcirclekorean",
+    "phieuphkorean",
+    "phieuphparenkorean",
+    "philatin",
+    "phinthuthai",
+    "phisymbolgreek",
+    "phook",
+    "phophanthai",
+    "phophungthai",
+    "phosamphaothai",
     "pi",
+    "pieupacirclekorean",
+    "pieupaparenkorean",
+    "pieupcieuckorean",
+    "pieupcirclekorean",
+    "pieupkiyeokkorean",
+    "pieupkorean",
+    "pieupparenkorean",
+    "pieupsioskiyeokkorean",
+    "pieupsioskorean",
+    "pieupsiostikeutkorean",
+    "pieupthieuthkorean",
+    "pieuptikeutkorean",
+    "pihiragana",
+    "pikatakana",
+    "pisymbolgreek",
+    "piwrarmenian",
+    "plusbelowcmb",
+    "pluscircle",
+    "plusmod",
+    "plusmonospace",
+    "plussmall",
+    "plussuperior",
+    "pmonospace",
+    "pmsquare",
+    "pohiragana",
+    "pointingindexdownwhite",
+    "pointingindexleftwhite",
+    "pointingindexrightwhite",
+    "pointingindexupwhite",
+    "pokatakana",
+    "poplathai",
+    "postalmark",
+    "postalmarkface",
+    "pparen",
+    "precedes",
     "prescription",
+    "primemod",
+    "primereversed",
     "product",
+    "projective",
+    "prolongedkana",
+    "propellor",
     "propersubset",
     "propersuperset",
+    "proportion",
     "proportional",
     "psi",
+    "psicyrillic",
+    "psilipneumatacyrilliccmb",
+    "pssquare",
+    "puhiragana",
+    "pukatakana",
+    "pvsquare",
+    "pwsquare",
+    "qadeva",
+    "qadmahebrew",
+    "qafarabic",
+    "qaffinalarabic",
+    "qafinitialarabic",
+    "qafmedialarabic",
+    "qamats",
+    "qamats10",
+    "qamats1a",
+    "qamats1c",
+    "qamats27",
+    "qamats29",
+    "qamats33",
+    "qamatsde",
+    "qamatshebrew",
+    "qamatsnarrowhebrew",
+    "qamatsqatanhebrew",
+    "qamatsqatannarrowhebrew",
+    "qamatsqatanquarterhebrew",
+    "qamatsqatanwidehebrew",
+    "qamatsquarterhebrew",
+    "qamatswidehebrew",
+    "qarneyparahebrew",
+    "qbopomofo",
+    "qcircle",
+    "qhook",
+    "qmonospace",
+    "qof",
+    "qofdagesh",
+    "qofdageshhebrew",
+    "qofhatafpatah",
+    "qofhatafpatahhebrew",
+    "qofhatafsegol",
+    "qofhatafsegolhebrew",
+    "qofhebrew",
+    "qofhiriq",
+    "qofhiriqhebrew",
+    "qofholam",
+    "qofholamhebrew",
+    "qofpatah",
+    "qofpatahhebrew",
+    "qofqamats",
+    "qofqamatshebrew",
+    "qofqubuts",
+    "qofqubutshebrew",
+    "qofsegol",
+    "qofsegolhebrew",
+    "qofsheva",
+    "qofshevahebrew",
+    "qoftsere",
+    "qoftserehebrew",
+    "qparen",
+    "quarternote",
+    "qubuts",
+    "qubuts18",
+    "qubuts25",
+    "qubuts31",
+    "qubutshebrew",
+    "qubutsnarrowhebrew",
+    "qubutsquarterhebrew",
+    "qubutswidehebrew",
+    "questionarabic",
+    "questionarmenian",
+    "questiongreek",
+    "questionmonospace",
+    "quotedblmonospace",
+    "quotedblprime",
+    "quotedblprimereversed",
+    "quoteleftreversed",
     "quotereversed",
+    "quoterightn",
+    "quotesinglemonospace",
+    "raarmenian",
+    "rabengali",
     "racute",
+    "radeva",
     "radical",
     "radicalex",
+    "radoverssquare",
+    "radoverssquaredsquare",
+    "radsquare",
+    "rafe",
+    "rafehebrew",
+    "ragujarati",
+    "ragurmukhi",
+    "rahiragana",
+    "rakatakana",
+    "rakatakanahalfwidth",
+    "ralowerdiagonalbengali",
+    "ramiddlediagonalbengali",
+    "ramshorn",
+    "ratio",
+    "rbopomofo",
     "rcaron",
+    "rcedilla",
+    "rcircle",
     "rcommaaccent",
+    "rdblgrave",
+    "rdotaccent",
+    "rdotbelow",
+    "rdotbelowmacron",
+    "referencemark",
     "reflexsubset",
     "reflexsuperset",
     "registersans",
     "registerserif",
+    "reharabic",
+    "reharmenian",
+    "rehfinalarabic",
+    "rehiragana",
+    "rehyehaleflamarabic",
+    "rekatakana",
+    "rekatakanahalfwidth",
+    "resh",
+    "reshdageshhebrew",
+    "reshhatafpatah",
+    "reshhatafpatahhebrew",
+    "reshhatafsegol",
+    "reshhatafsegolhebrew",
+    "reshhebrew",
+    "reshhiriq",
+    "reshhiriqhebrew",
+    "reshholam",
+    "reshholamhebrew",
+    "reshpatah",
+    "reshpatahhebrew",
+    "reshqamats",
+    "reshqamatshebrew",
+    "reshqubuts",
+    "reshqubutshebrew",
+    "reshsegol",
+    "reshsegolhebrew",
+    "reshsheva",
+    "reshshevahebrew",
+    "reshtsere",
+    "reshtserehebrew",
+    "reversedtilde",
+    "reviahebrew",
+    "reviamugrashhebrew",
     "revlogicalnot",
+    "rfishhook",
+    "rfishhookreversed",
+    "rhabengali",
+    "rhadeva",
     "rho",
+    "rhook",
+    "rhookturned",
+    "rhookturnedsuperior",
+    "rhosymbolgreek",
+    "rhotichookmod",
+    "rieulacirclekorean",
+    "rieulaparenkorean",
+    "rieulcirclekorean",
+    "rieulhieuhkorean",
+    "rieulkiyeokkorean",
+    "rieulkiyeoksioskorean",
+    "rieulkorean",
+    "rieulmieumkorean",
+    "rieulpansioskorean",
+    "rieulparenkorean",
+    "rieulphieuphkorean",
+    "rieulpieupkorean",
+    "rieulpieupsioskorean",
+    "rieulsioskorean",
+    "rieulthieuthkorean",
+    "rieultikeutkorean",
+    "rieulyeorinhieuhkorean",
+    "rightangle",
+    "righttackbelowcmb",
+    "righttriangle",
+    "rihiragana",
+    "rikatakana",
+    "rikatakanahalfwidth",
+    "ringbelowcmb",
+    "ringcmb",
+    "ringhalfleft",
+    "ringhalfleftarmenian",
+    "ringhalfleftbelowcmb",
+    "ringhalfleftcentered",
+    "ringhalfright",
+    "ringhalfrightbelowcmb",
+    "ringhalfrightcentered",
+    "rinvertedbreve",
+    "rittorusquare",
+    "rlinebelow",
+    "rlongleg",
+    "rlonglegturned",
+    "rmonospace",
+    "rohiragana",
+    "rokatakana",
+    "rokatakanahalfwidth",
+    "roruathai",
+    "rparen",
+    "rrabengali",
+    "rradeva",
+    "rragurmukhi",
+    "rreharabic",
+    "rrehfinalarabic",
+    "rrvocalicbengali",
+    "rrvocalicdeva",
+    "rrvocalicgujarati",
+    "rrvocalicvowelsignbengali",
+    "rrvocalicvowelsigndeva",
+    "rrvocalicvowelsigngujarati",
     "rtblock",
+    "rturned",
+    "rturnedsuperior",
+    "ruhiragana",
+    "rukatakana",
+    "rukatakanahalfwidth",
+    "rupeemarkbengali",
+    "rupeesignbengali",
+    "ruthai",
+    "rvocalicbengali",
+    "rvocalicdeva",
+    "rvocalicgujarati",
+    "rvocalicvowelsignbengali",
+    "rvocalicvowelsigndeva",
+    "rvocalicvowelsigngujarati",
+    "sabengali",
     "sacute",
+    "sacutedotaccent",
+    "sadarabic",
+    "sadeva",
+    "sadfinalarabic",
+    "sadinitialarabic",
+    "sadmedialarabic",
+    "sagujarati",
+    "sagurmukhi",
+    "sahiragana",
+    "sakatakana",
+    "sakatakanahalfwidth",
+    "sallallahoualayhewasallamarabic",
+    "samekh",
+    "samekhdagesh",
+    "samekhdageshhebrew",
+    "samekhhebrew",
+    "saraaathai",
+    "saraaethai",
+    "saraaimaimalaithai",
+    "saraaimaimuanthai",
+    "saraamthai",
+    "saraathai",
+    "saraethai",
+    "saraiileftthai",
+    "saraiithai",
+    "saraileftthai",
+    "saraithai",
+    "saraothai",
+    "saraueeleftthai",
+    "saraueethai",
+    "saraueleftthai",
+    "sarauethai",
+    "sarauthai",
+    "sarauuthai",
+    "sbopomofo",
+    "scarondotaccent",
     "scedilla",
-    "scedilla",
+    "schwa",
+    "schwacyrillic",
+    "schwadieresiscyrillic",
+    "schwahook",
+    "scircle",
     "scircumflex",
     "scommaaccent",
+    "sdotaccent",
+    "sdotbelow",
+    "sdotbelowdotaccent",
+    "seagullbelowcmb",
     "second",
+    "secondtonechinese",
+    "seenarabic",
+    "seenfinalarabic",
+    "seeninitialarabic",
+    "seenmedialarabic",
+    "segol",
+    "segol13",
+    "segol1f",
+    "segol2c",
+    "segolhebrew",
+    "segolnarrowhebrew",
+    "segolquarterhebrew",
+    "segoltahebrew",
+    "segolwidehebrew",
+    "seharmenian",
+    "sehiragana",
+    "sekatakana",
+    "sekatakanahalfwidth",
+    "semicolonarabic",
+    "semicolonmonospace",
+    "semicolonsmall",
+    "semivoicedmarkkana",
+    "semivoicedmarkkanahalfwidth",
+    "sentisquare",
+    "sentosquare",
+    "sevenarabic",
+    "sevenbengali",
+    "sevencircle",
+    "sevencircleinversesansserif",
+    "sevendeva",
+    "sevengujarati",
+    "sevengurmukhi",
+    "sevenhackarabic",
+    "sevenhangzhou",
+    "sevenideographicparen",
+    "sevenmonospace",
+    "sevenparen",
+    "sevenperiod",
+    "sevenpersian",
+    "sevenroman",
+    "seventeencircle",
+    "seventeenparen",
+    "seventeenperiod",
+    "seventhai",
+    "sfthyphen",
+    "shaarmenian",
+    "shabengali",
+    "shacyrillic",
+    "shaddaarabic",
+    "shaddadammaarabic",
+    "shaddadammatanarabic",
+    "shaddafathaarabic",
+    "shaddafathatanarabic",
+    "shaddakasraarabic",
+    "shaddakasratanarabic",
     "shade",
+    "shadedark",
+    "shadelight",
+    "shademedium",
+    "shadeva",
+    "shagujarati",
+    "shagurmukhi",
+    "shalshelethebrew",
+    "shbopomofo",
+    "shchacyrillic",
+    "sheenarabic",
+    "sheenfinalarabic",
+    "sheeninitialarabic",
+    "sheenmedialarabic",
+    "sheicoptic",
+    "sheqel",
+    "sheqelhebrew",
+    "sheva",
+    "sheva115",
+    "sheva15",
+    "sheva22",
+    "sheva2e",
+    "shevahebrew",
+    "shevanarrowhebrew",
+    "shevaquarterhebrew",
+    "shevawidehebrew",
+    "shhacyrillic",
+    "shimacoptic",
+    "shin",
+    "shindagesh",
+    "shindageshhebrew",
+    "shindageshshindot",
+    "shindageshshindothebrew",
+    "shindageshsindot",
+    "shindageshsindothebrew",
+    "shindothebrew",
+    "shinhebrew",
+    "shinshindot",
+    "shinshindothebrew",
+    "shinsindot",
+    "shinsindothebrew",
+    "shook",
     "sigma",
     "sigma1",
+    "sigmafinal",
+    "sigmalunatesymbolgreek",
+    "sihiragana",
+    "sikatakana",
+    "sikatakanahalfwidth",
+    "siluqhebrew",
+    "siluqlefthebrew",
     "similar",
+    "sindothebrew",
+    "siosacirclekorean",
+    "siosaparenkorean",
+    "sioscieuckorean",
+    "sioscirclekorean",
+    "sioskiyeokkorean",
+    "sioskorean",
+    "siosnieunkorean",
+    "siosparenkorean",
+    "siospieupkorean",
+    "siostikeutkorean",
+    "sixarabic",
+    "sixbengali",
+    "sixcircle",
+    "sixcircleinversesansserif",
+    "sixdeva",
+    "sixgujarati",
+    "sixgurmukhi",
+    "sixhackarabic",
+    "sixhangzhou",
+    "sixideographicparen",
+    "sixmonospace",
+    "sixparen",
+    "sixperiod",
+    "sixpersian",
+    "sixroman",
+    "sixteencircle",
+    "sixteencurrencydenominatorbengali",
+    "sixteenparen",
+    "sixteenperiod",
+    "sixthai",
+    "slashmonospace",
+    "slong",
+    "slongdotaccent",
     "smileface",
+    "smonospace",
+    "sofpasuqhebrew",
+    "softhyphen",
+    "softsigncyrillic",
+    "sohiragana",
+    "sokatakana",
+    "sokatakanahalfwidth",
+    "soliduslongoverlaycmb",
+    "solidusshortoverlaycmb",
+    "sorusithai",
+    "sosalathai",
+    "sosothai",
+    "sosuathai",
+    "spacehackarabic",
     "spade",
+    "spadesuitblack",
+    "spadesuitwhite",
+    "sparen",
+    "squarebelowcmb",
+    "squarecc",
+    "squarecm",
+    "squarediagonalcrosshatchfill",
+    "squarehorizontalfill",
+    "squarekg",
+    "squarekm",
+    "squarekmcapital",
+    "squareln",
+    "squarelog",
+    "squaremg",
+    "squaremil",
+    "squaremm",
+    "squaremsquared",
+    "squareorthogonalcrosshatchfill",
+    "squareupperlefttolowerrightfill",
+    "squareupperrighttolowerleftfill",
+    "squareverticalfill",
+    "squarewhitewithsmallblack",
+    "srsquare",
+    "ssabengali",
+    "ssadeva",
+    "ssagujarati",
+    "ssangcieuckorean",
+    "ssanghieuhkorean",
+    "ssangieungkorean",
+    "ssangkiyeokkorean",
+    "ssangnieunkorean",
+    "ssangpieupkorean",
+    "ssangsioskorean",
+    "ssangtikeutkorean",
+    "sterlingmonospace",
+    "strokelongoverlaycmb",
+    "strokeshortoverlaycmb",
+    "subset",
+    "subsetnotequal",
+    "subsetorequal",
+    "succeeds",
     "suchthat",
+    "suhiragana",
+    "sukatakana",
+    "sukatakanahalfwidth",
+    "sukunarabic",
     "summation",
     "sun",
+    "superset",
+    "supersetnotequal",
+    "supersetorequal",
+    "svsquare",
+    "syouwaerasquare",
+    "tabengali",
+    "tackdown",
+    "tackleft",
+    "tadeva",
+    "tagujarati",
+    "tagurmukhi",
+    "taharabic",
+    "tahfinalarabic",
+    "tahinitialarabic",
+    "tahiragana",
+    "tahmedialarabic",
+    "taisyouerasquare",
+    "takatakana",
+    "takatakanahalfwidth",
+    "tatweelarabic",
     "tau",
+    "tav",
+    "tavdages",
+    "tavdagesh",
+    "tavdageshhebrew",
+    "tavhebrew",
     "tbar",
+    "tbopomofo",
     "tcaron",
+    "tccurl",
+    "tcedilla",
+    "tcheharabic",
+    "tchehfinalarabic",
+    "tchehinitialarabic",
+    "tchehmedialarabic",
+    "tchehmeeminitialarabic",
+    "tcircle",
+    "tcircumflexbelow",
     "tcommaaccent",
-    "tcommaaccent",
+    "tdieresis",
+    "tdotaccent",
+    "tdotbelow",
+    "tecyrillic",
+    "tedescendercyrillic",
+    "teharabic",
+    "tehfinalarabic",
+    "tehhahinitialarabic",
+    "tehhahisolatedarabic",
+    "tehinitialarabic",
+    "tehiragana",
+    "tehjeeminitialarabic",
+    "tehjeemisolatedarabic",
+    "tehmarbutaarabic",
+    "tehmarbutafinalarabic",
+    "tehmedialarabic",
+    "tehmeeminitialarabic",
+    "tehmeemisolatedarabic",
+    "tehnoonfinalarabic",
+    "tekatakana",
+    "tekatakanahalfwidth",
+    "telephone",
+    "telephoneblack",
+    "telishagedolahebrew",
+    "telishaqetanahebrew",
+    "tencircle",
+    "tenideographicparen",
+    "tenparen",
+    "tenperiod",
+    "tenroman",
+    "tesh",
+    "tet",
+    "tetdagesh",
+    "tetdageshhebrew",
+    "tethebrew",
+    "tetsecyrillic",
+    "tevirhebrew",
+    "tevirlefthebrew",
+    "thabengali",
+    "thadeva",
+    "thagujarati",
+    "thagurmukhi",
+    "thalarabic",
+    "thalfinalarabic",
+    "thanthakhatlowleftthai",
+    "thanthakhatlowrightthai",
+    "thanthakhatthai",
+    "thanthakhatupperleftthai",
+    "theharabic",
+    "thehfinalarabic",
+    "thehinitialarabic",
+    "thehmedialarabic",
+    "thereexists",
     "therefore",
     "theta",
     "theta1",
+    "thetasymbolgreek",
+    "thieuthacirclekorean",
+    "thieuthaparenkorean",
+    "thieuthcirclekorean",
+    "thieuthkorean",
+    "thieuthparenkorean",
+    "thirteencircle",
+    "thirteenparen",
+    "thirteenperiod",
+    "thonangmonthothai",
+    "thook",
+    "thophuthaothai",
+    "thothahanthai",
+    "thothanthai",
+    "thothongthai",
+    "thothungthai",
+    "thousandcyrillic",
+    "thousandsseparatorarabic",
+    "thousandsseparatorpersian",
+    "threearabic",
+    "threebengali",
+    "threecircle",
+    "threecircleinversesansserif",
+    "threedeva",
+    "threegujarati",
+    "threegurmukhi",
+    "threehackarabic",
+    "threehangzhou",
+    "threeideographicparen",
+    "threemonospace",
+    "threenumeratorbengali",
+    "threeparen",
+    "threeperiod",
+    "threepersian",
+    "threeroman",
+    "threethai",
+    "thzsquare",
+    "tihiragana",
+    "tikatakana",
+    "tikatakanahalfwidth",
+    "tikeutacirclekorean",
+    "tikeutaparenkorean",
+    "tikeutcirclekorean",
+    "tikeutkorean",
+    "tikeutparenkorean",
+    "tildebelowcmb",
+    "tildecmb",
     "tildecomb",
+    "tildedoublecmb",
+    "tildeoperator",
+    "tildeoverlaycmb",
+    "tildeverticalcmb",
+    "timescircle",
+    "tipehahebrew",
+    "tipehalefthebrew",
+    "tippigurmukhi",
+    "titlocyrilliccmb",
+    "tiwnarmenian",
+    "tlinebelow",
+    "tmonospace",
+    "toarmenian",
+    "tohiragana",
+    "tokatakana",
+    "tokatakanahalfwidth",
+    "tonebarextrahighmod",
+    "tonebarextralowmod",
+    "tonebarhighmod",
+    "tonebarlowmod",
+    "tonebarmidmod",
+    "tonefive",
+    "tonesix",
+    "tonetwo",
     "tonos",
+    "tonsquare",
+    "topatakthai",
+    "tortoiseshellbracketleft",
+    "tortoiseshellbracketleftsmall",
+    "tortoiseshellbracketleftvertical",
+    "tortoiseshellbracketright",
+    "tortoiseshellbracketrightsmall",
+    "tortoiseshellbracketrightvertical",
+    "totaothai",
+    "tpalatalhook",
+    "tparen",
     "trademarksans",
     "trademarkserif",
+    "tretroflexhook",
     "triagdn",
     "triaglf",
     "triagrt",
     "triagup",
+    "ts",
+    "tsadi",
+    "tsadidagesh",
+    "tsadidageshhebrew",
+    "tsadihebrew",
+    "tsecyrillic",
+    "tsere",
+    "tsere12",
+    "tsere1e",
+    "tsere2b",
+    "tserehebrew",
+    "tserenarrowhebrew",
+    "tserequarterhebrew",
+    "tserewidehebrew",
+    "tshecyrillic",
+    "ttabengali",
+    "ttadeva",
+    "ttagujarati",
+    "ttagurmukhi",
+    "tteharabic",
+    "ttehfinalarabic",
+    "ttehinitialarabic",
+    "ttehmedialarabic",
+    "tthabengali",
+    "tthadeva",
+    "tthagujarati",
+    "tthagurmukhi",
+    "tturned",
+    "tuhiragana",
+    "tukatakana",
+    "tukatakanahalfwidth",
+    "tusmallhiragana",
+    "tusmallkatakana",
+    "tusmallkatakanahalfwidth",
+    "twelvecircle",
+    "twelveparen",
+    "twelveperiod",
+    "twelveroman",
+    "twentycircle",
+    "twentyhangzhou",
+    "twentyparen",
+    "twentyperiod",
+    "twoarabic",
+    "twobengali",
+    "twocircle",
+    "twocircleinversesansserif",
+    "twodeva",
+    "twodotleader",
+    "twodotleadervertical",
+    "twogujarati",
+    "twogurmukhi",
+    "twohackarabic",
+    "twohangzhou",
+    "twoideographicparen",
+    "twomonospace",
+    "twonumeratorbengali",
+    "twoparen",
+    "twoperiod",
+    "twopersian",
+    "tworoman",
+    "twostroke",
+    "twothai",
+    "ubar",
+    "ubengali",
+    "ubopomofo",
     "ubreve",
+    "ucaron",
+    "ucircle",
+    "ucircumflexbelow",
+    "ucyrillic",
+    "udattadeva",
+    "udblacute",
+    "udblgrave",
+    "udeva",
+    "udieresisacute",
+    "udieresisbelow",
+    "udieresiscaron",
+    "udieresiscyrillic",
+    "udieresisgrave",
+    "udieresismacron",
+    "udotbelow",
+    "ugujarati",
+    "ugurmukhi",
+    "uhiragana",
+    "uhookabove",
     "uhorn",
+    "uhornacute",
+    "uhorndotbelow",
+    "uhorngrave",
+    "uhornhookabove",
+    "uhorntilde",
     "uhungarumlaut",
+    "uhungarumlautcyrillic",
+    "uinvertedbreve",
+    "ukatakana",
+    "ukatakanahalfwidth",
+    "ukcyrillic",
+    "ukorean",
     "umacron",
+    "umacroncyrillic",
+    "umacrondieresis",
+    "umatragurmukhi",
+    "umonospace",
     "underscoredbl",
+    "underscoremonospace",
+    "underscorevertical",
+    "underscorewavy",
     "union",
     "universal",
     "uogonek",
+    "uparen",
     "upblock",
+    "upperdothebrew",
     "upsilon",
     "upsilondieresis",
     "upsilondieresistonos",
+    "upsilonlatin",
     "upsilontonos",
+    "uptackbelowcmb",
+    "uptackmod",
+    "uragurmukhi",
     "uring",
+    "ushortcyrillic",
+    "usmallhiragana",
+    "usmallkatakana",
+    "usmallkatakanahalfwidth",
+    "ustraightcyrillic",
+    "ustraightstrokecyrillic",
     "utilde",
+    "utildeacute",
+    "utildebelow",
+    "uubengali",
+    "uudeva",
+    "uugujarati",
+    "uugurmukhi",
+    "uumatragurmukhi",
+    "uuvowelsignbengali",
+    "uuvowelsigndeva",
+    "uuvowelsigngujarati",
+    "uvowelsignbengali",
+    "uvowelsigndeva",
+    "uvowelsigngujarati",
+    "vadeva",
+    "vagujarati",
+    "vagurmukhi",
+    "vakatakana",
+    "vav",
+    "vavdagesh",
+    "vavdagesh65",
+    "vavdageshhebrew",
+    "vavhebrew",
+    "vavholam",
+    "vavholamhebrew",
+    "vavvavhebrew",
+    "vavyodhebrew",
+    "vcircle",
+    "vdotbelow",
+    "vecyrillic",
+    "veharabic",
+    "vehfinalarabic",
+    "vehinitialarabic",
+    "vehmedialarabic",
+    "vekatakana",
+    "venus",
+    "verticalbar",
+    "verticallineabovecmb",
+    "verticallinebelowcmb",
+    "verticallinelowmod",
+    "verticallinemod",
+    "vewarmenian",
+    "vhook",
+    "vikatakana",
+    "viramabengali",
+    "viramadeva",
+    "viramagujarati",
+    "visargabengali",
+    "visargadeva",
+    "visargagujarati",
+    "vmonospace",
+    "voarmenian",
+    "voicediterationhiragana",
+    "voicediterationkatakana",
+    "voicedmarkkana",
+    "voicedmarkkanahalfwidth",
+    "vokatakana",
+    "vparen",
+    "vtilde",
+    "vturned",
+    "vuhiragana",
+    "vukatakana",
     "wacute",
+    "waekorean",
+    "wahiragana",
+    "wakatakana",
+    "wakatakanahalfwidth",
+    "wakorean",
+    "wasmallhiragana",
+    "wasmallkatakana",
+    "wattosquare",
+    "wavedash",
+    "wavyunderscorevertical",
+    "wawarabic",
+    "wawfinalarabic",
+    "wawhamzaabovearabic",
+    "wawhamzaabovefinalarabic",
+    "wbsquare",
+    "wcircle",
     "wcircumflex",
     "wdieresis",
+    "wdotaccent",
+    "wdotbelow",
+    "wehiragana",
     "weierstrass",
+    "wekatakana",
+    "wekorean",
+    "weokorean",
     "wgrave",
+    "whitebullet",
+    "whitecircle",
+    "whitecircleinverse",
+    "whitecornerbracketleft",
+    "whitecornerbracketleftvertical",
+    "whitecornerbracketright",
+    "whitecornerbracketrightvertical",
+    "whitediamond",
+    "whitediamondcontainingblacksmalldiamond",
+    "whitedownpointingsmalltriangle",
+    "whitedownpointingtriangle",
+    "whiteleftpointingsmalltriangle",
+    "whiteleftpointingtriangle",
+    "whitelenticularbracketleft",
+    "whitelenticularbracketright",
+    "whiterightpointingsmalltriangle",
+    "whiterightpointingtriangle",
+    "whitesmallsquare",
+    "whitesmilingface",
+    "whitesquare",
+    "whitestar",
+    "whitetelephone",
+    "whitetortoiseshellbracketleft",
+    "whitetortoiseshellbracketright",
+    "whiteuppointingsmalltriangle",
+    "whiteuppointingtriangle",
+    "wihiragana",
+    "wikatakana",
+    "wikorean",
+    "wmonospace",
+    "wohiragana",
+    "wokatakana",
+    "wokatakanahalfwidth",
+    "won",
+    "wonmonospace",
+    "wowaenthai",
+    "wparen",
+    "wring",
+    "wsuperior",
+    "wturned",
+    "wynn",
+    "xabovecmb",
+    "xbopomofo",
+    "xcircle",
+    "xdieresis",
+    "xdotaccent",
+    "xeharmenian",
     "xi",
+    "xmonospace",
+    "xparen",
+    "xsuperior",
+    "yaadosquare",
+    "yabengali",
+    "yadeva",
+    "yaekorean",
+    "yagujarati",
+    "yagurmukhi",
+    "yahiragana",
+    "yakatakana",
+    "yakatakanahalfwidth",
+    "yakorean",
+    "yamakkanthai",
+    "yasmallhiragana",
+    "yasmallkatakana",
+    "yasmallkatakanahalfwidth",
+    "yatcyrillic",
+    "ycircle",
     "ycircumflex",
+    "ydotaccent",
+    "ydotbelow",
+    "yeharabic",
+    "yehbarreearabic",
+    "yehbarreefinalarabic",
+    "yehfinalarabic",
+    "yehhamzaabovearabic",
+    "yehhamzaabovefinalarabic",
+    "yehhamzaaboveinitialarabic",
+    "yehhamzaabovemedialarabic",
+    "yehinitialarabic",
+    "yehmedialarabic",
+    "yehmeeminitialarabic",
+    "yehmeemisolatedarabic",
+    "yehnoonfinalarabic",
+    "yehthreedotsbelowarabic",
+    "yekorean",
+    "yenmonospace",
+    "yeokorean",
+    "yeorinhieuhkorean",
+    "yerahbenyomohebrew",
+    "yerahbenyomolefthebrew",
+    "yericyrillic",
+    "yerudieresiscyrillic",
+    "yesieungkorean",
+    "yesieungpansioskorean",
+    "yesieungsioskorean",
+    "yetivhebrew",
     "ygrave",
+    "yhook",
+    "yhookabove",
+    "yiarmenian",
+    "yicyrillic",
+    "yikorean",
+    "yinyang",
+    "yiwnarmenian",
+    "ymonospace",
+    "yod",
+    "yoddagesh",
+    "yoddageshhebrew",
+    "yodhebrew",
+    "yodyodhebrew",
+    "yodyodpatahhebrew",
+    "yohiragana",
+    "yoikorean",
+    "yokatakana",
+    "yokatakanahalfwidth",
+    "yokorean",
+    "yosmallhiragana",
+    "yosmallkatakana",
+    "yosmallkatakanahalfwidth",
+    "yotgreek",
+    "yoyaekorean",
+    "yoyakorean",
+    "yoyakthai",
+    "yoyingthai",
+    "yparen",
+    "ypogegrammeni",
+    "ypogegrammenigreekcmb",
+    "yr",
+    "yring",
+    "ysuperior",
+    "ytilde",
+    "yturned",
+    "yuhiragana",
+    "yuikorean",
+    "yukatakana",
+    "yukatakanahalfwidth",
+    "yukorean",
+    "yusbigcyrillic",
+    "yusbigiotifiedcyrillic",
+    "yuslittlecyrillic",
+    "yuslittleiotifiedcyrillic",
+    "yusmallhiragana",
+    "yusmallkatakana",
+    "yusmallkatakanahalfwidth",
+    "yuyekorean",
+    "yuyeokorean",
+    "yyabengali",
+    "yyadeva",
+    "zaarmenian",
     "zacute",
+    "zadeva",
+    "zagurmukhi",
+    "zaharabic",
+    "zahfinalarabic",
+    "zahinitialarabic",
+    "zahiragana",
+    "zahmedialarabic",
+    "zainarabic",
+    "zainfinalarabic",
+    "zakatakana",
+    "zaqefgadolhebrew",
+    "zaqefqatanhebrew",
+    "zarqahebrew",
+    "zayin",
+    "zayindagesh",
+    "zayindageshhebrew",
+    "zayinhebrew",
+    "zbopomofo",
+    "zcircle",
+    "zcircumflex",
+    "zcurl",
+    "zdot",
     "zdotaccent",
+    "zdotbelow",
+    "zecyrillic",
+    "zedescendercyrillic",
+    "zedieresiscyrillic",
+    "zehiragana",
+    "zekatakana",
+    "zeroarabic",
+    "zerobengali",
+    "zerodeva",
+    "zerogujarati",
+    "zerogurmukhi",
+    "zerohackarabic",
+    "zeromonospace",
+    "zeropersian",
+    "zerothai",
+    "zerowidthjoiner",
+    "zerowidthnonjoiner",
+    "zerowidthspace",
     "zeta",
+    "zhbopomofo",
+    "zhearmenian",
+    "zhebrevecyrillic",
+    "zhecyrillic",
+    "zhedescendercyrillic",
+    "zhedieresiscyrillic",
+    "zihiragana",
+    "zikatakana",
+    "zinorhebrew",
+    "zlinebelow",
+    "zmonospace",
+    "zohiragana",
+    "zokatakana",
+    "zparen",
+    "zretroflexhook",
+    "zstroke",
+    "zuhiragana",
+    "zukatakana",
 
 #endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */
 
@@ -1093,13 +4327,13 @@
   };
 
 
-  static const char* const * const  sid_standard_names = ps_glyph_names + 4;
+  static const char* const * const  sid_standard_names = ps_glyph_names + 2;
 
 
 #define NUM_SID_GLYPHS 391
 
 #ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
-#define NUM_ADOBE_GLYPHS 1058
+#define NUM_ADOBE_GLYPHS 4294
 #else
 #define NUM_ADOBE_GLYPHS 391
 #endif
@@ -1107,17 +4341,19 @@
 
   static const unsigned short  mac_standard_names[259] =
   {
-    4,
+    2,
     0,
     1,
+    3,
+    4,
     5,
     6,
     7,
     8,
     9,
-    10,
+    106,
     11,
-    108,
+    12,
     13,
     14,
     15,
@@ -1172,9 +4408,9 @@
     64,
     65,
     66,
-    67,
+    126,
     68,
-    128,
+    69,
     70,
     71,
     72,
@@ -1203,554 +4439,552 @@
     95,
     96,
     97,
-    98,
-    99,
+    175,
     177,
     179,
-    181,
-    182,
-    190,
-    193,
-    199,
+    180,
+    188,
+    191,
+    197,
+    202,
+    205,
+    203,
     204,
     207,
-    205,
     206,
-    209,
     208,
+    209,
+    212,
     210,
     211,
-    214,
-    212,
     213,
-    215,
-    218,
     216,
+    214,
+    215,
     217,
+    218,
+    221,
     219,
     220,
-    223,
-    221,
     222,
     224,
-    226,
-    229,
     227,
-    228,
-    116,
-    165,
-    101,
-    102,
-    106,
-    120,
-    119,
-    153,
-    169,
-    174,
-    157,
-    129,
-    135,
-    959,
-    142,
-    145,
-    917,
-    160,
-    941,
-    908,
-    104,
-    156,
-    980,
-    1018,
-    987,
-    985,
-    918,
-    143,
-    147,
-    471,
-    148,
-    151,
-    127,
-    100,
-    155,
-    994,
-    105,
-    815,
-    412,
-    110,
-    124,
-    125,
-    2,
-    178,
-    180,
-    195,
-    146,
-    152,
-    115,
-    141,
-    109,
-    123,
-    69,
-    12,
+    225,
+    226,
+    114,
     163,
-    948,
-    231,
-    202,
+    99,
+    100,
+    104,
+    118,
+    117,
+    151,
+    167,
+    172,
+    155,
+    127,
+    133,
+    2919,
+    140,
+    143,
+    2413,
+    158,
+    2642,
+    2156,
+    102,
+    154,
+    3092,
+    3681,
+    3192,
+    3153,
+    2415,
+    141,
+    145,
+    741,
+    146,
+    149,
+    125,
+    98,
+    153,
+    3284,
     103,
+    1353,
+    472,
+    108,
+    122,
+    123,
+    2901,
+    176,
+    178,
+    193,
+    144,
+    150,
+    113,
+    139,
     107,
+    121,
+    67,
+    10,
+    161,
+    2677,
+    229,
+    200,
+    101,
+    105,
+    109,
+    110,
     111,
     112,
-    113,
-    114,
-    117,
-    118,
-    121,
-    122,
-    126,
-    176,
+    115,
+    116,
+    119,
+    120,
+    124,
+    174,
+    181,
+    173,
+    182,
     183,
-    175,
     184,
     185,
     186,
     187,
-    188,
     189,
-    191,
+    190,
+    1351,
     192,
-    3,
-    194,
-    197,
+    195,
+    196,
     198,
-    200,
-    149,
+    147,
+    128,
+    129,
     130,
     131,
     132,
-    133,
     134,
+    135,
     136,
     137,
     138,
-    139,
-    140,
-    144,
-    150,
-    196,
-    225,
-    203,
-    232,
-    164,
-    158,
-    171,
+    142,
+    148,
+    194,
+    223,
     201,
     230,
-    161,
-    166,
-    170,
-    172,
-    154,
-    168,
-    173,
-    159,
     162,
-    167,
-    899,
-    429,
-    901,
-    444,
-    526,
-    1006,
-    404,
-    847,
-    406,
-    849,
-    868,
+    156,
+    169,
+    199,
+    228,
+    159,
+    164,
+    168,
+    170,
+    152,
+    166,
+    171,
+    157,
+    160,
+    165,
+    2074,
+    556,
+    2091,
+    609,
+    836,
+    3465,
+    438,
+    1545,
+    440,
+    1560,
+    1767,
     0
   };
 
 
 
-  static const unsigned short  ps_names_to_unicode[1059] =
+  static const unsigned short  ps_names_to_unicode[4295] =
   {
     0,
-    0x0020,
-    0x0021,
-    0x0022,
-    0x0023,
-    0x0024,
-    0x0025,
-    0x0026,
-    0x2019,
-    0x0028,
-    0x0029,
-    0x002A,
-    0x002B,
-    0x002C,
-    0x002D,
-    0x002E,
-    0x002F,
-    0x0030,
-    0x0031,
-    0x0032,
-    0x0033,
-    0x0034,
-    0x0035,
-    0x0036,
-    0x0037,
-    0x0038,
-    0x0039,
-    0x003A,
-    0x003B,
-    0x003C,
-    0x003D,
-    0x003E,
-    0x003F,
-    0x0040,
-    0x0041,
-    0x0042,
-    0x0043,
-    0x0044,
-    0x0045,
-    0x0046,
-    0x0047,
-    0x0048,
-    0x0049,
-    0x004A,
-    0x004B,
-    0x004C,
-    0x004D,
-    0x004E,
-    0x004F,
-    0x0050,
-    0x0051,
-    0x0052,
-    0x0053,
-    0x0054,
-    0x0055,
-    0x0056,
-    0x0057,
-    0x0058,
-    0x0059,
-    0x005A,
-    0x005B,
-    0x005C,
-    0x005D,
-    0x005E,
-    0x005F,
-    0x2018,
-    0x0061,
-    0x0062,
-    0x0063,
-    0x0064,
-    0x0065,
-    0x0066,
-    0x0067,
-    0x0068,
-    0x0069,
-    0x006A,
-    0x006B,
-    0x006C,
-    0x006D,
-    0x006E,
-    0x006F,
-    0x0070,
-    0x0071,
-    0x0072,
-    0x0073,
-    0x0074,
-    0x0075,
-    0x0076,
-    0x0077,
-    0x0078,
-    0x0079,
-    0x007A,
-    0x007B,
-    0x007C,
-    0x007D,
-    0x007E,
-    0x00A1,
-    0x00A2,
-    0x00A3,
-    0x2044,
-    0x00A5,
-    0x0192,
-    0x00A7,
-    0x00A4,
-    0x0027,
-    0x201C,
-    0x00AB,
-    0x2039,
-    0x203A,
-    0xFB01,
-    0xFB02,
-    0x2013,
-    0x2020,
-    0x2021,
-    0x00B7,
-    0x00B6,
-    0x2022,
-    0x201A,
-    0x201E,
-    0x201D,
-    0x00BB,
-    0x2026,
-    0x2030,
-    0x00BF,
-    0x0060,
-    0x00B4,
-    0x02C6,
-    0x02DC,
-    0x00AF,
-    0x02D8,
-    0x02D9,
-    0x00A8,
-    0x02DA,
-    0x00B8,
-    0x02DD,
-    0x02DB,
-    0x02C7,
-    0x2014,
-    0x00C6,
-    0x00AA,
-    0x0141,
-    0x00D8,
-    0x0152,
-    0x00BA,
-    0x00E6,
-    0x0131,
-    0x0142,
-    0x00F8,
-    0x0153,
-    0x00DF,
-    0x00B9,
-    0x00AC,
-    0x00B5,
-    0x2122,
-    0x00D0,
-    0x00BD,
-    0x00B1,
-    0x00DE,
-    0x00BC,
-    0x00F7,
-    0x00A6,
-    0x00B0,
-    0x00FE,
-    0x00BE,
-    0x00B2,
-    0x00AE,
-    0x2212,
-    0x00F0,
-    0x00D7,
-    0x00B3,
-    0x00A9,
-    0x00C1,
-    0x00C2,
-    0x00C4,
-    0x00C0,
-    0x00C5,
-    0x00C3,
-    0x00C7,
-    0x00C9,
-    0x00CA,
-    0x00CB,
-    0x00C8,
-    0x00CD,
-    0x00CE,
-    0x00CF,
-    0x00CC,
-    0x00D1,
-    0x00D3,
-    0x00D4,
-    0x00D6,
-    0x00D2,
-    0x00D5,
-    0x0160,
-    0x00DA,
-    0x00DB,
-    0x00DC,
-    0x00D9,
-    0x00DD,
-    0x0178,
-    0x017D,
-    0x00E1,
-    0x00E2,
-    0x00E4,
-    0x00E0,
-    0x00E5,
-    0x00E3,
-    0x00E7,
-    0x00E9,
-    0x00EA,
-    0x00EB,
-    0x00E8,
-    0x00ED,
-    0x00EE,
-    0x00EF,
-    0x00EC,
-    0x00F1,
-    0x00F3,
-    0x00F4,
-    0x00F6,
-    0x00F2,
-    0x00F5,
-    0x0161,
-    0x00FA,
-    0x00FB,
-    0x00FC,
-    0x00F9,
-    0x00FD,
-    0x00FF,
-    0x017E,
-    0xF721,
-    0xF6F8,
-    0xF724,
-    0xF6E4,
-    0xF726,
-    0xF7B4,
-    0x207D,
-    0x207E,
-    0x2025,
-    0x2024,
-    0xF730,
-    0xF731,
-    0xF732,
-    0xF733,
-    0xF734,
-    0xF735,
-    0xF736,
-    0xF737,
-    0xF738,
-    0xF739,
-    0xF6E2,
-    0xF6DE,
-    0xF6E8,
-    0xF73F,
-    0xF6E9,
-    0xF6EA,
-    0xF6E0,
-    0xF6EB,
-    0xF6EC,
-    0xF6ED,
-    0xF6EE,
-    0xF6EF,
-    0x207F,
-    0xF6F0,
-    0xF6F1,
-    0xF6F2,
-    0xF6F3,
-    0xFB00,
-    0xFB03,
-    0xFB04,
-    0x208D,
-    0x208E,
-    0xF6F6,
-    0xF6E6,
-    0xF760,
-    0xF761,
-    0xF762,
-    0xF763,
-    0xF764,
-    0xF765,
-    0xF766,
-    0xF767,
-    0xF768,
-    0xF769,
-    0xF76A,
-    0xF76B,
-    0xF76C,
-    0xF76D,
-    0xF76E,
-    0xF76F,
-    0xF770,
-    0xF771,
-    0xF772,
-    0xF773,
-    0xF774,
-    0xF775,
-    0xF776,
-    0xF777,
-    0xF778,
-    0xF779,
-    0xF77A,
-    0x20A1,
-    0xF6DC,
-    0xF6DD,
-    0xF6FE,
-    0xF7A1,
-    0xF7A2,
-    0xF6F9,
-    0xF6FD,
-    0xF6FF,
-    0xF7A8,
-    0xF6F4,
-    0xF6F5,
-    0xF6F7,
-    0xF7AF,
-    0x2012,
-    0xF6E5,
-    0xF6FB,
-    0xF6FC,
-    0xF7B8,
-    0xF7BF,
-    0x215B,
-    0x215C,
-    0x215D,
-    0x215E,
-    0x2153,
-    0x2154,
-    0x2070,
-    0x2074,
-    0x2075,
-    0x2076,
-    0x2077,
-    0x2078,
-    0x2079,
-    0x2080,
-    0x2081,
-    0x2082,
-    0x2083,
-    0x2084,
-    0x2085,
-    0x2086,
-    0x2087,
-    0x2088,
-    0x2089,
-    0xF6DF,
-    0xF6E3,
-    0xF6E7,
-    0xF6E1,
-    0xF7E0,
-    0xF7E1,
-    0xF7E2,
-    0xF7E3,
-    0xF7E4,
-    0xF7E5,
-    0xF7E6,
-    0xF7E7,
-    0xF7E8,
-    0xF7E9,
-    0xF7EA,
-    0xF7EB,
-    0xF7EC,
-    0xF7ED,
-    0xF7EE,
-    0xF7EF,
-    0xF7F0,
-    0xF7F1,
-    0xF7F2,
-    0xF7F3,
-    0xF7F4,
-    0xF7F5,
-    0xF7F6,
-    0xF6FA,
-    0xF7F8,
-    0xF7F9,
-    0xF7FA,
-    0xF7FB,
-    0xF7FC,
-    0xF7FD,
-    0xF7FE,
-    0xF7FF,
+    0x0020U,
+    0x0021U,
+    0x0022U,
+    0x0023U,
+    0x0024U,
+    0x0025U,
+    0x0026U,
+    0x2019U,
+    0x0028U,
+    0x0029U,
+    0x002AU,
+    0x002BU,
+    0x002CU,
+    0x002DU,
+    0x002EU,
+    0x002FU,
+    0x0030U,
+    0x0031U,
+    0x0032U,
+    0x0033U,
+    0x0034U,
+    0x0035U,
+    0x0036U,
+    0x0037U,
+    0x0038U,
+    0x0039U,
+    0x003AU,
+    0x003BU,
+    0x003CU,
+    0x003DU,
+    0x003EU,
+    0x003FU,
+    0x0040U,
+    0x0041U,
+    0x0042U,
+    0x0043U,
+    0x0044U,
+    0x0045U,
+    0x0046U,
+    0x0047U,
+    0x0048U,
+    0x0049U,
+    0x004AU,
+    0x004BU,
+    0x004CU,
+    0x004DU,
+    0x004EU,
+    0x004FU,
+    0x0050U,
+    0x0051U,
+    0x0052U,
+    0x0053U,
+    0x0054U,
+    0x0055U,
+    0x0056U,
+    0x0057U,
+    0x0058U,
+    0x0059U,
+    0x005AU,
+    0x005BU,
+    0x005CU,
+    0x005DU,
+    0x005EU,
+    0x005FU,
+    0x2018U,
+    0x0061U,
+    0x0062U,
+    0x0063U,
+    0x0064U,
+    0x0065U,
+    0x0066U,
+    0x0067U,
+    0x0068U,
+    0x0069U,
+    0x006AU,
+    0x006BU,
+    0x006CU,
+    0x006DU,
+    0x006EU,
+    0x006FU,
+    0x0070U,
+    0x0071U,
+    0x0072U,
+    0x0073U,
+    0x0074U,
+    0x0075U,
+    0x0076U,
+    0x0077U,
+    0x0078U,
+    0x0079U,
+    0x007AU,
+    0x007BU,
+    0x007CU,
+    0x007DU,
+    0x007EU,
+    0x00A1U,
+    0x00A2U,
+    0x00A3U,
+    0x2044U,
+    0x00A5U,
+    0x0192U,
+    0x00A7U,
+    0x00A4U,
+    0x0027U,
+    0x201CU,
+    0x00ABU,
+    0x2039U,
+    0x203AU,
+    0xFB01U,
+    0xFB02U,
+    0x2013U,
+    0x2020U,
+    0x2021U,
+    0x00B7U,
+    0x00B6U,
+    0x2022U,
+    0x201AU,
+    0x201EU,
+    0x201DU,
+    0x00BBU,
+    0x2026U,
+    0x2030U,
+    0x00BFU,
+    0x0060U,
+    0x00B4U,
+    0x02C6U,
+    0x02DCU,
+    0x00AFU,
+    0x02D8U,
+    0x02D9U,
+    0x00A8U,
+    0x02DAU,
+    0x00B8U,
+    0x02DDU,
+    0x02DBU,
+    0x02C7U,
+    0x2014U,
+    0x00C6U,
+    0x00AAU,
+    0x0141U,
+    0x00D8U,
+    0x0152U,
+    0x00BAU,
+    0x00E6U,
+    0x0131U,
+    0x0142U,
+    0x00F8U,
+    0x0153U,
+    0x00DFU,
+    0x00B9U,
+    0x00ACU,
+    0x00B5U,
+    0x2122U,
+    0x00D0U,
+    0x00BDU,
+    0x00B1U,
+    0x00DEU,
+    0x00BCU,
+    0x00F7U,
+    0x00A6U,
+    0x00B0U,
+    0x00FEU,
+    0x00BEU,
+    0x00B2U,
+    0x00AEU,
+    0x2212U,
+    0x00F0U,
+    0x00D7U,
+    0x00B3U,
+    0x00A9U,
+    0x00C1U,
+    0x00C2U,
+    0x00C4U,
+    0x00C0U,
+    0x00C5U,
+    0x00C3U,
+    0x00C7U,
+    0x00C9U,
+    0x00CAU,
+    0x00CBU,
+    0x00C8U,
+    0x00CDU,
+    0x00CEU,
+    0x00CFU,
+    0x00CCU,
+    0x00D1U,
+    0x00D3U,
+    0x00D4U,
+    0x00D6U,
+    0x00D2U,
+    0x00D5U,
+    0x0160U,
+    0x00DAU,
+    0x00DBU,
+    0x00DCU,
+    0x00D9U,
+    0x00DDU,
+    0x0178U,
+    0x017DU,
+    0x00E1U,
+    0x00E2U,
+    0x00E4U,
+    0x00E0U,
+    0x00E5U,
+    0x00E3U,
+    0x00E7U,
+    0x00E9U,
+    0x00EAU,
+    0x00EBU,
+    0x00E8U,
+    0x00EDU,
+    0x00EEU,
+    0x00EFU,
+    0x00ECU,
+    0x00F1U,
+    0x00F3U,
+    0x00F4U,
+    0x00F6U,
+    0x00F2U,
+    0x00F5U,
+    0x0161U,
+    0x00FAU,
+    0x00FBU,
+    0x00FCU,
+    0x00F9U,
+    0x00FDU,
+    0x00FFU,
+    0x017EU,
+    0xF721U,
+    0xF6F8U,
+    0xF724U,
+    0xF6E4U,
+    0xF726U,
+    0xF7B4U,
+    0x207DU,
+    0x207EU,
+    0x2025U,
+    0x2024U,
+    0xF730U,
+    0xF731U,
+    0xF732U,
+    0xF733U,
+    0xF734U,
+    0xF735U,
+    0xF736U,
+    0xF737U,
+    0xF738U,
+    0xF739U,
+    0xF6E2U,
+    0xF6DEU,
+    0xF6E8U,
+    0xF73FU,
+    0xF6E9U,
+    0xF6EAU,
+    0xF6E0U,
+    0xF6EBU,
+    0xF6ECU,
+    0xF6EDU,
+    0xF6EEU,
+    0xF6EFU,
+    0x207FU,
+    0xF6F0U,
+    0xF6F1U,
+    0xF6F2U,
+    0xF6F3U,
+    0xFB00U,
+    0xFB03U,
+    0xFB04U,
+    0x208DU,
+    0x208EU,
+    0xF6F6U,
+    0xF6E6U,
+    0xF760U,
+    0xF761U,
+    0xF762U,
+    0xF763U,
+    0xF764U,
+    0xF765U,
+    0xF766U,
+    0xF767U,
+    0xF768U,
+    0xF769U,
+    0xF76AU,
+    0xF76BU,
+    0xF76CU,
+    0xF76DU,
+    0xF76EU,
+    0xF76FU,
+    0xF770U,
+    0xF771U,
+    0xF772U,
+    0xF773U,
+    0xF774U,
+    0xF775U,
+    0xF776U,
+    0xF777U,
+    0xF778U,
+    0xF779U,
+    0xF77AU,
+    0x20A1U,
+    0xF6DCU,
+    0xF6DDU,
+    0xF6FEU,
+    0xF7A1U,
+    0xF7A2U,
+    0xF6F9U,
+    0xF6FDU,
+    0xF6FFU,
+    0xF7A8U,
+    0xF6F4U,
+    0xF6F5U,
+    0xF6F7U,
+    0xF7AFU,
+    0x2012U,
+    0xF6E5U,
+    0xF6FBU,
+    0xF6FCU,
+    0xF7B8U,
+    0xF7BFU,
+    0x215BU,
+    0x215CU,
+    0x215DU,
+    0x215EU,
+    0x2153U,
+    0x2154U,
+    0x2070U,
+    0x2074U,
+    0x2075U,
+    0x2076U,
+    0x2077U,
+    0x2078U,
+    0x2079U,
+    0x2080U,
+    0x2081U,
+    0x2082U,
+    0x2083U,
+    0x2084U,
+    0x2085U,
+    0x2086U,
+    0x2087U,
+    0x2088U,
+    0x2089U,
+    0xF6DFU,
+    0xF6E3U,
+    0xF6E7U,
+    0xF6E1U,
+    0xF7E0U,
+    0xF7E1U,
+    0xF7E2U,
+    0xF7E3U,
+    0xF7E4U,
+    0xF7E5U,
+    0xF7E6U,
+    0xF7E7U,
+    0xF7E8U,
+    0xF7E9U,
+    0xF7EAU,
+    0xF7EBU,
+    0xF7ECU,
+    0xF7EDU,
+    0xF7EEU,
+    0xF7EFU,
+    0xF7F0U,
+    0xF7F1U,
+    0xF7F2U,
+    0xF7F3U,
+    0xF7F4U,
+    0xF7F5U,
+    0xF7F6U,
+    0xF6FAU,
+    0xF7F8U,
+    0xF7F9U,
+    0xF7FAU,
+    0xF7FBU,
+    0xF7FCU,
+    0xF7FDU,
+    0xF7FEU,
+    0xF7FFU,
     0,
     0,
     0,
@@ -1766,673 +5000,3909 @@
 
 #ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
 
-    0x01FC,
-    0x0102,
-    0xF6C9,
-    0x0391,
-    0x0386,
-    0x0100,
-    0x0104,
-    0x01FA,
-    0x0392,
-    0x0106,
-    0xF6CA,
-    0x010C,
-    0x0108,
-    0x010A,
-    0x03A7,
-    0x010E,
-    0x0110,
-    0x2206,
-    0x2206,
-    0xF6CB,
-    0xF6CC,
-    0xF6CD,
-    0x0114,
-    0x011A,
-    0x0116,
-    0x0112,
-    0x014A,
-    0x0118,
-    0x0395,
-    0x0388,
-    0x0397,
-    0x0389,
-    0x20AC,
-    0x0393,
-    0x011E,
-    0x01E6,
-    0x011C,
-    0x0122,
-    0x0120,
-    0xF6CE,
-    0x25CF,
-    0x25AA,
-    0x25AB,
-    0x25A1,
-    0x0126,
-    0x0124,
-    0xF6CF,
-    0x0132,
-    0x012C,
-    0x0130,
-    0x2111,
-    0x012A,
-    0x012E,
-    0x0399,
-    0x03AA,
-    0x038A,
-    0x0128,
-    0x0134,
-    0x039A,
-    0x0136,
-    0xF6BF,
-    0x0139,
-    0x039B,
-    0x013D,
-    0x013B,
-    0x013F,
-    0xF6D0,
-    0x039C,
-    0x0143,
-    0x0147,
-    0x0145,
-    0x039D,
-    0x014E,
-    0x01A0,
-    0x0150,
-    0x014C,
-    0x2126,
-    0x2126,
-    0x038F,
-    0x039F,
-    0x038C,
-    0x01FE,
-    0x03A6,
-    0x03A0,
-    0x03A8,
-    0x0154,
-    0x0158,
-    0x0156,
-    0x211C,
-    0x03A1,
-    0x250C,
-    0x2514,
-    0x2510,
-    0x2518,
-    0x253C,
-    0x252C,
-    0x2534,
-    0x251C,
-    0x2524,
-    0x2500,
-    0x2502,
-    0x2561,
-    0x2562,
-    0x2556,
-    0x2555,
-    0x2563,
-    0x2551,
-    0x2557,
-    0x255D,
-    0x255C,
-    0x255B,
-    0x255E,
-    0x255F,
-    0x255A,
-    0x2554,
-    0x2569,
-    0x2566,
-    0x2560,
-    0x2550,
-    0x256C,
-    0x2567,
-    0x2568,
-    0x2564,
-    0x2565,
-    0x2559,
-    0x2558,
-    0x2552,
-    0x2553,
-    0x256B,
-    0x256A,
-    0x015A,
-    0x015E,
-    0x015E,
-    0x015C,
-    0x0218,
-    0x03A3,
-    0x03A4,
-    0x0166,
-    0x0164,
-    0x0162,
-    0x0162,
-    0x0398,
-    0x016C,
-    0x01AF,
-    0x0170,
-    0x016A,
-    0x0172,
-    0x03A5,
-    0x03D2,
-    0x03AB,
-    0x038E,
-    0x016E,
-    0x0168,
-    0x1E82,
-    0x0174,
-    0x1E84,
-    0x1E80,
-    0x039E,
-    0x0176,
-    0x1EF2,
-    0x0179,
-    0x017B,
-    0x0396,
-    0x0103,
-    0x0301,
-    0x01FD,
-    0x2015,
-    0x0410,
-    0x0411,
-    0x0412,
-    0x0413,
-    0x0414,
-    0x0415,
-    0x0401,
-    0x0416,
-    0x0417,
-    0x0418,
-    0x0419,
-    0x041A,
-    0x041B,
-    0x041C,
-    0x041D,
-    0x041E,
-    0x041F,
-    0x0420,
-    0x0421,
-    0x0422,
-    0x0423,
-    0x0424,
-    0x0425,
-    0x0426,
-    0x0427,
-    0x0428,
-    0x0429,
-    0x042A,
-    0x042B,
-    0x042C,
-    0x042D,
-    0x042E,
-    0x042F,
-    0x0490,
-    0x0402,
-    0x0403,
-    0x0404,
-    0x0405,
-    0x0406,
-    0x0407,
-    0x0408,
-    0x0409,
-    0x040A,
-    0x040B,
-    0x040C,
-    0x040E,
-    0xF6C4,
-    0xF6C5,
-    0x0430,
-    0x0431,
-    0x0432,
-    0x0433,
-    0x0434,
-    0x0435,
-    0x0451,
-    0x0436,
-    0x0437,
-    0x0438,
-    0x0439,
-    0x043A,
-    0x043B,
-    0x043C,
-    0x043D,
-    0x043E,
-    0x043F,
-    0x0440,
-    0x0441,
-    0x0442,
-    0x0443,
-    0x0444,
-    0x0445,
-    0x0446,
-    0x0447,
-    0x0448,
-    0x0449,
-    0x044A,
-    0x044B,
-    0x044C,
-    0x044D,
-    0x044E,
-    0x044F,
-    0x0491,
-    0x0452,
-    0x0453,
-    0x0454,
-    0x0455,
-    0x0456,
-    0x0457,
-    0x0458,
-    0x0459,
-    0x045A,
-    0x045B,
-    0x045C,
-    0x045E,
-    0x040F,
-    0x0462,
-    0x0472,
-    0x0474,
-    0xF6C6,
-    0x045F,
-    0x0463,
-    0x0473,
-    0x0475,
-    0xF6C7,
-    0xF6C8,
-    0x04D9,
-    0x200E,
-    0x200F,
-    0x200D,
-    0x066A,
-    0x060C,
-    0x0660,
-    0x0661,
-    0x0662,
-    0x0663,
-    0x0664,
-    0x0665,
-    0x0666,
-    0x0667,
-    0x0668,
-    0x0669,
-    0x061B,
-    0x061F,
-    0x0621,
-    0x0622,
-    0x0623,
-    0x0624,
-    0x0625,
-    0x0626,
-    0x0627,
-    0x0628,
-    0x0629,
-    0x062A,
-    0x062B,
-    0x062C,
-    0x062D,
-    0x062E,
-    0x062F,
-    0x0630,
-    0x0631,
-    0x0632,
-    0x0633,
-    0x0634,
-    0x0635,
-    0x0636,
-    0x0637,
-    0x0638,
-    0x0639,
-    0x063A,
-    0x0640,
-    0x0641,
-    0x0642,
-    0x0643,
-    0x0644,
-    0x0645,
-    0x0646,
-    0x0648,
-    0x0649,
-    0x064A,
-    0x064B,
-    0x064C,
-    0x064D,
-    0x064E,
-    0x064F,
-    0x0650,
-    0x0651,
-    0x0652,
-    0x0647,
-    0x06A4,
-    0x067E,
-    0x0686,
-    0x0698,
-    0x06AF,
-    0x0679,
-    0x0688,
-    0x0691,
-    0x06BA,
-    0x06D2,
-    0x06D5,
-    0x20AA,
-    0x05BE,
-    0x05C3,
-    0x05D0,
-    0x05D1,
-    0x05D2,
-    0x05D3,
-    0x05D4,
-    0x05D5,
-    0x05D6,
-    0x05D7,
-    0x05D8,
-    0x05D9,
-    0x05DA,
-    0x05DB,
-    0x05DC,
-    0x05DD,
-    0x05DE,
-    0x05DF,
-    0x05E0,
-    0x05E1,
-    0x05E2,
-    0x05E3,
-    0x05E4,
-    0x05E5,
-    0x05E6,
-    0x05E7,
-    0x05E8,
-    0x05E9,
-    0x05EA,
-    0xFB2A,
-    0xFB2B,
-    0xFB4B,
-    0xFB1F,
-    0x05F0,
-    0x05F1,
-    0x05F2,
-    0xFB35,
-    0x05B4,
-    0x05B5,
-    0x05B6,
-    0x05BB,
-    0x05B8,
-    0x05B7,
-    0x05B0,
-    0x05B2,
-    0x05B1,
-    0x05B3,
-    0x05C2,
-    0x05C1,
-    0x05B9,
-    0x05BC,
-    0x05BD,
-    0x05BF,
-    0x05C0,
-    0x02BC,
-    0x2105,
-    0x2113,
-    0x2116,
-    0x202C,
-    0x202D,
-    0x202E,
-    0x200C,
-    0x066D,
-    0x02BD,
-    0x2135,
-    0x03B1,
-    0x03AC,
-    0x0101,
-    0x2220,
-    0x2329,
-    0x232A,
-    0x0387,
-    0x0105,
-    0x2248,
-    0x01FB,
-    0x2194,
-    0x21D4,
-    0x21D3,
-    0x21D0,
-    0x21D2,
-    0x21D1,
-    0x2193,
-    0xF8E7,
-    0x2190,
-    0x2192,
-    0x2191,
-    0x2195,
-    0x21A8,
-    0xF8E6,
-    0x2217,
-    0x03B2,
-    0x2588,
-    0xF8F4,
-    0xF8F3,
-    0xF8F2,
-    0xF8F1,
-    0xF8FE,
-    0xF8FD,
-    0xF8FC,
-    0xF8F0,
-    0xF8EF,
-    0xF8EE,
-    0xF8FB,
-    0xF8FA,
-    0xF8F9,
-    0x0107,
-    0x21B5,
-    0x010D,
-    0x0109,
-    0x010B,
-    0x03C7,
-    0x25CB,
-    0x2297,
-    0x2295,
-    0x2663,
-    0xF6C3,
-    0x2245,
-    0xF8E9,
-    0xF6D9,
-    0xF6D1,
-    0xF6D2,
-    0xF6D4,
-    0xF6D5,
-    0xF6D3,
-    0xF6D6,
-    0x010F,
-    0x0111,
-    0x03B4,
-    0x2666,
-    0xF6D7,
-    0xF6D8,
-    0x0385,
-    0x2593,
-    0x2584,
-    0x20AB,
-    0x0323,
-    0xF6BE,
-    0x22C5,
-    0x0115,
-    0x011B,
-    0x0117,
-    0x2208,
-    0x0113,
-    0x2205,
-    0x014B,
-    0x0119,
-    0x03B5,
-    0x03AD,
-    0x2261,
-    0x212E,
-    0x03B7,
-    0x03AE,
-    0x203C,
-    0x2203,
-    0x2640,
-    0x25A0,
-    0x25AC,
-    0x20A3,
-    0x03B3,
-    0x011F,
-    0x01E7,
-    0x011D,
-    0x0123,
-    0x0121,
-    0x2207,
-    0x0300,
-    0x2265,
-    0x0127,
-    0x0125,
-    0x2665,
-    0x0309,
-    0x2302,
-    0x012D,
-    0x0133,
-    0x012B,
-    0x221E,
-    0x222B,
-    0x2321,
-    0xF8F5,
-    0x2320,
-    0x2229,
-    0x25D8,
-    0x25D9,
-    0x263B,
-    0x012F,
-    0x03B9,
-    0x03CA,
-    0x0390,
-    0x03AF,
-    0x0129,
-    0x0135,
-    0x03BA,
-    0x0137,
-    0x0138,
-    0x013A,
-    0x03BB,
-    0x013E,
-    0x013C,
-    0x0140,
-    0x2264,
-    0x258C,
-    0x20A4,
-    0xF6C0,
-    0x2227,
-    0x2228,
-    0x017F,
-    0x25CA,
-    0x2591,
-    0x2642,
-    0x2032,
-    0x266A,
-    0x266B,
-    0x0144,
-    0x0149,
-    0x0148,
-    0x0146,
-    0x2209,
-    0x2260,
-    0x2284,
-    0x03BD,
-    0x014F,
-    0x01A1,
-    0x0151,
-    0x014D,
-    0x03C9,
-    0x03D6,
-    0x03CE,
-    0x03BF,
-    0x03CC,
-    0x25E6,
-    0x221F,
-    0x01FF,
-    0xF8ED,
-    0xF8EC,
-    0xF8EB,
-    0xF8F8,
-    0xF8F7,
-    0xF8F6,
-    0x2202,
-    0x22A5,
-    0x20A7,
-    0x03C6,
-    0x03D5,
-    0x03C0,
-    0x211E,
-    0x220F,
-    0x2282,
-    0x2283,
-    0x221D,
-    0x03C8,
-    0x201B,
-    0x0155,
-    0x221A,
-    0xF8E5,
-    0x0159,
-    0x0157,
-    0x2286,
-    0x2287,
-    0xF8E8,
-    0xF6DA,
-    0x2310,
-    0x03C1,
-    0x2590,
-    0x015B,
-    0x015F,
-    0x015F,
-    0x015D,
-    0x0219,
-    0x2033,
-    0x2592,
-    0x03C3,
-    0x03C2,
-    0x223C,
-    0x263A,
-    0x2660,
-    0x220B,
-    0x2211,
-    0x263C,
-    0x03C4,
-    0x0167,
-    0x0165,
-    0x0163,
-    0x0163,
-    0x2234,
-    0x03B8,
-    0x03D1,
-    0x0303,
-    0x0384,
-    0xF8EA,
-    0xF6DB,
-    0x25BC,
-    0x25C4,
-    0x25BA,
-    0x25B2,
-    0x016D,
-    0x01B0,
-    0x0171,
-    0x016B,
-    0x2017,
-    0x222A,
-    0x2200,
-    0x0173,
-    0x2580,
-    0x03C5,
-    0x03CB,
-    0x03B0,
-    0x03CD,
-    0x016F,
-    0x0169,
-    0x1E83,
-    0x0175,
-    0x1E85,
-    0x2118,
-    0x1E81,
-    0x03BE,
-    0x0177,
-    0x1EF3,
-    0x017A,
-    0x017C,
-    0x03B6,
+    0x01FCU,
+    0x01E2U,
+    0x0102U,
+    0x1EAEU,
+    0x04D0U,
+    0x1EB6U,
+    0x1EB0U,
+    0x1EB2U,
+    0x1EB4U,
+    0x01CDU,
+    0x24B6U,
+    0x1EA4U,
+    0x1EACU,
+    0x1EA6U,
+    0x1EA8U,
+    0x1EAAU,
+    0xF6C9U,
+    0x0410U,
+    0x0200U,
+    0x04D2U,
+    0x01DEU,
+    0x1EA0U,
+    0x01E0U,
+    0x1EA2U,
+    0x04D4U,
+    0x0202U,
+    0x0391U,
+    0x0386U,
+    0x0100U,
+    0xFF21U,
+    0x0104U,
+    0x01FAU,
+    0x1E00U,
+    0x0531U,
+    0x24B7U,
+    0x1E02U,
+    0x1E04U,
+    0x0411U,
+    0x0532U,
+    0x0392U,
+    0x0181U,
+    0x1E06U,
+    0xFF22U,
+    0x0182U,
+    0x053EU,
+    0x0106U,
+    0xF6CAU,
+    0x010CU,
+    0x1E08U,
+    0x24B8U,
+    0x0108U,
+    0x010AU,
+    0x010AU,
+    0x0549U,
+    0x04BCU,
+    0x0427U,
+    0x04BEU,
+    0x04B6U,
+    0x04F4U,
+    0x0543U,
+    0x04CBU,
+    0x04B8U,
+    0x03A7U,
+    0x0187U,
+    0xFF23U,
+    0x0551U,
+    0x01F1U,
+    0x01C4U,
+    0x0534U,
+    0x0189U,
+    0x010EU,
+    0x1E10U,
+    0x24B9U,
+    0x1E12U,
+    0x0110U,
+    0x1E0AU,
+    0x1E0CU,
+    0x0414U,
+    0x03EEU,
+    0x2206U,
+    0x0394U,
+    0x018AU,
+    0xF6CBU,
+    0xF6CCU,
+    0xF6CDU,
+    0x03DCU,
+    0x0402U,
+    0x1E0EU,
+    0xFF24U,
+    0x0110U,
+    0x018BU,
+    0x01F2U,
+    0x01C5U,
+    0x04E0U,
+    0x0405U,
+    0x040FU,
+    0x0114U,
+    0x011AU,
+    0x1E1CU,
+    0x0535U,
+    0x24BAU,
+    0x1EBEU,
+    0x1E18U,
+    0x1EC6U,
+    0x1EC0U,
+    0x1EC2U,
+    0x1EC4U,
+    0x0404U,
+    0x0204U,
+    0x0116U,
+    0x0116U,
+    0x1EB8U,
+    0x0424U,
+    0x0537U,
+    0x1EBAU,
+    0x2167U,
+    0x0206U,
+    0x0464U,
+    0x041BU,
+    0x216AU,
+    0x0112U,
+    0x1E16U,
+    0x1E14U,
+    0x041CU,
+    0xFF25U,
+    0x041DU,
+    0x04A2U,
+    0x014AU,
+    0x04A4U,
+    0x04C7U,
+    0x0118U,
+    0x0190U,
+    0x0395U,
+    0x0388U,
+    0x0420U,
+    0x018EU,
+    0x042DU,
+    0x0421U,
+    0x04AAU,
+    0x01A9U,
+    0x0397U,
+    0x0538U,
+    0x0389U,
+    0x1EBCU,
+    0x1E1AU,
+    0x20ACU,
+    0x01B7U,
+    0x01EEU,
+    0x01B8U,
+    0x24BBU,
+    0x1E1EU,
+    0x0556U,
+    0x03E4U,
+    0x0191U,
+    0x0472U,
+    0x2164U,
+    0xFF26U,
+    0x2163U,
+    0x3387U,
+    0x01F4U,
+    0x0393U,
+    0x0194U,
+    0x03EAU,
+    0x011EU,
+    0x01E6U,
+    0x0122U,
+    0x24BCU,
+    0x011CU,
+    0x0122U,
+    0x0120U,
+    0x0120U,
+    0x0413U,
+    0x0542U,
+    0x0494U,
+    0x0492U,
+    0x0490U,
+    0x0193U,
+    0x0533U,
+    0x0403U,
+    0x1E20U,
+    0xFF27U,
+    0xF6CEU,
+    0x029BU,
+    0x01E4U,
+    0x25CFU,
+    0x25AAU,
+    0x25ABU,
+    0x25A1U,
+    0x33CBU,
+    0x04A8U,
+    0x04B2U,
+    0x042AU,
+    0x0126U,
+    0x1E2AU,
+    0x1E28U,
+    0x24BDU,
+    0x0124U,
+    0x1E26U,
+    0x1E22U,
+    0x1E24U,
+    0xFF28U,
+    0x0540U,
+    0x03E8U,
+    0xF6CFU,
+    0x3390U,
+    0x042FU,
+    0x0132U,
+    0x042EU,
+    0x012CU,
+    0x01CFU,
+    0x24BEU,
+    0x0406U,
+    0x0208U,
+    0x1E2EU,
+    0x04E4U,
+    0x0130U,
+    0x0130U,
+    0x1ECAU,
+    0x04D6U,
+    0x0415U,
+    0x2111U,
+    0x1EC8U,
+    0x0418U,
+    0x020AU,
+    0x0419U,
+    0x012AU,
+    0x04E2U,
+    0xFF29U,
+    0x053BU,
+    0x0401U,
+    0x012EU,
+    0x0399U,
+    0x0196U,
+    0x03AAU,
+    0x038AU,
+    0x0197U,
+    0x0128U,
+    0x1E2CU,
+    0x0474U,
+    0x0476U,
+    0x0541U,
+    0x24BFU,
+    0x0134U,
+    0x0408U,
+    0x054BU,
+    0xFF2AU,
+    0x3385U,
+    0x33CDU,
+    0x04A0U,
+    0x1E30U,
+    0x041AU,
+    0x049AU,
+    0x04C3U,
+    0x039AU,
+    0x049EU,
+    0x049CU,
+    0x01E8U,
+    0x0136U,
+    0x24C0U,
+    0x0136U,
+    0x1E32U,
+    0x0554U,
+    0x053FU,
+    0x0425U,
+    0x03E6U,
+    0x0198U,
+    0x040CU,
+    0x1E34U,
+    0xFF2BU,
+    0x0480U,
+    0x03DEU,
+    0x046EU,
+    0x01C7U,
+    0xF6BFU,
+    0x0139U,
+    0x039BU,
+    0x013DU,
+    0x013BU,
+    0x24C1U,
+    0x1E3CU,
+    0x013BU,
+    0x013FU,
+    0x013FU,
+    0x1E36U,
+    0x1E38U,
+    0x053CU,
+    0x01C8U,
+    0x0409U,
+    0x1E3AU,
+    0xFF2CU,
+    0x3386U,
+    0xF6D0U,
+    0x1E3EU,
+    0x24C2U,
+    0x1E40U,
+    0x1E42U,
+    0x0544U,
+    0xFF2DU,
+    0x019CU,
+    0x039CU,
+    0x01CAU,
+    0x0143U,
+    0x0147U,
+    0x0145U,
+    0x24C3U,
+    0x1E4AU,
+    0x0145U,
+    0x1E44U,
+    0x1E46U,
+    0x019DU,
+    0x2168U,
+    0x01CBU,
+    0x040AU,
+    0x1E48U,
+    0xFF2EU,
+    0x0546U,
+    0x039DU,
+    0x04E8U,
+    0x04EAU,
+    0x014EU,
+    0x01D1U,
+    0x019FU,
+    0x24C4U,
+    0x1ED0U,
+    0x1ED8U,
+    0x1ED2U,
+    0x1ED4U,
+    0x1ED6U,
+    0x041EU,
+    0x0150U,
+    0x020CU,
+    0x04E6U,
+    0x1ECCU,
+    0x0555U,
+    0x2126U,
+    0x1ECEU,
+    0x01A0U,
+    0x1EDAU,
+    0x1EE2U,
+    0x1EDCU,
+    0x1EDEU,
+    0x1EE0U,
+    0x0150U,
+    0x01A2U,
+    0x020EU,
+    0x014CU,
+    0x1E52U,
+    0x1E50U,
+    0x2126U,
+    0x0460U,
+    0x03A9U,
+    0x047AU,
+    0x047CU,
+    0x038FU,
+    0x039FU,
+    0x038CU,
+    0xFF2FU,
+    0x2160U,
+    0x01EAU,
+    0x01ECU,
+    0x0186U,
+    0x01FEU,
+    0x01FEU,
+    0x047EU,
+    0x1E4CU,
+    0x1E4EU,
+    0x1E54U,
+    0x24C5U,
+    0x1E56U,
+    0x041FU,
+    0x054AU,
+    0x04A6U,
+    0x03A6U,
+    0x01A4U,
+    0x03A0U,
+    0x0553U,
+    0xFF30U,
+    0x03A8U,
+    0x0470U,
+    0x24C6U,
+    0xFF31U,
+    0x054CU,
+    0x0154U,
+    0x0158U,
+    0x0156U,
+    0x24C7U,
+    0x0156U,
+    0x0210U,
+    0x1E58U,
+    0x1E5AU,
+    0x1E5CU,
+    0x0550U,
+    0x211CU,
+    0x03A1U,
+    0x0212U,
+    0x1E5EU,
+    0xFF32U,
+    0x0281U,
+    0x02B6U,
+    0x250CU,
+    0x2514U,
+    0x2510U,
+    0x2518U,
+    0x253CU,
+    0x252CU,
+    0x2534U,
+    0x251CU,
+    0x2524U,
+    0x2500U,
+    0x2502U,
+    0x2561U,
+    0x2562U,
+    0x2556U,
+    0x2555U,
+    0x2563U,
+    0x2551U,
+    0x2557U,
+    0x255DU,
+    0x255CU,
+    0x255BU,
+    0x255EU,
+    0x255FU,
+    0x255AU,
+    0x2554U,
+    0x2569U,
+    0x2566U,
+    0x2560U,
+    0x2550U,
+    0x256CU,
+    0x2567U,
+    0x2568U,
+    0x2564U,
+    0x2565U,
+    0x2559U,
+    0x2558U,
+    0x2552U,
+    0x2553U,
+    0x256BU,
+    0x256AU,
+    0x015AU,
+    0x1E64U,
+    0x03E0U,
+    0x1E66U,
+    0x015EU,
+    0x018FU,
+    0x04D8U,
+    0x04DAU,
+    0x24C8U,
+    0x015CU,
+    0x0218U,
+    0x1E60U,
+    0x1E62U,
+    0x1E68U,
+    0x054DU,
+    0x2166U,
+    0x0547U,
+    0x0428U,
+    0x0429U,
+    0x03E2U,
+    0x04BAU,
+    0x03ECU,
+    0x03A3U,
+    0x2165U,
+    0xFF33U,
+    0x042CU,
+    0x03DAU,
+    0x03A4U,
+    0x0166U,
+    0x0164U,
+    0x0162U,
+    0x24C9U,
+    0x1E70U,
+    0x0162U,
+    0x1E6AU,
+    0x1E6CU,
+    0x0422U,
+    0x04ACU,
+    0x2169U,
+    0x04B4U,
+    0x0398U,
+    0x01ACU,
+    0x2162U,
+    0x054FU,
+    0x1E6EU,
+    0xFF34U,
+    0x0539U,
+    0x01BCU,
+    0x0184U,
+    0x01A7U,
+    0x01AEU,
+    0x0426U,
+    0x040BU,
+    0x216BU,
+    0x2161U,
+    0x016CU,
+    0x01D3U,
+    0x24CAU,
+    0x1E76U,
+    0x0423U,
+    0x0170U,
+    0x0214U,
+    0x01D7U,
+    0x1E72U,
+    0x01D9U,
+    0x04F0U,
+    0x01DBU,
+    0x01D5U,
+    0x1EE4U,
+    0x1EE6U,
+    0x01AFU,
+    0x1EE8U,
+    0x1EF0U,
+    0x1EEAU,
+    0x1EECU,
+    0x1EEEU,
+    0x0170U,
+    0x04F2U,
+    0x0216U,
+    0x0478U,
+    0x016AU,
+    0x04EEU,
+    0x1E7AU,
+    0xFF35U,
+    0x0172U,
+    0x03A5U,
+    0x03D2U,
+    0x03D3U,
+    0x01B1U,
+    0x03ABU,
+    0x03D4U,
+    0x03D2U,
+    0x038EU,
+    0x016EU,
+    0x040EU,
+    0x04AEU,
+    0x04B0U,
+    0x0168U,
+    0x1E78U,
+    0x1E74U,
+    0x24CBU,
+    0x1E7EU,
+    0x0412U,
+    0x054EU,
+    0x01B2U,
+    0xFF36U,
+    0x0548U,
+    0x1E7CU,
+    0x1E82U,
+    0x24CCU,
+    0x0174U,
+    0x1E84U,
+    0x1E86U,
+    0x1E88U,
+    0x1E80U,
+    0xFF37U,
+    0x24CDU,
+    0x1E8CU,
+    0x1E8AU,
+    0x053DU,
+    0x039EU,
+    0xFF38U,
+    0x0462U,
+    0x24CEU,
+    0x0176U,
+    0x1E8EU,
+    0x1EF4U,
+    0x042BU,
+    0x04F8U,
+    0x1EF2U,
+    0x01B3U,
+    0x1EF6U,
+    0x0545U,
+    0x0407U,
+    0x0552U,
+    0xFF39U,
+    0x1EF8U,
+    0x046AU,
+    0x046CU,
+    0x0466U,
+    0x0468U,
+    0x0536U,
+    0x0179U,
+    0x24CFU,
+    0x1E90U,
+    0x017BU,
+    0x017BU,
+    0x1E92U,
+    0x0417U,
+    0x0498U,
+    0x04DEU,
+    0x0396U,
+    0x053AU,
+    0x04C1U,
+    0x0416U,
+    0x0496U,
+    0x04DCU,
+    0x1E94U,
+    0xFF3AU,
+    0x01B5U,
+    0x0986U,
+    0x0906U,
+    0x0A86U,
+    0x0A06U,
+    0x0A3EU,
+    0x3303U,
+    0x09BEU,
+    0x093EU,
+    0x0ABEU,
+    0x055FU,
+    0x0970U,
+    0x0985U,
+    0x311AU,
+    0x0103U,
+    0x1EAFU,
+    0x04D1U,
+    0x1EB7U,
+    0x1EB1U,
+    0x1EB3U,
+    0x1EB5U,
+    0x01CEU,
+    0x24D0U,
+    0x1EA5U,
+    0x1EADU,
+    0x1EA7U,
+    0x1EA9U,
+    0x1EABU,
+    0x0317U,
+    0x0301U,
+    0x0301U,
+    0x0954U,
+    0x02CFU,
+    0x0341U,
+    0x0430U,
+    0x0201U,
+    0x0A71U,
+    0x0905U,
+    0x04D3U,
+    0x01DFU,
+    0x1EA1U,
+    0x01E1U,
+    0x01FDU,
+    0x3150U,
+    0x01E3U,
+    0x2015U,
+    0x20A4U,
+    0x0410U,
+    0x0411U,
+    0x0412U,
+    0x0413U,
+    0x0414U,
+    0x0415U,
+    0x0401U,
+    0x0416U,
+    0x0417U,
+    0x0418U,
+    0x0419U,
+    0x041AU,
+    0x041BU,
+    0x041CU,
+    0x041DU,
+    0x041EU,
+    0x041FU,
+    0x0420U,
+    0x0421U,
+    0x0422U,
+    0x0423U,
+    0x0424U,
+    0x0425U,
+    0x0426U,
+    0x0427U,
+    0x0428U,
+    0x0429U,
+    0x042AU,
+    0x042BU,
+    0x042CU,
+    0x042DU,
+    0x042EU,
+    0x042FU,
+    0x0490U,
+    0x0402U,
+    0x0403U,
+    0x0404U,
+    0x0405U,
+    0x0406U,
+    0x0407U,
+    0x0408U,
+    0x0409U,
+    0x040AU,
+    0x040BU,
+    0x040CU,
+    0x040EU,
+    0xF6C4U,
+    0xF6C5U,
+    0x0430U,
+    0x0431U,
+    0x0432U,
+    0x0433U,
+    0x0434U,
+    0x0435U,
+    0x0451U,
+    0x0436U,
+    0x0437U,
+    0x0438U,
+    0x0439U,
+    0x043AU,
+    0x043BU,
+    0x043CU,
+    0x043DU,
+    0x043EU,
+    0x043FU,
+    0x0440U,
+    0x0441U,
+    0x0442U,
+    0x0443U,
+    0x0444U,
+    0x0445U,
+    0x0446U,
+    0x0447U,
+    0x0448U,
+    0x0449U,
+    0x044AU,
+    0x044BU,
+    0x044CU,
+    0x044DU,
+    0x044EU,
+    0x044FU,
+    0x0491U,
+    0x0452U,
+    0x0453U,
+    0x0454U,
+    0x0455U,
+    0x0456U,
+    0x0457U,
+    0x0458U,
+    0x0459U,
+    0x045AU,
+    0x045BU,
+    0x045CU,
+    0x045EU,
+    0x040FU,
+    0x0462U,
+    0x0472U,
+    0x0474U,
+    0xF6C6U,
+    0x045FU,
+    0x0463U,
+    0x0473U,
+    0x0475U,
+    0xF6C7U,
+    0xF6C8U,
+    0x04D9U,
+    0x200EU,
+    0x200FU,
+    0x200DU,
+    0x066AU,
+    0x060CU,
+    0x0660U,
+    0x0661U,
+    0x0662U,
+    0x0663U,
+    0x0664U,
+    0x0665U,
+    0x0666U,
+    0x0667U,
+    0x0668U,
+    0x0669U,
+    0x061BU,
+    0x061FU,
+    0x0621U,
+    0x0622U,
+    0x0623U,
+    0x0624U,
+    0x0625U,
+    0x0626U,
+    0x0627U,
+    0x0628U,
+    0x0629U,
+    0x062AU,
+    0x062BU,
+    0x062CU,
+    0x062DU,
+    0x062EU,
+    0x062FU,
+    0x0630U,
+    0x0631U,
+    0x0632U,
+    0x0633U,
+    0x0634U,
+    0x0635U,
+    0x0636U,
+    0x0637U,
+    0x0638U,
+    0x0639U,
+    0x063AU,
+    0x0640U,
+    0x0641U,
+    0x0642U,
+    0x0643U,
+    0x0644U,
+    0x0645U,
+    0x0646U,
+    0x0648U,
+    0x0649U,
+    0x064AU,
+    0x064BU,
+    0x064CU,
+    0x064DU,
+    0x064EU,
+    0x064FU,
+    0x0650U,
+    0x0651U,
+    0x0652U,
+    0x0647U,
+    0x06A4U,
+    0x067EU,
+    0x0686U,
+    0x0698U,
+    0x06AFU,
+    0x0679U,
+    0x0688U,
+    0x0691U,
+    0x06BAU,
+    0x06D2U,
+    0x06D5U,
+    0x20AAU,
+    0x05BEU,
+    0x05C3U,
+    0x05D0U,
+    0x05D1U,
+    0x05D2U,
+    0x05D3U,
+    0x05D4U,
+    0x05D5U,
+    0x05D6U,
+    0x05D7U,
+    0x05D8U,
+    0x05D9U,
+    0x05DAU,
+    0x05DBU,
+    0x05DCU,
+    0x05DDU,
+    0x05DEU,
+    0x05DFU,
+    0x05E0U,
+    0x05E1U,
+    0x05E2U,
+    0x05E3U,
+    0x05E4U,
+    0x05E5U,
+    0x05E6U,
+    0x05E7U,
+    0x05E8U,
+    0x05E9U,
+    0x05EAU,
+    0xFB2AU,
+    0xFB2BU,
+    0xFB4BU,
+    0xFB1FU,
+    0x05F0U,
+    0x05F1U,
+    0x05F2U,
+    0xFB35U,
+    0x05B4U,
+    0x05B5U,
+    0x05B6U,
+    0x05BBU,
+    0x05B8U,
+    0x05B7U,
+    0x05B0U,
+    0x05B2U,
+    0x05B1U,
+    0x05B3U,
+    0x05C2U,
+    0x05C1U,
+    0x05B9U,
+    0x05BCU,
+    0x05BDU,
+    0x05BFU,
+    0x05C0U,
+    0x02BCU,
+    0x2105U,
+    0x2113U,
+    0x2116U,
+    0x202CU,
+    0x202DU,
+    0x202EU,
+    0x200CU,
+    0x066DU,
+    0x02BDU,
+    0x0A85U,
+    0x0A05U,
+    0x3042U,
+    0x1EA3U,
+    0x0990U,
+    0x311EU,
+    0x0910U,
+    0x04D5U,
+    0x0A90U,
+    0x0A10U,
+    0x0A48U,
+    0x0639U,
+    0xFECAU,
+    0xFECBU,
+    0xFECCU,
+    0x0203U,
+    0x09C8U,
+    0x0948U,
+    0x0AC8U,
+    0x30A2U,
+    0xFF71U,
+    0x314FU,
+    0x05D0U,
+    0x0627U,
+    0xFB30U,
+    0xFE8EU,
+    0x0623U,
+    0xFE84U,
+    0x0625U,
+    0xFE88U,
+    0x05D0U,
+    0xFB4FU,
+    0x0622U,
+    0xFE82U,
+    0x0649U,
+    0xFEF0U,
+    0xFEF3U,
+    0xFEF4U,
+    0xFB2EU,
+    0xFB2FU,
+    0x2135U,
+    0x224CU,
+    0x03B1U,
+    0x03ACU,
+    0x0101U,
+    0xFF41U,
+    0xFF06U,
+    0x33C2U,
+    0x3122U,
+    0x3124U,
+    0x0E5AU,
+    0x2220U,
+    0x3008U,
+    0xFE3FU,
+    0x3009U,
+    0xFE40U,
+    0x2329U,
+    0x232AU,
+    0x212BU,
+    0x0387U,
+    0x0952U,
+    0x0982U,
+    0x0902U,
+    0x0A82U,
+    0x0105U,
+    0x3300U,
+    0x249CU,
+    0x055AU,
+    0x02BCU,
+    0xF8FFU,
+    0x2250U,
+    0x2248U,
+    0x2252U,
+    0x2245U,
+    0x318EU,
+    0x318DU,
+    0x2312U,
+    0x1E9AU,
+    0x01FBU,
+    0x1E01U,
+    0x2194U,
+    0x21E3U,
+    0x21E0U,
+    0x21E2U,
+    0x21E1U,
+    0x21D4U,
+    0x21D3U,
+    0x21D0U,
+    0x21D2U,
+    0x21D1U,
+    0x2193U,
+    0x2199U,
+    0x2198U,
+    0x21E9U,
+    0x02C5U,
+    0x02C2U,
+    0x02C3U,
+    0x02C4U,
+    0xF8E7U,
+    0x2190U,
+    0x21D0U,
+    0x21CDU,
+    0x21C6U,
+    0x21E6U,
+    0x2192U,
+    0x21CFU,
+    0x279EU,
+    0x21C4U,
+    0x21E8U,
+    0x21E4U,
+    0x21E5U,
+    0x2191U,
+    0x2195U,
+    0x21A8U,
+    0x21A8U,
+    0x2196U,
+    0x21C5U,
+    0x2197U,
+    0x21E7U,
+    0xF8E6U,
+    0xFF3EU,
+    0xFF5EU,
+    0x0251U,
+    0x0252U,
+    0x3041U,
+    0x30A1U,
+    0xFF67U,
+    0x066DU,
+    0x066DU,
+    0x2217U,
+    0xFF0AU,
+    0xFE61U,
+    0x2042U,
+    0x2243U,
+    0xFF20U,
+    0xFE6BU,
+    0x0250U,
+    0x0994U,
+    0x3120U,
+    0x0914U,
+    0x0A94U,
+    0x0A14U,
+    0x09D7U,
+    0x0A4CU,
+    0x09CCU,
+    0x094CU,
+    0x0ACCU,
+    0x093DU,
+    0x0561U,
+    0x05E2U,
+    0xFB20U,
+    0x05E2U,
+    0x09ACU,
+    0xFF3CU,
+    0x092CU,
+    0x0AACU,
+    0x0A2CU,
+    0x3070U,
+    0x0E3FU,
+    0x30D0U,
+    0xFF5CU,
+    0x3105U,
+    0x24D1U,
+    0x1E03U,
+    0x1E05U,
+    0x266CU,
+    0x2235U,
+    0x0431U,
+    0x0628U,
+    0xFE90U,
+    0xFE91U,
+    0x3079U,
+    0xFE92U,
+    0xFC9FU,
+    0xFC08U,
+    0xFC6DU,
+    0x30D9U,
+    0x0562U,
+    0x05D1U,
+    0x03B2U,
+    0x03D0U,
+    0xFB31U,
+    0xFB31U,
+    0x05D1U,
+    0xFB4CU,
+    0x09ADU,
+    0x092DU,
+    0x0AADU,
+    0x0A2DU,
+    0x0253U,
+    0x3073U,
+    0x30D3U,
+    0x0298U,
+    0x0A02U,
+    0x3331U,
+    0x25CFU,
+    0x25C6U,
+    0x25BCU,
+    0x25C4U,
+    0x25C0U,
+    0x3010U,
+    0xFE3BU,
+    0x3011U,
+    0xFE3CU,
+    0x25E3U,
+    0x25E2U,
+    0x25ACU,
+    0x25BAU,
+    0x25B6U,
+    0x25AAU,
+    0x263BU,
+    0x25A0U,
+    0x2605U,
+    0x25E4U,
+    0x25E5U,
+    0x25B4U,
+    0x25B2U,
+    0x2423U,
+    0x1E07U,
+    0x2588U,
+    0xFF42U,
+    0x0E1AU,
+    0x307CU,
+    0x30DCU,
+    0x249DU,
+    0x33C3U,
+    0xF8F4U,
+    0xF8F3U,
+    0xF8F2U,
+    0xFF5BU,
+    0xFE5BU,
+    0xF8F1U,
+    0xFE37U,
+    0xF8FEU,
+    0xF8FDU,
+    0xFF5DU,
+    0xFE5CU,
+    0xF8FCU,
+    0xFE38U,
+    0xF8F0U,
+    0xF8EFU,
+    0xFF3BU,
+    0xF8EEU,
+    0xF8FBU,
+    0xF8FAU,
+    0xFF3DU,
+    0xF8F9U,
+    0x032EU,
+    0x0306U,
+    0x032FU,
+    0x0311U,
+    0x0361U,
+    0x032AU,
+    0x033AU,
+    0x0180U,
+    0x0183U,
+    0x3076U,
+    0x30D6U,
+    0x25D8U,
+    0x2219U,
+    0x25CEU,
+    0x056EU,
+    0x099AU,
+    0x0107U,
+    0x091AU,
+    0x0A9AU,
+    0x0A1AU,
+    0x3388U,
+    0x0981U,
+    0x0310U,
+    0x0901U,
+    0x0A81U,
+    0x21EAU,
+    0x2105U,
+    0x032CU,
+    0x030CU,
+    0x21B5U,
+    0x3118U,
+    0x010DU,
+    0x1E09U,
+    0x24D2U,
+    0x0109U,
+    0x0255U,
+    0x010BU,
+    0x010BU,
+    0x33C5U,
+    0x0327U,
+    0x2103U,
+    0xFFE0U,
+    0x0579U,
+    0x099BU,
+    0x091BU,
+    0x0A9BU,
+    0x0A1BU,
+    0x3114U,
+    0x04BDU,
+    0x2713U,
+    0x0447U,
+    0x04BFU,
+    0x04B7U,
+    0x04F5U,
+    0x0573U,
+    0x04CCU,
+    0x04B9U,
+    0x03C7U,
+    0x3277U,
+    0x3217U,
+    0x3269U,
+    0x314AU,
+    0x3209U,
+    0x0E0AU,
+    0x0E08U,
+    0x0E09U,
+    0x0E0CU,
+    0x0188U,
+    0x3276U,
+    0x3216U,
+    0x3268U,
+    0x3148U,
+    0x3208U,
+    0x321CU,
+    0x25CBU,
+    0x2297U,
+    0x2299U,
+    0x2295U,
+    0x3036U,
+    0x25D0U,
+    0x25D1U,
+    0x032DU,
+    0x0302U,
+    0x2327U,
+    0x01C2U,
+    0x01C0U,
+    0x01C1U,
+    0x01C3U,
+    0x2663U,
+    0x2663U,
+    0x2667U,
+    0x33A4U,
+    0xFF43U,
+    0x33A0U,
+    0x0581U,
+    0xFF1AU,
+    0x20A1U,
+    0xFE55U,
+    0x02D1U,
+    0x02D0U,
+    0x0313U,
+    0x0315U,
+    0xF6C3U,
+    0x060CU,
+    0x055DU,
+    0xFF0CU,
+    0x0314U,
+    0x02BDU,
+    0xFE50U,
+    0x0312U,
+    0x02BBU,
+    0x263CU,
+    0x2245U,
+    0x222EU,
+    0x2303U,
+    0x0006U,
+    0x0007U,
+    0x0008U,
+    0x0018U,
+    0x000DU,
+    0x0011U,
+    0x0012U,
+    0x0013U,
+    0x0014U,
+    0x007FU,
+    0x0010U,
+    0x0019U,
+    0x0005U,
+    0x0004U,
+    0x001BU,
+    0x0017U,
+    0x0003U,
+    0x000CU,
+    0x001CU,
+    0x001DU,
+    0x0009U,
+    0x000AU,
+    0x0015U,
+    0x001EU,
+    0x000FU,
+    0x000EU,
+    0x0002U,
+    0x0001U,
+    0x001AU,
+    0x0016U,
+    0x001FU,
+    0x000BU,
+    0xF8E9U,
+    0xF6D9U,
+    0x300CU,
+    0xFF62U,
+    0xFE41U,
+    0x300DU,
+    0xFF63U,
+    0xFE42U,
+    0x337FU,
+    0x33C7U,
+    0x33C6U,
+    0x249EU,
+    0x20A2U,
+    0x0297U,
+    0x22CFU,
+    0x22CEU,
+    0xF6D1U,
+    0xF6D2U,
+    0xF6D4U,
+    0xF6D5U,
+    0x0564U,
+    0x09A6U,
+    0x0636U,
+    0x0926U,
+    0xFEBEU,
+    0xFEBFU,
+    0xFEC0U,
+    0x05BCU,
+    0x05BCU,
+    0x0AA6U,
+    0x0A26U,
+    0x3060U,
+    0x30C0U,
+    0x062FU,
+    0x05D3U,
+    0xFB33U,
+    0xFB33U,
+    0,
+    0,
+    0,
+    0,
+    0x05D3U,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0xFEAAU,
+    0x064FU,
+    0x064FU,
+    0x064CU,
+    0x064CU,
+    0x0964U,
+    0x05A7U,
+    0x05A7U,
+    0x0485U,
+    0xF6D3U,
+    0x300AU,
+    0xFE3DU,
+    0x300BU,
+    0xFE3EU,
+    0x032BU,
+    0x21D4U,
+    0x21D2U,
+    0x0965U,
+    0xF6D6U,
+    0x030FU,
+    0x222CU,
+    0x2017U,
+    0x0333U,
+    0x033FU,
+    0x02BAU,
+    0x2016U,
+    0x030EU,
+    0x3109U,
+    0x33C8U,
+    0x010FU,
+    0x1E11U,
+    0x24D3U,
+    0x1E13U,
+    0x0111U,
+    0x09A1U,
+    0x0921U,
+    0x0AA1U,
+    0x0A21U,
+    0x0688U,
+    0xFB89U,
+    0x095CU,
+    0x09A2U,
+    0x0922U,
+    0x0AA2U,
+    0x0A22U,
+    0x1E0BU,
+    0x1E0DU,
+    0x066BU,
+    0x066BU,
+    0x0434U,
+    0x05ADU,
+    0x3067U,
+    0x03EFU,
+    0x30C7U,
+    0x232BU,
+    0x2326U,
+    0x03B4U,
+    0x018DU,
+    0x09F8U,
+    0x02A4U,
+    0x09A7U,
+    0x0927U,
+    0x0AA7U,
+    0x0A27U,
+    0x0257U,
+    0x0385U,
+    0x0344U,
+    0x2666U,
+    0x2662U,
+    0xF6D7U,
+    0x0324U,
+    0x0308U,
+    0xF6D8U,
+    0x0385U,
+    0x3062U,
+    0x30C2U,
+    0x3003U,
+    0x2223U,
+    0x2215U,
+    0x0452U,
+    0x2593U,
+    0x1E0FU,
+    0x3397U,
+    0x0111U,
+    0xFF44U,
+    0x2584U,
+    0x0E0EU,
+    0x0E14U,
+    0x3069U,
+    0x30C9U,
+    0xFF04U,
+    0xFE69U,
+    0x20ABU,
+    0x3326U,
+    0x0307U,
+    0x0323U,
+    0x0323U,
+    0x30FBU,
+    0xF6BEU,
+    0x0284U,
+    0x22C5U,
+    0x25CCU,
+    0xFB1FU,
+    0xFB1FU,
+    0x031EU,
+    0x02D5U,
+    0x249FU,
+    0x0256U,
+    0x018CU,
+    0x3065U,
+    0x30C5U,
+    0x01F3U,
+    0x02A3U,
+    0x01C6U,
+    0x02A5U,
+    0x04E1U,
+    0x0455U,
+    0x045FU,
+    0x2641U,
+    0x098FU,
+    0x311CU,
+    0x0115U,
+    0x090DU,
+    0x0A8DU,
+    0x0945U,
+    0x0AC5U,
+    0x011BU,
+    0x1E1DU,
+    0x0565U,
+    0x0587U,
+    0x24D4U,
+    0x1EBFU,
+    0x1E19U,
+    0x1EC7U,
+    0x1EC1U,
+    0x1EC3U,
+    0x1EC5U,
+    0x0454U,
+    0x0205U,
+    0x090FU,
+    0x0117U,
+    0x0117U,
+    0x1EB9U,
+    0x0A0FU,
+    0x0A47U,
+    0x0444U,
+    0x0A8FU,
+    0x0567U,
+    0x311DU,
+    0x3048U,
+    0x1EBBU,
+    0x311FU,
+    0x0668U,
+    0x09EEU,
+    0x2467U,
+    0x2791U,
+    0x096EU,
+    0x2471U,
+    0x2485U,
+    0x2499U,
+    0x0AEEU,
+    0x0A6EU,
+    0x0668U,
+    0x3028U,
+    0x266BU,
+    0x3227U,
+    0xFF18U,
+    0x247BU,
+    0x248FU,
+    0x06F8U,
+    0x2177U,
+    0x0E58U,
+    0x0207U,
+    0x0465U,
+    0x30A8U,
+    0xFF74U,
+    0x0A74U,
+    0x3154U,
+    0x043BU,
+    0x2208U,
+    0x246AU,
+    0x247EU,
+    0x2492U,
+    0x217AU,
+    0x22EEU,
+    0x0113U,
+    0x1E17U,
+    0x1E15U,
+    0x043CU,
+    0xFE31U,
+    0xFF45U,
+    0x055BU,
+    0x2205U,
+    0x3123U,
+    0x043DU,
+    0xFE32U,
+    0x04A3U,
+    0x014BU,
+    0x3125U,
+    0x04A5U,
+    0x04C8U,
+    0x2002U,
+    0x0119U,
+    0x3153U,
+    0x025BU,
+    0x029AU,
+    0x025CU,
+    0x025EU,
+    0x025DU,
+    0x24A0U,
+    0x03B5U,
+    0x03ADU,
+    0xFF1DU,
+    0xFE66U,
+    0x207CU,
+    0x2261U,
+    0x3126U,
+    0x0440U,
+    0x0258U,
+    0x044DU,
+    0x0441U,
+    0x04ABU,
+    0x0283U,
+    0x0286U,
+    0x090EU,
+    0x0946U,
+    0x01AAU,
+    0x0285U,
+    0x3047U,
+    0x30A7U,
+    0xFF6AU,
+    0x212EU,
+    0x03B7U,
+    0x0568U,
+    0x03AEU,
+    0x1EBDU,
+    0x1E1BU,
+    0x0591U,
+    0x0591U,
+    0x0591U,
+    0x0591U,
+    0x01DDU,
+    0x3161U,
+    0x20ACU,
+    0x09C7U,
+    0x0947U,
+    0x0AC7U,
+    0x055CU,
+    0x203CU,
+    0xFF01U,
+    0x2203U,
+    0x0292U,
+    0x01EFU,
+    0x0293U,
+    0x01B9U,
+    0x01BAU,
+    0x095EU,
+    0x0A5EU,
+    0x2109U,
+    0x064EU,
+    0x064EU,
+    0x064BU,
+    0x3108U,
+    0x24D5U,
+    0x1E1FU,
+    0x0641U,
+    0x0586U,
+    0xFED2U,
+    0xFED3U,
+    0xFED4U,
+    0x03E5U,
+    0x2640U,
+    0x246EU,
+    0x2482U,
+    0x2496U,
+    0x25A0U,
+    0x25ACU,
+    0x05DAU,
+    0xFB3AU,
+    0xFB3AU,
+    0x05DAU,
+    0,
+    0,
+    0,
+    0,
+    0x05DDU,
+    0x05DDU,
+    0x05DFU,
+    0x05DFU,
+    0x05E3U,
+    0x05E3U,
+    0x05E5U,
+    0x05E5U,
+    0x02C9U,
+    0x25C9U,
+    0x0473U,
+    0x0665U,
+    0x09EBU,
+    0x2464U,
+    0x278EU,
+    0x096BU,
+    0x0AEBU,
+    0x0A6BU,
+    0x0665U,
+    0x3025U,
+    0x3224U,
+    0xFF15U,
+    0x2478U,
+    0x248CU,
+    0x06F5U,
+    0x2174U,
+    0x0E55U,
+    0xFF46U,
+    0x3399U,
+    0x0E1FU,
+    0x0E1DU,
+    0x0E4FU,
+    0x2200U,
+    0x0664U,
+    0x09EAU,
+    0x2463U,
+    0x278DU,
+    0x096AU,
+    0x0AEAU,
+    0x0A6AU,
+    0x0664U,
+    0x3024U,
+    0x3223U,
+    0xFF14U,
+    0x09F7U,
+    0x2477U,
+    0x248BU,
+    0x06F4U,
+    0x2173U,
+    0x246DU,
+    0x2481U,
+    0x2495U,
+    0x0E54U,
+    0x02CBU,
+    0x24A1U,
+    0x20A3U,
+    0x0997U,
+    0x01F5U,
+    0x0917U,
+    0x06AFU,
+    0xFB93U,
+    0xFB94U,
+    0xFB95U,
+    0x0A97U,
+    0x0A17U,
+    0x304CU,
+    0x30ACU,
+    0x03B3U,
+    0x0263U,
+    0x02E0U,
+    0x03EBU,
+    0x310DU,
+    0x011FU,
+    0x01E7U,
+    0x0123U,
+    0x24D6U,
+    0x011DU,
+    0x0123U,
+    0x0121U,
+    0x0121U,
+    0x0433U,
+    0x3052U,
+    0x30B2U,
+    0x2251U,
+    0x059CU,
+    0x05F3U,
+    0x059DU,
+    0x059EU,
+    0x05F4U,
+    0x3013U,
+    0x0998U,
+    0x0572U,
+    0x0918U,
+    0x0A98U,
+    0x0A18U,
+    0x063AU,
+    0xFECEU,
+    0xFECFU,
+    0xFED0U,
+    0x0495U,
+    0x0493U,
+    0x0491U,
+    0x095AU,
+    0x0A5AU,
+    0x0260U,
+    0x3393U,
+    0x304EU,
+    0x30AEU,
+    0x0563U,
+    0x05D2U,
+    0xFB32U,
+    0xFB32U,
+    0x05D2U,
+    0x0453U,
+    0x01BEU,
+    0x0294U,
+    0x0296U,
+    0x02C0U,
+    0x0295U,
+    0x02C1U,
+    0x02E4U,
+    0x02A1U,
+    0x02A2U,
+    0x1E21U,
+    0xFF47U,
+    0x3054U,
+    0x30B4U,
+    0x24A2U,
+    0x33ACU,
+    0x2207U,
+    0x0316U,
+    0x0300U,
+    0x0300U,
+    0x0953U,
+    0x02CEU,
+    0xFF40U,
+    0x0340U,
+    0x2265U,
+    0x22DBU,
+    0xFF1EU,
+    0x2273U,
+    0x2277U,
+    0x2267U,
+    0xFE65U,
+    0x0261U,
+    0x01E5U,
+    0x3050U,
+    0x30B0U,
+    0x3318U,
+    0x33C9U,
+    0x04A9U,
+    0x06C1U,
+    0x09B9U,
+    0x04B3U,
+    0x0939U,
+    0x0AB9U,
+    0x0A39U,
+    0x062DU,
+    0xFEA2U,
+    0xFEA3U,
+    0x306FU,
+    0xFEA4U,
+    0x332AU,
+    0x30CFU,
+    0xFF8AU,
+    0x0A4DU,
+    0x0621U,
+    0,
+    0,
+    0,
+    0,
+    0x0621U,
+    0,
+    0,
+    0,
+    0x3164U,
+    0x044AU,
+    0x21BCU,
+    0x21C0U,
+    0x33CAU,
+    0x05B2U,
+    0x05B2U,
+    0x05B2U,
+    0x05B2U,
+    0x05B2U,
+    0x05B2U,
+    0x05B2U,
+    0x05B2U,
+    0x05B3U,
+    0x05B3U,
+    0x05B3U,
+    0x05B3U,
+    0x05B3U,
+    0x05B3U,
+    0x05B3U,
+    0x05B3U,
+    0x05B1U,
+    0x05B1U,
+    0x05B1U,
+    0x05B1U,
+    0x05B1U,
+    0x05B1U,
+    0x05B1U,
+    0x05B1U,
+    0x0127U,
+    0x310FU,
+    0x1E2BU,
+    0x1E29U,
+    0x24D7U,
+    0x0125U,
+    0x1E27U,
+    0x1E23U,
+    0x1E25U,
+    0x05D4U,
+    0x2665U,
+    0x2665U,
+    0x2661U,
+    0xFB34U,
+    0xFB34U,
+    0x06C1U,
+    0x0647U,
+    0x05D4U,
+    0xFBA7U,
+    0xFEEAU,
+    0xFEEAU,
+    0xFBA5U,
+    0xFBA4U,
+    0xFBA8U,
+    0xFEEBU,
+    0x3078U,
+    0xFBA9U,
+    0xFEECU,
+    0x337BU,
+    0x30D8U,
+    0xFF8DU,
+    0x3336U,
+    0x0267U,
+    0x3339U,
+    0x05D7U,
+    0x05D7U,
+    0x0266U,
+    0x02B1U,
+    0x327BU,
+    0x321BU,
+    0x326DU,
+    0x314EU,
+    0x320DU,
+    0x3072U,
+    0x30D2U,
+    0xFF8BU,
+    0x05B4U,
+    0x05B4U,
+    0x05B4U,
+    0x05B4U,
+    0x05B4U,
+    0x05B4U,
+    0x05B4U,
+    0x05B4U,
+    0x1E96U,
+    0xFF48U,
+    0x0570U,
+    0x0E2BU,
+    0x307BU,
+    0x30DBU,
+    0xFF8EU,
+    0x05B9U,
+    0x05B9U,
+    0x05B9U,
+    0x05B9U,
+    0x05B9U,
+    0x05B9U,
+    0x05B9U,
+    0x05B9U,
+    0x0E2EU,
+    0x0309U,
+    0x0309U,
+    0x0321U,
+    0x0322U,
+    0x3342U,
+    0x03E9U,
+    0x2015U,
+    0x031BU,
+    0x2668U,
+    0x2302U,
+    0x24A3U,
+    0x02B0U,
+    0x0265U,
+    0x3075U,
+    0x3333U,
+    0x30D5U,
+    0xFF8CU,
+    0x030BU,
+    0x0195U,
+    0xFF0DU,
+    0xFE63U,
+    0x2010U,
+    0x044FU,
+    0x0987U,
+    0x3127U,
+    0x012DU,
+    0x01D0U,
+    0x24D8U,
+    0x0456U,
+    0x0209U,
+    0x328FU,
+    0x328BU,
+    0x323FU,
+    0x323AU,
+    0x32A5U,
+    0x3006U,
+    0x3001U,
+    0xFF64U,
+    0x3237U,
+    0x32A3U,
+    0x322FU,
+    0x323DU,
+    0x329DU,
+    0x3240U,
+    0x3296U,
+    0x3236U,
+    0x322BU,
+    0x3232U,
+    0x32A4U,
+    0x3005U,
+    0x3298U,
+    0x3238U,
+    0x32A7U,
+    0x32A6U,
+    0x32A9U,
+    0x322EU,
+    0x322AU,
+    0x3234U,
+    0x3002U,
+    0x329EU,
+    0x3243U,
+    0x3239U,
+    0x323EU,
+    0x32A8U,
+    0x3299U,
+    0x3242U,
+    0x3233U,
+    0x3000U,
+    0x3235U,
+    0x3231U,
+    0x323BU,
+    0x3230U,
+    0x323CU,
+    0x322CU,
+    0x322DU,
+    0x3007U,
+    0x328EU,
+    0x328AU,
+    0x3294U,
+    0x3290U,
+    0x328CU,
+    0x328DU,
+    0x0907U,
+    0x1E2FU,
+    0x04E5U,
+    0x1ECBU,
+    0x04D7U,
+    0x0435U,
+    0x3275U,
+    0x3215U,
+    0x3267U,
+    0x3147U,
+    0x3207U,
+    0x0A87U,
+    0x0A07U,
+    0x3044U,
+    0x1EC9U,
+    0x0988U,
+    0x0438U,
+    0x0908U,
+    0x0A88U,
+    0x0A08U,
+    0x0A40U,
+    0x020BU,
+    0x0439U,
+    0x09C0U,
+    0x0940U,
+    0x0AC0U,
+    0x0133U,
+    0x30A4U,
+    0xFF72U,
+    0x3163U,
+    0x02DCU,
+    0x05ACU,
+    0x012BU,
+    0x04E3U,
+    0x2253U,
+    0x0A3FU,
+    0xFF49U,
+    0x2206U,
+    0x221EU,
+    0x056BU,
+    0x222BU,
+    0x2321U,
+    0x2321U,
+    0xF8F5U,
+    0x2320U,
+    0x2320U,
+    0x2229U,
+    0x3305U,
+    0x25D8U,
+    0x25D9U,
+    0x263BU,
+    0x0451U,
+    0x012FU,
+    0x03B9U,
+    0x03CAU,
+    0x0390U,
+    0x0269U,
+    0x03AFU,
+    0x24A4U,
+    0x0A72U,
+    0x3043U,
+    0x30A3U,
+    0xFF68U,
+    0x09FAU,
+    0x0268U,
+    0x309DU,
+    0x30FDU,
+    0x0129U,
+    0x1E2DU,
+    0x3129U,
+    0x044EU,
+    0x09BFU,
+    0x093FU,
+    0x0ABFU,
+    0x0475U,
+    0x0477U,
+    0x0571U,
+    0x099CU,
+    0x091CU,
+    0x0A9CU,
+    0x0A1CU,
+    0x3110U,
+    0x01F0U,
+    0x24D9U,
+    0x0135U,
+    0x029DU,
+    0x025FU,
+    0x0458U,
+    0x062CU,
+    0xFE9EU,
+    0xFE9FU,
+    0xFEA0U,
+    0x0698U,
+    0xFB8BU,
+    0x099DU,
+    0x091DU,
+    0x0A9DU,
+    0x0A1DU,
+    0x057BU,
+    0x3004U,
+    0xFF4AU,
+    0x24A5U,
+    0x02B2U,
+    0x04A1U,
+    0x0995U,
+    0x1E31U,
+    0x043AU,
+    0x049BU,
+    0x0915U,
+    0x05DBU,
+    0x0643U,
+    0xFB3BU,
+    0xFB3BU,
+    0xFEDAU,
+    0x05DBU,
+    0xFEDBU,
+    0xFEDCU,
+    0xFB4DU,
+    0x0A95U,
+    0x0A15U,
+    0x304BU,
+    0x04C4U,
+    0x30ABU,
+    0xFF76U,
+    0x03BAU,
+    0x03F0U,
+    0x3171U,
+    0x3184U,
+    0x3178U,
+    0x3179U,
+    0x330DU,
+    0x0640U,
+    0x0640U,
+    0x30F5U,
+    0x3384U,
+    0x0650U,
+    0x064DU,
+    0x049FU,
+    0xFF70U,
+    0x049DU,
+    0x310EU,
+    0x3389U,
+    0x01E9U,
+    0x0137U,
+    0x24DAU,
+    0x0137U,
+    0x1E33U,
+    0x0584U,
+    0x3051U,
+    0x30B1U,
+    0xFF79U,
+    0x056FU,
+    0x30F6U,
+    0x0138U,
+    0x0996U,
+    0x0445U,
+    0x0916U,
+    0x0A96U,
+    0x0A16U,
+    0x062EU,
+    0xFEA6U,
+    0xFEA7U,
+    0xFEA8U,
+    0x03E7U,
+    0x0959U,
+    0x0A59U,
+    0x3278U,
+    0x3218U,
+    0x326AU,
+    0x314BU,
+    0x320AU,
+    0x0E02U,
+    0x0E05U,
+    0x0E03U,
+    0x0E04U,
+    0x0E5BU,
+    0x0199U,
+    0x0E06U,
+    0x3391U,
+    0x304DU,
+    0x30ADU,
+    0xFF77U,
+    0x3315U,
+    0x3316U,
+    0x3314U,
+    0x326EU,
+    0x320EU,
+    0x3260U,
+    0x3131U,
+    0x3200U,
+    0x3133U,
+    0x045CU,
+    0x1E35U,
+    0x3398U,
+    0x33A6U,
+    0xFF4BU,
+    0x33A2U,
+    0x3053U,
+    0x33C0U,
+    0x0E01U,
+    0x30B3U,
+    0xFF7AU,
+    0x331EU,
+    0x0481U,
+    0x327FU,
+    0x0343U,
+    0x24A6U,
+    0x33AAU,
+    0x046FU,
+    0x33CFU,
+    0x029EU,
+    0x304FU,
+    0x30AFU,
+    0xFF78U,
+    0x33B8U,
+    0x33BEU,
+    0x09B2U,
+    0x013AU,
+    0x0932U,
+    0x0AB2U,
+    0x0A32U,
+    0x0E45U,
+    0xFEFCU,
+    0xFEF8U,
+    0xFEF7U,
+    0xFEFAU,
+    0xFEF9U,
+    0xFEFBU,
+    0xFEF6U,
+    0xFEF5U,
+    0x0644U,
+    0x03BBU,
+    0x019BU,
+    0x05DCU,
+    0xFB3CU,
+    0xFB3CU,
+    0x05DCU,
+    0,
+    0,
+    0,
+    0,
+    0xFEDEU,
+    0xFCCAU,
+    0xFEDFU,
+    0xFCC9U,
+    0xFCCBU,
+    0xFDF2U,
+    0xFEE0U,
+    0xFD88U,
+    0xFCCCU,
+    0,
+    0,
+    0x25EFU,
+    0x019AU,
+    0x026CU,
+    0x310CU,
+    0x013EU,
+    0x013CU,
+    0x24DBU,
+    0x1E3DU,
+    0x013CU,
+    0x0140U,
+    0x0140U,
+    0x1E37U,
+    0x1E39U,
+    0x031AU,
+    0x0318U,
+    0x2264U,
+    0x22DAU,
+    0xFF1CU,
+    0x2272U,
+    0x2276U,
+    0x2266U,
+    0xFE64U,
+    0x026EU,
+    0x258CU,
+    0x026DU,
+    0x20A4U,
+    0x056CU,
+    0x01C9U,
+    0x0459U,
+    0xF6C0U,
+    0x0933U,
+    0x0AB3U,
+    0x1E3BU,
+    0x0934U,
+    0x09E1U,
+    0x0961U,
+    0x09E3U,
+    0x0963U,
+    0x026BU,
+    0xFF4CU,
+    0x33D0U,
+    0x0E2CU,
+    0x2227U,
+    0x2310U,
+    0x2228U,
+    0x0E25U,
+    0x017FU,
+    0xFE4EU,
+    0x0332U,
+    0xFE4DU,
+    0x25CAU,
+    0x24A7U,
+    0x2113U,
+    0x2591U,
+    0x0E26U,
+    0x098CU,
+    0x090CU,
+    0x09E2U,
+    0x0962U,
+    0x33D3U,
+    0x09AEU,
+    0x0331U,
+    0x0304U,
+    0x02CDU,
+    0xFFE3U,
+    0x1E3FU,
+    0x092EU,
+    0x0AAEU,
+    0x0A2EU,
+    0x05A4U,
+    0x05A4U,
+    0x307EU,
+    0xF895U,
+    0xF894U,
+    0x0E4BU,
+    0xF893U,
+    0xF88CU,
+    0xF88BU,
+    0x0E48U,
+    0xF88AU,
+    0xF884U,
+    0x0E31U,
+    0xF889U,
+    0x0E47U,
+    0xF88FU,
+    0xF88EU,
+    0x0E49U,
+    0xF88DU,
+    0xF892U,
+    0xF891U,
+    0x0E4AU,
+    0xF890U,
+    0x0E46U,
+    0x30DEU,
+    0xFF8FU,
+    0x2642U,
+    0x3347U,
+    0x05BEU,
+    0x2642U,
+    0x05AFU,
+    0x3383U,
+    0x3107U,
+    0x33D4U,
+    0x24DCU,
+    0x33A5U,
+    0x1E41U,
+    0x1E43U,
+    0x0645U,
+    0xFEE2U,
+    0xFEE3U,
+    0xFEE4U,
+    0xFCD1U,
+    0xFC48U,
+    0x334DU,
+    0x3081U,
+    0x337EU,
+    0x30E1U,
+    0xFF92U,
+    0x05DEU,
+    0xFB3EU,
+    0xFB3EU,
+    0x05DEU,
+    0x0574U,
+    0x05A5U,
+    0x05A6U,
+    0x05A6U,
+    0x05A5U,
+    0x0271U,
+    0x3392U,
+    0xFF65U,
+    0x00B7U,
+    0x3272U,
+    0x3212U,
+    0x3264U,
+    0x3141U,
+    0x3170U,
+    0x3204U,
+    0x316EU,
+    0x316FU,
+    0x307FU,
+    0x30DFU,
+    0xFF90U,
+    0x0320U,
+    0x2296U,
+    0x02D7U,
+    0x2213U,
+    0x2032U,
+    0x334AU,
+    0x3349U,
+    0x0270U,
+    0x3396U,
+    0x33A3U,
+    0xFF4DU,
+    0x339FU,
+    0x3082U,
+    0x33C1U,
+    0x30E2U,
+    0xFF93U,
+    0x33D6U,
+    0x0E21U,
+    0x33A7U,
+    0x33A8U,
+    0x24A8U,
+    0x33ABU,
+    0x33B3U,
+    0x026FU,
+    0x00B5U,
+    0x3382U,
+    0x226BU,
+    0x226AU,
+    0x338CU,
+    0x03BCU,
+    0x338DU,
+    0x3080U,
+    0x30E0U,
+    0xFF91U,
+    0x3395U,
+    0x339BU,
+    0x05A3U,
+    0x05A3U,
+    0x266AU,
+    0x266BU,
+    0x266DU,
+    0x266FU,
+    0x33B2U,
+    0x33B6U,
+    0x33BCU,
+    0x33B9U,
+    0x33B7U,
+    0x33BFU,
+    0x33BDU,
+    0x09A8U,
+    0x2207U,
+    0x0144U,
+    0x0928U,
+    0x0AA8U,
+    0x0A28U,
+    0x306AU,
+    0x30CAU,
+    0xFF85U,
+    0x0149U,
+    0x3381U,
+    0x310BU,
+    0x00A0U,
+    0x0148U,
+    0x0146U,
+    0x24DDU,
+    0x1E4BU,
+    0x0146U,
+    0x1E45U,
+    0x1E47U,
+    0x306DU,
+    0x30CDU,
+    0xFF88U,
+    0x20AAU,
+    0x338BU,
+    0x0999U,
+    0x0919U,
+    0x0A99U,
+    0x0A19U,
+    0x0E07U,
+    0x3093U,
+    0x0272U,
+    0x0273U,
+    0x326FU,
+    0x320FU,
+    0x3135U,
+    0x3261U,
+    0x3136U,
+    0x3134U,
+    0x3168U,
+    0x3201U,
+    0x3167U,
+    0x3166U,
+    0x306BU,
+    0x30CBU,
+    0xFF86U,
+    0xF899U,
+    0x0E4DU,
+    0x0669U,
+    0x09EFU,
+    0x2468U,
+    0x2792U,
+    0x096FU,
+    0x0AEFU,
+    0x0A6FU,
+    0x0669U,
+    0x3029U,
+    0x3228U,
+    0xFF19U,
+    0x247CU,
+    0x2490U,
+    0x06F9U,
+    0x2178U,
+    0x2472U,
+    0x2486U,
+    0x249AU,
+    0x0E59U,
+    0x01CCU,
+    0x045AU,
+    0x30F3U,
+    0xFF9DU,
+    0x019EU,
+    0x1E49U,
+    0xFF4EU,
+    0x339AU,
+    0x09A3U,
+    0x0923U,
+    0x0AA3U,
+    0x0A23U,
+    0x0929U,
+    0x306EU,
+    0x30CEU,
+    0xFF89U,
+    0x00A0U,
+    0x0E13U,
+    0x0E19U,
+    0x0646U,
+    0xFEE6U,
+    0x06BAU,
+    0xFB9FU,
+    0,
+    0xFEE7U,
+    0xFCD2U,
+    0xFC4BU,
+    0xFEE8U,
+    0xFCD5U,
+    0xFC4EU,
+    0xFC8DU,
+    0x220CU,
+    0x2209U,
+    0x2209U,
+    0x2260U,
+    0x226FU,
+    0x2271U,
+    0x2279U,
+    0x2262U,
+    0x226EU,
+    0x2270U,
+    0x2226U,
+    0x2280U,
+    0x2284U,
+    0x2281U,
+    0x2285U,
+    0x0576U,
+    0x24A9U,
+    0x33B1U,
+    0x03BDU,
+    0x306CU,
+    0x30CCU,
+    0xFF87U,
+    0x09BCU,
+    0x093CU,
+    0x0ABCU,
+    0x0A3CU,
+    0xFF03U,
+    0xFE5FU,
+    0x0374U,
+    0x0375U,
+    0x2116U,
+    0x05E0U,
+    0xFB40U,
+    0xFB40U,
+    0x05E0U,
+    0x33B5U,
+    0x33BBU,
+    0x099EU,
+    0x091EU,
+    0x0A9EU,
+    0x0A1EU,
+    0x0E2DU,
+    0x0275U,
+    0x04E9U,
+    0x04EBU,
+    0x0993U,
+    0x311BU,
+    0x014FU,
+    0x0911U,
+    0x0A91U,
+    0x0949U,
+    0x0AC9U,
+    0x01D2U,
+    0x24DEU,
+    0x1ED1U,
+    0x1ED9U,
+    0x1ED3U,
+    0x1ED5U,
+    0x1ED7U,
+    0x043EU,
+    0x0151U,
+    0x020DU,
+    0x0913U,
+    0x04E7U,
+    0x1ECDU,
+    0x315AU,
+    0x0328U,
+    0x0A93U,
+    0x0585U,
+    0x304AU,
+    0x1ECFU,
+    0x01A1U,
+    0x1EDBU,
+    0x1EE3U,
+    0x1EDDU,
+    0x1EDFU,
+    0x1EE1U,
+    0x0151U,
+    0x01A3U,
+    0x020FU,
+    0x30AAU,
+    0xFF75U,
+    0x3157U,
+    0x05ABU,
+    0x014DU,
+    0x1E53U,
+    0x1E51U,
+    0x0950U,
+    0x03C9U,
+    0x03D6U,
+    0x0461U,
+    0x0277U,
+    0x047BU,
+    0x047DU,
+    0x03CEU,
+    0x0AD0U,
+    0x03BFU,
+    0x03CCU,
+    0xFF4FU,
+    0x0661U,
+    0x09E7U,
+    0x2460U,
+    0x278AU,
+    0x0967U,
+    0x0AE7U,
+    0x0A67U,
+    0x0661U,
+    0x3021U,
+    0x3220U,
+    0xFF11U,
+    0x09F4U,
+    0x2474U,
+    0x2488U,
+    0x06F1U,
+    0x2170U,
+    0x0E51U,
+    0x01EBU,
+    0x01EDU,
+    0x0A13U,
+    0x0A4BU,
+    0x0254U,
+    0x24AAU,
+    0x25E6U,
+    0x2325U,
+    0x221FU,
+    0x0912U,
+    0x094AU,
+    0x01FFU,
+    0x3049U,
+    0x30A9U,
+    0xFF6BU,
+    0x01FFU,
+    0x047FU,
+    0x1E4DU,
+    0x1E4FU,
+    0x3121U,
+    0x203EU,
+    0xFE4AU,
+    0x0305U,
+    0xFE49U,
+    0xFE4CU,
+    0xFE4BU,
+    0x00AFU,
+    0x09CBU,
+    0x094BU,
+    0x0ACBU,
+    0x3380U,
+    0x332BU,
+    0x09AAU,
+    0x1E55U,
+    0x092AU,
+    0x21DFU,
+    0x21DEU,
+    0x0AAAU,
+    0x0A2AU,
+    0x3071U,
+    0x0E2FU,
+    0x30D1U,
+    0x0484U,
+    0x04C0U,
+    0x317FU,
+    0x2225U,
+    0xFD3EU,
+    0xF8EDU,
+    0xF8ECU,
+    0xFF08U,
+    0xFE59U,
+    0xF8EBU,
+    0xFE35U,
+    0xFD3FU,
+    0xF8F8U,
+    0xF8F7U,
+    0xFF09U,
+    0xFE5AU,
+    0xF8F6U,
+    0xFE36U,
+    0x2202U,
+    0x05C0U,
+    0x0599U,
+    0x33A9U,
+    0x05B7U,
+    0x05B7U,
+    0x05B7U,
+    0x05B7U,
+    0x05B7U,
+    0x05B7U,
+    0x05B7U,
+    0x05B7U,
+    0x05A1U,
+    0x3106U,
+    0x24DFU,
+    0x1E57U,
+    0x05E4U,
+    0x043FU,
+    0xFB44U,
+    0xFB44U,
+    0x333BU,
+    0xFB43U,
+    0x067EU,
+    0x057AU,
+    0x05E4U,
+    0xFB57U,
+    0xFB58U,
+    0x307AU,
+    0xFB59U,
+    0x30DAU,
+    0x04A7U,
+    0xFB4EU,
+    0x066AU,
+    0xFF05U,
+    0xFE6AU,
+    0x0589U,
+    0xFF61U,
+    0xFF0EU,
+    0xFE52U,
+    0x0342U,
+    0x22A5U,
+    0x20A7U,
+    0x338AU,
+    0x09ABU,
+    0x092BU,
+    0x0AABU,
+    0x0A2BU,
+    0x03C6U,
+    0x03D5U,
+    0x327AU,
+    0x321AU,
+    0x326CU,
+    0x314DU,
+    0x320CU,
+    0x0278U,
+    0x0E3AU,
+    0x03D5U,
+    0x01A5U,
+    0x0E1EU,
+    0x0E1CU,
+    0x0E20U,
+    0x03C0U,
+    0x3273U,
+    0x3213U,
+    0x3176U,
+    0x3265U,
+    0x3172U,
+    0x3142U,
+    0x3205U,
+    0x3174U,
+    0x3144U,
+    0x3175U,
+    0x3177U,
+    0x3173U,
+    0x3074U,
+    0x30D4U,
+    0x03D6U,
+    0x0583U,
+    0x031FU,
+    0x2295U,
+    0x02D6U,
+    0xFF0BU,
+    0xFE62U,
+    0x207AU,
+    0xFF50U,
+    0x33D8U,
+    0x307DU,
+    0x261FU,
+    0x261CU,
+    0x261EU,
+    0x261DU,
+    0x30DDU,
+    0x0E1BU,
+    0x3012U,
+    0x3020U,
+    0x24ABU,
+    0x227AU,
+    0x211EU,
+    0x02B9U,
+    0x2035U,
+    0x220FU,
+    0x2305U,
+    0x30FCU,
+    0x2318U,
+    0x2282U,
+    0x2283U,
+    0x2237U,
+    0x221DU,
+    0x03C8U,
+    0x0471U,
+    0x0486U,
+    0x33B0U,
+    0x3077U,
+    0x30D7U,
+    0x33B4U,
+    0x33BAU,
+    0x0958U,
+    0x05A8U,
+    0x0642U,
+    0xFED6U,
+    0xFED7U,
+    0xFED8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x05B8U,
+    0x059FU,
+    0x3111U,
+    0x24E0U,
+    0x02A0U,
+    0xFF51U,
+    0x05E7U,
+    0xFB47U,
+    0xFB47U,
+    0,
+    0,
+    0,
+    0,
+    0x05E7U,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0x24ACU,
+    0x2669U,
+    0x05BBU,
+    0x05BBU,
+    0x05BBU,
+    0x05BBU,
+    0x05BBU,
+    0x05BBU,
+    0x05BBU,
+    0x05BBU,
+    0x061FU,
+    0x055EU,
+    0x037EU,
+    0xFF1FU,
+    0xFF02U,
+    0x301EU,
+    0x301DU,
+    0x201BU,
+    0x201BU,
+    0x0149U,
+    0xFF07U,
+    0x057CU,
+    0x09B0U,
+    0x0155U,
+    0x0930U,
+    0x221AU,
+    0xF8E5U,
+    0x33AEU,
+    0x33AFU,
+    0x33ADU,
+    0x05BFU,
+    0x05BFU,
+    0x0AB0U,
+    0x0A30U,
+    0x3089U,
+    0x30E9U,
+    0xFF97U,
+    0x09F1U,
+    0x09F0U,
+    0x0264U,
+    0x2236U,
+    0x3116U,
+    0x0159U,
+    0x0157U,
+    0x24E1U,
+    0x0157U,
+    0x0211U,
+    0x1E59U,
+    0x1E5BU,
+    0x1E5DU,
+    0x203BU,
+    0x2286U,
+    0x2287U,
+    0xF8E8U,
+    0xF6DAU,
+    0x0631U,
+    0x0580U,
+    0xFEAEU,
+    0x308CU,
+    0,
+    0x30ECU,
+    0xFF9AU,
+    0x05E8U,
+    0xFB48U,
+    0,
+    0,
+    0,
+    0,
+    0x05E8U,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0x223DU,
+    0x0597U,
+    0x0597U,
+    0x2310U,
+    0x027EU,
+    0x027FU,
+    0x09DDU,
+    0x095DU,
+    0x03C1U,
+    0x027DU,
+    0x027BU,
+    0x02B5U,
+    0x03F1U,
+    0x02DEU,
+    0x3271U,
+    0x3211U,
+    0x3263U,
+    0x3140U,
+    0x313AU,
+    0x3169U,
+    0x3139U,
+    0x313BU,
+    0x316CU,
+    0x3203U,
+    0x313FU,
+    0x313CU,
+    0x316BU,
+    0x313DU,
+    0x313EU,
+    0x316AU,
+    0x316DU,
+    0x221FU,
+    0x0319U,
+    0x22BFU,
+    0x308AU,
+    0x30EAU,
+    0xFF98U,
+    0x0325U,
+    0x030AU,
+    0x02BFU,
+    0x0559U,
+    0x031CU,
+    0x02D3U,
+    0x02BEU,
+    0x0339U,
+    0x02D2U,
+    0x0213U,
+    0x3351U,
+    0x1E5FU,
+    0x027CU,
+    0x027AU,
+    0xFF52U,
+    0x308DU,
+    0x30EDU,
+    0xFF9BU,
+    0x0E23U,
+    0x24ADU,
+    0x09DCU,
+    0x0931U,
+    0x0A5CU,
+    0x0691U,
+    0xFB8DU,
+    0x09E0U,
+    0x0960U,
+    0x0AE0U,
+    0x09C4U,
+    0x0944U,
+    0x0AC4U,
+    0x2590U,
+    0x0279U,
+    0x02B4U,
+    0x308BU,
+    0x30EBU,
+    0xFF99U,
+    0x09F2U,
+    0x09F3U,
+    0x0E24U,
+    0x098BU,
+    0x090BU,
+    0x0A8BU,
+    0x09C3U,
+    0x0943U,
+    0x0AC3U,
+    0x09B8U,
+    0x015BU,
+    0x1E65U,
+    0x0635U,
+    0x0938U,
+    0xFEBAU,
+    0xFEBBU,
+    0xFEBCU,
+    0x0AB8U,
+    0x0A38U,
+    0x3055U,
+    0x30B5U,
+    0xFF7BU,
+    0xFDFAU,
+    0x05E1U,
+    0xFB41U,
+    0xFB41U,
+    0x05E1U,
+    0x0E32U,
+    0x0E41U,
+    0x0E44U,
+    0x0E43U,
+    0x0E33U,
+    0x0E30U,
+    0x0E40U,
+    0xF886U,
+    0x0E35U,
+    0xF885U,
+    0x0E34U,
+    0x0E42U,
+    0xF888U,
+    0x0E37U,
+    0xF887U,
+    0x0E36U,
+    0x0E38U,
+    0x0E39U,
+    0x3119U,
+    0x1E67U,
+    0x015FU,
+    0x0259U,
+    0x04D9U,
+    0x04DBU,
+    0x025AU,
+    0x24E2U,
+    0x015DU,
+    0x0219U,
+    0x1E61U,
+    0x1E63U,
+    0x1E69U,
+    0x033CU,
+    0x2033U,
+    0x02CAU,
+    0x0633U,
+    0xFEB2U,
+    0xFEB3U,
+    0xFEB4U,
+    0x05B6U,
+    0x05B6U,
+    0x05B6U,
+    0x05B6U,
+    0x05B6U,
+    0x05B6U,
+    0x05B6U,
+    0x0592U,
+    0x05B6U,
+    0x057DU,
+    0x305BU,
+    0x30BBU,
+    0xFF7EU,
+    0x061BU,
+    0xFF1BU,
+    0xFE54U,
+    0x309CU,
+    0xFF9FU,
+    0x3322U,
+    0x3323U,
+    0x0667U,
+    0x09EDU,
+    0x2466U,
+    0x2790U,
+    0x096DU,
+    0x0AEDU,
+    0x0A6DU,
+    0x0667U,
+    0x3027U,
+    0x3226U,
+    0xFF17U,
+    0x247AU,
+    0x248EU,
+    0x06F7U,
+    0x2176U,
+    0x2470U,
+    0x2484U,
+    0x2498U,
+    0x0E57U,
+    0x00ADU,
+    0x0577U,
+    0x09B6U,
+    0x0448U,
+    0x0651U,
+    0xFC61U,
+    0xFC5EU,
+    0xFC60U,
+    0,
+    0xFC62U,
+    0xFC5FU,
+    0x2592U,
+    0x2593U,
+    0x2591U,
+    0x2592U,
+    0x0936U,
+    0x0AB6U,
+    0x0A36U,
+    0x0593U,
+    0x3115U,
+    0x0449U,
+    0x0634U,
+    0xFEB6U,
+    0xFEB7U,
+    0xFEB8U,
+    0x03E3U,
+    0x20AAU,
+    0x20AAU,
+    0x05B0U,
+    0x05B0U,
+    0x05B0U,
+    0x05B0U,
+    0x05B0U,
+    0x05B0U,
+    0x05B0U,
+    0x05B0U,
+    0x05B0U,
+    0x04BBU,
+    0x03EDU,
+    0x05E9U,
+    0xFB49U,
+    0xFB49U,
+    0xFB2CU,
+    0xFB2CU,
+    0xFB2DU,
+    0xFB2DU,
+    0x05C1U,
+    0x05E9U,
+    0xFB2AU,
+    0xFB2AU,
+    0xFB2BU,
+    0xFB2BU,
+    0x0282U,
+    0x03C3U,
+    0x03C2U,
+    0x03C2U,
+    0x03F2U,
+    0x3057U,
+    0x30B7U,
+    0xFF7CU,
+    0x05BDU,
+    0x05BDU,
+    0x223CU,
+    0x05C2U,
+    0x3274U,
+    0x3214U,
+    0x317EU,
+    0x3266U,
+    0x317AU,
+    0x3145U,
+    0x317BU,
+    0x3206U,
+    0x317DU,
+    0x317CU,
+    0x0666U,
+    0x09ECU,
+    0x2465U,
+    0x278FU,
+    0x096CU,
+    0x0AECU,
+    0x0A6CU,
+    0x0666U,
+    0x3026U,
+    0x3225U,
+    0xFF16U,
+    0x2479U,
+    0x248DU,
+    0x06F6U,
+    0x2175U,
+    0x246FU,
+    0x09F9U,
+    0x2483U,
+    0x2497U,
+    0x0E56U,
+    0xFF0FU,
+    0x017FU,
+    0x1E9BU,
+    0x263AU,
+    0xFF53U,
+    0x05C3U,
+    0x00ADU,
+    0x044CU,
+    0x305DU,
+    0x30BDU,
+    0xFF7FU,
+    0x0338U,
+    0x0337U,
+    0x0E29U,
+    0x0E28U,
+    0x0E0BU,
+    0x0E2AU,
+    0x0020U,
+    0x2660U,
+    0x2660U,
+    0x2664U,
+    0x24AEU,
+    0x033BU,
+    0x33C4U,
+    0x339DU,
+    0x25A9U,
+    0x25A4U,
+    0x338FU,
+    0x339EU,
+    0x33CEU,
+    0x33D1U,
+    0x33D2U,
+    0x338EU,
+    0x33D5U,
+    0x339CU,
+    0x33A1U,
+    0x25A6U,
+    0x25A7U,
+    0x25A8U,
+    0x25A5U,
+    0x25A3U,
+    0x33DBU,
+    0x09B7U,
+    0x0937U,
+    0x0AB7U,
+    0x3149U,
+    0x3185U,
+    0x3180U,
+    0x3132U,
+    0x3165U,
+    0x3143U,
+    0x3146U,
+    0x3138U,
+    0xFFE1U,
+    0x0336U,
+    0x0335U,
+    0x2282U,
+    0x228AU,
+    0x2286U,
+    0x227BU,
+    0x220BU,
+    0x3059U,
+    0x30B9U,
+    0xFF7DU,
+    0x0652U,
+    0x2211U,
+    0x263CU,
+    0x2283U,
+    0x228BU,
+    0x2287U,
+    0x33DCU,
+    0x337CU,
+    0x09A4U,
+    0x22A4U,
+    0x22A3U,
+    0x0924U,
+    0x0AA4U,
+    0x0A24U,
+    0x0637U,
+    0xFEC2U,
+    0xFEC3U,
+    0x305FU,
+    0xFEC4U,
+    0x337DU,
+    0x30BFU,
+    0xFF80U,
+    0x0640U,
+    0x03C4U,
+    0x05EAU,
+    0xFB4AU,
+    0xFB4AU,
+    0xFB4AU,
+    0x05EAU,
+    0x0167U,
+    0x310AU,
+    0x0165U,
+    0x02A8U,
+    0x0163U,
+    0x0686U,
+    0xFB7BU,
+    0xFB7CU,
+    0xFB7DU,
+    0,
+    0x24E3U,
+    0x1E71U,
+    0x0163U,
+    0x1E97U,
+    0x1E6BU,
+    0x1E6DU,
+    0x0442U,
+    0x04ADU,
+    0x062AU,
+    0xFE96U,
+    0xFCA2U,
+    0xFC0CU,
+    0xFE97U,
+    0x3066U,
+    0xFCA1U,
+    0xFC0BU,
+    0x0629U,
+    0xFE94U,
+    0xFE98U,
+    0xFCA4U,
+    0xFC0EU,
+    0xFC73U,
+    0x30C6U,
+    0xFF83U,
+    0x2121U,
+    0x260EU,
+    0x05A0U,
+    0x05A9U,
+    0x2469U,
+    0x3229U,
+    0x247DU,
+    0x2491U,
+    0x2179U,
+    0x02A7U,
+    0x05D8U,
+    0xFB38U,
+    0xFB38U,
+    0x05D8U,
+    0x04B5U,
+    0x059BU,
+    0x059BU,
+    0x09A5U,
+    0x0925U,
+    0x0AA5U,
+    0x0A25U,
+    0x0630U,
+    0xFEACU,
+    0xF898U,
+    0xF897U,
+    0x0E4CU,
+    0xF896U,
+    0x062BU,
+    0xFE9AU,
+    0xFE9BU,
+    0xFE9CU,
+    0x2203U,
+    0x2234U,
+    0x03B8U,
+    0x03D1U,
+    0x03D1U,
+    0x3279U,
+    0x3219U,
+    0x326BU,
+    0x314CU,
+    0x320BU,
+    0x246CU,
+    0x2480U,
+    0x2494U,
+    0x0E11U,
+    0x01ADU,
+    0x0E12U,
+    0x0E17U,
+    0x0E10U,
+    0x0E18U,
+    0x0E16U,
+    0x0482U,
+    0x066CU,
+    0x066CU,
+    0x0663U,
+    0x09E9U,
+    0x2462U,
+    0x278CU,
+    0x0969U,
+    0x0AE9U,
+    0x0A69U,
+    0x0663U,
+    0x3023U,
+    0x3222U,
+    0xFF13U,
+    0x09F6U,
+    0x2476U,
+    0x248AU,
+    0x06F3U,
+    0x2172U,
+    0x0E53U,
+    0x3394U,
+    0x3061U,
+    0x30C1U,
+    0xFF81U,
+    0x3270U,
+    0x3210U,
+    0x3262U,
+    0x3137U,
+    0x3202U,
+    0x0330U,
+    0x0303U,
+    0x0303U,
+    0x0360U,
+    0x223CU,
+    0x0334U,
+    0x033EU,
+    0x2297U,
+    0x0596U,
+    0x0596U,
+    0x0A70U,
+    0x0483U,
+    0x057FU,
+    0x1E6FU,
+    0xFF54U,
+    0x0569U,
+    0x3068U,
+    0x30C8U,
+    0xFF84U,
+    0x02E5U,
+    0x02E9U,
+    0x02E6U,
+    0x02E8U,
+    0x02E7U,
+    0x01BDU,
+    0x0185U,
+    0x01A8U,
+    0x0384U,
+    0x3327U,
+    0x0E0FU,
+    0x3014U,
+    0xFE5DU,
+    0xFE39U,
+    0x3015U,
+    0xFE5EU,
+    0xFE3AU,
+    0x0E15U,
+    0x01ABU,
+    0x24AFU,
+    0xF8EAU,
+    0xF6DBU,
+    0x0288U,
+    0x25BCU,
+    0x25C4U,
+    0x25BAU,
+    0x25B2U,
+    0x02A6U,
+    0x05E6U,
+    0xFB46U,
+    0xFB46U,
+    0x05E6U,
+    0x0446U,
+    0x05B5U,
+    0x05B5U,
+    0x05B5U,
+    0x05B5U,
+    0x05B5U,
+    0x05B5U,
+    0x05B5U,
+    0x05B5U,
+    0x045BU,
+    0x099FU,
+    0x091FU,
+    0x0A9FU,
+    0x0A1FU,
+    0x0679U,
+    0xFB67U,
+    0xFB68U,
+    0xFB69U,
+    0x09A0U,
+    0x0920U,
+    0x0AA0U,
+    0x0A20U,
+    0x0287U,
+    0x3064U,
+    0x30C4U,
+    0xFF82U,
+    0x3063U,
+    0x30C3U,
+    0xFF6FU,
+    0x246BU,
+    0x247FU,
+    0x2493U,
+    0x217BU,
+    0x2473U,
+    0x5344U,
+    0x2487U,
+    0x249BU,
+    0x0662U,
+    0x09E8U,
+    0x2461U,
+    0x278BU,
+    0x0968U,
+    0x2025U,
+    0xFE30U,
+    0x0AE8U,
+    0x0A68U,
+    0x0662U,
+    0x3022U,
+    0x3221U,
+    0xFF12U,
+    0x09F5U,
+    0x2475U,
+    0x2489U,
+    0x06F2U,
+    0x2171U,
+    0x01BBU,
+    0x0E52U,
+    0x0289U,
+    0x0989U,
+    0x3128U,
+    0x016DU,
+    0x01D4U,
+    0x24E4U,
+    0x1E77U,
+    0x0443U,
+    0x0951U,
+    0x0171U,
+    0x0215U,
+    0x0909U,
+    0x01D8U,
+    0x1E73U,
+    0x01DAU,
+    0x04F1U,
+    0x01DCU,
+    0x01D6U,
+    0x1EE5U,
+    0x0A89U,
+    0x0A09U,
+    0x3046U,
+    0x1EE7U,
+    0x01B0U,
+    0x1EE9U,
+    0x1EF1U,
+    0x1EEBU,
+    0x1EEDU,
+    0x1EEFU,
+    0x0171U,
+    0x04F3U,
+    0x0217U,
+    0x30A6U,
+    0xFF73U,
+    0x0479U,
+    0x315CU,
+    0x016BU,
+    0x04EFU,
+    0x1E7BU,
+    0x0A41U,
+    0xFF55U,
+    0x2017U,
+    0xFF3FU,
+    0xFE33U,
+    0xFE4FU,
+    0x222AU,
+    0x2200U,
+    0x0173U,
+    0x24B0U,
+    0x2580U,
+    0x05C4U,
+    0x03C5U,
+    0x03CBU,
+    0x03B0U,
+    0x028AU,
+    0x03CDU,
+    0x031DU,
+    0x02D4U,
+    0x0A73U,
+    0x016FU,
+    0x045EU,
+    0x3045U,
+    0x30A5U,
+    0xFF69U,
+    0x04AFU,
+    0x04B1U,
+    0x0169U,
+    0x1E79U,
+    0x1E75U,
+    0x098AU,
+    0x090AU,
+    0x0A8AU,
+    0x0A0AU,
+    0x0A42U,
+    0x09C2U,
+    0x0942U,
+    0x0AC2U,
+    0x09C1U,
+    0x0941U,
+    0x0AC1U,
+    0x0935U,
+    0x0AB5U,
+    0x0A35U,
+    0x30F7U,
+    0x05D5U,
+    0xFB35U,
+    0xFB35U,
+    0xFB35U,
+    0x05D5U,
+    0xFB4BU,
+    0xFB4BU,
+    0x05F0U,
+    0x05F1U,
+    0x24E5U,
+    0x1E7FU,
+    0x0432U,
+    0x06A4U,
+    0xFB6BU,
+    0xFB6CU,
+    0xFB6DU,
+    0x30F9U,
+    0x2640U,
+    0x007CU,
+    0x030DU,
+    0x0329U,
+    0x02CCU,
+    0x02C8U,
+    0x057EU,
+    0x028BU,
+    0x30F8U,
+    0x09CDU,
+    0x094DU,
+    0x0ACDU,
+    0x0983U,
+    0x0903U,
+    0x0A83U,
+    0xFF56U,
+    0x0578U,
+    0x309EU,
+    0x30FEU,
+    0x309BU,
+    0xFF9EU,
+    0x30FAU,
+    0x24B1U,
+    0x1E7DU,
+    0x028CU,
+    0x3094U,
+    0x30F4U,
+    0x1E83U,
+    0x3159U,
+    0x308FU,
+    0x30EFU,
+    0xFF9CU,
+    0x3158U,
+    0x308EU,
+    0x30EEU,
+    0x3357U,
+    0x301CU,
+    0xFE34U,
+    0x0648U,
+    0xFEEEU,
+    0x0624U,
+    0xFE86U,
+    0x33DDU,
+    0x24E6U,
+    0x0175U,
+    0x1E85U,
+    0x1E87U,
+    0x1E89U,
+    0x3091U,
+    0x2118U,
+    0x30F1U,
+    0x315EU,
+    0x315DU,
+    0x1E81U,
+    0x25E6U,
+    0x25CBU,
+    0x25D9U,
+    0x300EU,
+    0xFE43U,
+    0x300FU,
+    0xFE44U,
+    0x25C7U,
+    0x25C8U,
+    0x25BFU,
+    0x25BDU,
+    0x25C3U,
+    0x25C1U,
+    0x3016U,
+    0x3017U,
+    0x25B9U,
+    0x25B7U,
+    0x25ABU,
+    0x263AU,
+    0x25A1U,
+    0x2606U,
+    0x260FU,
+    0x3018U,
+    0x3019U,
+    0x25B5U,
+    0x25B3U,
+    0x3090U,
+    0x30F0U,
+    0x315FU,
+    0xFF57U,
+    0x3092U,
+    0x30F2U,
+    0xFF66U,
+    0x20A9U,
+    0xFFE6U,
+    0x0E27U,
+    0x24B2U,
+    0x1E98U,
+    0x02B7U,
+    0x028DU,
+    0x01BFU,
+    0x033DU,
+    0x3112U,
+    0x24E7U,
+    0x1E8DU,
+    0x1E8BU,
+    0x056DU,
+    0x03BEU,
+    0xFF58U,
+    0x24B3U,
+    0x02E3U,
+    0x334EU,
+    0x09AFU,
+    0x092FU,
+    0x3152U,
+    0x0AAFU,
+    0x0A2FU,
+    0x3084U,
+    0x30E4U,
+    0xFF94U,
+    0x3151U,
+    0x0E4EU,
+    0x3083U,
+    0x30E3U,
+    0xFF6CU,
+    0x0463U,
+    0x24E8U,
+    0x0177U,
+    0x1E8FU,
+    0x1EF5U,
+    0x064AU,
+    0x06D2U,
+    0xFBAFU,
+    0xFEF2U,
+    0x0626U,
+    0xFE8AU,
+    0xFE8BU,
+    0xFE8CU,
+    0xFEF3U,
+    0xFEF4U,
+    0xFCDDU,
+    0xFC58U,
+    0xFC94U,
+    0x06D1U,
+    0x3156U,
+    0xFFE5U,
+    0x3155U,
+    0x3186U,
+    0x05AAU,
+    0x05AAU,
+    0x044BU,
+    0x04F9U,
+    0x3181U,
+    0x3183U,
+    0x3182U,
+    0x059AU,
+    0x1EF3U,
+    0x01B4U,
+    0x1EF7U,
+    0x0575U,
+    0x0457U,
+    0x3162U,
+    0x262FU,
+    0x0582U,
+    0xFF59U,
+    0x05D9U,
+    0xFB39U,
+    0xFB39U,
+    0x05D9U,
+    0x05F2U,
+    0xFB1FU,
+    0x3088U,
+    0x3189U,
+    0x30E8U,
+    0xFF96U,
+    0x315BU,
+    0x3087U,
+    0x30E7U,
+    0xFF6EU,
+    0x03F3U,
+    0x3188U,
+    0x3187U,
+    0x0E22U,
+    0x0E0DU,
+    0x24B4U,
+    0x037AU,
+    0x0345U,
+    0x01A6U,
+    0x1E99U,
+    0x02B8U,
+    0x1EF9U,
+    0x028EU,
+    0x3086U,
+    0x318CU,
+    0x30E6U,
+    0xFF95U,
+    0x3160U,
+    0x046BU,
+    0x046DU,
+    0x0467U,
+    0x0469U,
+    0x3085U,
+    0x30E5U,
+    0xFF6DU,
+    0x318BU,
+    0x318AU,
+    0x09DFU,
+    0x095FU,
+    0x0566U,
+    0x017AU,
+    0x095BU,
+    0x0A5BU,
+    0x0638U,
+    0xFEC6U,
+    0xFEC7U,
+    0x3056U,
+    0xFEC8U,
+    0x0632U,
+    0xFEB0U,
+    0x30B6U,
+    0x0595U,
+    0x0594U,
+    0x0598U,
+    0x05D6U,
+    0xFB36U,
+    0xFB36U,
+    0x05D6U,
+    0x3117U,
+    0x24E9U,
+    0x1E91U,
+    0x0291U,
+    0x017CU,
+    0x017CU,
+    0x1E93U,
+    0x0437U,
+    0x0499U,
+    0x04DFU,
+    0x305CU,
+    0x30BCU,
+    0x0660U,
+    0x09E6U,
+    0x0966U,
+    0x0AE6U,
+    0x0A66U,
+    0x0660U,
+    0xFF10U,
+    0x06F0U,
+    0x0E50U,
+    0xFEFFU,
+    0x200CU,
+    0x200BU,
+    0x03B6U,
+    0x3113U,
+    0x056AU,
+    0x04C2U,
+    0x0436U,
+    0x0497U,
+    0x04DDU,
+    0x3058U,
+    0x30B8U,
+    0x05AEU,
+    0x1E95U,
+    0xFF5AU,
+    0x305EU,
+    0x30BEU,
+    0x24B5U,
+    0x0290U,
+    0x01B6U,
+    0x305AU,
+    0x30BAU,
 
 #endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */
     0
diff --git a/reactos/lib/freetype/src/psnames/rules.mk b/reactos/lib/freetype/src/psnames/rules.mk
index 4a4b82e82f9..06bd161e341 100644
--- a/reactos/lib/freetype/src/psnames/rules.mk
+++ b/reactos/lib/freetype/src/psnames/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001 by
+# Copyright 1996-2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,25 +15,24 @@
 
 # PSNames driver directory
 #
-PSNAMES_DIR  := $(SRC_)psnames
-PSNAMES_DIR_ := $(PSNAMES_DIR)$(SEP)
+PSNAMES_DIR := $(SRC_DIR)/psnames
 
 
 # compilation flags for the driver
 #
-PSNAMES_COMPILE := $(FT_COMPILE) $I$(PSNAMES_DIR)
+PSNAMES_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PSNAMES_DIR))
 
 
 # PSNames driver sources (i.e., C files)
 #
-PSNAMES_DRV_SRC := $(PSNAMES_DIR_)psmodule.c
+PSNAMES_DRV_SRC := $(PSNAMES_DIR)/psmodule.c
 
 
 # PSNames driver headers
 #
 PSNAMES_DRV_H := $(PSNAMES_DRV_SRC:%.c=%.h) \
-                 $(PSNAMES_DIR_)pstables.h  \
-                 $(PSNAMES_DIR_)psnamerr.h
+                 $(PSNAMES_DIR)/pstables.h  \
+                 $(PSNAMES_DIR)/psnamerr.h
 
 
 # PSNames driver object(s)
@@ -41,25 +40,25 @@ PSNAMES_DRV_H := $(PSNAMES_DRV_SRC:%.c=%.h) \
 #   PSNAMES_DRV_OBJ_M is used during `multi' builds
 #   PSNAMES_DRV_OBJ_S is used during `single' builds
 #
-PSNAMES_DRV_OBJ_M := $(PSNAMES_DRV_SRC:$(PSNAMES_DIR_)%.c=$(OBJ_)%.$O)
-PSNAMES_DRV_OBJ_S := $(OBJ_)psnames.$O
+PSNAMES_DRV_OBJ_M := $(PSNAMES_DRV_SRC:$(PSNAMES_DIR)/%.c=$(OBJ_DIR)/%.$O)
+PSNAMES_DRV_OBJ_S := $(OBJ_DIR)/psnames.$O
 
 # PSNames driver source file for single build
 #
-PSNAMES_DRV_SRC_S := $(PSNAMES_DIR_)psmodule.c
+PSNAMES_DRV_SRC_S := $(PSNAMES_DIR)/psmodule.c
 
 
 # PSNames driver - single object
 #
 $(PSNAMES_DRV_OBJ_S): $(PSNAMES_DRV_SRC_S) $(PSNAMES_DRV_SRC) \
                       $(FREETYPE_H) $(PSNAMES_DRV_H)
-	$(PSNAMES_COMPILE) $T$@ $(PSNAMES_DRV_SRC_S)
+	$(PSNAMES_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PSNAMES_DRV_SRC_S))
 
 
 # PSNames driver - multiple objects
 #
-$(OBJ_)%.$O: $(PSNAMES_DIR_)%.c $(FREETYPE_H) $(PSNAMES_DRV_H)
-	$(PSNAMES_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(PSNAMES_DIR)/%.c $(FREETYPE_H) $(PSNAMES_DRV_H)
+	$(PSNAMES_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
diff --git a/reactos/lib/freetype/src/raster/ftraster.c b/reactos/lib/freetype/src/raster/ftraster.c
index 654a81ec37e..757cba758ca 100644
--- a/reactos/lib/freetype/src/raster/ftraster.c
+++ b/reactos/lib/freetype/src/raster/ftraster.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType glyph rasterizer (body).                                */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -687,8 +687,8 @@
   static Bool
   Insert_Y_Turn( RAS_ARGS Int  y )
   {
-    PLong     y_turns;
-    Int       y2, n;
+    PLong  y_turns;
+    Int    y2, n;
 
 
     n       = ras.numTurns - 1;
@@ -710,12 +710,12 @@
 
     if ( n < 0 )
     {
+      ras.maxBuff--;
       if ( ras.maxBuff <= ras.top )
       {
         ras.error = Raster_Err_Overflow;
         return FAILURE;
       }
-      ras.maxBuff--;
       ras.numTurns++;
       ras.sizeBuff[-ras.numTurns] = y;
     }
@@ -917,7 +917,7 @@
       /* Take care: miny-y1 can be a very large value; we use     */
       /*            a slow MulDiv function to avoid clipping bugs */
       x1 += SMulDiv( Dx, miny - y1, Dy );
-      e1  = TRUNC( miny );
+      e1  = (Int)TRUNC( miny );
       f1  = 0;
     }
     else
diff --git a/reactos/lib/freetype/src/raster/ftrend1.c b/reactos/lib/freetype/src/raster/ftrend1.c
index 86b170cfe96..b6c0f028249 100644
--- a/reactos/lib/freetype/src/raster/ftrend1.c
+++ b/reactos/lib/freetype/src/raster/ftrend1.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType glyph rasterizer interface (body).                      */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -151,10 +151,10 @@
     memory = render->root.memory;
 
     /* release old bitmap buffer */
-    if ( slot->flags & FT_GLYPH_OWN_BITMAP )
+    if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP )
     {
       FT_FREE( bitmap->buffer );
-      slot->flags &= ~FT_GLYPH_OWN_BITMAP;
+      slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP;
     }
 
     /* allocate new one, depends on pixel format */
@@ -178,7 +178,7 @@
     if ( FT_ALLOC( bitmap->buffer, (FT_ULong)pitch * height ) )
       goto Exit;
 
-    slot->flags |= FT_GLYPH_OWN_BITMAP;
+    slot->internal->flags |= FT_GLYPH_OWN_BITMAP;
 
     /* translate outline to render it into the bitmap */
     FT_Outline_Translate( outline, -cbox.xMin, -cbox.yMin );
@@ -212,7 +212,7 @@
   const FT_Renderer_Class  ft_raster1_renderer_class =
   {
     {
-      ft_module_renderer,
+      FT_MODULE_RENDERER,
       sizeof( FT_RendererRec ),
 
       "raster1",
@@ -245,7 +245,7 @@
   const FT_Renderer_Class  ft_raster5_renderer_class =
   {
     {
-      ft_module_renderer,
+      FT_MODULE_RENDERER,
       sizeof( FT_RendererRec ),
 
       "raster5",
diff --git a/reactos/lib/freetype/src/raster/rules.mk b/reactos/lib/freetype/src/raster/rules.mk
index 9fe4b8bd09b..0dc8782ea45 100644
--- a/reactos/lib/freetype/src/raster/rules.mk
+++ b/reactos/lib/freetype/src/raster/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001 by
+# Copyright 1996-2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -13,58 +13,57 @@
 # fully.
 
 
-# raster1 driver directory
+# raster driver directory
 #
-RAS1_DIR  := $(SRC_)raster
-RAS1_DIR_ := $(RAS1_DIR)$(SEP)
+RASTER_DIR := $(SRC_DIR)/raster
 
 # compilation flags for the driver
 #
-RAS1_COMPILE := $(FT_COMPILE) $I$(RAS1_DIR)
+RASTER_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(RASTER_DIR))
 
 
-# raster1 driver sources (i.e., C files)
+# raster driver sources (i.e., C files)
 #
-RAS1_DRV_SRC := $(RAS1_DIR_)ftraster.c \
-                $(RAS1_DIR_)ftrend1.c
+RASTER_DRV_SRC := $(RASTER_DIR)/ftraster.c \
+                  $(RASTER_DIR)/ftrend1.c
 
 
-# raster1 driver headers
+# raster driver headers
 #
-RAS1_DRV_H := $(RAS1_DRV_SRC:%.c=%.h) \
-              $(RAS1_DIR_)rasterrs.h
+RASTER_DRV_H := $(RASTER_DRV_SRC:%.c=%.h) \
+                $(RASTER_DIR)/rasterrs.h
 
 
-# raster1 driver object(s)
+# raster driver object(s)
 #
-#   RAS1_DRV_OBJ_M is used during `multi' builds.
-#   RAS1_DRV_OBJ_S is used during `single' builds.
+#   RASTER_DRV_OBJ_M is used during `multi' builds.
+#   RASTER_DRV_OBJ_S is used during `single' builds.
 #
-RAS1_DRV_OBJ_M := $(RAS1_DRV_SRC:$(RAS1_DIR_)%.c=$(OBJ_)%.$O)
-RAS1_DRV_OBJ_S := $(OBJ_)raster.$O
+RASTER_DRV_OBJ_M := $(RASTER_DRV_SRC:$(RASTER_DIR)/%.c=$(OBJ_DIR)/%.$O)
+RASTER_DRV_OBJ_S := $(OBJ_DIR)/raster.$O
 
-# raster1 driver source file for single build
+# raster driver source file for single build
 #
-RAS1_DRV_SRC_S := $(RAS1_DIR_)raster.c
+RASTER_DRV_SRC_S := $(RASTER_DIR)/raster.c
 
 
-# raster1 driver - single object
+# raster driver - single object
 #
-$(RAS1_DRV_OBJ_S): $(RAS1_DRV_SRC_S) $(RAS1_DRV_SRC) \
-                   $(FREETYPE_H) $(RAS1_DRV_H)
-	$(RAS1_COMPILE) $T$@ $(RAS1_DRV_SRC_S)
+$(RASTER_DRV_OBJ_S): $(RASTER_DRV_SRC_S) $(RASTER_DRV_SRC) \
+                     $(FREETYPE_H) $(RASTER_DRV_H)
+	$(RASTER_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(RASTER_DRV_SRC_S))
 
 
-# raster1 driver - multiple objects
+# raster driver - multiple objects
 #
-$(OBJ_)%.$O: $(RAS1_DIR_)%.c $(FREETYPE_H) $(RAS1_DRV_H)
-	$(RAS1_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(RASTER_DIR)/%.c $(FREETYPE_H) $(RASTER_DRV_H)
+	$(RASTER_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
 #
-DRV_OBJS_S += $(RAS1_DRV_OBJ_S)
-DRV_OBJS_M += $(RAS1_DRV_OBJ_M)
+DRV_OBJS_S += $(RASTER_DRV_OBJ_S)
+DRV_OBJS_M += $(RASTER_DRV_OBJ_M)
 
 
 # EOF
diff --git a/reactos/lib/freetype/src/sfnt/rules.mk b/reactos/lib/freetype/src/sfnt/rules.mk
index c074a6afc19..14078974713 100644
--- a/reactos/lib/freetype/src/sfnt/rules.mk
+++ b/reactos/lib/freetype/src/sfnt/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2002 by
+# Copyright 1996-2000, 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,29 +15,28 @@
 
 # SFNT driver directory
 #
-SFNT_DIR  := $(SRC_)sfnt
-SFNT_DIR_ := $(SFNT_DIR)$(SEP)
+SFNT_DIR := $(SRC_DIR)/sfnt
 
 
 # compilation flags for the driver
 #
-SFNT_COMPILE := $(FT_COMPILE) $I$(SFNT_DIR)
+SFNT_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SFNT_DIR))
 
 
 # SFNT driver sources (i.e., C files)
 #
-SFNT_DRV_SRC := $(SFNT_DIR_)ttload.c   \
-                $(SFNT_DIR_)ttcmap.c   \
-                $(SFNT_DIR_)ttcmap0.c  \
-                $(SFNT_DIR_)ttsbit.c   \
-                $(SFNT_DIR_)ttpost.c   \
-                $(SFNT_DIR_)sfobjs.c   \
-                $(SFNT_DIR_)sfdriver.c
+SFNT_DRV_SRC := $(SFNT_DIR)/ttload.c   \
+                $(SFNT_DIR)/ttcmap.c   \
+                $(SFNT_DIR)/ttcmap0.c  \
+                $(SFNT_DIR)/ttsbit.c   \
+                $(SFNT_DIR)/ttpost.c   \
+                $(SFNT_DIR)/sfobjs.c   \
+                $(SFNT_DIR)/sfdriver.c
 
 # SFNT driver headers
 #
 SFNT_DRV_H := $(SFNT_DRV_SRC:%c=%h) \
-              $(SFNT_DIR_)sferrors.h
+              $(SFNT_DIR)/sferrors.h
 
 
 # SFNT driver object(s)
@@ -45,25 +44,25 @@ SFNT_DRV_H := $(SFNT_DRV_SRC:%c=%h) \
 #   SFNT_DRV_OBJ_M is used during `multi' builds.
 #   SFNT_DRV_OBJ_S is used during `single' builds.
 #
-SFNT_DRV_OBJ_M := $(SFNT_DRV_SRC:$(SFNT_DIR_)%.c=$(OBJ_)%.$O)
-SFNT_DRV_OBJ_S := $(OBJ_)sfnt.$O
+SFNT_DRV_OBJ_M := $(SFNT_DRV_SRC:$(SFNT_DIR)/%.c=$(OBJ_DIR)/%.$O)
+SFNT_DRV_OBJ_S := $(OBJ_DIR)/sfnt.$O
 
 # SFNT driver source file for single build
 #
-SFNT_DRV_SRC_S := $(SFNT_DIR_)sfnt.c
+SFNT_DRV_SRC_S := $(SFNT_DIR)/sfnt.c
 
 
 # SFNT driver - single object
 #
 $(SFNT_DRV_OBJ_S): $(SFNT_DRV_SRC_S) $(SFNT_DRV_SRC) \
                    $(FREETYPE_H) $(SFNT_DRV_H)
-	$(SFNT_COMPILE) $T$@ $(SFNT_DRV_SRC_S)
+	$(SFNT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(SFNT_DRV_SRC_S))
 
 
 # SFNT driver - multiple objects
 #
-$(OBJ_)%.$O: $(SFNT_DIR_)%.c $(FREETYPE_H) $(SFNT_DRV_H)
-	$(SFNT_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(SFNT_DIR)/%.c $(FREETYPE_H) $(SFNT_DRV_H)
+	$(SFNT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
diff --git a/reactos/lib/freetype/src/sfnt/sfdriver.c b/reactos/lib/freetype/src/sfnt/sfdriver.c
index c4dd1b47856..ea504bdd7bd 100644
--- a/reactos/lib/freetype/src/sfnt/sfdriver.c
+++ b/reactos/lib/freetype/src/sfnt/sfdriver.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    High-level SFNT driver interface (body).                             */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -149,7 +149,9 @@
       FT_Memory         memory = face->root.memory;
       TT_NameEntryRec*  name   = face->name_table.names + found_win;
       FT_UInt           len    = name->stringLength / 2;
-      FT_Error          error;
+      FT_Error          error  = SFNT_Err_Ok;
+
+      FT_UNUSED( error );
 
 
       if ( !FT_ALLOC( result, name->stringLength + 1 ) )
@@ -189,7 +191,9 @@
       FT_Memory         memory = face->root.memory;
       TT_NameEntryRec*  name   = face->name_table.names + found_apple;
       FT_UInt           len    = name->stringLength;
-      FT_Error          error;
+      FT_Error          error  = SFNT_Err_Ok;
+
+      FT_UNUSED( error );
 
 
       if ( !FT_ALLOC( result, len + 1 ) )
diff --git a/reactos/lib/freetype/src/sfnt/sfobjs.c b/reactos/lib/freetype/src/sfnt/sfobjs.c
index adaca244039..33a71ae3f9d 100644
--- a/reactos/lib/freetype/src/sfnt/sfobjs.c
+++ b/reactos/lib/freetype/src/sfnt/sfobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    SFNT object management (base).                                       */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -258,9 +258,11 @@
     {
       if ( rec->string == NULL )
       {
-        FT_Error   error;
+        FT_Error   error  = SFNT_Err_Ok;
         FT_Stream  stream = face->name_table.stream;
 
+        FT_UNUSED( error );
+
 
         if ( FT_NEW_ARRAY  ( rec->string, rec->stringLength ) ||
              FT_STREAM_SEEK( rec->stringOffset )              ||
@@ -305,11 +307,11 @@
       { TT_PLATFORM_MICROSOFT,     TT_MS_ID_SYMBOL_CS,  FT_ENCODING_MS_SYMBOL },
       { TT_PLATFORM_MICROSOFT,     TT_MS_ID_UCS_4,      FT_ENCODING_UNICODE },
       { TT_PLATFORM_MICROSOFT,     TT_MS_ID_UNICODE_CS, FT_ENCODING_UNICODE },
-      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_SJIS,       FT_ENCODING_MS_SJIS },
-      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_GB2312,     FT_ENCODING_MS_GB2312 },
-      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_BIG_5,      FT_ENCODING_MS_BIG5 },
-      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_WANSUNG,    FT_ENCODING_MS_WANSUNG },
-      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_JOHAB,      FT_ENCODING_MS_JOHAB }
+      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_SJIS,       FT_ENCODING_SJIS },
+      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_GB2312,     FT_ENCODING_GB2312 },
+      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_BIG_5,      FT_ENCODING_BIG5 },
+      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_WANSUNG,    FT_ENCODING_WANSUNG },
+      { TT_PLATFORM_MICROSOFT,     TT_MS_ID_JOHAB,      FT_ENCODING_JOHAB }
     };
 
     const TEncoding  *cur, *limit;
@@ -556,7 +558,7 @@
       /* Compute style flags.                                              */
       /*                                                                   */
       flags = 0;
-      if ( has_outline == TRUE && face->os2.version != 0xFFFF )
+      if ( has_outline == TRUE && face->os2.version != 0xFFFFU )
       {
         /* we have an OS/2 table; use the `fsSelection' field */
         if ( face->os2.fsSelection & 1 )
@@ -631,18 +633,30 @@
           root->face_flags |= FT_FACE_FLAG_VERTICAL;
         }
 #endif
-        root->num_fixed_sizes = face->num_sbit_strikes;
+        root->num_fixed_sizes = (FT_Int)face->num_sbit_strikes;
 
         if ( FT_NEW_ARRAY( root->available_sizes, face->num_sbit_strikes ) )
           goto Exit;
 
         for ( n = 0 ; n < face->num_sbit_strikes ; n++ )
         {
-          root->available_sizes[n].width =
-            face->sbit_strikes[n].x_ppem;
+          FT_Bitmap_Size*  bsize  = root->available_sizes + n;
+          TT_SBit_Strike   strike = face->sbit_strikes + n;
+          FT_UShort        fupem  = face->header.Units_Per_EM;
+          FT_Short         height = face->horizontal.Ascender -
+                                      face->horizontal.Descender +
+                                      face->horizontal.Line_Gap;
+          FT_Short         avg    = face->os2.xAvgCharWidth;
 
-          root->available_sizes[n].height =
-            face->sbit_strikes[n].y_ppem;
+
+          /* assume 72dpi */
+          bsize->height = 
+            (FT_Short)( ( height * strike->y_ppem + fupem/2 ) / fupem );
+          bsize->width  =
+            (FT_Short)( ( avg * strike->y_ppem + fupem/2 ) / fupem );
+          bsize->size   = strike->y_ppem << 6;
+          bsize->x_ppem = strike->x_ppem << 6;
+          bsize->y_ppem = strike->y_ppem << 6;
         }
       }
       else
@@ -661,7 +675,7 @@
       if ( has_outline == TRUE )
       {
         /* XXX What about if outline header is missing */
-        /*     (e.g. sfnt wrapped outline)?            */
+        /*     (e.g. sfnt wrapped bitmap)?             */
         root->bbox.xMin    = face->header.xMin;
         root->bbox.yMin    = face->header.yMin;
         root->bbox.xMax    = face->header.xMax;
@@ -706,16 +720,18 @@
         root->height    = (FT_Short)( root->ascender - root->descender +
                                       face->horizontal.Line_Gap );
 
+#if 0
         /* if the line_gap is 0, we add an extra 15% to the text height --  */
         /* this computation is based on various versions of Times New Roman */
         if ( face->horizontal.Line_Gap == 0 )
           root->height = (FT_Short)( ( root->height * 115 + 50 ) / 100 );
+#endif
 
 #if 0
 
         /* some fonts have the OS/2 "sTypoAscender", "sTypoDescender" & */
         /* "sTypoLineGap" fields set to 0, like ARIALNB.TTF             */
-        if ( face->os2.version != 0xFFFF && root->ascender )
+        if ( face->os2.version != 0xFFFFU && root->ascender )
         {
           FT_Int  height;
 
diff --git a/reactos/lib/freetype/src/sfnt/ttcmap0.c b/reactos/lib/freetype/src/sfnt/ttcmap0.c
index 40533457798..4c9dadfbb42 100644
--- a/reactos/lib/freetype/src/sfnt/ttcmap0.c
+++ b/reactos/lib/freetype/src/sfnt/ttcmap0.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType new character mapping table (cmap) support (body).          */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -701,9 +701,18 @@
           p += offset;  /* start of glyph id array */
 
           /* check that we point within the glyph ids table only */
-          if ( p < glyph_ids                                ||
-               p + ( end - start + 1 ) * 2 > table + length )
-            FT_INVALID_DATA;
+          if ( valid->level >= FT_VALIDATE_TIGHT )
+          {
+            if ( p < glyph_ids                                ||
+                 p + ( end - start + 1 ) * 2 > table + length )
+              FT_INVALID_DATA;
+          }
+          else
+          {
+            if ( p < glyph_ids                              ||
+                 p + ( end - start + 1 ) * 2 > valid->limit )
+              FT_INVALID_DATA;
+          }
 
           /* check glyph indices within the segment range */
           if ( valid->level >= FT_VALIDATE_TIGHT )
@@ -780,10 +789,8 @@
 
           if ( code < start )
             max = mid;
-
           else if ( code > end )
             min = mid + 1;
-
           else
           {
             /* we found the segment */
@@ -872,24 +879,117 @@
   {
     FT_Byte*   table     = cmap->data;
     FT_UInt32  result    = 0;
-    FT_UInt32  char_code = *pchar_code + 1;
     FT_UInt    gindex    = 0;
+    FT_UInt32  char_code = *pchar_code;
     FT_Byte*   p;
-    FT_Byte*   q;
     FT_UInt    code, num_segs2;
 
 
-    if ( char_code >= 0x10000UL )
+    if ( char_code >= 0xFFFFUL )
       goto Exit;
 
-    code      = (FT_UInt)char_code;
+    code      = (FT_UInt)char_code + 1;
     p         = table + 6;
     num_segs2 = TT_PEEK_USHORT(p) & -2;  /* ensure even-ness */
 
+#if 1
+
     for (;;)
     {
-      FT_UInt  offset, n;
+      /* Some fonts have more than 170 segments in their charmaps! */
+      /* We changed this function to use a more efficient binary   */
+      /* search                                                    */
+      FT_UInt  offset;
       FT_Int   delta;
+      FT_UInt  min = 0;
+      FT_UInt  max = num_segs2 >> 1;
+      FT_UInt  mid, start, end;
+      FT_UInt  hi;
+
+
+      /* we begin by finding the segment which end is
+         closer to our code point */
+      hi = max + 1;
+      while ( min < max )
+      {
+        mid = ( min + max ) >> 1;
+        p   = table + 14 + mid * 2;
+        end = TT_PEEK_USHORT( p );
+
+        if ( end < code )
+          min = mid + 1;
+        else
+        {
+          hi  = mid;
+          max = mid;
+        }
+      }
+
+      if ( hi > max )
+      {
+        /* the point is behind the last segment;
+           we will exit right now */
+        goto Exit;
+      }
+
+      p   = table + 14 + hi * 2;
+      end = TT_PEEK_USHORT( p );
+
+      p    += 2 + num_segs2;
+      start = TT_PEEK_USHORT( p );
+
+      if ( code < start )
+        code = start;
+
+      p    += num_segs2;
+      delta = TT_PEEK_USHORT( p );
+
+      p     += num_segs2;
+      offset = TT_PEEK_USHORT( p );
+
+      if ( offset != 0 && offset != 0xFFFFU )
+      {
+        /* parse the glyph ids array for non-zero index */
+        p += offset + ( code - start ) * 2;
+        while ( code <= end )
+        {
+          gindex = TT_NEXT_USHORT( p );
+          if ( gindex != 0 )
+          {
+            gindex = (FT_UInt)( gindex + delta ) & 0xFFFFU;
+            if ( gindex != 0 )
+            {
+              result = code;
+              goto Exit;
+            }
+          }
+          code++;
+        }
+      }
+      else if ( offset == 0xFFFFU )
+      {
+        /* an offset of 0xFFFF means an empty glyph in certain fonts! */
+        code = end + 1;
+      }
+      else  /* offset == 0 */
+      {
+        gindex = (FT_UInt)( code + delta ) & 0xFFFFU;
+        if ( gindex != 0 )
+        {
+          result = code;
+          goto Exit;
+        }
+        code++;
+      }
+    }
+
+#else   /* old code -- kept for reference */
+
+    for ( ;; )
+    {
+      FT_UInt   offset, n;
+      FT_Int    delta;
+      FT_Byte*  q;
 
 
       p = table + 14;              /* ends table  */
@@ -943,14 +1043,14 @@
           goto Exit;
         }
       }
-
       /* loop to next trial charcode */
       if ( code >= 0xFFFFU )
         break;
 
       code++;
     }
-    return (FT_UInt)result;
+
+#endif /* !1 */
 
   Exit:
     *pchar_code = result;
@@ -1009,7 +1109,7 @@
                      FT_Validator  valid )
   {
     FT_Byte*  p;
-    FT_UInt   length, start, count;
+    FT_UInt   length, count;
 
 
     if ( table + 10 > valid->limit )
@@ -1018,8 +1118,7 @@
     p      = table + 2;
     length = TT_NEXT_USHORT( p );
 
-    p      = table + 6;             /* skip language */
-    start  = TT_NEXT_USHORT( p );
+    p      = table + 8;             /* skip language and start index */
     count  = TT_NEXT_USHORT( p );
 
     if ( table + length > valid->limit || length < 10 + count * 2 )
@@ -1390,15 +1489,14 @@
                       FT_Validator  valid )
   {
     FT_Byte*  p = table + 4;
-    FT_ULong  length, start, count;
+    FT_ULong  length, count;
 
 
     if ( table + 20 > valid->limit )
       FT_INVALID_TOO_SHORT;
 
     length = TT_NEXT_ULONG( p );
-    p      = table + 12;
-    start  = TT_NEXT_ULONG( p );
+    p      = table + 16;
     count  = TT_NEXT_ULONG( p );
 
     if ( table + length > valid->limit || length < 20 + count * 2 )
@@ -1446,7 +1544,6 @@
                        FT_UInt32  *pchar_code )
   {
     FT_Byte*   table     = cmap->data;
-    FT_UInt32  result    = 0;
     FT_UInt32  char_code = *pchar_code + 1;
     FT_UInt    gindex    = 0;
     FT_Byte*   p         = table + 12;
@@ -1465,10 +1562,7 @@
     {
       gindex = TT_NEXT_USHORT( p );
       if ( gindex != 0 )
-      {
-        result = char_code;
         break;
-      }
       char_code++;
     }
 
@@ -1713,7 +1807,7 @@
 
 
     if ( p + 4 > limit )
-      return FT_Err_Invalid_Table;
+      return SFNT_Err_Invalid_Table;
 
     /* only recognize format 0 */
     if ( TT_NEXT_USHORT( p ) != 0 )
@@ -1721,7 +1815,7 @@
       p -= 2;
       FT_ERROR(( "tt_face_build_cmaps: unsupported `cmap' table format = %d\n",
                  TT_PEEK_USHORT( p ) ));
-      return FT_Err_Invalid_Table;
+      return SFNT_Err_Invalid_Table;
     }
 
     num_cmaps = TT_NEXT_USHORT( p );
@@ -1741,7 +1835,7 @@
       if ( offset && table + offset + 2 < limit )
       {
         FT_Byte*                       cmap   = table + offset;
-        FT_UInt                        format = TT_PEEK_USHORT( cmap );
+        volatile FT_UInt               format = TT_PEEK_USHORT( cmap );
         const TT_CMap_Class* volatile  pclazz = tt_cmap_classes;
         TT_CMap_Class                  clazz;
 
diff --git a/reactos/lib/freetype/src/sfnt/ttload.c b/reactos/lib/freetype/src/sfnt/ttload.c
index 7a79503f9f3..13b7e867790 100644
--- a/reactos/lib/freetype/src/sfnt/ttload.c
+++ b/reactos/lib/freetype/src/sfnt/ttload.c
@@ -5,7 +5,7 @@
 /*    Load the basic TrueType tables, i.e., tables that can be either in   */
 /*    TTF or OTF fonts (body).                                             */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -179,11 +179,8 @@
     /* if 'num_tables' is 0, read the table count from the file */
     if ( num_tables == 0 )
     {
-      FT_ULong  format_tag;
-
-
       if ( FT_STREAM_SEEK( offset )     ||
-           FT_READ_ULONG ( format_tag ) ||
+           FT_STREAM_SKIP( 4 )          ||
            FT_READ_USHORT( num_tables ) ||
            FT_STREAM_SKIP( 6 )          )
         goto Bad_Format;
@@ -213,13 +210,13 @@
 
         has_head = 1;
 
-       /* the table length should be 0x36, but certain font tools
-        * make it 0x38, so we will just check that it is greater.
-        *
-        * note that according to the specification,
-        * the table must be padded to 32-bit lengths, but this doesn't
-        * apply to the value of its "Length" field !!
-        */
+        /* The table length should be 0x36, but certain font tools
+         * make it 0x38, so we will just check that it is greater.
+         *
+         * Note that according to the specification,
+         * the table must be padded to 32-bit lengths, but this doesn't
+         * apply to the value of its "Length" field!
+         */
         if ( table.Length < 0x36                 ||
              FT_STREAM_SEEK( table.Offset + 12 ) ||
              FT_READ_ULONG( magic )              ||
@@ -238,7 +235,7 @@
     return  error;
 
   Bad_Format:
-    error = FT_Err_Unknown_File_Format;
+    error = SFNT_Err_Unknown_File_Format;
     goto Exit;
   }
 
@@ -840,16 +837,16 @@
       {
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
-      /* If this is an incrementally loaded font and there are    */
-      /* overriding metrics tolerate a missing 'hmtx' table.      */
+        /* If this is an incrementally loaded font and there are */
+        /* overriding metrics tolerate a missing 'hmtx' table.   */
         if ( face->root.internal->incremental_interface &&
              face->root.internal->incremental_interface->funcs->
-                 get_glyph_metrics )
+               get_glyph_metrics )
         {
           face->horizontal.number_Of_HMetrics = 0;
           error = SFNT_Err_Ok;
           goto Exit;
-	    }
+        }
 #endif
 
         FT_ERROR(( " no horizontal metrics in file!\n" ));
@@ -1779,6 +1776,7 @@
     FT_Memory  memory = stream->memory;
 
     TT_Hdmx    hdmx = &face->hdmx;
+    FT_Short   num_records;
     FT_Long    num_glyphs;
     FT_Long    record_size;
 
@@ -1796,7 +1794,7 @@
       goto Exit;
 
     hdmx->version     = FT_GET_USHORT();
-    hdmx->num_records = FT_GET_SHORT();
+    num_records       = FT_GET_SHORT();
     record_size       = FT_GET_LONG();
 
     FT_FRAME_EXIT();
@@ -1805,9 +1803,10 @@
     if ( hdmx->version != 0 )
       goto Exit;
 
-    if ( FT_NEW_ARRAY( hdmx->records, hdmx->num_records ) )
+    if ( FT_NEW_ARRAY( hdmx->records, num_records ) )
       goto Exit;
 
+    hdmx->num_records = num_records;
     num_glyphs   = face->root.num_glyphs;
     record_size -= num_glyphs + 2;
 
diff --git a/reactos/lib/freetype/src/sfnt/ttsbit.c b/reactos/lib/freetype/src/sfnt/ttsbit.c
index 9cfa92be63e..d4c16b15f51 100644
--- a/reactos/lib/freetype/src/sfnt/ttsbit.c
+++ b/reactos/lib/freetype/src/sfnt/ttsbit.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType and OpenType embedded bitmap support (body).                */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -635,7 +635,7 @@
 
     for ( i = 0; i < face->num_sbit_strikes; i++ )
     {
-      if ( ( face->sbit_strikes[i].y_ppem  == y_ppem )    &&
+      if ( ( face->sbit_strikes[i].y_ppem == y_ppem )     &&
            ( ( x_ppem == 0 )                            ||
              ( face->sbit_strikes[i].x_ppem == x_ppem ) ) )
       {
@@ -1232,9 +1232,9 @@
     if ( error )
       goto Exit;
 
-    /* this function is recursive.  At the top-level call, we  */
+    /* This function is recursive.  At the top-level call, we  */
     /* compute the dimensions of the higher-level glyph to     */
-    /* allocate the final pixmap buffer                        */
+    /* allocate the final pixmap buffer.                       */
     if ( depth == 0 )
     {
       FT_Long  size;
@@ -1355,7 +1355,7 @@
                                  y_offset + comp->y_offset,
                                  stream,
                                  &elem_metrics,
-                                 depth+1 );
+                                 depth + 1 );
         if ( error )
           goto Fail_Memory;
       }
diff --git a/reactos/lib/freetype/src/smooth/ftgrays.c b/reactos/lib/freetype/src/smooth/ftgrays.c
index 6c094818889..499cc8cb57c 100644
--- a/reactos/lib/freetype/src/smooth/ftgrays.c
+++ b/reactos/lib/freetype/src/smooth/ftgrays.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    A new `perfect' anti-aliasing renderer (body).                       */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
+/*  Copyright 2000-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -340,7 +340,7 @@
                    long            byte_size )
   {
     ras.cells     = (PCell)buffer;
-    ras.max_cells = byte_size / sizeof ( TCell );
+    ras.max_cells = (int)( byte_size / sizeof ( TCell ) );
     ras.num_cells = 0;
     ras.area      = 0;
     ras.cover     = 0;
@@ -567,16 +567,16 @@
 
     if ( ex1 != ex2 )
     {
-      p     = ONE_PIXEL * ( y2 - y1 + delta );
-      lift  = (TCoord)( p / dx );
-      rem   = (TCoord)( p % dx );
+      p    = ONE_PIXEL * ( y2 - y1 + delta );
+      lift = (TCoord)( p / dx );
+      rem  = (TCoord)( p % dx );
       if ( rem < 0 )
       {
         lift--;
         rem += (TCoord)dx;
       }
 
-      mod -= dx;
+      mod -= (int)dx;
 
       while ( ex1 != ex2 )
       {
diff --git a/reactos/lib/freetype/src/smooth/ftsmooth.c b/reactos/lib/freetype/src/smooth/ftsmooth.c
index 131b17eba02..cc84acd0490 100644
--- a/reactos/lib/freetype/src/smooth/ftsmooth.c
+++ b/reactos/lib/freetype/src/smooth/ftsmooth.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Anti-aliasing renderer interface (body).                             */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
+/*  Copyright 2000-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -137,16 +137,16 @@
     cbox.xMax  = ( cbox.xMax + 63 ) & -64;
     cbox.yMax  = ( cbox.yMax + 63 ) & -64;
 
-    width  = ( cbox.xMax - cbox.xMin ) >> 6;
-    height = ( cbox.yMax - cbox.yMin ) >> 6;
+    width  = (FT_UInt)( ( cbox.xMax - cbox.xMin ) >> 6 );
+    height = (FT_UInt)( ( cbox.yMax - cbox.yMin ) >> 6 );
     bitmap = &slot->bitmap;
     memory = render->root.memory;
 
     /* release old bitmap buffer */
-    if ( slot->flags & FT_GLYPH_OWN_BITMAP )
+    if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP )
     {
       FT_FREE( bitmap->buffer );
-      slot->flags &= ~FT_GLYPH_OWN_BITMAP;
+      slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP;
     }
 
     /* allocate new one, depends on pixel format */
@@ -169,7 +169,7 @@
     if ( FT_ALLOC( bitmap->buffer, (FT_ULong)pitch * height ) )
       goto Exit;
 
-    slot->flags |= FT_GLYPH_OWN_BITMAP;
+    slot->internal->flags |= FT_GLYPH_OWN_BITMAP;
 
     /* translate outline to render it into the bitmap */
     FT_Outline_Translate( outline, -cbox.xMin, -cbox.yMin );
@@ -284,7 +284,7 @@
   const FT_Renderer_Class  ft_smooth_renderer_class =
   {
     {
-      ft_module_renderer,
+      FT_MODULE_RENDERER,
       sizeof( FT_RendererRec ),
 
       "smooth",
@@ -313,7 +313,7 @@
   const FT_Renderer_Class  ft_smooth_lcd_renderer_class =
   {
     {
-      ft_module_renderer,
+      FT_MODULE_RENDERER,
       sizeof( FT_RendererRec ),
 
       "smooth-lcd",
@@ -343,7 +343,7 @@
   const FT_Renderer_Class  ft_smooth_lcdv_renderer_class =
   {
     {
-      ft_module_renderer,
+      FT_MODULE_RENDERER,
       sizeof( FT_RendererRec ),
 
       "smooth-lcdv",
diff --git a/reactos/lib/freetype/src/smooth/rules.mk b/reactos/lib/freetype/src/smooth/rules.mk
index 457f1e5f4e4..4f27f01dba7 100644
--- a/reactos/lib/freetype/src/smooth/rules.mk
+++ b/reactos/lib/freetype/src/smooth/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001 by
+# Copyright 1996-2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,24 +15,23 @@
 
 # smooth driver directory
 #
-SMOOTH_DIR  := $(SRC_)smooth
-SMOOTH_DIR_ := $(SMOOTH_DIR)$(SEP)
+SMOOTH_DIR := $(SRC_DIR)/smooth
 
 # compilation flags for the driver
 #
-SMOOTH_COMPILE := $(FT_COMPILE) $I$(SMOOTH_DIR)
+SMOOTH_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SMOOTH_DIR))
 
 
 # smooth driver sources (i.e., C files)
 #
-SMOOTH_DRV_SRC := $(SMOOTH_DIR_)ftgrays.c  \
-                  $(SMOOTH_DIR_)ftsmooth.c
+SMOOTH_DRV_SRC := $(SMOOTH_DIR)/ftgrays.c  \
+                  $(SMOOTH_DIR)/ftsmooth.c
 
 
 # smooth driver headers
 #
 SMOOTH_DRV_H := $(SMOOTH_DRV_SRC:%c=%h)  \
-                $(SMOOTH_DIR_)ftsmerrs.h
+                $(SMOOTH_DIR)/ftsmerrs.h
 
 
 # smooth driver object(s)
@@ -40,25 +39,25 @@ SMOOTH_DRV_H := $(SMOOTH_DRV_SRC:%c=%h)  \
 #   SMOOTH_DRV_OBJ_M is used during `multi' builds.
 #   SMOOTH_DRV_OBJ_S is used during `single' builds.
 #
-SMOOTH_DRV_OBJ_M := $(SMOOTH_DRV_SRC:$(SMOOTH_DIR_)%.c=$(OBJ_)%.$O)
-SMOOTH_DRV_OBJ_S := $(OBJ_)smooth.$O
+SMOOTH_DRV_OBJ_M := $(SMOOTH_DRV_SRC:$(SMOOTH_DIR)/%.c=$(OBJ_DIR)/%.$O)
+SMOOTH_DRV_OBJ_S := $(OBJ_DIR)/smooth.$O
 
 # smooth driver source file for single build
 #
-SMOOTH_DRV_SRC_S := $(SMOOTH_DIR_)smooth.c
+SMOOTH_DRV_SRC_S := $(SMOOTH_DIR)/smooth.c
 
 
 # smooth driver - single object
 #
 $(SMOOTH_DRV_OBJ_S): $(SMOOTH_DRV_SRC_S) $(SMOOTH_DRV_SRC) \
-                   $(FREETYPE_H) $(SMOOTH_DRV_H)
-	$(SMOOTH_COMPILE) $T$@ $(SMOOTH_DRV_SRC_S)
+                     $(FREETYPE_H) $(SMOOTH_DRV_H)
+	$(SMOOTH_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(SMOOTH_DRV_SRC_S))
 
 
 # smooth driver - multiple objects
 #
-$(OBJ_)%.$O: $(SMOOTH_DIR_)%.c $(FREETYPE_H) $(SMOOTH_DRV_H)
-	$(SMOOTH_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(SMOOTH_DIR)/%.c $(FREETYPE_H) $(SMOOTH_DRV_H)
+	$(SMOOTH_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
diff --git a/reactos/lib/freetype/src/tools/docmaker/sources.py b/reactos/lib/freetype/src/tools/docmaker/sources.py
index 9828aa6421c..c270e54118e 100644
--- a/reactos/lib/freetype/src/tools/docmaker/sources.py
+++ b/reactos/lib/freetype/src/tools/docmaker/sources.py
@@ -130,7 +130,7 @@ re_markup_tags = [ re_markup_tag1, re_markup_tag2 ]
 #
 # used to detect a cross-reference, after markup tags have been stripped
 #
-re_crossref = re.compile( r'@(\w*)' )
+re_crossref = re.compile( r'@(\w*)(.*)' )
 
 #
 # used to detect italic and bold styles in paragraph text
diff --git a/reactos/lib/freetype/src/tools/docmaker/tohtml.py b/reactos/lib/freetype/src/tools/docmaker/tohtml.py
index 75e5db0689d..2a3cf239b4a 100644
--- a/reactos/lib/freetype/src/tools/docmaker/tohtml.py
+++ b/reactos/lib/freetype/src/tools/docmaker/tohtml.py
@@ -7,23 +7,38 @@ import time
 # The following defines the HTML header used by all generated pages.
 #
 html_header_1 = """\
+<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<header>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>"""
 
 html_header_2= """ API Reference</title>
-<basefont face="Verdana,Geneva,Arial,Helvetica">
-<style content="text/css">
-  P { text-align=justify }
-  H1 { text-align=center }
-  LI { text-align=justify }
+<style type="text/css">
+  body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
+         color: #000000;
+         background: #FFFFFF; }
+
+  p { text-align: justify; }
+  h1 { text-align: center; }
+  li { text-align: justify; }
+
+  a:link { color: #0000EF; }
+  a:visited { color: #51188E; }
+  a:hover { color: #FF0000; }
+
+  span.keyword { font-family: monospace;
+                 text-align: left;
+                 white-space: pre;
+                 color: darkblue; }
+
+  pre.colored { color: blue; }
+
+  ul.empty { list-style-type: none; }
 </style>
-</header>
-<body text=#000000
-      bgcolor=#FFFFFF
-      link=#0000EF
-      vlink=#51188E
-      alink=#FF0000>
+</head>
+<body>
 <center><h1>"""
 
 html_header_3=""" API Reference</h1></center>
@@ -44,8 +59,8 @@ section_title_footer = "</h1></center>"
 
 # The header and footer used for code segments.
 #
-code_header = "<font color=blue><pre>"
-code_footer = "</pre></font>"
+code_header = '<pre class="colored">'
+code_footer = '</pre>'
 
 # Paragraph header and footer.
 #
@@ -54,39 +69,39 @@ para_footer = "</p>"
 
 # Block header and footer.
 #
-block_header = "<center><table width=75%><tr><td>"
-block_footer = "</td></tr></table><hr width=75%></center>"
+block_header = '<table align=center width="75%"><tr><td>'
+block_footer = '</td></tr></table><hr width="75%">'
 
 # Description header/footer.
 #
-description_header = "<center><table width=87%><tr><td>"
-description_footer = "</td></tr></table></center><br>"
+description_header = '<table align=center width="87%"><tr><td>'
+description_footer = "</td></tr></table><br>"
 
 # Marker header/inter/footer combination.
 #
-marker_header = "<center><table width=87% cellpadding=5><tr bgcolor=#EEEEFF><td><em><b>"
+marker_header = '<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>'
 marker_inter  = "</b></em></td></tr><tr><td>"
-marker_footer = "</td></tr></table></center>"
+marker_footer = "</td></tr></table>"
 
 # Source code extracts header/footer.
 #
-source_header = "<center><table width=87%><tr bgcolor=#D6E8FF width=100%><td><pre>\n"
-source_footer = "\n</pre></table></center><br>"
+source_header = '<table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>\n'
+source_footer = "\n</pre></table><br>"
 
 # Chapter header/inter/footer.
 #
-chapter_header = "<br><center><table width=75%><tr><td><h2>"
-chapter_inter  = "</h2><ul>"
-chapter_footer = "</ul></td></tr></table></center>"
+chapter_header = '<br><table align=center width="75%"><tr><td><h2>'
+chapter_inter  = '</h2><ul class="empty"><li>'
+chapter_footer = '</li></ul></td></tr></table>'
 
 
 # source language keyword coloration/styling
 #
-keyword_prefix = '<font color="darkblue">'
-keyword_suffix = '</font>'
+keyword_prefix = '<span class="keyword">'
+keyword_suffix = '</span>'
 
-section_synopsis_header = '<h2>Synopsys</h2><font color="cyan">'
-section_synopsis_footer = '</font>'
+section_synopsis_header = '<h2>Synopsis</h2>'
+section_synopsis_footer = ''
 
 # Translate a single line of source to HTML.  This will convert
 # a "<" into "&lt.", ">" into "&gt.", etc.
@@ -139,9 +154,9 @@ class HtmlFormatter(Formatter):
         self.html_header   = html_header_1 + project_title + html_header_2 + \
                              project_title + html_header_3
 
-        self.html_footer = "<p><center><font size=""-2"">generated on " +   \
+        self.html_footer = "<center><font size=""-2"">generated on " +   \
                             time.asctime( time.localtime( time.time() ) ) + \
-                           "</font></p></center>" + html_footer
+                           "</font></center>" + html_footer
 
         self.columns = 3
 
@@ -172,11 +187,12 @@ class HtmlFormatter(Formatter):
         if m:
             try:
                 name = m.group(1)
+                rest = m.group(2)
                 block = self.identifiers[ name ]
                 url   = self.make_block_url( block )
-                return '<a href="' + url + '">' + name + '</a>'
+                return '<a href="' + url + '">' + name + '</a>' + rest
             except:
-                return '?' + name + '?'
+                return '?' + name + '?' + rest
 
         # look for italics and bolds
         m = re_italic.match( word )
@@ -230,7 +246,7 @@ class HtmlFormatter(Formatter):
 
     def print_html_field( self, field ):
         if field.name:
-            print "<table valign=top><tr><td><b>"+field.name+"</b></td><td>"
+            print "<table><tr valign=top><td><b>"+field.name+"</b></td><td>"
 
         print self.make_html_items( field.items )
 
@@ -272,7 +288,7 @@ class HtmlFormatter(Formatter):
 
 
     def print_html_field_list( self, fields ):
-        print "<table valign=top cellpadding=3>"
+        print "<table cellpadding=3>"
         for field in fields:
             print "<tr valign=top><td><b>" + field.name + "</b></td><td>"
             self.print_html_items( field.items )
@@ -319,7 +335,7 @@ class HtmlFormatter(Formatter):
         count = len( self.block_index )
         rows  = (count + self.columns - 1)/self.columns
 
-        print "<center><table border=0 cellpadding=0 cellspacing=0>"
+        print "<table align=center border=0 cellpadding=0 cellspacing=0>"
         for r in range(rows):
             line = "<tr>"
             for c in range(self.columns):
@@ -333,7 +349,7 @@ class HtmlFormatter(Formatter):
             line = line + "</tr>"
             print line
 
-        print "</table></center>"
+        print "</table>"
         print self.html_footer
         self.index_items = {}
 
@@ -373,7 +389,6 @@ class HtmlFormatter(Formatter):
         print chapter_header + '<a href="' + index_filename + '">Global Index</a>' + chapter_inter + chapter_footer
 
     def  toc_exit( self ):
-        print "</table></center>"
         print self.html_footer
 
     def  toc_dump( self, toc_filename = None, index_filename = None ):
@@ -397,7 +412,7 @@ class HtmlFormatter(Formatter):
 
         # print section synopsys
         print section_synopsis_header
-        print "<center><table cellspacing=5 cellpadding=0 border=0>"
+        print "<table align=center cellspacing=5 cellpadding=0 border=0>"
 
         maxwidth = 0
         for b in section.blocks.values():
@@ -424,7 +439,7 @@ class HtmlFormatter(Formatter):
             line = line + "</tr>"
             print line
 
-        print "</table></center><br><br>"
+        print "</table><br><br>"
         print section_synopsis_footer
 
         print description_header
@@ -436,9 +451,7 @@ class HtmlFormatter(Formatter):
 
         # place html anchor if needed
         if block.name:
-            print '<a name="' + block.name + '">'
-            print "<h4>" + block.name + "</h4>"
-            print "</a>"
+            print '<h4><a name="' + block.name + '">' + block.name + '</a></h4>'
 
         # dump the block C source lines now
         if block.code:
@@ -473,4 +486,4 @@ class HtmlFormatter(Formatter):
     def section_dump_all( self ):
         for section in self.sections:
             self.section_dump( section, self.file_prefix + section.name + '.html' )
-        
\ No newline at end of file
+        
diff --git a/reactos/lib/freetype/src/tools/glnames.py b/reactos/lib/freetype/src/tools/glnames.py
index e377cd0d32a..e8e80ec6cf9 100644
--- a/reactos/lib/freetype/src/tools/glnames.py
+++ b/reactos/lib/freetype/src/tools/glnames.py
@@ -6,7 +6,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -30,11 +30,11 @@ usage: %s <output-file>
 import sys, string
 
 
-# This table is used to name the glyph according to the Macintosh
-# specification.  It is used by the TrueType Postscript names table
+# This table is used to name the glyphs according to the Macintosh
+# specification.  It is used by the TrueType Postscript names table.
 #
-# see http://fonts.apple.com/TTRefMan/RM06/Chap6post.html
-# for the official list
+# See http://fonts.apple.com/TTRefMan/RM06/Chap6post.html
+# for the official list.
 #
 mac_standard_names = \
 [
@@ -145,9 +145,9 @@ mac_standard_names = \
 ]
 
 
-# the list of standard "SID" glyph names. For the official list,
+# The list of standard "SID" glyph names.  For the official list,
 # see Annex A of document at
-# http://partners.adobe.com/asn/developer/pdfs/tn/5176.CFF.pdf
+# http://partners.adobe.com/asn/developer/pdfs/tn/5176.CFF.pdf.
 #
 sid_standard_names = \
 [
@@ -330,8 +330,8 @@ sid_standard_names = \
 ]
 
 
-# this table maps character code of the Adobe Standard Type 1
-# encoding to glyph indexes in the sid_standard_names table
+# This table maps character codes of the Adobe Standard Type 1
+# encoding to glyph indices in the sid_standard_names table.
 #
 t1_standard_encoding = \
 [
@@ -369,8 +369,8 @@ t1_standard_encoding = \
 ]
 
 
-# this table maps character code of the Adobe Expert Type 1
-# encoding to glyph indexes in the sid_standard_names table
+# This table maps character codes of the Adobe Expert Type 1
+# encoding to glyph indices in the sid_standard_names table.
 #
 t1_expert_encoding = \
 [
@@ -409,1062 +409,4292 @@ t1_expert_encoding = \
 
 
 # This data has been taken literally from the file `glyphlist.txt',
-# version 1.2, 22 Oct 1998.  It is available from
+# version 2.0, 22 Sept 2002.  It is available from
 #
 #   http://partners.adobe.com/asn/developer/typeforum/unicodegn.html
 #
 adobe_glyph_list = """\
-0041;A;LATIN CAPITAL LETTER A
-00C6;AE;LATIN CAPITAL LETTER AE
-01FC;AEacute;LATIN CAPITAL LETTER AE WITH ACUTE
-F7E6;AEsmall;LATIN SMALL CAPITAL LETTER AE
-00C1;Aacute;LATIN CAPITAL LETTER A WITH ACUTE
-F7E1;Aacutesmall;LATIN SMALL CAPITAL LETTER A WITH ACUTE
-0102;Abreve;LATIN CAPITAL LETTER A WITH BREVE
-00C2;Acircumflex;LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-F7E2;Acircumflexsmall;LATIN SMALL CAPITAL LETTER A WITH CIRCUMFLEX
-F6C9;Acute;CAPITAL ACUTE ACCENT
-F7B4;Acutesmall;SMALL CAPITAL ACUTE ACCENT
-00C4;Adieresis;LATIN CAPITAL LETTER A WITH DIAERESIS
-F7E4;Adieresissmall;LATIN SMALL CAPITAL LETTER A WITH DIAERESIS
-00C0;Agrave;LATIN CAPITAL LETTER A WITH GRAVE
-F7E0;Agravesmall;LATIN SMALL CAPITAL LETTER A WITH GRAVE
-0391;Alpha;GREEK CAPITAL LETTER ALPHA
-0386;Alphatonos;GREEK CAPITAL LETTER ALPHA WITH TONOS
-0100;Amacron;LATIN CAPITAL LETTER A WITH MACRON
-0104;Aogonek;LATIN CAPITAL LETTER A WITH OGONEK
-00C5;Aring;LATIN CAPITAL LETTER A WITH RING ABOVE
-01FA;Aringacute;LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-F7E5;Aringsmall;LATIN SMALL CAPITAL LETTER A WITH RING ABOVE
-F761;Asmall;LATIN SMALL CAPITAL LETTER A
-00C3;Atilde;LATIN CAPITAL LETTER A WITH TILDE
-F7E3;Atildesmall;LATIN SMALL CAPITAL LETTER A WITH TILDE
-0042;B;LATIN CAPITAL LETTER B
-0392;Beta;GREEK CAPITAL LETTER BETA
-F6F4;Brevesmall;SMALL CAPITAL BREVE
-F762;Bsmall;LATIN SMALL CAPITAL LETTER B
-0043;C;LATIN CAPITAL LETTER C
-0106;Cacute;LATIN CAPITAL LETTER C WITH ACUTE
-F6CA;Caron;CAPITAL CARON
-F6F5;Caronsmall;SMALL CAPITAL CARON
-010C;Ccaron;LATIN CAPITAL LETTER C WITH CARON
-00C7;Ccedilla;LATIN CAPITAL LETTER C WITH CEDILLA
-F7E7;Ccedillasmall;LATIN SMALL CAPITAL LETTER C WITH CEDILLA
-0108;Ccircumflex;LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-010A;Cdotaccent;LATIN CAPITAL LETTER C WITH DOT ABOVE
-F7B8;Cedillasmall;SMALL CAPITAL CEDILLA
-03A7;Chi;GREEK CAPITAL LETTER CHI
-F6F6;Circumflexsmall;SMALL CAPITAL MODIFIER LETTER CIRCUMFLEX ACCENT
-F763;Csmall;LATIN SMALL CAPITAL LETTER C
-0044;D;LATIN CAPITAL LETTER D
-010E;Dcaron;LATIN CAPITAL LETTER D WITH CARON
-0110;Dcroat;LATIN CAPITAL LETTER D WITH STROKE
-2206;Delta;INCREMENT
-0394;Delta;GREEK CAPITAL LETTER DELTA;Duplicate
-F6CB;Dieresis;CAPITAL DIAERESIS
-F6CC;DieresisAcute;CAPITAL DIAERESIS ACUTE ACCENT
-F6CD;DieresisGrave;CAPITAL DIAERESIS GRAVE ACCENT
-F7A8;Dieresissmall;SMALL CAPITAL DIAERESIS
-F6F7;Dotaccentsmall;SMALL CAPITAL DOT ABOVE
-F764;Dsmall;LATIN SMALL CAPITAL LETTER D
-0045;E;LATIN CAPITAL LETTER E
-00C9;Eacute;LATIN CAPITAL LETTER E WITH ACUTE
-F7E9;Eacutesmall;LATIN SMALL CAPITAL LETTER E WITH ACUTE
-0114;Ebreve;LATIN CAPITAL LETTER E WITH BREVE
-011A;Ecaron;LATIN CAPITAL LETTER E WITH CARON
-00CA;Ecircumflex;LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-F7EA;Ecircumflexsmall;LATIN SMALL CAPITAL LETTER E WITH CIRCUMFLEX
-00CB;Edieresis;LATIN CAPITAL LETTER E WITH DIAERESIS
-F7EB;Edieresissmall;LATIN SMALL CAPITAL LETTER E WITH DIAERESIS
-0116;Edotaccent;LATIN CAPITAL LETTER E WITH DOT ABOVE
-00C8;Egrave;LATIN CAPITAL LETTER E WITH GRAVE
-F7E8;Egravesmall;LATIN SMALL CAPITAL LETTER E WITH GRAVE
-0112;Emacron;LATIN CAPITAL LETTER E WITH MACRON
-014A;Eng;LATIN CAPITAL LETTER ENG
-0118;Eogonek;LATIN CAPITAL LETTER E WITH OGONEK
-0395;Epsilon;GREEK CAPITAL LETTER EPSILON
-0388;Epsilontonos;GREEK CAPITAL LETTER EPSILON WITH TONOS
-F765;Esmall;LATIN SMALL CAPITAL LETTER E
-0397;Eta;GREEK CAPITAL LETTER ETA
-0389;Etatonos;GREEK CAPITAL LETTER ETA WITH TONOS
-00D0;Eth;LATIN CAPITAL LETTER ETH
-F7F0;Ethsmall;LATIN SMALL CAPITAL LETTER ETH
-20AC;Euro;EURO SIGN
-0046;F;LATIN CAPITAL LETTER F
-F766;Fsmall;LATIN SMALL CAPITAL LETTER F
-0047;G;LATIN CAPITAL LETTER G
-0393;Gamma;GREEK CAPITAL LETTER GAMMA
-011E;Gbreve;LATIN CAPITAL LETTER G WITH BREVE
-01E6;Gcaron;LATIN CAPITAL LETTER G WITH CARON
-011C;Gcircumflex;LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-0122;Gcommaaccent;LATIN CAPITAL LETTER G WITH CEDILLA
-0120;Gdotaccent;LATIN CAPITAL LETTER G WITH DOT ABOVE
-F6CE;Grave;CAPITAL GRAVE ACCENT
-F760;Gravesmall;SMALL CAPITAL GRAVE ACCENT
-F767;Gsmall;LATIN SMALL CAPITAL LETTER G
-0048;H;LATIN CAPITAL LETTER H
-25CF;H18533;BLACK CIRCLE
-25AA;H18543;BLACK SMALL SQUARE
-25AB;H18551;WHITE SMALL SQUARE
-25A1;H22073;WHITE SQUARE
-0126;Hbar;LATIN CAPITAL LETTER H WITH STROKE
-0124;Hcircumflex;LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-F768;Hsmall;LATIN SMALL CAPITAL LETTER H
-F6CF;Hungarumlaut;CAPITAL DOUBLE ACUTE ACCENT
-F6F8;Hungarumlautsmall;SMALL CAPITAL DOUBLE ACUTE ACCENT
-0049;I;LATIN CAPITAL LETTER I
-0132;IJ;LATIN CAPITAL LIGATURE IJ
-00CD;Iacute;LATIN CAPITAL LETTER I WITH ACUTE
-F7ED;Iacutesmall;LATIN SMALL CAPITAL LETTER I WITH ACUTE
-012C;Ibreve;LATIN CAPITAL LETTER I WITH BREVE
-00CE;Icircumflex;LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-F7EE;Icircumflexsmall;LATIN SMALL CAPITAL LETTER I WITH CIRCUMFLEX
-00CF;Idieresis;LATIN CAPITAL LETTER I WITH DIAERESIS
-F7EF;Idieresissmall;LATIN SMALL CAPITAL LETTER I WITH DIAERESIS
-0130;Idotaccent;LATIN CAPITAL LETTER I WITH DOT ABOVE
-2111;Ifraktur;BLACK-LETTER CAPITAL I
-00CC;Igrave;LATIN CAPITAL LETTER I WITH GRAVE
-F7EC;Igravesmall;LATIN SMALL CAPITAL LETTER I WITH GRAVE
-012A;Imacron;LATIN CAPITAL LETTER I WITH MACRON
-012E;Iogonek;LATIN CAPITAL LETTER I WITH OGONEK
-0399;Iota;GREEK CAPITAL LETTER IOTA
-03AA;Iotadieresis;GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-038A;Iotatonos;GREEK CAPITAL LETTER IOTA WITH TONOS
-F769;Ismall;LATIN SMALL CAPITAL LETTER I
-0128;Itilde;LATIN CAPITAL LETTER I WITH TILDE
-004A;J;LATIN CAPITAL LETTER J
-0134;Jcircumflex;LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-F76A;Jsmall;LATIN SMALL CAPITAL LETTER J
-004B;K;LATIN CAPITAL LETTER K
-039A;Kappa;GREEK CAPITAL LETTER KAPPA
-0136;Kcommaaccent;LATIN CAPITAL LETTER K WITH CEDILLA
-F76B;Ksmall;LATIN SMALL CAPITAL LETTER K
-004C;L;LATIN CAPITAL LETTER L
-F6BF;LL;LATIN CAPITAL LETTER LL
-0139;Lacute;LATIN CAPITAL LETTER L WITH ACUTE
-039B;Lambda;GREEK CAPITAL LETTER LAMDA
-013D;Lcaron;LATIN CAPITAL LETTER L WITH CARON
-013B;Lcommaaccent;LATIN CAPITAL LETTER L WITH CEDILLA
-013F;Ldot;LATIN CAPITAL LETTER L WITH MIDDLE DOT
-0141;Lslash;LATIN CAPITAL LETTER L WITH STROKE
-F6F9;Lslashsmall;LATIN SMALL CAPITAL LETTER L WITH STROKE
-F76C;Lsmall;LATIN SMALL CAPITAL LETTER L
-004D;M;LATIN CAPITAL LETTER M
-F6D0;Macron;CAPITAL MACRON
-F7AF;Macronsmall;SMALL CAPITAL MACRON
-F76D;Msmall;LATIN SMALL CAPITAL LETTER M
-039C;Mu;GREEK CAPITAL LETTER MU
-004E;N;LATIN CAPITAL LETTER N
-0143;Nacute;LATIN CAPITAL LETTER N WITH ACUTE
-0147;Ncaron;LATIN CAPITAL LETTER N WITH CARON
-0145;Ncommaaccent;LATIN CAPITAL LETTER N WITH CEDILLA
-F76E;Nsmall;LATIN SMALL CAPITAL LETTER N
-00D1;Ntilde;LATIN CAPITAL LETTER N WITH TILDE
-F7F1;Ntildesmall;LATIN SMALL CAPITAL LETTER N WITH TILDE
-039D;Nu;GREEK CAPITAL LETTER NU
-004F;O;LATIN CAPITAL LETTER O
-0152;OE;LATIN CAPITAL LIGATURE OE
-F6FA;OEsmall;LATIN SMALL CAPITAL LIGATURE OE
-00D3;Oacute;LATIN CAPITAL LETTER O WITH ACUTE
-F7F3;Oacutesmall;LATIN SMALL CAPITAL LETTER O WITH ACUTE
-014E;Obreve;LATIN CAPITAL LETTER O WITH BREVE
-00D4;Ocircumflex;LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-F7F4;Ocircumflexsmall;LATIN SMALL CAPITAL LETTER O WITH CIRCUMFLEX
-00D6;Odieresis;LATIN CAPITAL LETTER O WITH DIAERESIS
-F7F6;Odieresissmall;LATIN SMALL CAPITAL LETTER O WITH DIAERESIS
-F6FB;Ogoneksmall;SMALL CAPITAL OGONEK
-00D2;Ograve;LATIN CAPITAL LETTER O WITH GRAVE
-F7F2;Ogravesmall;LATIN SMALL CAPITAL LETTER O WITH GRAVE
-01A0;Ohorn;LATIN CAPITAL LETTER O WITH HORN
-0150;Ohungarumlaut;LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-014C;Omacron;LATIN CAPITAL LETTER O WITH MACRON
-2126;Omega;OHM SIGN
-03A9;Omega;GREEK CAPITAL LETTER OMEGA;Duplicate
-038F;Omegatonos;GREEK CAPITAL LETTER OMEGA WITH TONOS
-039F;Omicron;GREEK CAPITAL LETTER OMICRON
-038C;Omicrontonos;GREEK CAPITAL LETTER OMICRON WITH TONOS
-00D8;Oslash;LATIN CAPITAL LETTER O WITH STROKE
-01FE;Oslashacute;LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-F7F8;Oslashsmall;LATIN SMALL CAPITAL LETTER O WITH STROKE
-F76F;Osmall;LATIN SMALL CAPITAL LETTER O
-00D5;Otilde;LATIN CAPITAL LETTER O WITH TILDE
-F7F5;Otildesmall;LATIN SMALL CAPITAL LETTER O WITH TILDE
-0050;P;LATIN CAPITAL LETTER P
-03A6;Phi;GREEK CAPITAL LETTER PHI
-03A0;Pi;GREEK CAPITAL LETTER PI
-03A8;Psi;GREEK CAPITAL LETTER PSI
-F770;Psmall;LATIN SMALL CAPITAL LETTER P
-0051;Q;LATIN CAPITAL LETTER Q
-F771;Qsmall;LATIN SMALL CAPITAL LETTER Q
-0052;R;LATIN CAPITAL LETTER R
-0154;Racute;LATIN CAPITAL LETTER R WITH ACUTE
-0158;Rcaron;LATIN CAPITAL LETTER R WITH CARON
-0156;Rcommaaccent;LATIN CAPITAL LETTER R WITH CEDILLA
-211C;Rfraktur;BLACK-LETTER CAPITAL R
-03A1;Rho;GREEK CAPITAL LETTER RHO
-F6FC;Ringsmall;SMALL CAPITAL RING ABOVE
-F772;Rsmall;LATIN SMALL CAPITAL LETTER R
-0053;S;LATIN CAPITAL LETTER S
-250C;SF010000;BOX DRAWINGS LIGHT DOWN AND RIGHT
-2514;SF020000;BOX DRAWINGS LIGHT UP AND RIGHT
-2510;SF030000;BOX DRAWINGS LIGHT DOWN AND LEFT
-2518;SF040000;BOX DRAWINGS LIGHT UP AND LEFT
-253C;SF050000;BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-252C;SF060000;BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-2534;SF070000;BOX DRAWINGS LIGHT UP AND HORIZONTAL
-251C;SF080000;BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-2524;SF090000;BOX DRAWINGS LIGHT VERTICAL AND LEFT
-2500;SF100000;BOX DRAWINGS LIGHT HORIZONTAL
-2502;SF110000;BOX DRAWINGS LIGHT VERTICAL
-2561;SF190000;BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-2562;SF200000;BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
-2556;SF210000;BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
-2555;SF220000;BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
-2563;SF230000;BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-2551;SF240000;BOX DRAWINGS DOUBLE VERTICAL
-2557;SF250000;BOX DRAWINGS DOUBLE DOWN AND LEFT
-255D;SF260000;BOX DRAWINGS DOUBLE UP AND LEFT
-255C;SF270000;BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
-255B;SF280000;BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
-255E;SF360000;BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-255F;SF370000;BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
-255A;SF380000;BOX DRAWINGS DOUBLE UP AND RIGHT
-2554;SF390000;BOX DRAWINGS DOUBLE DOWN AND RIGHT
-2569;SF400000;BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-2566;SF410000;BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-2560;SF420000;BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-2550;SF430000;BOX DRAWINGS DOUBLE HORIZONTAL
-256C;SF440000;BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-2567;SF450000;BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
-2568;SF460000;BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
-2564;SF470000;BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
-2565;SF480000;BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
-2559;SF490000;BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
-2558;SF500000;BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
-2552;SF510000;BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
-2553;SF520000;BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
-256B;SF530000;BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
-256A;SF540000;BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-015A;Sacute;LATIN CAPITAL LETTER S WITH ACUTE
-0160;Scaron;LATIN CAPITAL LETTER S WITH CARON
-F6FD;Scaronsmall;LATIN SMALL CAPITAL LETTER S WITH CARON
-015E;Scedilla;LATIN CAPITAL LETTER S WITH CEDILLA
-F6C1;Scedilla;LATIN CAPITAL LETTER S WITH CEDILLA;Duplicate
-015C;Scircumflex;LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-0218;Scommaaccent;LATIN CAPITAL LETTER S WITH COMMA BELOW
-03A3;Sigma;GREEK CAPITAL LETTER SIGMA
-F773;Ssmall;LATIN SMALL CAPITAL LETTER S
-0054;T;LATIN CAPITAL LETTER T
-03A4;Tau;GREEK CAPITAL LETTER TAU
-0166;Tbar;LATIN CAPITAL LETTER T WITH STROKE
-0164;Tcaron;LATIN CAPITAL LETTER T WITH CARON
-0162;Tcommaaccent;LATIN CAPITAL LETTER T WITH CEDILLA
-021A;Tcommaaccent;LATIN CAPITAL LETTER T WITH COMMA BELOW;Duplicate
-0398;Theta;GREEK CAPITAL LETTER THETA
-00DE;Thorn;LATIN CAPITAL LETTER THORN
-F7FE;Thornsmall;LATIN SMALL CAPITAL LETTER THORN
-F6FE;Tildesmall;SMALL CAPITAL SMALL TILDE
-F774;Tsmall;LATIN SMALL CAPITAL LETTER T
-0055;U;LATIN CAPITAL LETTER U
-00DA;Uacute;LATIN CAPITAL LETTER U WITH ACUTE
-F7FA;Uacutesmall;LATIN SMALL CAPITAL LETTER U WITH ACUTE
-016C;Ubreve;LATIN CAPITAL LETTER U WITH BREVE
-00DB;Ucircumflex;LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-F7FB;Ucircumflexsmall;LATIN SMALL CAPITAL LETTER U WITH CIRCUMFLEX
-00DC;Udieresis;LATIN CAPITAL LETTER U WITH DIAERESIS
-F7FC;Udieresissmall;LATIN SMALL CAPITAL LETTER U WITH DIAERESIS
-00D9;Ugrave;LATIN CAPITAL LETTER U WITH GRAVE
-F7F9;Ugravesmall;LATIN SMALL CAPITAL LETTER U WITH GRAVE
-01AF;Uhorn;LATIN CAPITAL LETTER U WITH HORN
-0170;Uhungarumlaut;LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-016A;Umacron;LATIN CAPITAL LETTER U WITH MACRON
-0172;Uogonek;LATIN CAPITAL LETTER U WITH OGONEK
-03A5;Upsilon;GREEK CAPITAL LETTER UPSILON
-03D2;Upsilon1;GREEK UPSILON WITH HOOK SYMBOL
-03AB;Upsilondieresis;GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-038E;Upsilontonos;GREEK CAPITAL LETTER UPSILON WITH TONOS
-016E;Uring;LATIN CAPITAL LETTER U WITH RING ABOVE
-F775;Usmall;LATIN SMALL CAPITAL LETTER U
-0168;Utilde;LATIN CAPITAL LETTER U WITH TILDE
-0056;V;LATIN CAPITAL LETTER V
-F776;Vsmall;LATIN SMALL CAPITAL LETTER V
-0057;W;LATIN CAPITAL LETTER W
-1E82;Wacute;LATIN CAPITAL LETTER W WITH ACUTE
-0174;Wcircumflex;LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-1E84;Wdieresis;LATIN CAPITAL LETTER W WITH DIAERESIS
-1E80;Wgrave;LATIN CAPITAL LETTER W WITH GRAVE
-F777;Wsmall;LATIN SMALL CAPITAL LETTER W
-0058;X;LATIN CAPITAL LETTER X
-039E;Xi;GREEK CAPITAL LETTER XI
-F778;Xsmall;LATIN SMALL CAPITAL LETTER X
-0059;Y;LATIN CAPITAL LETTER Y
-00DD;Yacute;LATIN CAPITAL LETTER Y WITH ACUTE
-F7FD;Yacutesmall;LATIN SMALL CAPITAL LETTER Y WITH ACUTE
-0176;Ycircumflex;LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-0178;Ydieresis;LATIN CAPITAL LETTER Y WITH DIAERESIS
-F7FF;Ydieresissmall;LATIN SMALL CAPITAL LETTER Y WITH DIAERESIS
-1EF2;Ygrave;LATIN CAPITAL LETTER Y WITH GRAVE
-F779;Ysmall;LATIN SMALL CAPITAL LETTER Y
-005A;Z;LATIN CAPITAL LETTER Z
-0179;Zacute;LATIN CAPITAL LETTER Z WITH ACUTE
-017D;Zcaron;LATIN CAPITAL LETTER Z WITH CARON
-F6FF;Zcaronsmall;LATIN SMALL CAPITAL LETTER Z WITH CARON
-017B;Zdotaccent;LATIN CAPITAL LETTER Z WITH DOT ABOVE
-0396;Zeta;GREEK CAPITAL LETTER ZETA
-F77A;Zsmall;LATIN SMALL CAPITAL LETTER Z
-0061;a;LATIN SMALL LETTER A
-00E1;aacute;LATIN SMALL LETTER A WITH ACUTE
-0103;abreve;LATIN SMALL LETTER A WITH BREVE
-00E2;acircumflex;LATIN SMALL LETTER A WITH CIRCUMFLEX
-00B4;acute;ACUTE ACCENT
-0301;acutecomb;COMBINING ACUTE ACCENT
-00E4;adieresis;LATIN SMALL LETTER A WITH DIAERESIS
-00E6;ae;LATIN SMALL LETTER AE
-01FD;aeacute;LATIN SMALL LETTER AE WITH ACUTE
-2015;afii00208;HORIZONTAL BAR
-0410;afii10017;CYRILLIC CAPITAL LETTER A
-0411;afii10018;CYRILLIC CAPITAL LETTER BE
-0412;afii10019;CYRILLIC CAPITAL LETTER VE
-0413;afii10020;CYRILLIC CAPITAL LETTER GHE
-0414;afii10021;CYRILLIC CAPITAL LETTER DE
-0415;afii10022;CYRILLIC CAPITAL LETTER IE
-0401;afii10023;CYRILLIC CAPITAL LETTER IO
-0416;afii10024;CYRILLIC CAPITAL LETTER ZHE
-0417;afii10025;CYRILLIC CAPITAL LETTER ZE
-0418;afii10026;CYRILLIC CAPITAL LETTER I
-0419;afii10027;CYRILLIC CAPITAL LETTER SHORT I
-041A;afii10028;CYRILLIC CAPITAL LETTER KA
-041B;afii10029;CYRILLIC CAPITAL LETTER EL
-041C;afii10030;CYRILLIC CAPITAL LETTER EM
-041D;afii10031;CYRILLIC CAPITAL LETTER EN
-041E;afii10032;CYRILLIC CAPITAL LETTER O
-041F;afii10033;CYRILLIC CAPITAL LETTER PE
-0420;afii10034;CYRILLIC CAPITAL LETTER ER
-0421;afii10035;CYRILLIC CAPITAL LETTER ES
-0422;afii10036;CYRILLIC CAPITAL LETTER TE
-0423;afii10037;CYRILLIC CAPITAL LETTER U
-0424;afii10038;CYRILLIC CAPITAL LETTER EF
-0425;afii10039;CYRILLIC CAPITAL LETTER HA
-0426;afii10040;CYRILLIC CAPITAL LETTER TSE
-0427;afii10041;CYRILLIC CAPITAL LETTER CHE
-0428;afii10042;CYRILLIC CAPITAL LETTER SHA
-0429;afii10043;CYRILLIC CAPITAL LETTER SHCHA
-042A;afii10044;CYRILLIC CAPITAL LETTER HARD SIGN
-042B;afii10045;CYRILLIC CAPITAL LETTER YERU
-042C;afii10046;CYRILLIC CAPITAL LETTER SOFT SIGN
-042D;afii10047;CYRILLIC CAPITAL LETTER E
-042E;afii10048;CYRILLIC CAPITAL LETTER YU
-042F;afii10049;CYRILLIC CAPITAL LETTER YA
-0490;afii10050;CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-0402;afii10051;CYRILLIC CAPITAL LETTER DJE
-0403;afii10052;CYRILLIC CAPITAL LETTER GJE
-0404;afii10053;CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0405;afii10054;CYRILLIC CAPITAL LETTER DZE
-0406;afii10055;CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0407;afii10056;CYRILLIC CAPITAL LETTER YI
-0408;afii10057;CYRILLIC CAPITAL LETTER JE
-0409;afii10058;CYRILLIC CAPITAL LETTER LJE
-040A;afii10059;CYRILLIC CAPITAL LETTER NJE
-040B;afii10060;CYRILLIC CAPITAL LETTER TSHE
-040C;afii10061;CYRILLIC CAPITAL LETTER KJE
-040E;afii10062;CYRILLIC CAPITAL LETTER SHORT U
-F6C4;afii10063;CYRILLIC SMALL LETTER GHE VARIANT
-F6C5;afii10064;CYRILLIC SMALL LETTER BE VARIANT
-0430;afii10065;CYRILLIC SMALL LETTER A
-0431;afii10066;CYRILLIC SMALL LETTER BE
-0432;afii10067;CYRILLIC SMALL LETTER VE
-0433;afii10068;CYRILLIC SMALL LETTER GHE
-0434;afii10069;CYRILLIC SMALL LETTER DE
-0435;afii10070;CYRILLIC SMALL LETTER IE
-0451;afii10071;CYRILLIC SMALL LETTER IO
-0436;afii10072;CYRILLIC SMALL LETTER ZHE
-0437;afii10073;CYRILLIC SMALL LETTER ZE
-0438;afii10074;CYRILLIC SMALL LETTER I
-0439;afii10075;CYRILLIC SMALL LETTER SHORT I
-043A;afii10076;CYRILLIC SMALL LETTER KA
-043B;afii10077;CYRILLIC SMALL LETTER EL
-043C;afii10078;CYRILLIC SMALL LETTER EM
-043D;afii10079;CYRILLIC SMALL LETTER EN
-043E;afii10080;CYRILLIC SMALL LETTER O
-043F;afii10081;CYRILLIC SMALL LETTER PE
-0440;afii10082;CYRILLIC SMALL LETTER ER
-0441;afii10083;CYRILLIC SMALL LETTER ES
-0442;afii10084;CYRILLIC SMALL LETTER TE
-0443;afii10085;CYRILLIC SMALL LETTER U
-0444;afii10086;CYRILLIC SMALL LETTER EF
-0445;afii10087;CYRILLIC SMALL LETTER HA
-0446;afii10088;CYRILLIC SMALL LETTER TSE
-0447;afii10089;CYRILLIC SMALL LETTER CHE
-0448;afii10090;CYRILLIC SMALL LETTER SHA
-0449;afii10091;CYRILLIC SMALL LETTER SHCHA
-044A;afii10092;CYRILLIC SMALL LETTER HARD SIGN
-044B;afii10093;CYRILLIC SMALL LETTER YERU
-044C;afii10094;CYRILLIC SMALL LETTER SOFT SIGN
-044D;afii10095;CYRILLIC SMALL LETTER E
-044E;afii10096;CYRILLIC SMALL LETTER YU
-044F;afii10097;CYRILLIC SMALL LETTER YA
-0491;afii10098;CYRILLIC SMALL LETTER GHE WITH UPTURN
-0452;afii10099;CYRILLIC SMALL LETTER DJE
-0453;afii10100;CYRILLIC SMALL LETTER GJE
-0454;afii10101;CYRILLIC SMALL LETTER UKRAINIAN IE
-0455;afii10102;CYRILLIC SMALL LETTER DZE
-0456;afii10103;CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-0457;afii10104;CYRILLIC SMALL LETTER YI
-0458;afii10105;CYRILLIC SMALL LETTER JE
-0459;afii10106;CYRILLIC SMALL LETTER LJE
-045A;afii10107;CYRILLIC SMALL LETTER NJE
-045B;afii10108;CYRILLIC SMALL LETTER TSHE
-045C;afii10109;CYRILLIC SMALL LETTER KJE
-045E;afii10110;CYRILLIC SMALL LETTER SHORT U
-040F;afii10145;CYRILLIC CAPITAL LETTER DZHE
-0462;afii10146;CYRILLIC CAPITAL LETTER YAT
-0472;afii10147;CYRILLIC CAPITAL LETTER FITA
-0474;afii10148;CYRILLIC CAPITAL LETTER IZHITSA
-F6C6;afii10192;CYRILLIC SMALL LETTER DE VARIANT
-045F;afii10193;CYRILLIC SMALL LETTER DZHE
-0463;afii10194;CYRILLIC SMALL LETTER YAT
-0473;afii10195;CYRILLIC SMALL LETTER FITA
-0475;afii10196;CYRILLIC SMALL LETTER IZHITSA
-F6C7;afii10831;CYRILLIC SMALL LETTER PE VARIANT
-F6C8;afii10832;CYRILLIC SMALL LETTER TE VARIANT
-04D9;afii10846;CYRILLIC SMALL LETTER SCHWA
-200E;afii299;LEFT-TO-RIGHT MARK
-200F;afii300;RIGHT-TO-LEFT MARK
-200D;afii301;ZERO WIDTH JOINER
-066A;afii57381;ARABIC PERCENT SIGN
-060C;afii57388;ARABIC COMMA
-0660;afii57392;ARABIC-INDIC DIGIT ZERO
-0661;afii57393;ARABIC-INDIC DIGIT ONE
-0662;afii57394;ARABIC-INDIC DIGIT TWO
-0663;afii57395;ARABIC-INDIC DIGIT THREE
-0664;afii57396;ARABIC-INDIC DIGIT FOUR
-0665;afii57397;ARABIC-INDIC DIGIT FIVE
-0666;afii57398;ARABIC-INDIC DIGIT SIX
-0667;afii57399;ARABIC-INDIC DIGIT SEVEN
-0668;afii57400;ARABIC-INDIC DIGIT EIGHT
-0669;afii57401;ARABIC-INDIC DIGIT NINE
-061B;afii57403;ARABIC SEMICOLON
-061F;afii57407;ARABIC QUESTION MARK
-0621;afii57409;ARABIC LETTER HAMZA
-0622;afii57410;ARABIC LETTER ALEF WITH MADDA ABOVE
-0623;afii57411;ARABIC LETTER ALEF WITH HAMZA ABOVE
-0624;afii57412;ARABIC LETTER WAW WITH HAMZA ABOVE
-0625;afii57413;ARABIC LETTER ALEF WITH HAMZA BELOW
-0626;afii57414;ARABIC LETTER YEH WITH HAMZA ABOVE
-0627;afii57415;ARABIC LETTER ALEF
-0628;afii57416;ARABIC LETTER BEH
-0629;afii57417;ARABIC LETTER TEH MARBUTA
-062A;afii57418;ARABIC LETTER TEH
-062B;afii57419;ARABIC LETTER THEH
-062C;afii57420;ARABIC LETTER JEEM
-062D;afii57421;ARABIC LETTER HAH
-062E;afii57422;ARABIC LETTER KHAH
-062F;afii57423;ARABIC LETTER DAL
-0630;afii57424;ARABIC LETTER THAL
-0631;afii57425;ARABIC LETTER REH
-0632;afii57426;ARABIC LETTER ZAIN
-0633;afii57427;ARABIC LETTER SEEN
-0634;afii57428;ARABIC LETTER SHEEN
-0635;afii57429;ARABIC LETTER SAD
-0636;afii57430;ARABIC LETTER DAD
-0637;afii57431;ARABIC LETTER TAH
-0638;afii57432;ARABIC LETTER ZAH
-0639;afii57433;ARABIC LETTER AIN
-063A;afii57434;ARABIC LETTER GHAIN
-0640;afii57440;ARABIC TATWEEL
-0641;afii57441;ARABIC LETTER FEH
-0642;afii57442;ARABIC LETTER QAF
-0643;afii57443;ARABIC LETTER KAF
-0644;afii57444;ARABIC LETTER LAM
-0645;afii57445;ARABIC LETTER MEEM
-0646;afii57446;ARABIC LETTER NOON
-0648;afii57448;ARABIC LETTER WAW
-0649;afii57449;ARABIC LETTER ALEF MAKSURA
-064A;afii57450;ARABIC LETTER YEH
-064B;afii57451;ARABIC FATHATAN
-064C;afii57452;ARABIC DAMMATAN
-064D;afii57453;ARABIC KASRATAN
-064E;afii57454;ARABIC FATHA
-064F;afii57455;ARABIC DAMMA
-0650;afii57456;ARABIC KASRA
-0651;afii57457;ARABIC SHADDA
-0652;afii57458;ARABIC SUKUN
-0647;afii57470;ARABIC LETTER HEH
-06A4;afii57505;ARABIC LETTER VEH
-067E;afii57506;ARABIC LETTER PEH
-0686;afii57507;ARABIC LETTER TCHEH
-0698;afii57508;ARABIC LETTER JEH
-06AF;afii57509;ARABIC LETTER GAF
-0679;afii57511;ARABIC LETTER TTEH
-0688;afii57512;ARABIC LETTER DDAL
-0691;afii57513;ARABIC LETTER RREH
-06BA;afii57514;ARABIC LETTER NOON GHUNNA
-06D2;afii57519;ARABIC LETTER YEH BARREE
-06D5;afii57534;ARABIC LETTER AE
-20AA;afii57636;NEW SHEQEL SIGN
-05BE;afii57645;HEBREW PUNCTUATION MAQAF
-05C3;afii57658;HEBREW PUNCTUATION SOF PASUQ
-05D0;afii57664;HEBREW LETTER ALEF
-05D1;afii57665;HEBREW LETTER BET
-05D2;afii57666;HEBREW LETTER GIMEL
-05D3;afii57667;HEBREW LETTER DALET
-05D4;afii57668;HEBREW LETTER HE
-05D5;afii57669;HEBREW LETTER VAV
-05D6;afii57670;HEBREW LETTER ZAYIN
-05D7;afii57671;HEBREW LETTER HET
-05D8;afii57672;HEBREW LETTER TET
-05D9;afii57673;HEBREW LETTER YOD
-05DA;afii57674;HEBREW LETTER FINAL KAF
-05DB;afii57675;HEBREW LETTER KAF
-05DC;afii57676;HEBREW LETTER LAMED
-05DD;afii57677;HEBREW LETTER FINAL MEM
-05DE;afii57678;HEBREW LETTER MEM
-05DF;afii57679;HEBREW LETTER FINAL NUN
-05E0;afii57680;HEBREW LETTER NUN
-05E1;afii57681;HEBREW LETTER SAMEKH
-05E2;afii57682;HEBREW LETTER AYIN
-05E3;afii57683;HEBREW LETTER FINAL PE
-05E4;afii57684;HEBREW LETTER PE
-05E5;afii57685;HEBREW LETTER FINAL TSADI
-05E6;afii57686;HEBREW LETTER TSADI
-05E7;afii57687;HEBREW LETTER QOF
-05E8;afii57688;HEBREW LETTER RESH
-05E9;afii57689;HEBREW LETTER SHIN
-05EA;afii57690;HEBREW LETTER TAV
-FB2A;afii57694;HEBREW LETTER SHIN WITH SHIN DOT
-FB2B;afii57695;HEBREW LETTER SHIN WITH SIN DOT
-FB4B;afii57700;HEBREW LETTER VAV WITH HOLAM
-FB1F;afii57705;HEBREW LIGATURE YIDDISH YOD YOD PATAH
-05F0;afii57716;HEBREW LIGATURE YIDDISH DOUBLE VAV
-05F1;afii57717;HEBREW LIGATURE YIDDISH VAV YOD
-05F2;afii57718;HEBREW LIGATURE YIDDISH DOUBLE YOD
-FB35;afii57723;HEBREW LETTER VAV WITH DAGESH
-05B4;afii57793;HEBREW POINT HIRIQ
-05B5;afii57794;HEBREW POINT TSERE
-05B6;afii57795;HEBREW POINT SEGOL
-05BB;afii57796;HEBREW POINT QUBUTS
-05B8;afii57797;HEBREW POINT QAMATS
-05B7;afii57798;HEBREW POINT PATAH
-05B0;afii57799;HEBREW POINT SHEVA
-05B2;afii57800;HEBREW POINT HATAF PATAH
-05B1;afii57801;HEBREW POINT HATAF SEGOL
-05B3;afii57802;HEBREW POINT HATAF QAMATS
-05C2;afii57803;HEBREW POINT SIN DOT
-05C1;afii57804;HEBREW POINT SHIN DOT
-05B9;afii57806;HEBREW POINT HOLAM
-05BC;afii57807;HEBREW POINT DAGESH OR MAPIQ
-05BD;afii57839;HEBREW POINT METEG
-05BF;afii57841;HEBREW POINT RAFE
-05C0;afii57842;HEBREW PUNCTUATION PASEQ
-02BC;afii57929;MODIFIER LETTER APOSTROPHE
-2105;afii61248;CARE OF
-2113;afii61289;SCRIPT SMALL L
-2116;afii61352;NUMERO SIGN
-202C;afii61573;POP DIRECTIONAL FORMATTING
-202D;afii61574;LEFT-TO-RIGHT OVERRIDE
-202E;afii61575;RIGHT-TO-LEFT OVERRIDE
-200C;afii61664;ZERO WIDTH NON-JOINER
-066D;afii63167;ARABIC FIVE POINTED STAR
-02BD;afii64937;MODIFIER LETTER REVERSED COMMA
-00E0;agrave;LATIN SMALL LETTER A WITH GRAVE
-2135;aleph;ALEF SYMBOL
-03B1;alpha;GREEK SMALL LETTER ALPHA
-03AC;alphatonos;GREEK SMALL LETTER ALPHA WITH TONOS
-0101;amacron;LATIN SMALL LETTER A WITH MACRON
-0026;ampersand;AMPERSAND
-F726;ampersandsmall;SMALL CAPITAL AMPERSAND
-2220;angle;ANGLE
-2329;angleleft;LEFT-POINTING ANGLE BRACKET
-232A;angleright;RIGHT-POINTING ANGLE BRACKET
-0387;anoteleia;GREEK ANO TELEIA
-0105;aogonek;LATIN SMALL LETTER A WITH OGONEK
-2248;approxequal;ALMOST EQUAL TO
-00E5;aring;LATIN SMALL LETTER A WITH RING ABOVE
-01FB;aringacute;LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-2194;arrowboth;LEFT RIGHT ARROW
-21D4;arrowdblboth;LEFT RIGHT DOUBLE ARROW
-21D3;arrowdbldown;DOWNWARDS DOUBLE ARROW
-21D0;arrowdblleft;LEFTWARDS DOUBLE ARROW
-21D2;arrowdblright;RIGHTWARDS DOUBLE ARROW
-21D1;arrowdblup;UPWARDS DOUBLE ARROW
-2193;arrowdown;DOWNWARDS ARROW
-F8E7;arrowhorizex;HORIZONTAL ARROW EXTENDER
-2190;arrowleft;LEFTWARDS ARROW
-2192;arrowright;RIGHTWARDS ARROW
-2191;arrowup;UPWARDS ARROW
-2195;arrowupdn;UP DOWN ARROW
-21A8;arrowupdnbse;UP DOWN ARROW WITH BASE
-F8E6;arrowvertex;VERTICAL ARROW EXTENDER
-005E;asciicircum;CIRCUMFLEX ACCENT
-007E;asciitilde;TILDE
-002A;asterisk;ASTERISK
-2217;asteriskmath;ASTERISK OPERATOR
-F6E9;asuperior;SUPERSCRIPT LATIN SMALL LETTER A
-0040;at;COMMERCIAL AT
-00E3;atilde;LATIN SMALL LETTER A WITH TILDE
-0062;b;LATIN SMALL LETTER B
-005C;backslash;REVERSE SOLIDUS
-007C;bar;VERTICAL LINE
-03B2;beta;GREEK SMALL LETTER BETA
-2588;block;FULL BLOCK
-F8F4;braceex;CURLY BRACKET EXTENDER
-007B;braceleft;LEFT CURLY BRACKET
-F8F3;braceleftbt;LEFT CURLY BRACKET BOTTOM
-F8F2;braceleftmid;LEFT CURLY BRACKET MID
-F8F1;bracelefttp;LEFT CURLY BRACKET TOP
-007D;braceright;RIGHT CURLY BRACKET
-F8FE;bracerightbt;RIGHT CURLY BRACKET BOTTOM
-F8FD;bracerightmid;RIGHT CURLY BRACKET MID
-F8FC;bracerighttp;RIGHT CURLY BRACKET TOP
-005B;bracketleft;LEFT SQUARE BRACKET
-F8F0;bracketleftbt;LEFT SQUARE BRACKET BOTTOM
-F8EF;bracketleftex;LEFT SQUARE BRACKET EXTENDER
-F8EE;bracketlefttp;LEFT SQUARE BRACKET TOP
-005D;bracketright;RIGHT SQUARE BRACKET
-F8FB;bracketrightbt;RIGHT SQUARE BRACKET BOTTOM
-F8FA;bracketrightex;RIGHT SQUARE BRACKET EXTENDER
-F8F9;bracketrighttp;RIGHT SQUARE BRACKET TOP
-02D8;breve;BREVE
-00A6;brokenbar;BROKEN BAR
-F6EA;bsuperior;SUPERSCRIPT LATIN SMALL LETTER B
-2022;bullet;BULLET
-0063;c;LATIN SMALL LETTER C
-0107;cacute;LATIN SMALL LETTER C WITH ACUTE
-02C7;caron;CARON
-21B5;carriagereturn;DOWNWARDS ARROW WITH CORNER LEFTWARDS
-010D;ccaron;LATIN SMALL LETTER C WITH CARON
-00E7;ccedilla;LATIN SMALL LETTER C WITH CEDILLA
-0109;ccircumflex;LATIN SMALL LETTER C WITH CIRCUMFLEX
-010B;cdotaccent;LATIN SMALL LETTER C WITH DOT ABOVE
-00B8;cedilla;CEDILLA
-00A2;cent;CENT SIGN
-F6DF;centinferior;SUBSCRIPT CENT SIGN
-F7A2;centoldstyle;OLDSTYLE CENT SIGN
-F6E0;centsuperior;SUPERSCRIPT CENT SIGN
-03C7;chi;GREEK SMALL LETTER CHI
-25CB;circle;WHITE CIRCLE
-2297;circlemultiply;CIRCLED TIMES
-2295;circleplus;CIRCLED PLUS
-02C6;circumflex;MODIFIER LETTER CIRCUMFLEX ACCENT
-2663;club;BLACK CLUB SUIT
-003A;colon;COLON
-20A1;colonmonetary;COLON SIGN
-002C;comma;COMMA
-F6C3;commaaccent;COMMA BELOW
-F6E1;commainferior;SUBSCRIPT COMMA
-F6E2;commasuperior;SUPERSCRIPT COMMA
-2245;congruent;APPROXIMATELY EQUAL TO
-00A9;copyright;COPYRIGHT SIGN
-F8E9;copyrightsans;COPYRIGHT SIGN SANS SERIF
-F6D9;copyrightserif;COPYRIGHT SIGN SERIF
-00A4;currency;CURRENCY SIGN
-F6D1;cyrBreve;CAPITAL CYRILLIC BREVE
-F6D2;cyrFlex;CAPITAL CYRILLIC CIRCUMFLEX
-F6D4;cyrbreve;CYRILLIC BREVE
-F6D5;cyrflex;CYRILLIC CIRCUMFLEX
-0064;d;LATIN SMALL LETTER D
-2020;dagger;DAGGER
-2021;daggerdbl;DOUBLE DAGGER
-F6D3;dblGrave;CAPITAL DOUBLE GRAVE ACCENT
-F6D6;dblgrave;DOUBLE GRAVE ACCENT
-010F;dcaron;LATIN SMALL LETTER D WITH CARON
-0111;dcroat;LATIN SMALL LETTER D WITH STROKE
-00B0;degree;DEGREE SIGN
-03B4;delta;GREEK SMALL LETTER DELTA
-2666;diamond;BLACK DIAMOND SUIT
-00A8;dieresis;DIAERESIS
-F6D7;dieresisacute;DIAERESIS ACUTE ACCENT
-F6D8;dieresisgrave;DIAERESIS GRAVE ACCENT
-0385;dieresistonos;GREEK DIALYTIKA TONOS
-00F7;divide;DIVISION SIGN
-2593;dkshade;DARK SHADE
-2584;dnblock;LOWER HALF BLOCK
-0024;dollar;DOLLAR SIGN
-F6E3;dollarinferior;SUBSCRIPT DOLLAR SIGN
-F724;dollaroldstyle;OLDSTYLE DOLLAR SIGN
-F6E4;dollarsuperior;SUPERSCRIPT DOLLAR SIGN
-20AB;dong;DONG SIGN
-02D9;dotaccent;DOT ABOVE
-0323;dotbelowcomb;COMBINING DOT BELOW
-0131;dotlessi;LATIN SMALL LETTER DOTLESS I
-F6BE;dotlessj;LATIN SMALL LETTER DOTLESS J
-22C5;dotmath;DOT OPERATOR
-F6EB;dsuperior;SUPERSCRIPT LATIN SMALL LETTER D
-0065;e;LATIN SMALL LETTER E
-00E9;eacute;LATIN SMALL LETTER E WITH ACUTE
-0115;ebreve;LATIN SMALL LETTER E WITH BREVE
-011B;ecaron;LATIN SMALL LETTER E WITH CARON
-00EA;ecircumflex;LATIN SMALL LETTER E WITH CIRCUMFLEX
-00EB;edieresis;LATIN SMALL LETTER E WITH DIAERESIS
-0117;edotaccent;LATIN SMALL LETTER E WITH DOT ABOVE
-00E8;egrave;LATIN SMALL LETTER E WITH GRAVE
-0038;eight;DIGIT EIGHT
-2088;eightinferior;SUBSCRIPT EIGHT
-F738;eightoldstyle;OLDSTYLE DIGIT EIGHT
-2078;eightsuperior;SUPERSCRIPT EIGHT
-2208;element;ELEMENT OF
-2026;ellipsis;HORIZONTAL ELLIPSIS
-0113;emacron;LATIN SMALL LETTER E WITH MACRON
-2014;emdash;EM DASH
-2205;emptyset;EMPTY SET
-2013;endash;EN DASH
-014B;eng;LATIN SMALL LETTER ENG
-0119;eogonek;LATIN SMALL LETTER E WITH OGONEK
-03B5;epsilon;GREEK SMALL LETTER EPSILON
-03AD;epsilontonos;GREEK SMALL LETTER EPSILON WITH TONOS
-003D;equal;EQUALS SIGN
-2261;equivalence;IDENTICAL TO
-212E;estimated;ESTIMATED SYMBOL
-F6EC;esuperior;SUPERSCRIPT LATIN SMALL LETTER E
-03B7;eta;GREEK SMALL LETTER ETA
-03AE;etatonos;GREEK SMALL LETTER ETA WITH TONOS
-00F0;eth;LATIN SMALL LETTER ETH
-0021;exclam;EXCLAMATION MARK
-203C;exclamdbl;DOUBLE EXCLAMATION MARK
-00A1;exclamdown;INVERTED EXCLAMATION MARK
-F7A1;exclamdownsmall;SMALL CAPITAL INVERTED EXCLAMATION MARK
-F721;exclamsmall;SMALL CAPITAL EXCLAMATION MARK
-2203;existential;THERE EXISTS
-0066;f;LATIN SMALL LETTER F
-2640;female;FEMALE SIGN
-FB00;ff;LATIN SMALL LIGATURE FF
-FB03;ffi;LATIN SMALL LIGATURE FFI
-FB04;ffl;LATIN SMALL LIGATURE FFL
-FB01;fi;LATIN SMALL LIGATURE FI
-2012;figuredash;FIGURE DASH
-25A0;filledbox;BLACK SQUARE
-25AC;filledrect;BLACK RECTANGLE
-0035;five;DIGIT FIVE
-215D;fiveeighths;VULGAR FRACTION FIVE EIGHTHS
-2085;fiveinferior;SUBSCRIPT FIVE
-F735;fiveoldstyle;OLDSTYLE DIGIT FIVE
-2075;fivesuperior;SUPERSCRIPT FIVE
-FB02;fl;LATIN SMALL LIGATURE FL
-0192;florin;LATIN SMALL LETTER F WITH HOOK
-0034;four;DIGIT FOUR
-2084;fourinferior;SUBSCRIPT FOUR
-F734;fouroldstyle;OLDSTYLE DIGIT FOUR
-2074;foursuperior;SUPERSCRIPT FOUR
-2044;fraction;FRACTION SLASH
-2215;fraction;DIVISION SLASH;Duplicate
-20A3;franc;FRENCH FRANC SIGN
-0067;g;LATIN SMALL LETTER G
-03B3;gamma;GREEK SMALL LETTER GAMMA
-011F;gbreve;LATIN SMALL LETTER G WITH BREVE
-01E7;gcaron;LATIN SMALL LETTER G WITH CARON
-011D;gcircumflex;LATIN SMALL LETTER G WITH CIRCUMFLEX
-0123;gcommaaccent;LATIN SMALL LETTER G WITH CEDILLA
-0121;gdotaccent;LATIN SMALL LETTER G WITH DOT ABOVE
-00DF;germandbls;LATIN SMALL LETTER SHARP S
-2207;gradient;NABLA
-0060;grave;GRAVE ACCENT
-0300;gravecomb;COMBINING GRAVE ACCENT
-003E;greater;GREATER-THAN SIGN
-2265;greaterequal;GREATER-THAN OR EQUAL TO
-00AB;guillemotleft;LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-00BB;guillemotright;RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-2039;guilsinglleft;SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-203A;guilsinglright;SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-0068;h;LATIN SMALL LETTER H
-0127;hbar;LATIN SMALL LETTER H WITH STROKE
-0125;hcircumflex;LATIN SMALL LETTER H WITH CIRCUMFLEX
-2665;heart;BLACK HEART SUIT
-0309;hookabovecomb;COMBINING HOOK ABOVE
-2302;house;HOUSE
-02DD;hungarumlaut;DOUBLE ACUTE ACCENT
-002D;hyphen;HYPHEN-MINUS
-00AD;hyphen;SOFT HYPHEN;Duplicate
-F6E5;hypheninferior;SUBSCRIPT HYPHEN-MINUS
-F6E6;hyphensuperior;SUPERSCRIPT HYPHEN-MINUS
-0069;i;LATIN SMALL LETTER I
-00ED;iacute;LATIN SMALL LETTER I WITH ACUTE
-012D;ibreve;LATIN SMALL LETTER I WITH BREVE
-00EE;icircumflex;LATIN SMALL LETTER I WITH CIRCUMFLEX
-00EF;idieresis;LATIN SMALL LETTER I WITH DIAERESIS
-00EC;igrave;LATIN SMALL LETTER I WITH GRAVE
-0133;ij;LATIN SMALL LIGATURE IJ
-012B;imacron;LATIN SMALL LETTER I WITH MACRON
-221E;infinity;INFINITY
-222B;integral;INTEGRAL
-2321;integralbt;BOTTOM HALF INTEGRAL
-F8F5;integralex;INTEGRAL EXTENDER
-2320;integraltp;TOP HALF INTEGRAL
-2229;intersection;INTERSECTION
-25D8;invbullet;INVERSE BULLET
-25D9;invcircle;INVERSE WHITE CIRCLE
-263B;invsmileface;BLACK SMILING FACE
-012F;iogonek;LATIN SMALL LETTER I WITH OGONEK
-03B9;iota;GREEK SMALL LETTER IOTA
-03CA;iotadieresis;GREEK SMALL LETTER IOTA WITH DIALYTIKA
-0390;iotadieresistonos;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-03AF;iotatonos;GREEK SMALL LETTER IOTA WITH TONOS
-F6ED;isuperior;SUPERSCRIPT LATIN SMALL LETTER I
-0129;itilde;LATIN SMALL LETTER I WITH TILDE
-006A;j;LATIN SMALL LETTER J
-0135;jcircumflex;LATIN SMALL LETTER J WITH CIRCUMFLEX
-006B;k;LATIN SMALL LETTER K
-03BA;kappa;GREEK SMALL LETTER KAPPA
-0137;kcommaaccent;LATIN SMALL LETTER K WITH CEDILLA
-0138;kgreenlandic;LATIN SMALL LETTER KRA
-006C;l;LATIN SMALL LETTER L
-013A;lacute;LATIN SMALL LETTER L WITH ACUTE
-03BB;lambda;GREEK SMALL LETTER LAMDA
-013E;lcaron;LATIN SMALL LETTER L WITH CARON
-013C;lcommaaccent;LATIN SMALL LETTER L WITH CEDILLA
-0140;ldot;LATIN SMALL LETTER L WITH MIDDLE DOT
-003C;less;LESS-THAN SIGN
-2264;lessequal;LESS-THAN OR EQUAL TO
-258C;lfblock;LEFT HALF BLOCK
-20A4;lira;LIRA SIGN
-F6C0;ll;LATIN SMALL LETTER LL
-2227;logicaland;LOGICAL AND
-00AC;logicalnot;NOT SIGN
-2228;logicalor;LOGICAL OR
-017F;longs;LATIN SMALL LETTER LONG S
-25CA;lozenge;LOZENGE
-0142;lslash;LATIN SMALL LETTER L WITH STROKE
-F6EE;lsuperior;SUPERSCRIPT LATIN SMALL LETTER L
-2591;ltshade;LIGHT SHADE
-006D;m;LATIN SMALL LETTER M
-00AF;macron;MACRON
-02C9;macron;MODIFIER LETTER MACRON;Duplicate
-2642;male;MALE SIGN
-2212;minus;MINUS SIGN
-2032;minute;PRIME
-F6EF;msuperior;SUPERSCRIPT LATIN SMALL LETTER M
-00B5;mu;MICRO SIGN
-03BC;mu;GREEK SMALL LETTER MU;Duplicate
-00D7;multiply;MULTIPLICATION SIGN
-266A;musicalnote;EIGHTH NOTE
-266B;musicalnotedbl;BEAMED EIGHTH NOTES
-006E;n;LATIN SMALL LETTER N
-0144;nacute;LATIN SMALL LETTER N WITH ACUTE
-0149;napostrophe;LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
-0148;ncaron;LATIN SMALL LETTER N WITH CARON
-0146;ncommaaccent;LATIN SMALL LETTER N WITH CEDILLA
-0039;nine;DIGIT NINE
-2089;nineinferior;SUBSCRIPT NINE
-F739;nineoldstyle;OLDSTYLE DIGIT NINE
-2079;ninesuperior;SUPERSCRIPT NINE
-2209;notelement;NOT AN ELEMENT OF
-2260;notequal;NOT EQUAL TO
-2284;notsubset;NOT A SUBSET OF
-207F;nsuperior;SUPERSCRIPT LATIN SMALL LETTER N
-00F1;ntilde;LATIN SMALL LETTER N WITH TILDE
-03BD;nu;GREEK SMALL LETTER NU
-0023;numbersign;NUMBER SIGN
-006F;o;LATIN SMALL LETTER O
-00F3;oacute;LATIN SMALL LETTER O WITH ACUTE
-014F;obreve;LATIN SMALL LETTER O WITH BREVE
-00F4;ocircumflex;LATIN SMALL LETTER O WITH CIRCUMFLEX
-00F6;odieresis;LATIN SMALL LETTER O WITH DIAERESIS
-0153;oe;LATIN SMALL LIGATURE OE
-02DB;ogonek;OGONEK
-00F2;ograve;LATIN SMALL LETTER O WITH GRAVE
-01A1;ohorn;LATIN SMALL LETTER O WITH HORN
-0151;ohungarumlaut;LATIN SMALL LETTER O WITH DOUBLE ACUTE
-014D;omacron;LATIN SMALL LETTER O WITH MACRON
-03C9;omega;GREEK SMALL LETTER OMEGA
-03D6;omega1;GREEK PI SYMBOL
-03CE;omegatonos;GREEK SMALL LETTER OMEGA WITH TONOS
-03BF;omicron;GREEK SMALL LETTER OMICRON
-03CC;omicrontonos;GREEK SMALL LETTER OMICRON WITH TONOS
-0031;one;DIGIT ONE
-2024;onedotenleader;ONE DOT LEADER
-215B;oneeighth;VULGAR FRACTION ONE EIGHTH
-F6DC;onefitted;PROPORTIONAL DIGIT ONE
-00BD;onehalf;VULGAR FRACTION ONE HALF
-2081;oneinferior;SUBSCRIPT ONE
-F731;oneoldstyle;OLDSTYLE DIGIT ONE
-00BC;onequarter;VULGAR FRACTION ONE QUARTER
-00B9;onesuperior;SUPERSCRIPT ONE
-2153;onethird;VULGAR FRACTION ONE THIRD
-25E6;openbullet;WHITE BULLET
-00AA;ordfeminine;FEMININE ORDINAL INDICATOR
-00BA;ordmasculine;MASCULINE ORDINAL INDICATOR
-221F;orthogonal;RIGHT ANGLE
-00F8;oslash;LATIN SMALL LETTER O WITH STROKE
-01FF;oslashacute;LATIN SMALL LETTER O WITH STROKE AND ACUTE
-F6F0;osuperior;SUPERSCRIPT LATIN SMALL LETTER O
-00F5;otilde;LATIN SMALL LETTER O WITH TILDE
-0070;p;LATIN SMALL LETTER P
-00B6;paragraph;PILCROW SIGN
-0028;parenleft;LEFT PARENTHESIS
-F8ED;parenleftbt;LEFT PAREN BOTTOM
-F8EC;parenleftex;LEFT PAREN EXTENDER
-208D;parenleftinferior;SUBSCRIPT LEFT PARENTHESIS
-207D;parenleftsuperior;SUPERSCRIPT LEFT PARENTHESIS
-F8EB;parenlefttp;LEFT PAREN TOP
-0029;parenright;RIGHT PARENTHESIS
-F8F8;parenrightbt;RIGHT PAREN BOTTOM
-F8F7;parenrightex;RIGHT PAREN EXTENDER
-208E;parenrightinferior;SUBSCRIPT RIGHT PARENTHESIS
-207E;parenrightsuperior;SUPERSCRIPT RIGHT PARENTHESIS
-F8F6;parenrighttp;RIGHT PAREN TOP
-2202;partialdiff;PARTIAL DIFFERENTIAL
-0025;percent;PERCENT SIGN
-002E;period;FULL STOP
-00B7;periodcentered;MIDDLE DOT
-2219;periodcentered;BULLET OPERATOR;Duplicate
-F6E7;periodinferior;SUBSCRIPT FULL STOP
-F6E8;periodsuperior;SUPERSCRIPT FULL STOP
-22A5;perpendicular;UP TACK
-2030;perthousand;PER MILLE SIGN
-20A7;peseta;PESETA SIGN
-03C6;phi;GREEK SMALL LETTER PHI
-03D5;phi1;GREEK PHI SYMBOL
-03C0;pi;GREEK SMALL LETTER PI
-002B;plus;PLUS SIGN
-00B1;plusminus;PLUS-MINUS SIGN
-211E;prescription;PRESCRIPTION TAKE
-220F;product;N-ARY PRODUCT
-2282;propersubset;SUBSET OF
-2283;propersuperset;SUPERSET OF
-221D;proportional;PROPORTIONAL TO
-03C8;psi;GREEK SMALL LETTER PSI
-0071;q;LATIN SMALL LETTER Q
-003F;question;QUESTION MARK
-00BF;questiondown;INVERTED QUESTION MARK
-F7BF;questiondownsmall;SMALL CAPITAL INVERTED QUESTION MARK
-F73F;questionsmall;SMALL CAPITAL QUESTION MARK
-0022;quotedbl;QUOTATION MARK
-201E;quotedblbase;DOUBLE LOW-9 QUOTATION MARK
-201C;quotedblleft;LEFT DOUBLE QUOTATION MARK
-201D;quotedblright;RIGHT DOUBLE QUOTATION MARK
-2018;quoteleft;LEFT SINGLE QUOTATION MARK
-201B;quotereversed;SINGLE HIGH-REVERSED-9 QUOTATION MARK
-2019;quoteright;RIGHT SINGLE QUOTATION MARK
-201A;quotesinglbase;SINGLE LOW-9 QUOTATION MARK
-0027;quotesingle;APOSTROPHE
-0072;r;LATIN SMALL LETTER R
-0155;racute;LATIN SMALL LETTER R WITH ACUTE
-221A;radical;SQUARE ROOT
-F8E5;radicalex;RADICAL EXTENDER
-0159;rcaron;LATIN SMALL LETTER R WITH CARON
-0157;rcommaaccent;LATIN SMALL LETTER R WITH CEDILLA
-2286;reflexsubset;SUBSET OF OR EQUAL TO
-2287;reflexsuperset;SUPERSET OF OR EQUAL TO
-00AE;registered;REGISTERED SIGN
-F8E8;registersans;REGISTERED SIGN SANS SERIF
-F6DA;registerserif;REGISTERED SIGN SERIF
-2310;revlogicalnot;REVERSED NOT SIGN
-03C1;rho;GREEK SMALL LETTER RHO
-02DA;ring;RING ABOVE
-F6F1;rsuperior;SUPERSCRIPT LATIN SMALL LETTER R
-2590;rtblock;RIGHT HALF BLOCK
-F6DD;rupiah;RUPIAH SIGN
-0073;s;LATIN SMALL LETTER S
-015B;sacute;LATIN SMALL LETTER S WITH ACUTE
-0161;scaron;LATIN SMALL LETTER S WITH CARON
-015F;scedilla;LATIN SMALL LETTER S WITH CEDILLA
-F6C2;scedilla;LATIN SMALL LETTER S WITH CEDILLA;Duplicate
-015D;scircumflex;LATIN SMALL LETTER S WITH CIRCUMFLEX
-0219;scommaaccent;LATIN SMALL LETTER S WITH COMMA BELOW
-2033;second;DOUBLE PRIME
-00A7;section;SECTION SIGN
-003B;semicolon;SEMICOLON
-0037;seven;DIGIT SEVEN
-215E;seveneighths;VULGAR FRACTION SEVEN EIGHTHS
-2087;seveninferior;SUBSCRIPT SEVEN
-F737;sevenoldstyle;OLDSTYLE DIGIT SEVEN
-2077;sevensuperior;SUPERSCRIPT SEVEN
-2592;shade;MEDIUM SHADE
-03C3;sigma;GREEK SMALL LETTER SIGMA
-03C2;sigma1;GREEK SMALL LETTER FINAL SIGMA
-223C;similar;TILDE OPERATOR
-0036;six;DIGIT SIX
-2086;sixinferior;SUBSCRIPT SIX
-F736;sixoldstyle;OLDSTYLE DIGIT SIX
-2076;sixsuperior;SUPERSCRIPT SIX
-002F;slash;SOLIDUS
-263A;smileface;WHITE SMILING FACE
-0020;space;SPACE
-00A0;space;NO-BREAK SPACE;Duplicate
-2660;spade;BLACK SPADE SUIT
-F6F2;ssuperior;SUPERSCRIPT LATIN SMALL LETTER S
-00A3;sterling;POUND SIGN
-220B;suchthat;CONTAINS AS MEMBER
-2211;summation;N-ARY SUMMATION
-263C;sun;WHITE SUN WITH RAYS
-0074;t;LATIN SMALL LETTER T
-03C4;tau;GREEK SMALL LETTER TAU
-0167;tbar;LATIN SMALL LETTER T WITH STROKE
-0165;tcaron;LATIN SMALL LETTER T WITH CARON
-0163;tcommaaccent;LATIN SMALL LETTER T WITH CEDILLA
-021B;tcommaaccent;LATIN SMALL LETTER T WITH COMMA BELOW;Duplicate
-2234;therefore;THEREFORE
-03B8;theta;GREEK SMALL LETTER THETA
-03D1;theta1;GREEK THETA SYMBOL
-00FE;thorn;LATIN SMALL LETTER THORN
-0033;three;DIGIT THREE
-215C;threeeighths;VULGAR FRACTION THREE EIGHTHS
-2083;threeinferior;SUBSCRIPT THREE
-F733;threeoldstyle;OLDSTYLE DIGIT THREE
-00BE;threequarters;VULGAR FRACTION THREE QUARTERS
-F6DE;threequartersemdash;THREE QUARTERS EM DASH
-00B3;threesuperior;SUPERSCRIPT THREE
-02DC;tilde;SMALL TILDE
-0303;tildecomb;COMBINING TILDE
-0384;tonos;GREEK TONOS
-2122;trademark;TRADE MARK SIGN
-F8EA;trademarksans;TRADE MARK SIGN SANS SERIF
-F6DB;trademarkserif;TRADE MARK SIGN SERIF
-25BC;triagdn;BLACK DOWN-POINTING TRIANGLE
-25C4;triaglf;BLACK LEFT-POINTING POINTER
-25BA;triagrt;BLACK RIGHT-POINTING POINTER
-25B2;triagup;BLACK UP-POINTING TRIANGLE
-F6F3;tsuperior;SUPERSCRIPT LATIN SMALL LETTER T
-0032;two;DIGIT TWO
-2025;twodotenleader;TWO DOT LEADER
-2082;twoinferior;SUBSCRIPT TWO
-F732;twooldstyle;OLDSTYLE DIGIT TWO
-00B2;twosuperior;SUPERSCRIPT TWO
-2154;twothirds;VULGAR FRACTION TWO THIRDS
-0075;u;LATIN SMALL LETTER U
-00FA;uacute;LATIN SMALL LETTER U WITH ACUTE
-016D;ubreve;LATIN SMALL LETTER U WITH BREVE
-00FB;ucircumflex;LATIN SMALL LETTER U WITH CIRCUMFLEX
-00FC;udieresis;LATIN SMALL LETTER U WITH DIAERESIS
-00F9;ugrave;LATIN SMALL LETTER U WITH GRAVE
-01B0;uhorn;LATIN SMALL LETTER U WITH HORN
-0171;uhungarumlaut;LATIN SMALL LETTER U WITH DOUBLE ACUTE
-016B;umacron;LATIN SMALL LETTER U WITH MACRON
-005F;underscore;LOW LINE
-2017;underscoredbl;DOUBLE LOW LINE
-222A;union;UNION
-2200;universal;FOR ALL
-0173;uogonek;LATIN SMALL LETTER U WITH OGONEK
-2580;upblock;UPPER HALF BLOCK
-03C5;upsilon;GREEK SMALL LETTER UPSILON
-03CB;upsilondieresis;GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-03B0;upsilondieresistonos;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-03CD;upsilontonos;GREEK SMALL LETTER UPSILON WITH TONOS
-016F;uring;LATIN SMALL LETTER U WITH RING ABOVE
-0169;utilde;LATIN SMALL LETTER U WITH TILDE
-0076;v;LATIN SMALL LETTER V
-0077;w;LATIN SMALL LETTER W
-1E83;wacute;LATIN SMALL LETTER W WITH ACUTE
-0175;wcircumflex;LATIN SMALL LETTER W WITH CIRCUMFLEX
-1E85;wdieresis;LATIN SMALL LETTER W WITH DIAERESIS
-2118;weierstrass;SCRIPT CAPITAL P
-1E81;wgrave;LATIN SMALL LETTER W WITH GRAVE
-0078;x;LATIN SMALL LETTER X
-03BE;xi;GREEK SMALL LETTER XI
-0079;y;LATIN SMALL LETTER Y
-00FD;yacute;LATIN SMALL LETTER Y WITH ACUTE
-0177;ycircumflex;LATIN SMALL LETTER Y WITH CIRCUMFLEX
-00FF;ydieresis;LATIN SMALL LETTER Y WITH DIAERESIS
-00A5;yen;YEN SIGN
-1EF3;ygrave;LATIN SMALL LETTER Y WITH GRAVE
-007A;z;LATIN SMALL LETTER Z
-017A;zacute;LATIN SMALL LETTER Z WITH ACUTE
-017E;zcaron;LATIN SMALL LETTER Z WITH CARON
-017C;zdotaccent;LATIN SMALL LETTER Z WITH DOT ABOVE
-0030;zero;DIGIT ZERO
-2080;zeroinferior;SUBSCRIPT ZERO
-F730;zerooldstyle;OLDSTYLE DIGIT ZERO
-2070;zerosuperior;SUPERSCRIPT ZERO
-03B6;zeta;GREEK SMALL LETTER ZETA
+A;0041
+AE;00C6
+AEacute;01FC
+AEmacron;01E2
+AEsmall;F7E6
+Aacute;00C1
+Aacutesmall;F7E1
+Abreve;0102
+Abreveacute;1EAE
+Abrevecyrillic;04D0
+Abrevedotbelow;1EB6
+Abrevegrave;1EB0
+Abrevehookabove;1EB2
+Abrevetilde;1EB4
+Acaron;01CD
+Acircle;24B6
+Acircumflex;00C2
+Acircumflexacute;1EA4
+Acircumflexdotbelow;1EAC
+Acircumflexgrave;1EA6
+Acircumflexhookabove;1EA8
+Acircumflexsmall;F7E2
+Acircumflextilde;1EAA
+Acute;F6C9
+Acutesmall;F7B4
+Acyrillic;0410
+Adblgrave;0200
+Adieresis;00C4
+Adieresiscyrillic;04D2
+Adieresismacron;01DE
+Adieresissmall;F7E4
+Adotbelow;1EA0
+Adotmacron;01E0
+Agrave;00C0
+Agravesmall;F7E0
+Ahookabove;1EA2
+Aiecyrillic;04D4
+Ainvertedbreve;0202
+Alpha;0391
+Alphatonos;0386
+Amacron;0100
+Amonospace;FF21
+Aogonek;0104
+Aring;00C5
+Aringacute;01FA
+Aringbelow;1E00
+Aringsmall;F7E5
+Asmall;F761
+Atilde;00C3
+Atildesmall;F7E3
+Aybarmenian;0531
+B;0042
+Bcircle;24B7
+Bdotaccent;1E02
+Bdotbelow;1E04
+Becyrillic;0411
+Benarmenian;0532
+Beta;0392
+Bhook;0181
+Blinebelow;1E06
+Bmonospace;FF22
+Brevesmall;F6F4
+Bsmall;F762
+Btopbar;0182
+C;0043
+Caarmenian;053E
+Cacute;0106
+Caron;F6CA
+Caronsmall;F6F5
+Ccaron;010C
+Ccedilla;00C7
+Ccedillaacute;1E08
+Ccedillasmall;F7E7
+Ccircle;24B8
+Ccircumflex;0108
+Cdot;010A
+Cdotaccent;010A
+Cedillasmall;F7B8
+Chaarmenian;0549
+Cheabkhasiancyrillic;04BC
+Checyrillic;0427
+Chedescenderabkhasiancyrillic;04BE
+Chedescendercyrillic;04B6
+Chedieresiscyrillic;04F4
+Cheharmenian;0543
+Chekhakassiancyrillic;04CB
+Cheverticalstrokecyrillic;04B8
+Chi;03A7
+Chook;0187
+Circumflexsmall;F6F6
+Cmonospace;FF23
+Coarmenian;0551
+Csmall;F763
+D;0044
+DZ;01F1
+DZcaron;01C4
+Daarmenian;0534
+Dafrican;0189
+Dcaron;010E
+Dcedilla;1E10
+Dcircle;24B9
+Dcircumflexbelow;1E12
+Dcroat;0110
+Ddotaccent;1E0A
+Ddotbelow;1E0C
+Decyrillic;0414
+Deicoptic;03EE
+Delta;2206
+Deltagreek;0394
+Dhook;018A
+Dieresis;F6CB
+DieresisAcute;F6CC
+DieresisGrave;F6CD
+Dieresissmall;F7A8
+Digammagreek;03DC
+Djecyrillic;0402
+Dlinebelow;1E0E
+Dmonospace;FF24
+Dotaccentsmall;F6F7
+Dslash;0110
+Dsmall;F764
+Dtopbar;018B
+Dz;01F2
+Dzcaron;01C5
+Dzeabkhasiancyrillic;04E0
+Dzecyrillic;0405
+Dzhecyrillic;040F
+E;0045
+Eacute;00C9
+Eacutesmall;F7E9
+Ebreve;0114
+Ecaron;011A
+Ecedillabreve;1E1C
+Echarmenian;0535
+Ecircle;24BA
+Ecircumflex;00CA
+Ecircumflexacute;1EBE
+Ecircumflexbelow;1E18
+Ecircumflexdotbelow;1EC6
+Ecircumflexgrave;1EC0
+Ecircumflexhookabove;1EC2
+Ecircumflexsmall;F7EA
+Ecircumflextilde;1EC4
+Ecyrillic;0404
+Edblgrave;0204
+Edieresis;00CB
+Edieresissmall;F7EB
+Edot;0116
+Edotaccent;0116
+Edotbelow;1EB8
+Efcyrillic;0424
+Egrave;00C8
+Egravesmall;F7E8
+Eharmenian;0537
+Ehookabove;1EBA
+Eightroman;2167
+Einvertedbreve;0206
+Eiotifiedcyrillic;0464
+Elcyrillic;041B
+Elevenroman;216A
+Emacron;0112
+Emacronacute;1E16
+Emacrongrave;1E14
+Emcyrillic;041C
+Emonospace;FF25
+Encyrillic;041D
+Endescendercyrillic;04A2
+Eng;014A
+Enghecyrillic;04A4
+Enhookcyrillic;04C7
+Eogonek;0118
+Eopen;0190
+Epsilon;0395
+Epsilontonos;0388
+Ercyrillic;0420
+Ereversed;018E
+Ereversedcyrillic;042D
+Escyrillic;0421
+Esdescendercyrillic;04AA
+Esh;01A9
+Esmall;F765
+Eta;0397
+Etarmenian;0538
+Etatonos;0389
+Eth;00D0
+Ethsmall;F7F0
+Etilde;1EBC
+Etildebelow;1E1A
+Euro;20AC
+Ezh;01B7
+Ezhcaron;01EE
+Ezhreversed;01B8
+F;0046
+Fcircle;24BB
+Fdotaccent;1E1E
+Feharmenian;0556
+Feicoptic;03E4
+Fhook;0191
+Fitacyrillic;0472
+Fiveroman;2164
+Fmonospace;FF26
+Fourroman;2163
+Fsmall;F766
+G;0047
+GBsquare;3387
+Gacute;01F4
+Gamma;0393
+Gammaafrican;0194
+Gangiacoptic;03EA
+Gbreve;011E
+Gcaron;01E6
+Gcedilla;0122
+Gcircle;24BC
+Gcircumflex;011C
+Gcommaaccent;0122
+Gdot;0120
+Gdotaccent;0120
+Gecyrillic;0413
+Ghadarmenian;0542
+Ghemiddlehookcyrillic;0494
+Ghestrokecyrillic;0492
+Gheupturncyrillic;0490
+Ghook;0193
+Gimarmenian;0533
+Gjecyrillic;0403
+Gmacron;1E20
+Gmonospace;FF27
+Grave;F6CE
+Gravesmall;F760
+Gsmall;F767
+Gsmallhook;029B
+Gstroke;01E4
+H;0048
+H18533;25CF
+H18543;25AA
+H18551;25AB
+H22073;25A1
+HPsquare;33CB
+Haabkhasiancyrillic;04A8
+Hadescendercyrillic;04B2
+Hardsigncyrillic;042A
+Hbar;0126
+Hbrevebelow;1E2A
+Hcedilla;1E28
+Hcircle;24BD
+Hcircumflex;0124
+Hdieresis;1E26
+Hdotaccent;1E22
+Hdotbelow;1E24
+Hmonospace;FF28
+Hoarmenian;0540
+Horicoptic;03E8
+Hsmall;F768
+Hungarumlaut;F6CF
+Hungarumlautsmall;F6F8
+Hzsquare;3390
+I;0049
+IAcyrillic;042F
+IJ;0132
+IUcyrillic;042E
+Iacute;00CD
+Iacutesmall;F7ED
+Ibreve;012C
+Icaron;01CF
+Icircle;24BE
+Icircumflex;00CE
+Icircumflexsmall;F7EE
+Icyrillic;0406
+Idblgrave;0208
+Idieresis;00CF
+Idieresisacute;1E2E
+Idieresiscyrillic;04E4
+Idieresissmall;F7EF
+Idot;0130
+Idotaccent;0130
+Idotbelow;1ECA
+Iebrevecyrillic;04D6
+Iecyrillic;0415
+Ifraktur;2111
+Igrave;00CC
+Igravesmall;F7EC
+Ihookabove;1EC8
+Iicyrillic;0418
+Iinvertedbreve;020A
+Iishortcyrillic;0419
+Imacron;012A
+Imacroncyrillic;04E2
+Imonospace;FF29
+Iniarmenian;053B
+Iocyrillic;0401
+Iogonek;012E
+Iota;0399
+Iotaafrican;0196
+Iotadieresis;03AA
+Iotatonos;038A
+Ismall;F769
+Istroke;0197
+Itilde;0128
+Itildebelow;1E2C
+Izhitsacyrillic;0474
+Izhitsadblgravecyrillic;0476
+J;004A
+Jaarmenian;0541
+Jcircle;24BF
+Jcircumflex;0134
+Jecyrillic;0408
+Jheharmenian;054B
+Jmonospace;FF2A
+Jsmall;F76A
+K;004B
+KBsquare;3385
+KKsquare;33CD
+Kabashkircyrillic;04A0
+Kacute;1E30
+Kacyrillic;041A
+Kadescendercyrillic;049A
+Kahookcyrillic;04C3
+Kappa;039A
+Kastrokecyrillic;049E
+Kaverticalstrokecyrillic;049C
+Kcaron;01E8
+Kcedilla;0136
+Kcircle;24C0
+Kcommaaccent;0136
+Kdotbelow;1E32
+Keharmenian;0554
+Kenarmenian;053F
+Khacyrillic;0425
+Kheicoptic;03E6
+Khook;0198
+Kjecyrillic;040C
+Klinebelow;1E34
+Kmonospace;FF2B
+Koppacyrillic;0480
+Koppagreek;03DE
+Ksicyrillic;046E
+Ksmall;F76B
+L;004C
+LJ;01C7
+LL;F6BF
+Lacute;0139
+Lambda;039B
+Lcaron;013D
+Lcedilla;013B
+Lcircle;24C1
+Lcircumflexbelow;1E3C
+Lcommaaccent;013B
+Ldot;013F
+Ldotaccent;013F
+Ldotbelow;1E36
+Ldotbelowmacron;1E38
+Liwnarmenian;053C
+Lj;01C8
+Ljecyrillic;0409
+Llinebelow;1E3A
+Lmonospace;FF2C
+Lslash;0141
+Lslashsmall;F6F9
+Lsmall;F76C
+M;004D
+MBsquare;3386
+Macron;F6D0
+Macronsmall;F7AF
+Macute;1E3E
+Mcircle;24C2
+Mdotaccent;1E40
+Mdotbelow;1E42
+Menarmenian;0544
+Mmonospace;FF2D
+Msmall;F76D
+Mturned;019C
+Mu;039C
+N;004E
+NJ;01CA
+Nacute;0143
+Ncaron;0147
+Ncedilla;0145
+Ncircle;24C3
+Ncircumflexbelow;1E4A
+Ncommaaccent;0145
+Ndotaccent;1E44
+Ndotbelow;1E46
+Nhookleft;019D
+Nineroman;2168
+Nj;01CB
+Njecyrillic;040A
+Nlinebelow;1E48
+Nmonospace;FF2E
+Nowarmenian;0546
+Nsmall;F76E
+Ntilde;00D1
+Ntildesmall;F7F1
+Nu;039D
+O;004F
+OE;0152
+OEsmall;F6FA
+Oacute;00D3
+Oacutesmall;F7F3
+Obarredcyrillic;04E8
+Obarreddieresiscyrillic;04EA
+Obreve;014E
+Ocaron;01D1
+Ocenteredtilde;019F
+Ocircle;24C4
+Ocircumflex;00D4
+Ocircumflexacute;1ED0
+Ocircumflexdotbelow;1ED8
+Ocircumflexgrave;1ED2
+Ocircumflexhookabove;1ED4
+Ocircumflexsmall;F7F4
+Ocircumflextilde;1ED6
+Ocyrillic;041E
+Odblacute;0150
+Odblgrave;020C
+Odieresis;00D6
+Odieresiscyrillic;04E6
+Odieresissmall;F7F6
+Odotbelow;1ECC
+Ogoneksmall;F6FB
+Ograve;00D2
+Ogravesmall;F7F2
+Oharmenian;0555
+Ohm;2126
+Ohookabove;1ECE
+Ohorn;01A0
+Ohornacute;1EDA
+Ohorndotbelow;1EE2
+Ohorngrave;1EDC
+Ohornhookabove;1EDE
+Ohorntilde;1EE0
+Ohungarumlaut;0150
+Oi;01A2
+Oinvertedbreve;020E
+Omacron;014C
+Omacronacute;1E52
+Omacrongrave;1E50
+Omega;2126
+Omegacyrillic;0460
+Omegagreek;03A9
+Omegaroundcyrillic;047A
+Omegatitlocyrillic;047C
+Omegatonos;038F
+Omicron;039F
+Omicrontonos;038C
+Omonospace;FF2F
+Oneroman;2160
+Oogonek;01EA
+Oogonekmacron;01EC
+Oopen;0186
+Oslash;00D8
+Oslashacute;01FE
+Oslashsmall;F7F8
+Osmall;F76F
+Ostrokeacute;01FE
+Otcyrillic;047E
+Otilde;00D5
+Otildeacute;1E4C
+Otildedieresis;1E4E
+Otildesmall;F7F5
+P;0050
+Pacute;1E54
+Pcircle;24C5
+Pdotaccent;1E56
+Pecyrillic;041F
+Peharmenian;054A
+Pemiddlehookcyrillic;04A6
+Phi;03A6
+Phook;01A4
+Pi;03A0
+Piwrarmenian;0553
+Pmonospace;FF30
+Psi;03A8
+Psicyrillic;0470
+Psmall;F770
+Q;0051
+Qcircle;24C6
+Qmonospace;FF31
+Qsmall;F771
+R;0052
+Raarmenian;054C
+Racute;0154
+Rcaron;0158
+Rcedilla;0156
+Rcircle;24C7
+Rcommaaccent;0156
+Rdblgrave;0210
+Rdotaccent;1E58
+Rdotbelow;1E5A
+Rdotbelowmacron;1E5C
+Reharmenian;0550
+Rfraktur;211C
+Rho;03A1
+Ringsmall;F6FC
+Rinvertedbreve;0212
+Rlinebelow;1E5E
+Rmonospace;FF32
+Rsmall;F772
+Rsmallinverted;0281
+Rsmallinvertedsuperior;02B6
+S;0053
+SF010000;250C
+SF020000;2514
+SF030000;2510
+SF040000;2518
+SF050000;253C
+SF060000;252C
+SF070000;2534
+SF080000;251C
+SF090000;2524
+SF100000;2500
+SF110000;2502
+SF190000;2561
+SF200000;2562
+SF210000;2556
+SF220000;2555
+SF230000;2563
+SF240000;2551
+SF250000;2557
+SF260000;255D
+SF270000;255C
+SF280000;255B
+SF360000;255E
+SF370000;255F
+SF380000;255A
+SF390000;2554
+SF400000;2569
+SF410000;2566
+SF420000;2560
+SF430000;2550
+SF440000;256C
+SF450000;2567
+SF460000;2568
+SF470000;2564
+SF480000;2565
+SF490000;2559
+SF500000;2558
+SF510000;2552
+SF520000;2553
+SF530000;256B
+SF540000;256A
+Sacute;015A
+Sacutedotaccent;1E64
+Sampigreek;03E0
+Scaron;0160
+Scarondotaccent;1E66
+Scaronsmall;F6FD
+Scedilla;015E
+Schwa;018F
+Schwacyrillic;04D8
+Schwadieresiscyrillic;04DA
+Scircle;24C8
+Scircumflex;015C
+Scommaaccent;0218
+Sdotaccent;1E60
+Sdotbelow;1E62
+Sdotbelowdotaccent;1E68
+Seharmenian;054D
+Sevenroman;2166
+Shaarmenian;0547
+Shacyrillic;0428
+Shchacyrillic;0429
+Sheicoptic;03E2
+Shhacyrillic;04BA
+Shimacoptic;03EC
+Sigma;03A3
+Sixroman;2165
+Smonospace;FF33
+Softsigncyrillic;042C
+Ssmall;F773
+Stigmagreek;03DA
+T;0054
+Tau;03A4
+Tbar;0166
+Tcaron;0164
+Tcedilla;0162
+Tcircle;24C9
+Tcircumflexbelow;1E70
+Tcommaaccent;0162
+Tdotaccent;1E6A
+Tdotbelow;1E6C
+Tecyrillic;0422
+Tedescendercyrillic;04AC
+Tenroman;2169
+Tetsecyrillic;04B4
+Theta;0398
+Thook;01AC
+Thorn;00DE
+Thornsmall;F7FE
+Threeroman;2162
+Tildesmall;F6FE
+Tiwnarmenian;054F
+Tlinebelow;1E6E
+Tmonospace;FF34
+Toarmenian;0539
+Tonefive;01BC
+Tonesix;0184
+Tonetwo;01A7
+Tretroflexhook;01AE
+Tsecyrillic;0426
+Tshecyrillic;040B
+Tsmall;F774
+Twelveroman;216B
+Tworoman;2161
+U;0055
+Uacute;00DA
+Uacutesmall;F7FA
+Ubreve;016C
+Ucaron;01D3
+Ucircle;24CA
+Ucircumflex;00DB
+Ucircumflexbelow;1E76
+Ucircumflexsmall;F7FB
+Ucyrillic;0423
+Udblacute;0170
+Udblgrave;0214
+Udieresis;00DC
+Udieresisacute;01D7
+Udieresisbelow;1E72
+Udieresiscaron;01D9
+Udieresiscyrillic;04F0
+Udieresisgrave;01DB
+Udieresismacron;01D5
+Udieresissmall;F7FC
+Udotbelow;1EE4
+Ugrave;00D9
+Ugravesmall;F7F9
+Uhookabove;1EE6
+Uhorn;01AF
+Uhornacute;1EE8
+Uhorndotbelow;1EF0
+Uhorngrave;1EEA
+Uhornhookabove;1EEC
+Uhorntilde;1EEE
+Uhungarumlaut;0170
+Uhungarumlautcyrillic;04F2
+Uinvertedbreve;0216
+Ukcyrillic;0478
+Umacron;016A
+Umacroncyrillic;04EE
+Umacrondieresis;1E7A
+Umonospace;FF35
+Uogonek;0172
+Upsilon;03A5
+Upsilon1;03D2
+Upsilonacutehooksymbolgreek;03D3
+Upsilonafrican;01B1
+Upsilondieresis;03AB
+Upsilondieresishooksymbolgreek;03D4
+Upsilonhooksymbol;03D2
+Upsilontonos;038E
+Uring;016E
+Ushortcyrillic;040E
+Usmall;F775
+Ustraightcyrillic;04AE
+Ustraightstrokecyrillic;04B0
+Utilde;0168
+Utildeacute;1E78
+Utildebelow;1E74
+V;0056
+Vcircle;24CB
+Vdotbelow;1E7E
+Vecyrillic;0412
+Vewarmenian;054E
+Vhook;01B2
+Vmonospace;FF36
+Voarmenian;0548
+Vsmall;F776
+Vtilde;1E7C
+W;0057
+Wacute;1E82
+Wcircle;24CC
+Wcircumflex;0174
+Wdieresis;1E84
+Wdotaccent;1E86
+Wdotbelow;1E88
+Wgrave;1E80
+Wmonospace;FF37
+Wsmall;F777
+X;0058
+Xcircle;24CD
+Xdieresis;1E8C
+Xdotaccent;1E8A
+Xeharmenian;053D
+Xi;039E
+Xmonospace;FF38
+Xsmall;F778
+Y;0059
+Yacute;00DD
+Yacutesmall;F7FD
+Yatcyrillic;0462
+Ycircle;24CE
+Ycircumflex;0176
+Ydieresis;0178
+Ydieresissmall;F7FF
+Ydotaccent;1E8E
+Ydotbelow;1EF4
+Yericyrillic;042B
+Yerudieresiscyrillic;04F8
+Ygrave;1EF2
+Yhook;01B3
+Yhookabove;1EF6
+Yiarmenian;0545
+Yicyrillic;0407
+Yiwnarmenian;0552
+Ymonospace;FF39
+Ysmall;F779
+Ytilde;1EF8
+Yusbigcyrillic;046A
+Yusbigiotifiedcyrillic;046C
+Yuslittlecyrillic;0466
+Yuslittleiotifiedcyrillic;0468
+Z;005A
+Zaarmenian;0536
+Zacute;0179
+Zcaron;017D
+Zcaronsmall;F6FF
+Zcircle;24CF
+Zcircumflex;1E90
+Zdot;017B
+Zdotaccent;017B
+Zdotbelow;1E92
+Zecyrillic;0417
+Zedescendercyrillic;0498
+Zedieresiscyrillic;04DE
+Zeta;0396
+Zhearmenian;053A
+Zhebrevecyrillic;04C1
+Zhecyrillic;0416
+Zhedescendercyrillic;0496
+Zhedieresiscyrillic;04DC
+Zlinebelow;1E94
+Zmonospace;FF3A
+Zsmall;F77A
+Zstroke;01B5
+a;0061
+aabengali;0986
+aacute;00E1
+aadeva;0906
+aagujarati;0A86
+aagurmukhi;0A06
+aamatragurmukhi;0A3E
+aarusquare;3303
+aavowelsignbengali;09BE
+aavowelsigndeva;093E
+aavowelsigngujarati;0ABE
+abbreviationmarkarmenian;055F
+abbreviationsigndeva;0970
+abengali;0985
+abopomofo;311A
+abreve;0103
+abreveacute;1EAF
+abrevecyrillic;04D1
+abrevedotbelow;1EB7
+abrevegrave;1EB1
+abrevehookabove;1EB3
+abrevetilde;1EB5
+acaron;01CE
+acircle;24D0
+acircumflex;00E2
+acircumflexacute;1EA5
+acircumflexdotbelow;1EAD
+acircumflexgrave;1EA7
+acircumflexhookabove;1EA9
+acircumflextilde;1EAB
+acute;00B4
+acutebelowcmb;0317
+acutecmb;0301
+acutecomb;0301
+acutedeva;0954
+acutelowmod;02CF
+acutetonecmb;0341
+acyrillic;0430
+adblgrave;0201
+addakgurmukhi;0A71
+adeva;0905
+adieresis;00E4
+adieresiscyrillic;04D3
+adieresismacron;01DF
+adotbelow;1EA1
+adotmacron;01E1
+ae;00E6
+aeacute;01FD
+aekorean;3150
+aemacron;01E3
+afii00208;2015
+afii08941;20A4
+afii10017;0410
+afii10018;0411
+afii10019;0412
+afii10020;0413
+afii10021;0414
+afii10022;0415
+afii10023;0401
+afii10024;0416
+afii10025;0417
+afii10026;0418
+afii10027;0419
+afii10028;041A
+afii10029;041B
+afii10030;041C
+afii10031;041D
+afii10032;041E
+afii10033;041F
+afii10034;0420
+afii10035;0421
+afii10036;0422
+afii10037;0423
+afii10038;0424
+afii10039;0425
+afii10040;0426
+afii10041;0427
+afii10042;0428
+afii10043;0429
+afii10044;042A
+afii10045;042B
+afii10046;042C
+afii10047;042D
+afii10048;042E
+afii10049;042F
+afii10050;0490
+afii10051;0402
+afii10052;0403
+afii10053;0404
+afii10054;0405
+afii10055;0406
+afii10056;0407
+afii10057;0408
+afii10058;0409
+afii10059;040A
+afii10060;040B
+afii10061;040C
+afii10062;040E
+afii10063;F6C4
+afii10064;F6C5
+afii10065;0430
+afii10066;0431
+afii10067;0432
+afii10068;0433
+afii10069;0434
+afii10070;0435
+afii10071;0451
+afii10072;0436
+afii10073;0437
+afii10074;0438
+afii10075;0439
+afii10076;043A
+afii10077;043B
+afii10078;043C
+afii10079;043D
+afii10080;043E
+afii10081;043F
+afii10082;0440
+afii10083;0441
+afii10084;0442
+afii10085;0443
+afii10086;0444
+afii10087;0445
+afii10088;0446
+afii10089;0447
+afii10090;0448
+afii10091;0449
+afii10092;044A
+afii10093;044B
+afii10094;044C
+afii10095;044D
+afii10096;044E
+afii10097;044F
+afii10098;0491
+afii10099;0452
+afii10100;0453
+afii10101;0454
+afii10102;0455
+afii10103;0456
+afii10104;0457
+afii10105;0458
+afii10106;0459
+afii10107;045A
+afii10108;045B
+afii10109;045C
+afii10110;045E
+afii10145;040F
+afii10146;0462
+afii10147;0472
+afii10148;0474
+afii10192;F6C6
+afii10193;045F
+afii10194;0463
+afii10195;0473
+afii10196;0475
+afii10831;F6C7
+afii10832;F6C8
+afii10846;04D9
+afii299;200E
+afii300;200F
+afii301;200D
+afii57381;066A
+afii57388;060C
+afii57392;0660
+afii57393;0661
+afii57394;0662
+afii57395;0663
+afii57396;0664
+afii57397;0665
+afii57398;0666
+afii57399;0667
+afii57400;0668
+afii57401;0669
+afii57403;061B
+afii57407;061F
+afii57409;0621
+afii57410;0622
+afii57411;0623
+afii57412;0624
+afii57413;0625
+afii57414;0626
+afii57415;0627
+afii57416;0628
+afii57417;0629
+afii57418;062A
+afii57419;062B
+afii57420;062C
+afii57421;062D
+afii57422;062E
+afii57423;062F
+afii57424;0630
+afii57425;0631
+afii57426;0632
+afii57427;0633
+afii57428;0634
+afii57429;0635
+afii57430;0636
+afii57431;0637
+afii57432;0638
+afii57433;0639
+afii57434;063A
+afii57440;0640
+afii57441;0641
+afii57442;0642
+afii57443;0643
+afii57444;0644
+afii57445;0645
+afii57446;0646
+afii57448;0648
+afii57449;0649
+afii57450;064A
+afii57451;064B
+afii57452;064C
+afii57453;064D
+afii57454;064E
+afii57455;064F
+afii57456;0650
+afii57457;0651
+afii57458;0652
+afii57470;0647
+afii57505;06A4
+afii57506;067E
+afii57507;0686
+afii57508;0698
+afii57509;06AF
+afii57511;0679
+afii57512;0688
+afii57513;0691
+afii57514;06BA
+afii57519;06D2
+afii57534;06D5
+afii57636;20AA
+afii57645;05BE
+afii57658;05C3
+afii57664;05D0
+afii57665;05D1
+afii57666;05D2
+afii57667;05D3
+afii57668;05D4
+afii57669;05D5
+afii57670;05D6
+afii57671;05D7
+afii57672;05D8
+afii57673;05D9
+afii57674;05DA
+afii57675;05DB
+afii57676;05DC
+afii57677;05DD
+afii57678;05DE
+afii57679;05DF
+afii57680;05E0
+afii57681;05E1
+afii57682;05E2
+afii57683;05E3
+afii57684;05E4
+afii57685;05E5
+afii57686;05E6
+afii57687;05E7
+afii57688;05E8
+afii57689;05E9
+afii57690;05EA
+afii57694;FB2A
+afii57695;FB2B
+afii57700;FB4B
+afii57705;FB1F
+afii57716;05F0
+afii57717;05F1
+afii57718;05F2
+afii57723;FB35
+afii57793;05B4
+afii57794;05B5
+afii57795;05B6
+afii57796;05BB
+afii57797;05B8
+afii57798;05B7
+afii57799;05B0
+afii57800;05B2
+afii57801;05B1
+afii57802;05B3
+afii57803;05C2
+afii57804;05C1
+afii57806;05B9
+afii57807;05BC
+afii57839;05BD
+afii57841;05BF
+afii57842;05C0
+afii57929;02BC
+afii61248;2105
+afii61289;2113
+afii61352;2116
+afii61573;202C
+afii61574;202D
+afii61575;202E
+afii61664;200C
+afii63167;066D
+afii64937;02BD
+agrave;00E0
+agujarati;0A85
+agurmukhi;0A05
+ahiragana;3042
+ahookabove;1EA3
+aibengali;0990
+aibopomofo;311E
+aideva;0910
+aiecyrillic;04D5
+aigujarati;0A90
+aigurmukhi;0A10
+aimatragurmukhi;0A48
+ainarabic;0639
+ainfinalarabic;FECA
+aininitialarabic;FECB
+ainmedialarabic;FECC
+ainvertedbreve;0203
+aivowelsignbengali;09C8
+aivowelsigndeva;0948
+aivowelsigngujarati;0AC8
+akatakana;30A2
+akatakanahalfwidth;FF71
+akorean;314F
+alef;05D0
+alefarabic;0627
+alefdageshhebrew;FB30
+aleffinalarabic;FE8E
+alefhamzaabovearabic;0623
+alefhamzaabovefinalarabic;FE84
+alefhamzabelowarabic;0625
+alefhamzabelowfinalarabic;FE88
+alefhebrew;05D0
+aleflamedhebrew;FB4F
+alefmaddaabovearabic;0622
+alefmaddaabovefinalarabic;FE82
+alefmaksuraarabic;0649
+alefmaksurafinalarabic;FEF0
+alefmaksurainitialarabic;FEF3
+alefmaksuramedialarabic;FEF4
+alefpatahhebrew;FB2E
+alefqamatshebrew;FB2F
+aleph;2135
+allequal;224C
+alpha;03B1
+alphatonos;03AC
+amacron;0101
+amonospace;FF41
+ampersand;0026
+ampersandmonospace;FF06
+ampersandsmall;F726
+amsquare;33C2
+anbopomofo;3122
+angbopomofo;3124
+angkhankhuthai;0E5A
+angle;2220
+anglebracketleft;3008
+anglebracketleftvertical;FE3F
+anglebracketright;3009
+anglebracketrightvertical;FE40
+angleleft;2329
+angleright;232A
+angstrom;212B
+anoteleia;0387
+anudattadeva;0952
+anusvarabengali;0982
+anusvaradeva;0902
+anusvaragujarati;0A82
+aogonek;0105
+apaatosquare;3300
+aparen;249C
+apostrophearmenian;055A
+apostrophemod;02BC
+apple;F8FF
+approaches;2250
+approxequal;2248
+approxequalorimage;2252
+approximatelyequal;2245
+araeaekorean;318E
+araeakorean;318D
+arc;2312
+arighthalfring;1E9A
+aring;00E5
+aringacute;01FB
+aringbelow;1E01
+arrowboth;2194
+arrowdashdown;21E3
+arrowdashleft;21E0
+arrowdashright;21E2
+arrowdashup;21E1
+arrowdblboth;21D4
+arrowdbldown;21D3
+arrowdblleft;21D0
+arrowdblright;21D2
+arrowdblup;21D1
+arrowdown;2193
+arrowdownleft;2199
+arrowdownright;2198
+arrowdownwhite;21E9
+arrowheaddownmod;02C5
+arrowheadleftmod;02C2
+arrowheadrightmod;02C3
+arrowheadupmod;02C4
+arrowhorizex;F8E7
+arrowleft;2190
+arrowleftdbl;21D0
+arrowleftdblstroke;21CD
+arrowleftoverright;21C6
+arrowleftwhite;21E6
+arrowright;2192
+arrowrightdblstroke;21CF
+arrowrightheavy;279E
+arrowrightoverleft;21C4
+arrowrightwhite;21E8
+arrowtableft;21E4
+arrowtabright;21E5
+arrowup;2191
+arrowupdn;2195
+arrowupdnbse;21A8
+arrowupdownbase;21A8
+arrowupleft;2196
+arrowupleftofdown;21C5
+arrowupright;2197
+arrowupwhite;21E7
+arrowvertex;F8E6
+asciicircum;005E
+asciicircummonospace;FF3E
+asciitilde;007E
+asciitildemonospace;FF5E
+ascript;0251
+ascriptturned;0252
+asmallhiragana;3041
+asmallkatakana;30A1
+asmallkatakanahalfwidth;FF67
+asterisk;002A
+asteriskaltonearabic;066D
+asteriskarabic;066D
+asteriskmath;2217
+asteriskmonospace;FF0A
+asterisksmall;FE61
+asterism;2042
+asuperior;F6E9
+asymptoticallyequal;2243
+at;0040
+atilde;00E3
+atmonospace;FF20
+atsmall;FE6B
+aturned;0250
+aubengali;0994
+aubopomofo;3120
+audeva;0914
+augujarati;0A94
+augurmukhi;0A14
+aulengthmarkbengali;09D7
+aumatragurmukhi;0A4C
+auvowelsignbengali;09CC
+auvowelsigndeva;094C
+auvowelsigngujarati;0ACC
+avagrahadeva;093D
+aybarmenian;0561
+ayin;05E2
+ayinaltonehebrew;FB20
+ayinhebrew;05E2
+b;0062
+babengali;09AC
+backslash;005C
+backslashmonospace;FF3C
+badeva;092C
+bagujarati;0AAC
+bagurmukhi;0A2C
+bahiragana;3070
+bahtthai;0E3F
+bakatakana;30D0
+bar;007C
+barmonospace;FF5C
+bbopomofo;3105
+bcircle;24D1
+bdotaccent;1E03
+bdotbelow;1E05
+beamedsixteenthnotes;266C
+because;2235
+becyrillic;0431
+beharabic;0628
+behfinalarabic;FE90
+behinitialarabic;FE91
+behiragana;3079
+behmedialarabic;FE92
+behmeeminitialarabic;FC9F
+behmeemisolatedarabic;FC08
+behnoonfinalarabic;FC6D
+bekatakana;30D9
+benarmenian;0562
+bet;05D1
+beta;03B2
+betasymbolgreek;03D0
+betdagesh;FB31
+betdageshhebrew;FB31
+bethebrew;05D1
+betrafehebrew;FB4C
+bhabengali;09AD
+bhadeva;092D
+bhagujarati;0AAD
+bhagurmukhi;0A2D
+bhook;0253
+bihiragana;3073
+bikatakana;30D3
+bilabialclick;0298
+bindigurmukhi;0A02
+birusquare;3331
+blackcircle;25CF
+blackdiamond;25C6
+blackdownpointingtriangle;25BC
+blackleftpointingpointer;25C4
+blackleftpointingtriangle;25C0
+blacklenticularbracketleft;3010
+blacklenticularbracketleftvertical;FE3B
+blacklenticularbracketright;3011
+blacklenticularbracketrightvertical;FE3C
+blacklowerlefttriangle;25E3
+blacklowerrighttriangle;25E2
+blackrectangle;25AC
+blackrightpointingpointer;25BA
+blackrightpointingtriangle;25B6
+blacksmallsquare;25AA
+blacksmilingface;263B
+blacksquare;25A0
+blackstar;2605
+blackupperlefttriangle;25E4
+blackupperrighttriangle;25E5
+blackuppointingsmalltriangle;25B4
+blackuppointingtriangle;25B2
+blank;2423
+blinebelow;1E07
+block;2588
+bmonospace;FF42
+bobaimaithai;0E1A
+bohiragana;307C
+bokatakana;30DC
+bparen;249D
+bqsquare;33C3
+braceex;F8F4
+braceleft;007B
+braceleftbt;F8F3
+braceleftmid;F8F2
+braceleftmonospace;FF5B
+braceleftsmall;FE5B
+bracelefttp;F8F1
+braceleftvertical;FE37
+braceright;007D
+bracerightbt;F8FE
+bracerightmid;F8FD
+bracerightmonospace;FF5D
+bracerightsmall;FE5C
+bracerighttp;F8FC
+bracerightvertical;FE38
+bracketleft;005B
+bracketleftbt;F8F0
+bracketleftex;F8EF
+bracketleftmonospace;FF3B
+bracketlefttp;F8EE
+bracketright;005D
+bracketrightbt;F8FB
+bracketrightex;F8FA
+bracketrightmonospace;FF3D
+bracketrighttp;F8F9
+breve;02D8
+brevebelowcmb;032E
+brevecmb;0306
+breveinvertedbelowcmb;032F
+breveinvertedcmb;0311
+breveinverteddoublecmb;0361
+bridgebelowcmb;032A
+bridgeinvertedbelowcmb;033A
+brokenbar;00A6
+bstroke;0180
+bsuperior;F6EA
+btopbar;0183
+buhiragana;3076
+bukatakana;30D6
+bullet;2022
+bulletinverse;25D8
+bulletoperator;2219
+bullseye;25CE
+c;0063
+caarmenian;056E
+cabengali;099A
+cacute;0107
+cadeva;091A
+cagujarati;0A9A
+cagurmukhi;0A1A
+calsquare;3388
+candrabindubengali;0981
+candrabinducmb;0310
+candrabindudeva;0901
+candrabindugujarati;0A81
+capslock;21EA
+careof;2105
+caron;02C7
+caronbelowcmb;032C
+caroncmb;030C
+carriagereturn;21B5
+cbopomofo;3118
+ccaron;010D
+ccedilla;00E7
+ccedillaacute;1E09
+ccircle;24D2
+ccircumflex;0109
+ccurl;0255
+cdot;010B
+cdotaccent;010B
+cdsquare;33C5
+cedilla;00B8
+cedillacmb;0327
+cent;00A2
+centigrade;2103
+centinferior;F6DF
+centmonospace;FFE0
+centoldstyle;F7A2
+centsuperior;F6E0
+chaarmenian;0579
+chabengali;099B
+chadeva;091B
+chagujarati;0A9B
+chagurmukhi;0A1B
+chbopomofo;3114
+cheabkhasiancyrillic;04BD
+checkmark;2713
+checyrillic;0447
+chedescenderabkhasiancyrillic;04BF
+chedescendercyrillic;04B7
+chedieresiscyrillic;04F5
+cheharmenian;0573
+chekhakassiancyrillic;04CC
+cheverticalstrokecyrillic;04B9
+chi;03C7
+chieuchacirclekorean;3277
+chieuchaparenkorean;3217
+chieuchcirclekorean;3269
+chieuchkorean;314A
+chieuchparenkorean;3209
+chochangthai;0E0A
+chochanthai;0E08
+chochingthai;0E09
+chochoethai;0E0C
+chook;0188
+cieucacirclekorean;3276
+cieucaparenkorean;3216
+cieuccirclekorean;3268
+cieuckorean;3148
+cieucparenkorean;3208
+cieucuparenkorean;321C
+circle;25CB
+circlemultiply;2297
+circleot;2299
+circleplus;2295
+circlepostalmark;3036
+circlewithlefthalfblack;25D0
+circlewithrighthalfblack;25D1
+circumflex;02C6
+circumflexbelowcmb;032D
+circumflexcmb;0302
+clear;2327
+clickalveolar;01C2
+clickdental;01C0
+clicklateral;01C1
+clickretroflex;01C3
+club;2663
+clubsuitblack;2663
+clubsuitwhite;2667
+cmcubedsquare;33A4
+cmonospace;FF43
+cmsquaredsquare;33A0
+coarmenian;0581
+colon;003A
+colonmonetary;20A1
+colonmonospace;FF1A
+colonsign;20A1
+colonsmall;FE55
+colontriangularhalfmod;02D1
+colontriangularmod;02D0
+comma;002C
+commaabovecmb;0313
+commaaboverightcmb;0315
+commaaccent;F6C3
+commaarabic;060C
+commaarmenian;055D
+commainferior;F6E1
+commamonospace;FF0C
+commareversedabovecmb;0314
+commareversedmod;02BD
+commasmall;FE50
+commasuperior;F6E2
+commaturnedabovecmb;0312
+commaturnedmod;02BB
+compass;263C
+congruent;2245
+contourintegral;222E
+control;2303
+controlACK;0006
+controlBEL;0007
+controlBS;0008
+controlCAN;0018
+controlCR;000D
+controlDC1;0011
+controlDC2;0012
+controlDC3;0013
+controlDC4;0014
+controlDEL;007F
+controlDLE;0010
+controlEM;0019
+controlENQ;0005
+controlEOT;0004
+controlESC;001B
+controlETB;0017
+controlETX;0003
+controlFF;000C
+controlFS;001C
+controlGS;001D
+controlHT;0009
+controlLF;000A
+controlNAK;0015
+controlRS;001E
+controlSI;000F
+controlSO;000E
+controlSOT;0002
+controlSTX;0001
+controlSUB;001A
+controlSYN;0016
+controlUS;001F
+controlVT;000B
+copyright;00A9
+copyrightsans;F8E9
+copyrightserif;F6D9
+cornerbracketleft;300C
+cornerbracketlefthalfwidth;FF62
+cornerbracketleftvertical;FE41
+cornerbracketright;300D
+cornerbracketrighthalfwidth;FF63
+cornerbracketrightvertical;FE42
+corporationsquare;337F
+cosquare;33C7
+coverkgsquare;33C6
+cparen;249E
+cruzeiro;20A2
+cstretched;0297
+curlyand;22CF
+curlyor;22CE
+currency;00A4
+cyrBreve;F6D1
+cyrFlex;F6D2
+cyrbreve;F6D4
+cyrflex;F6D5
+d;0064
+daarmenian;0564
+dabengali;09A6
+dadarabic;0636
+dadeva;0926
+dadfinalarabic;FEBE
+dadinitialarabic;FEBF
+dadmedialarabic;FEC0
+dagesh;05BC
+dageshhebrew;05BC
+dagger;2020
+daggerdbl;2021
+dagujarati;0AA6
+dagurmukhi;0A26
+dahiragana;3060
+dakatakana;30C0
+dalarabic;062F
+dalet;05D3
+daletdagesh;FB33
+daletdageshhebrew;FB33
+dalethatafpatah;05D3 05B2
+dalethatafpatahhebrew;05D3 05B2
+dalethatafsegol;05D3 05B1
+dalethatafsegolhebrew;05D3 05B1
+dalethebrew;05D3
+dalethiriq;05D3 05B4
+dalethiriqhebrew;05D3 05B4
+daletholam;05D3 05B9
+daletholamhebrew;05D3 05B9
+daletpatah;05D3 05B7
+daletpatahhebrew;05D3 05B7
+daletqamats;05D3 05B8
+daletqamatshebrew;05D3 05B8
+daletqubuts;05D3 05BB
+daletqubutshebrew;05D3 05BB
+daletsegol;05D3 05B6
+daletsegolhebrew;05D3 05B6
+daletsheva;05D3 05B0
+daletshevahebrew;05D3 05B0
+dalettsere;05D3 05B5
+dalettserehebrew;05D3 05B5
+dalfinalarabic;FEAA
+dammaarabic;064F
+dammalowarabic;064F
+dammatanaltonearabic;064C
+dammatanarabic;064C
+danda;0964
+dargahebrew;05A7
+dargalefthebrew;05A7
+dasiapneumatacyrilliccmb;0485
+dblGrave;F6D3
+dblanglebracketleft;300A
+dblanglebracketleftvertical;FE3D
+dblanglebracketright;300B
+dblanglebracketrightvertical;FE3E
+dblarchinvertedbelowcmb;032B
+dblarrowleft;21D4
+dblarrowright;21D2
+dbldanda;0965
+dblgrave;F6D6
+dblgravecmb;030F
+dblintegral;222C
+dbllowline;2017
+dbllowlinecmb;0333
+dbloverlinecmb;033F
+dblprimemod;02BA
+dblverticalbar;2016
+dblverticallineabovecmb;030E
+dbopomofo;3109
+dbsquare;33C8
+dcaron;010F
+dcedilla;1E11
+dcircle;24D3
+dcircumflexbelow;1E13
+dcroat;0111
+ddabengali;09A1
+ddadeva;0921
+ddagujarati;0AA1
+ddagurmukhi;0A21
+ddalarabic;0688
+ddalfinalarabic;FB89
+dddhadeva;095C
+ddhabengali;09A2
+ddhadeva;0922
+ddhagujarati;0AA2
+ddhagurmukhi;0A22
+ddotaccent;1E0B
+ddotbelow;1E0D
+decimalseparatorarabic;066B
+decimalseparatorpersian;066B
+decyrillic;0434
+degree;00B0
+dehihebrew;05AD
+dehiragana;3067
+deicoptic;03EF
+dekatakana;30C7
+deleteleft;232B
+deleteright;2326
+delta;03B4
+deltaturned;018D
+denominatorminusonenumeratorbengali;09F8
+dezh;02A4
+dhabengali;09A7
+dhadeva;0927
+dhagujarati;0AA7
+dhagurmukhi;0A27
+dhook;0257
+dialytikatonos;0385
+dialytikatonoscmb;0344
+diamond;2666
+diamondsuitwhite;2662
+dieresis;00A8
+dieresisacute;F6D7
+dieresisbelowcmb;0324
+dieresiscmb;0308
+dieresisgrave;F6D8
+dieresistonos;0385
+dihiragana;3062
+dikatakana;30C2
+dittomark;3003
+divide;00F7
+divides;2223
+divisionslash;2215
+djecyrillic;0452
+dkshade;2593
+dlinebelow;1E0F
+dlsquare;3397
+dmacron;0111
+dmonospace;FF44
+dnblock;2584
+dochadathai;0E0E
+dodekthai;0E14
+dohiragana;3069
+dokatakana;30C9
+dollar;0024
+dollarinferior;F6E3
+dollarmonospace;FF04
+dollaroldstyle;F724
+dollarsmall;FE69
+dollarsuperior;F6E4
+dong;20AB
+dorusquare;3326
+dotaccent;02D9
+dotaccentcmb;0307
+dotbelowcmb;0323
+dotbelowcomb;0323
+dotkatakana;30FB
+dotlessi;0131
+dotlessj;F6BE
+dotlessjstrokehook;0284
+dotmath;22C5
+dottedcircle;25CC
+doubleyodpatah;FB1F
+doubleyodpatahhebrew;FB1F
+downtackbelowcmb;031E
+downtackmod;02D5
+dparen;249F
+dsuperior;F6EB
+dtail;0256
+dtopbar;018C
+duhiragana;3065
+dukatakana;30C5
+dz;01F3
+dzaltone;02A3
+dzcaron;01C6
+dzcurl;02A5
+dzeabkhasiancyrillic;04E1
+dzecyrillic;0455
+dzhecyrillic;045F
+e;0065
+eacute;00E9
+earth;2641
+ebengali;098F
+ebopomofo;311C
+ebreve;0115
+ecandradeva;090D
+ecandragujarati;0A8D
+ecandravowelsigndeva;0945
+ecandravowelsigngujarati;0AC5
+ecaron;011B
+ecedillabreve;1E1D
+echarmenian;0565
+echyiwnarmenian;0587
+ecircle;24D4
+ecircumflex;00EA
+ecircumflexacute;1EBF
+ecircumflexbelow;1E19
+ecircumflexdotbelow;1EC7
+ecircumflexgrave;1EC1
+ecircumflexhookabove;1EC3
+ecircumflextilde;1EC5
+ecyrillic;0454
+edblgrave;0205
+edeva;090F
+edieresis;00EB
+edot;0117
+edotaccent;0117
+edotbelow;1EB9
+eegurmukhi;0A0F
+eematragurmukhi;0A47
+efcyrillic;0444
+egrave;00E8
+egujarati;0A8F
+eharmenian;0567
+ehbopomofo;311D
+ehiragana;3048
+ehookabove;1EBB
+eibopomofo;311F
+eight;0038
+eightarabic;0668
+eightbengali;09EE
+eightcircle;2467
+eightcircleinversesansserif;2791
+eightdeva;096E
+eighteencircle;2471
+eighteenparen;2485
+eighteenperiod;2499
+eightgujarati;0AEE
+eightgurmukhi;0A6E
+eighthackarabic;0668
+eighthangzhou;3028
+eighthnotebeamed;266B
+eightideographicparen;3227
+eightinferior;2088
+eightmonospace;FF18
+eightoldstyle;F738
+eightparen;247B
+eightperiod;248F
+eightpersian;06F8
+eightroman;2177
+eightsuperior;2078
+eightthai;0E58
+einvertedbreve;0207
+eiotifiedcyrillic;0465
+ekatakana;30A8
+ekatakanahalfwidth;FF74
+ekonkargurmukhi;0A74
+ekorean;3154
+elcyrillic;043B
+element;2208
+elevencircle;246A
+elevenparen;247E
+elevenperiod;2492
+elevenroman;217A
+ellipsis;2026
+ellipsisvertical;22EE
+emacron;0113
+emacronacute;1E17
+emacrongrave;1E15
+emcyrillic;043C
+emdash;2014
+emdashvertical;FE31
+emonospace;FF45
+emphasismarkarmenian;055B
+emptyset;2205
+enbopomofo;3123
+encyrillic;043D
+endash;2013
+endashvertical;FE32
+endescendercyrillic;04A3
+eng;014B
+engbopomofo;3125
+enghecyrillic;04A5
+enhookcyrillic;04C8
+enspace;2002
+eogonek;0119
+eokorean;3153
+eopen;025B
+eopenclosed;029A
+eopenreversed;025C
+eopenreversedclosed;025E
+eopenreversedhook;025D
+eparen;24A0
+epsilon;03B5
+epsilontonos;03AD
+equal;003D
+equalmonospace;FF1D
+equalsmall;FE66
+equalsuperior;207C
+equivalence;2261
+erbopomofo;3126
+ercyrillic;0440
+ereversed;0258
+ereversedcyrillic;044D
+escyrillic;0441
+esdescendercyrillic;04AB
+esh;0283
+eshcurl;0286
+eshortdeva;090E
+eshortvowelsigndeva;0946
+eshreversedloop;01AA
+eshsquatreversed;0285
+esmallhiragana;3047
+esmallkatakana;30A7
+esmallkatakanahalfwidth;FF6A
+estimated;212E
+esuperior;F6EC
+eta;03B7
+etarmenian;0568
+etatonos;03AE
+eth;00F0
+etilde;1EBD
+etildebelow;1E1B
+etnahtafoukhhebrew;0591
+etnahtafoukhlefthebrew;0591
+etnahtahebrew;0591
+etnahtalefthebrew;0591
+eturned;01DD
+eukorean;3161
+euro;20AC
+evowelsignbengali;09C7
+evowelsigndeva;0947
+evowelsigngujarati;0AC7
+exclam;0021
+exclamarmenian;055C
+exclamdbl;203C
+exclamdown;00A1
+exclamdownsmall;F7A1
+exclammonospace;FF01
+exclamsmall;F721
+existential;2203
+ezh;0292
+ezhcaron;01EF
+ezhcurl;0293
+ezhreversed;01B9
+ezhtail;01BA
+f;0066
+fadeva;095E
+fagurmukhi;0A5E
+fahrenheit;2109
+fathaarabic;064E
+fathalowarabic;064E
+fathatanarabic;064B
+fbopomofo;3108
+fcircle;24D5
+fdotaccent;1E1F
+feharabic;0641
+feharmenian;0586
+fehfinalarabic;FED2
+fehinitialarabic;FED3
+fehmedialarabic;FED4
+feicoptic;03E5
+female;2640
+ff;FB00
+ffi;FB03
+ffl;FB04
+fi;FB01
+fifteencircle;246E
+fifteenparen;2482
+fifteenperiod;2496
+figuredash;2012
+filledbox;25A0
+filledrect;25AC
+finalkaf;05DA
+finalkafdagesh;FB3A
+finalkafdageshhebrew;FB3A
+finalkafhebrew;05DA
+finalkafqamats;05DA 05B8
+finalkafqamatshebrew;05DA 05B8
+finalkafsheva;05DA 05B0
+finalkafshevahebrew;05DA 05B0
+finalmem;05DD
+finalmemhebrew;05DD
+finalnun;05DF
+finalnunhebrew;05DF
+finalpe;05E3
+finalpehebrew;05E3
+finaltsadi;05E5
+finaltsadihebrew;05E5
+firsttonechinese;02C9
+fisheye;25C9
+fitacyrillic;0473
+five;0035
+fivearabic;0665
+fivebengali;09EB
+fivecircle;2464
+fivecircleinversesansserif;278E
+fivedeva;096B
+fiveeighths;215D
+fivegujarati;0AEB
+fivegurmukhi;0A6B
+fivehackarabic;0665
+fivehangzhou;3025
+fiveideographicparen;3224
+fiveinferior;2085
+fivemonospace;FF15
+fiveoldstyle;F735
+fiveparen;2478
+fiveperiod;248C
+fivepersian;06F5
+fiveroman;2174
+fivesuperior;2075
+fivethai;0E55
+fl;FB02
+florin;0192
+fmonospace;FF46
+fmsquare;3399
+fofanthai;0E1F
+fofathai;0E1D
+fongmanthai;0E4F
+forall;2200
+four;0034
+fourarabic;0664
+fourbengali;09EA
+fourcircle;2463
+fourcircleinversesansserif;278D
+fourdeva;096A
+fourgujarati;0AEA
+fourgurmukhi;0A6A
+fourhackarabic;0664
+fourhangzhou;3024
+fourideographicparen;3223
+fourinferior;2084
+fourmonospace;FF14
+fournumeratorbengali;09F7
+fouroldstyle;F734
+fourparen;2477
+fourperiod;248B
+fourpersian;06F4
+fourroman;2173
+foursuperior;2074
+fourteencircle;246D
+fourteenparen;2481
+fourteenperiod;2495
+fourthai;0E54
+fourthtonechinese;02CB
+fparen;24A1
+fraction;2044
+franc;20A3
+g;0067
+gabengali;0997
+gacute;01F5
+gadeva;0917
+gafarabic;06AF
+gaffinalarabic;FB93
+gafinitialarabic;FB94
+gafmedialarabic;FB95
+gagujarati;0A97
+gagurmukhi;0A17
+gahiragana;304C
+gakatakana;30AC
+gamma;03B3
+gammalatinsmall;0263
+gammasuperior;02E0
+gangiacoptic;03EB
+gbopomofo;310D
+gbreve;011F
+gcaron;01E7
+gcedilla;0123
+gcircle;24D6
+gcircumflex;011D
+gcommaaccent;0123
+gdot;0121
+gdotaccent;0121
+gecyrillic;0433
+gehiragana;3052
+gekatakana;30B2
+geometricallyequal;2251
+gereshaccenthebrew;059C
+gereshhebrew;05F3
+gereshmuqdamhebrew;059D
+germandbls;00DF
+gershayimaccenthebrew;059E
+gershayimhebrew;05F4
+getamark;3013
+ghabengali;0998
+ghadarmenian;0572
+ghadeva;0918
+ghagujarati;0A98
+ghagurmukhi;0A18
+ghainarabic;063A
+ghainfinalarabic;FECE
+ghaininitialarabic;FECF
+ghainmedialarabic;FED0
+ghemiddlehookcyrillic;0495
+ghestrokecyrillic;0493
+gheupturncyrillic;0491
+ghhadeva;095A
+ghhagurmukhi;0A5A
+ghook;0260
+ghzsquare;3393
+gihiragana;304E
+gikatakana;30AE
+gimarmenian;0563
+gimel;05D2
+gimeldagesh;FB32
+gimeldageshhebrew;FB32
+gimelhebrew;05D2
+gjecyrillic;0453
+glottalinvertedstroke;01BE
+glottalstop;0294
+glottalstopinverted;0296
+glottalstopmod;02C0
+glottalstopreversed;0295
+glottalstopreversedmod;02C1
+glottalstopreversedsuperior;02E4
+glottalstopstroke;02A1
+glottalstopstrokereversed;02A2
+gmacron;1E21
+gmonospace;FF47
+gohiragana;3054
+gokatakana;30B4
+gparen;24A2
+gpasquare;33AC
+gradient;2207
+grave;0060
+gravebelowcmb;0316
+gravecmb;0300
+gravecomb;0300
+gravedeva;0953
+gravelowmod;02CE
+gravemonospace;FF40
+gravetonecmb;0340
+greater;003E
+greaterequal;2265
+greaterequalorless;22DB
+greatermonospace;FF1E
+greaterorequivalent;2273
+greaterorless;2277
+greateroverequal;2267
+greatersmall;FE65
+gscript;0261
+gstroke;01E5
+guhiragana;3050
+guillemotleft;00AB
+guillemotright;00BB
+guilsinglleft;2039
+guilsinglright;203A
+gukatakana;30B0
+guramusquare;3318
+gysquare;33C9
+h;0068
+haabkhasiancyrillic;04A9
+haaltonearabic;06C1
+habengali;09B9
+hadescendercyrillic;04B3
+hadeva;0939
+hagujarati;0AB9
+hagurmukhi;0A39
+haharabic;062D
+hahfinalarabic;FEA2
+hahinitialarabic;FEA3
+hahiragana;306F
+hahmedialarabic;FEA4
+haitusquare;332A
+hakatakana;30CF
+hakatakanahalfwidth;FF8A
+halantgurmukhi;0A4D
+hamzaarabic;0621
+hamzadammaarabic;0621 064F
+hamzadammatanarabic;0621 064C
+hamzafathaarabic;0621 064E
+hamzafathatanarabic;0621 064B
+hamzalowarabic;0621
+hamzalowkasraarabic;0621 0650
+hamzalowkasratanarabic;0621 064D
+hamzasukunarabic;0621 0652
+hangulfiller;3164
+hardsigncyrillic;044A
+harpoonleftbarbup;21BC
+harpoonrightbarbup;21C0
+hasquare;33CA
+hatafpatah;05B2
+hatafpatah16;05B2
+hatafpatah23;05B2
+hatafpatah2f;05B2
+hatafpatahhebrew;05B2
+hatafpatahnarrowhebrew;05B2
+hatafpatahquarterhebrew;05B2
+hatafpatahwidehebrew;05B2
+hatafqamats;05B3
+hatafqamats1b;05B3
+hatafqamats28;05B3
+hatafqamats34;05B3
+hatafqamatshebrew;05B3
+hatafqamatsnarrowhebrew;05B3
+hatafqamatsquarterhebrew;05B3
+hatafqamatswidehebrew;05B3
+hatafsegol;05B1
+hatafsegol17;05B1
+hatafsegol24;05B1
+hatafsegol30;05B1
+hatafsegolhebrew;05B1
+hatafsegolnarrowhebrew;05B1
+hatafsegolquarterhebrew;05B1
+hatafsegolwidehebrew;05B1
+hbar;0127
+hbopomofo;310F
+hbrevebelow;1E2B
+hcedilla;1E29
+hcircle;24D7
+hcircumflex;0125
+hdieresis;1E27
+hdotaccent;1E23
+hdotbelow;1E25
+he;05D4
+heart;2665
+heartsuitblack;2665
+heartsuitwhite;2661
+hedagesh;FB34
+hedageshhebrew;FB34
+hehaltonearabic;06C1
+heharabic;0647
+hehebrew;05D4
+hehfinalaltonearabic;FBA7
+hehfinalalttwoarabic;FEEA
+hehfinalarabic;FEEA
+hehhamzaabovefinalarabic;FBA5
+hehhamzaaboveisolatedarabic;FBA4
+hehinitialaltonearabic;FBA8
+hehinitialarabic;FEEB
+hehiragana;3078
+hehmedialaltonearabic;FBA9
+hehmedialarabic;FEEC
+heiseierasquare;337B
+hekatakana;30D8
+hekatakanahalfwidth;FF8D
+hekutaarusquare;3336
+henghook;0267
+herutusquare;3339
+het;05D7
+hethebrew;05D7
+hhook;0266
+hhooksuperior;02B1
+hieuhacirclekorean;327B
+hieuhaparenkorean;321B
+hieuhcirclekorean;326D
+hieuhkorean;314E
+hieuhparenkorean;320D
+hihiragana;3072
+hikatakana;30D2
+hikatakanahalfwidth;FF8B
+hiriq;05B4
+hiriq14;05B4
+hiriq21;05B4
+hiriq2d;05B4
+hiriqhebrew;05B4
+hiriqnarrowhebrew;05B4
+hiriqquarterhebrew;05B4
+hiriqwidehebrew;05B4
+hlinebelow;1E96
+hmonospace;FF48
+hoarmenian;0570
+hohipthai;0E2B
+hohiragana;307B
+hokatakana;30DB
+hokatakanahalfwidth;FF8E
+holam;05B9
+holam19;05B9
+holam26;05B9
+holam32;05B9
+holamhebrew;05B9
+holamnarrowhebrew;05B9
+holamquarterhebrew;05B9
+holamwidehebrew;05B9
+honokhukthai;0E2E
+hookabovecomb;0309
+hookcmb;0309
+hookpalatalizedbelowcmb;0321
+hookretroflexbelowcmb;0322
+hoonsquare;3342
+horicoptic;03E9
+horizontalbar;2015
+horncmb;031B
+hotsprings;2668
+house;2302
+hparen;24A3
+hsuperior;02B0
+hturned;0265
+huhiragana;3075
+huiitosquare;3333
+hukatakana;30D5
+hukatakanahalfwidth;FF8C
+hungarumlaut;02DD
+hungarumlautcmb;030B
+hv;0195
+hyphen;002D
+hypheninferior;F6E5
+hyphenmonospace;FF0D
+hyphensmall;FE63
+hyphensuperior;F6E6
+hyphentwo;2010
+i;0069
+iacute;00ED
+iacyrillic;044F
+ibengali;0987
+ibopomofo;3127
+ibreve;012D
+icaron;01D0
+icircle;24D8
+icircumflex;00EE
+icyrillic;0456
+idblgrave;0209
+ideographearthcircle;328F
+ideographfirecircle;328B
+ideographicallianceparen;323F
+ideographiccallparen;323A
+ideographiccentrecircle;32A5
+ideographicclose;3006
+ideographiccomma;3001
+ideographiccommaleft;FF64
+ideographiccongratulationparen;3237
+ideographiccorrectcircle;32A3
+ideographicearthparen;322F
+ideographicenterpriseparen;323D
+ideographicexcellentcircle;329D
+ideographicfestivalparen;3240
+ideographicfinancialcircle;3296
+ideographicfinancialparen;3236
+ideographicfireparen;322B
+ideographichaveparen;3232
+ideographichighcircle;32A4
+ideographiciterationmark;3005
+ideographiclaborcircle;3298
+ideographiclaborparen;3238
+ideographicleftcircle;32A7
+ideographiclowcircle;32A6
+ideographicmedicinecircle;32A9
+ideographicmetalparen;322E
+ideographicmoonparen;322A
+ideographicnameparen;3234
+ideographicperiod;3002
+ideographicprintcircle;329E
+ideographicreachparen;3243
+ideographicrepresentparen;3239
+ideographicresourceparen;323E
+ideographicrightcircle;32A8
+ideographicsecretcircle;3299
+ideographicselfparen;3242
+ideographicsocietyparen;3233
+ideographicspace;3000
+ideographicspecialparen;3235
+ideographicstockparen;3231
+ideographicstudyparen;323B
+ideographicsunparen;3230
+ideographicsuperviseparen;323C
+ideographicwaterparen;322C
+ideographicwoodparen;322D
+ideographiczero;3007
+ideographmetalcircle;328E
+ideographmooncircle;328A
+ideographnamecircle;3294
+ideographsuncircle;3290
+ideographwatercircle;328C
+ideographwoodcircle;328D
+ideva;0907
+idieresis;00EF
+idieresisacute;1E2F
+idieresiscyrillic;04E5
+idotbelow;1ECB
+iebrevecyrillic;04D7
+iecyrillic;0435
+ieungacirclekorean;3275
+ieungaparenkorean;3215
+ieungcirclekorean;3267
+ieungkorean;3147
+ieungparenkorean;3207
+igrave;00EC
+igujarati;0A87
+igurmukhi;0A07
+ihiragana;3044
+ihookabove;1EC9
+iibengali;0988
+iicyrillic;0438
+iideva;0908
+iigujarati;0A88
+iigurmukhi;0A08
+iimatragurmukhi;0A40
+iinvertedbreve;020B
+iishortcyrillic;0439
+iivowelsignbengali;09C0
+iivowelsigndeva;0940
+iivowelsigngujarati;0AC0
+ij;0133
+ikatakana;30A4
+ikatakanahalfwidth;FF72
+ikorean;3163
+ilde;02DC
+iluyhebrew;05AC
+imacron;012B
+imacroncyrillic;04E3
+imageorapproximatelyequal;2253
+imatragurmukhi;0A3F
+imonospace;FF49
+increment;2206
+infinity;221E
+iniarmenian;056B
+integral;222B
+integralbottom;2321
+integralbt;2321
+integralex;F8F5
+integraltop;2320
+integraltp;2320
+intersection;2229
+intisquare;3305
+invbullet;25D8
+invcircle;25D9
+invsmileface;263B
+iocyrillic;0451
+iogonek;012F
+iota;03B9
+iotadieresis;03CA
+iotadieresistonos;0390
+iotalatin;0269
+iotatonos;03AF
+iparen;24A4
+irigurmukhi;0A72
+ismallhiragana;3043
+ismallkatakana;30A3
+ismallkatakanahalfwidth;FF68
+issharbengali;09FA
+istroke;0268
+isuperior;F6ED
+iterationhiragana;309D
+iterationkatakana;30FD
+itilde;0129
+itildebelow;1E2D
+iubopomofo;3129
+iucyrillic;044E
+ivowelsignbengali;09BF
+ivowelsigndeva;093F
+ivowelsigngujarati;0ABF
+izhitsacyrillic;0475
+izhitsadblgravecyrillic;0477
+j;006A
+jaarmenian;0571
+jabengali;099C
+jadeva;091C
+jagujarati;0A9C
+jagurmukhi;0A1C
+jbopomofo;3110
+jcaron;01F0
+jcircle;24D9
+jcircumflex;0135
+jcrossedtail;029D
+jdotlessstroke;025F
+jecyrillic;0458
+jeemarabic;062C
+jeemfinalarabic;FE9E
+jeeminitialarabic;FE9F
+jeemmedialarabic;FEA0
+jeharabic;0698
+jehfinalarabic;FB8B
+jhabengali;099D
+jhadeva;091D
+jhagujarati;0A9D
+jhagurmukhi;0A1D
+jheharmenian;057B
+jis;3004
+jmonospace;FF4A
+jparen;24A5
+jsuperior;02B2
+k;006B
+kabashkircyrillic;04A1
+kabengali;0995
+kacute;1E31
+kacyrillic;043A
+kadescendercyrillic;049B
+kadeva;0915
+kaf;05DB
+kafarabic;0643
+kafdagesh;FB3B
+kafdageshhebrew;FB3B
+kaffinalarabic;FEDA
+kafhebrew;05DB
+kafinitialarabic;FEDB
+kafmedialarabic;FEDC
+kafrafehebrew;FB4D
+kagujarati;0A95
+kagurmukhi;0A15
+kahiragana;304B
+kahookcyrillic;04C4
+kakatakana;30AB
+kakatakanahalfwidth;FF76
+kappa;03BA
+kappasymbolgreek;03F0
+kapyeounmieumkorean;3171
+kapyeounphieuphkorean;3184
+kapyeounpieupkorean;3178
+kapyeounssangpieupkorean;3179
+karoriisquare;330D
+kashidaautoarabic;0640
+kashidaautonosidebearingarabic;0640
+kasmallkatakana;30F5
+kasquare;3384
+kasraarabic;0650
+kasratanarabic;064D
+kastrokecyrillic;049F
+katahiraprolongmarkhalfwidth;FF70
+kaverticalstrokecyrillic;049D
+kbopomofo;310E
+kcalsquare;3389
+kcaron;01E9
+kcedilla;0137
+kcircle;24DA
+kcommaaccent;0137
+kdotbelow;1E33
+keharmenian;0584
+kehiragana;3051
+kekatakana;30B1
+kekatakanahalfwidth;FF79
+kenarmenian;056F
+kesmallkatakana;30F6
+kgreenlandic;0138
+khabengali;0996
+khacyrillic;0445
+khadeva;0916
+khagujarati;0A96
+khagurmukhi;0A16
+khaharabic;062E
+khahfinalarabic;FEA6
+khahinitialarabic;FEA7
+khahmedialarabic;FEA8
+kheicoptic;03E7
+khhadeva;0959
+khhagurmukhi;0A59
+khieukhacirclekorean;3278
+khieukhaparenkorean;3218
+khieukhcirclekorean;326A
+khieukhkorean;314B
+khieukhparenkorean;320A
+khokhaithai;0E02
+khokhonthai;0E05
+khokhuatthai;0E03
+khokhwaithai;0E04
+khomutthai;0E5B
+khook;0199
+khorakhangthai;0E06
+khzsquare;3391
+kihiragana;304D
+kikatakana;30AD
+kikatakanahalfwidth;FF77
+kiroguramusquare;3315
+kiromeetorusquare;3316
+kirosquare;3314
+kiyeokacirclekorean;326E
+kiyeokaparenkorean;320E
+kiyeokcirclekorean;3260
+kiyeokkorean;3131
+kiyeokparenkorean;3200
+kiyeoksioskorean;3133
+kjecyrillic;045C
+klinebelow;1E35
+klsquare;3398
+kmcubedsquare;33A6
+kmonospace;FF4B
+kmsquaredsquare;33A2
+kohiragana;3053
+kohmsquare;33C0
+kokaithai;0E01
+kokatakana;30B3
+kokatakanahalfwidth;FF7A
+kooposquare;331E
+koppacyrillic;0481
+koreanstandardsymbol;327F
+koroniscmb;0343
+kparen;24A6
+kpasquare;33AA
+ksicyrillic;046F
+ktsquare;33CF
+kturned;029E
+kuhiragana;304F
+kukatakana;30AF
+kukatakanahalfwidth;FF78
+kvsquare;33B8
+kwsquare;33BE
+l;006C
+labengali;09B2
+lacute;013A
+ladeva;0932
+lagujarati;0AB2
+lagurmukhi;0A32
+lakkhangyaothai;0E45
+lamaleffinalarabic;FEFC
+lamalefhamzaabovefinalarabic;FEF8
+lamalefhamzaaboveisolatedarabic;FEF7
+lamalefhamzabelowfinalarabic;FEFA
+lamalefhamzabelowisolatedarabic;FEF9
+lamalefisolatedarabic;FEFB
+lamalefmaddaabovefinalarabic;FEF6
+lamalefmaddaaboveisolatedarabic;FEF5
+lamarabic;0644
+lambda;03BB
+lambdastroke;019B
+lamed;05DC
+lameddagesh;FB3C
+lameddageshhebrew;FB3C
+lamedhebrew;05DC
+lamedholam;05DC 05B9
+lamedholamdagesh;05DC 05B9 05BC
+lamedholamdageshhebrew;05DC 05B9 05BC
+lamedholamhebrew;05DC 05B9
+lamfinalarabic;FEDE
+lamhahinitialarabic;FCCA
+laminitialarabic;FEDF
+lamjeeminitialarabic;FCC9
+lamkhahinitialarabic;FCCB
+lamlamhehisolatedarabic;FDF2
+lammedialarabic;FEE0
+lammeemhahinitialarabic;FD88
+lammeeminitialarabic;FCCC
+lammeemjeeminitialarabic;FEDF FEE4 FEA0
+lammeemkhahinitialarabic;FEDF FEE4 FEA8
+largecircle;25EF
+lbar;019A
+lbelt;026C
+lbopomofo;310C
+lcaron;013E
+lcedilla;013C
+lcircle;24DB
+lcircumflexbelow;1E3D
+lcommaaccent;013C
+ldot;0140
+ldotaccent;0140
+ldotbelow;1E37
+ldotbelowmacron;1E39
+leftangleabovecmb;031A
+lefttackbelowcmb;0318
+less;003C
+lessequal;2264
+lessequalorgreater;22DA
+lessmonospace;FF1C
+lessorequivalent;2272
+lessorgreater;2276
+lessoverequal;2266
+lesssmall;FE64
+lezh;026E
+lfblock;258C
+lhookretroflex;026D
+lira;20A4
+liwnarmenian;056C
+lj;01C9
+ljecyrillic;0459
+ll;F6C0
+lladeva;0933
+llagujarati;0AB3
+llinebelow;1E3B
+llladeva;0934
+llvocalicbengali;09E1
+llvocalicdeva;0961
+llvocalicvowelsignbengali;09E3
+llvocalicvowelsigndeva;0963
+lmiddletilde;026B
+lmonospace;FF4C
+lmsquare;33D0
+lochulathai;0E2C
+logicaland;2227
+logicalnot;00AC
+logicalnotreversed;2310
+logicalor;2228
+lolingthai;0E25
+longs;017F
+lowlinecenterline;FE4E
+lowlinecmb;0332
+lowlinedashed;FE4D
+lozenge;25CA
+lparen;24A7
+lslash;0142
+lsquare;2113
+lsuperior;F6EE
+ltshade;2591
+luthai;0E26
+lvocalicbengali;098C
+lvocalicdeva;090C
+lvocalicvowelsignbengali;09E2
+lvocalicvowelsigndeva;0962
+lxsquare;33D3
+m;006D
+mabengali;09AE
+macron;00AF
+macronbelowcmb;0331
+macroncmb;0304
+macronlowmod;02CD
+macronmonospace;FFE3
+macute;1E3F
+madeva;092E
+magujarati;0AAE
+magurmukhi;0A2E
+mahapakhhebrew;05A4
+mahapakhlefthebrew;05A4
+mahiragana;307E
+maichattawalowleftthai;F895
+maichattawalowrightthai;F894
+maichattawathai;0E4B
+maichattawaupperleftthai;F893
+maieklowleftthai;F88C
+maieklowrightthai;F88B
+maiekthai;0E48
+maiekupperleftthai;F88A
+maihanakatleftthai;F884
+maihanakatthai;0E31
+maitaikhuleftthai;F889
+maitaikhuthai;0E47
+maitholowleftthai;F88F
+maitholowrightthai;F88E
+maithothai;0E49
+maithoupperleftthai;F88D
+maitrilowleftthai;F892
+maitrilowrightthai;F891
+maitrithai;0E4A
+maitriupperleftthai;F890
+maiyamokthai;0E46
+makatakana;30DE
+makatakanahalfwidth;FF8F
+male;2642
+mansyonsquare;3347
+maqafhebrew;05BE
+mars;2642
+masoracirclehebrew;05AF
+masquare;3383
+mbopomofo;3107
+mbsquare;33D4
+mcircle;24DC
+mcubedsquare;33A5
+mdotaccent;1E41
+mdotbelow;1E43
+meemarabic;0645
+meemfinalarabic;FEE2
+meeminitialarabic;FEE3
+meemmedialarabic;FEE4
+meemmeeminitialarabic;FCD1
+meemmeemisolatedarabic;FC48
+meetorusquare;334D
+mehiragana;3081
+meizierasquare;337E
+mekatakana;30E1
+mekatakanahalfwidth;FF92
+mem;05DE
+memdagesh;FB3E
+memdageshhebrew;FB3E
+memhebrew;05DE
+menarmenian;0574
+merkhahebrew;05A5
+merkhakefulahebrew;05A6
+merkhakefulalefthebrew;05A6
+merkhalefthebrew;05A5
+mhook;0271
+mhzsquare;3392
+middledotkatakanahalfwidth;FF65
+middot;00B7
+mieumacirclekorean;3272
+mieumaparenkorean;3212
+mieumcirclekorean;3264
+mieumkorean;3141
+mieumpansioskorean;3170
+mieumparenkorean;3204
+mieumpieupkorean;316E
+mieumsioskorean;316F
+mihiragana;307F
+mikatakana;30DF
+mikatakanahalfwidth;FF90
+minus;2212
+minusbelowcmb;0320
+minuscircle;2296
+minusmod;02D7
+minusplus;2213
+minute;2032
+miribaarusquare;334A
+mirisquare;3349
+mlonglegturned;0270
+mlsquare;3396
+mmcubedsquare;33A3
+mmonospace;FF4D
+mmsquaredsquare;339F
+mohiragana;3082
+mohmsquare;33C1
+mokatakana;30E2
+mokatakanahalfwidth;FF93
+molsquare;33D6
+momathai;0E21
+moverssquare;33A7
+moverssquaredsquare;33A8
+mparen;24A8
+mpasquare;33AB
+mssquare;33B3
+msuperior;F6EF
+mturned;026F
+mu;00B5
+mu1;00B5
+muasquare;3382
+muchgreater;226B
+muchless;226A
+mufsquare;338C
+mugreek;03BC
+mugsquare;338D
+muhiragana;3080
+mukatakana;30E0
+mukatakanahalfwidth;FF91
+mulsquare;3395
+multiply;00D7
+mumsquare;339B
+munahhebrew;05A3
+munahlefthebrew;05A3
+musicalnote;266A
+musicalnotedbl;266B
+musicflatsign;266D
+musicsharpsign;266F
+mussquare;33B2
+muvsquare;33B6
+muwsquare;33BC
+mvmegasquare;33B9
+mvsquare;33B7
+mwmegasquare;33BF
+mwsquare;33BD
+n;006E
+nabengali;09A8
+nabla;2207
+nacute;0144
+nadeva;0928
+nagujarati;0AA8
+nagurmukhi;0A28
+nahiragana;306A
+nakatakana;30CA
+nakatakanahalfwidth;FF85
+napostrophe;0149
+nasquare;3381
+nbopomofo;310B
+nbspace;00A0
+ncaron;0148
+ncedilla;0146
+ncircle;24DD
+ncircumflexbelow;1E4B
+ncommaaccent;0146
+ndotaccent;1E45
+ndotbelow;1E47
+nehiragana;306D
+nekatakana;30CD
+nekatakanahalfwidth;FF88
+newsheqelsign;20AA
+nfsquare;338B
+ngabengali;0999
+ngadeva;0919
+ngagujarati;0A99
+ngagurmukhi;0A19
+ngonguthai;0E07
+nhiragana;3093
+nhookleft;0272
+nhookretroflex;0273
+nieunacirclekorean;326F
+nieunaparenkorean;320F
+nieuncieuckorean;3135
+nieuncirclekorean;3261
+nieunhieuhkorean;3136
+nieunkorean;3134
+nieunpansioskorean;3168
+nieunparenkorean;3201
+nieunsioskorean;3167
+nieuntikeutkorean;3166
+nihiragana;306B
+nikatakana;30CB
+nikatakanahalfwidth;FF86
+nikhahitleftthai;F899
+nikhahitthai;0E4D
+nine;0039
+ninearabic;0669
+ninebengali;09EF
+ninecircle;2468
+ninecircleinversesansserif;2792
+ninedeva;096F
+ninegujarati;0AEF
+ninegurmukhi;0A6F
+ninehackarabic;0669
+ninehangzhou;3029
+nineideographicparen;3228
+nineinferior;2089
+ninemonospace;FF19
+nineoldstyle;F739
+nineparen;247C
+nineperiod;2490
+ninepersian;06F9
+nineroman;2178
+ninesuperior;2079
+nineteencircle;2472
+nineteenparen;2486
+nineteenperiod;249A
+ninethai;0E59
+nj;01CC
+njecyrillic;045A
+nkatakana;30F3
+nkatakanahalfwidth;FF9D
+nlegrightlong;019E
+nlinebelow;1E49
+nmonospace;FF4E
+nmsquare;339A
+nnabengali;09A3
+nnadeva;0923
+nnagujarati;0AA3
+nnagurmukhi;0A23
+nnnadeva;0929
+nohiragana;306E
+nokatakana;30CE
+nokatakanahalfwidth;FF89
+nonbreakingspace;00A0
+nonenthai;0E13
+nonuthai;0E19
+noonarabic;0646
+noonfinalarabic;FEE6
+noonghunnaarabic;06BA
+noonghunnafinalarabic;FB9F
+noonhehinitialarabic;FEE7 FEEC
+nooninitialarabic;FEE7
+noonjeeminitialarabic;FCD2
+noonjeemisolatedarabic;FC4B
+noonmedialarabic;FEE8
+noonmeeminitialarabic;FCD5
+noonmeemisolatedarabic;FC4E
+noonnoonfinalarabic;FC8D
+notcontains;220C
+notelement;2209
+notelementof;2209
+notequal;2260
+notgreater;226F
+notgreaternorequal;2271
+notgreaternorless;2279
+notidentical;2262
+notless;226E
+notlessnorequal;2270
+notparallel;2226
+notprecedes;2280
+notsubset;2284
+notsucceeds;2281
+notsuperset;2285
+nowarmenian;0576
+nparen;24A9
+nssquare;33B1
+nsuperior;207F
+ntilde;00F1
+nu;03BD
+nuhiragana;306C
+nukatakana;30CC
+nukatakanahalfwidth;FF87
+nuktabengali;09BC
+nuktadeva;093C
+nuktagujarati;0ABC
+nuktagurmukhi;0A3C
+numbersign;0023
+numbersignmonospace;FF03
+numbersignsmall;FE5F
+numeralsigngreek;0374
+numeralsignlowergreek;0375
+numero;2116
+nun;05E0
+nundagesh;FB40
+nundageshhebrew;FB40
+nunhebrew;05E0
+nvsquare;33B5
+nwsquare;33BB
+nyabengali;099E
+nyadeva;091E
+nyagujarati;0A9E
+nyagurmukhi;0A1E
+o;006F
+oacute;00F3
+oangthai;0E2D
+obarred;0275
+obarredcyrillic;04E9
+obarreddieresiscyrillic;04EB
+obengali;0993
+obopomofo;311B
+obreve;014F
+ocandradeva;0911
+ocandragujarati;0A91
+ocandravowelsigndeva;0949
+ocandravowelsigngujarati;0AC9
+ocaron;01D2
+ocircle;24DE
+ocircumflex;00F4
+ocircumflexacute;1ED1
+ocircumflexdotbelow;1ED9
+ocircumflexgrave;1ED3
+ocircumflexhookabove;1ED5
+ocircumflextilde;1ED7
+ocyrillic;043E
+odblacute;0151
+odblgrave;020D
+odeva;0913
+odieresis;00F6
+odieresiscyrillic;04E7
+odotbelow;1ECD
+oe;0153
+oekorean;315A
+ogonek;02DB
+ogonekcmb;0328
+ograve;00F2
+ogujarati;0A93
+oharmenian;0585
+ohiragana;304A
+ohookabove;1ECF
+ohorn;01A1
+ohornacute;1EDB
+ohorndotbelow;1EE3
+ohorngrave;1EDD
+ohornhookabove;1EDF
+ohorntilde;1EE1
+ohungarumlaut;0151
+oi;01A3
+oinvertedbreve;020F
+okatakana;30AA
+okatakanahalfwidth;FF75
+okorean;3157
+olehebrew;05AB
+omacron;014D
+omacronacute;1E53
+omacrongrave;1E51
+omdeva;0950
+omega;03C9
+omega1;03D6
+omegacyrillic;0461
+omegalatinclosed;0277
+omegaroundcyrillic;047B
+omegatitlocyrillic;047D
+omegatonos;03CE
+omgujarati;0AD0
+omicron;03BF
+omicrontonos;03CC
+omonospace;FF4F
+one;0031
+onearabic;0661
+onebengali;09E7
+onecircle;2460
+onecircleinversesansserif;278A
+onedeva;0967
+onedotenleader;2024
+oneeighth;215B
+onefitted;F6DC
+onegujarati;0AE7
+onegurmukhi;0A67
+onehackarabic;0661
+onehalf;00BD
+onehangzhou;3021
+oneideographicparen;3220
+oneinferior;2081
+onemonospace;FF11
+onenumeratorbengali;09F4
+oneoldstyle;F731
+oneparen;2474
+oneperiod;2488
+onepersian;06F1
+onequarter;00BC
+oneroman;2170
+onesuperior;00B9
+onethai;0E51
+onethird;2153
+oogonek;01EB
+oogonekmacron;01ED
+oogurmukhi;0A13
+oomatragurmukhi;0A4B
+oopen;0254
+oparen;24AA
+openbullet;25E6
+option;2325
+ordfeminine;00AA
+ordmasculine;00BA
+orthogonal;221F
+oshortdeva;0912
+oshortvowelsigndeva;094A
+oslash;00F8
+oslashacute;01FF
+osmallhiragana;3049
+osmallkatakana;30A9
+osmallkatakanahalfwidth;FF6B
+ostrokeacute;01FF
+osuperior;F6F0
+otcyrillic;047F
+otilde;00F5
+otildeacute;1E4D
+otildedieresis;1E4F
+oubopomofo;3121
+overline;203E
+overlinecenterline;FE4A
+overlinecmb;0305
+overlinedashed;FE49
+overlinedblwavy;FE4C
+overlinewavy;FE4B
+overscore;00AF
+ovowelsignbengali;09CB
+ovowelsigndeva;094B
+ovowelsigngujarati;0ACB
+p;0070
+paampssquare;3380
+paasentosquare;332B
+pabengali;09AA
+pacute;1E55
+padeva;092A
+pagedown;21DF
+pageup;21DE
+pagujarati;0AAA
+pagurmukhi;0A2A
+pahiragana;3071
+paiyannoithai;0E2F
+pakatakana;30D1
+palatalizationcyrilliccmb;0484
+palochkacyrillic;04C0
+pansioskorean;317F
+paragraph;00B6
+parallel;2225
+parenleft;0028
+parenleftaltonearabic;FD3E
+parenleftbt;F8ED
+parenleftex;F8EC
+parenleftinferior;208D
+parenleftmonospace;FF08
+parenleftsmall;FE59
+parenleftsuperior;207D
+parenlefttp;F8EB
+parenleftvertical;FE35
+parenright;0029
+parenrightaltonearabic;FD3F
+parenrightbt;F8F8
+parenrightex;F8F7
+parenrightinferior;208E
+parenrightmonospace;FF09
+parenrightsmall;FE5A
+parenrightsuperior;207E
+parenrighttp;F8F6
+parenrightvertical;FE36
+partialdiff;2202
+paseqhebrew;05C0
+pashtahebrew;0599
+pasquare;33A9
+patah;05B7
+patah11;05B7
+patah1d;05B7
+patah2a;05B7
+patahhebrew;05B7
+patahnarrowhebrew;05B7
+patahquarterhebrew;05B7
+patahwidehebrew;05B7
+pazerhebrew;05A1
+pbopomofo;3106
+pcircle;24DF
+pdotaccent;1E57
+pe;05E4
+pecyrillic;043F
+pedagesh;FB44
+pedageshhebrew;FB44
+peezisquare;333B
+pefinaldageshhebrew;FB43
+peharabic;067E
+peharmenian;057A
+pehebrew;05E4
+pehfinalarabic;FB57
+pehinitialarabic;FB58
+pehiragana;307A
+pehmedialarabic;FB59
+pekatakana;30DA
+pemiddlehookcyrillic;04A7
+perafehebrew;FB4E
+percent;0025
+percentarabic;066A
+percentmonospace;FF05
+percentsmall;FE6A
+period;002E
+periodarmenian;0589
+periodcentered;00B7
+periodhalfwidth;FF61
+periodinferior;F6E7
+periodmonospace;FF0E
+periodsmall;FE52
+periodsuperior;F6E8
+perispomenigreekcmb;0342
+perpendicular;22A5
+perthousand;2030
+peseta;20A7
+pfsquare;338A
+phabengali;09AB
+phadeva;092B
+phagujarati;0AAB
+phagurmukhi;0A2B
+phi;03C6
+phi1;03D5
+phieuphacirclekorean;327A
+phieuphaparenkorean;321A
+phieuphcirclekorean;326C
+phieuphkorean;314D
+phieuphparenkorean;320C
+philatin;0278
+phinthuthai;0E3A
+phisymbolgreek;03D5
+phook;01A5
+phophanthai;0E1E
+phophungthai;0E1C
+phosamphaothai;0E20
+pi;03C0
+pieupacirclekorean;3273
+pieupaparenkorean;3213
+pieupcieuckorean;3176
+pieupcirclekorean;3265
+pieupkiyeokkorean;3172
+pieupkorean;3142
+pieupparenkorean;3205
+pieupsioskiyeokkorean;3174
+pieupsioskorean;3144
+pieupsiostikeutkorean;3175
+pieupthieuthkorean;3177
+pieuptikeutkorean;3173
+pihiragana;3074
+pikatakana;30D4
+pisymbolgreek;03D6
+piwrarmenian;0583
+plus;002B
+plusbelowcmb;031F
+pluscircle;2295
+plusminus;00B1
+plusmod;02D6
+plusmonospace;FF0B
+plussmall;FE62
+plussuperior;207A
+pmonospace;FF50
+pmsquare;33D8
+pohiragana;307D
+pointingindexdownwhite;261F
+pointingindexleftwhite;261C
+pointingindexrightwhite;261E
+pointingindexupwhite;261D
+pokatakana;30DD
+poplathai;0E1B
+postalmark;3012
+postalmarkface;3020
+pparen;24AB
+precedes;227A
+prescription;211E
+primemod;02B9
+primereversed;2035
+product;220F
+projective;2305
+prolongedkana;30FC
+propellor;2318
+propersubset;2282
+propersuperset;2283
+proportion;2237
+proportional;221D
+psi;03C8
+psicyrillic;0471
+psilipneumatacyrilliccmb;0486
+pssquare;33B0
+puhiragana;3077
+pukatakana;30D7
+pvsquare;33B4
+pwsquare;33BA
+q;0071
+qadeva;0958
+qadmahebrew;05A8
+qafarabic;0642
+qaffinalarabic;FED6
+qafinitialarabic;FED7
+qafmedialarabic;FED8
+qamats;05B8
+qamats10;05B8
+qamats1a;05B8
+qamats1c;05B8
+qamats27;05B8
+qamats29;05B8
+qamats33;05B8
+qamatsde;05B8
+qamatshebrew;05B8
+qamatsnarrowhebrew;05B8
+qamatsqatanhebrew;05B8
+qamatsqatannarrowhebrew;05B8
+qamatsqatanquarterhebrew;05B8
+qamatsqatanwidehebrew;05B8
+qamatsquarterhebrew;05B8
+qamatswidehebrew;05B8
+qarneyparahebrew;059F
+qbopomofo;3111
+qcircle;24E0
+qhook;02A0
+qmonospace;FF51
+qof;05E7
+qofdagesh;FB47
+qofdageshhebrew;FB47
+qofhatafpatah;05E7 05B2
+qofhatafpatahhebrew;05E7 05B2
+qofhatafsegol;05E7 05B1
+qofhatafsegolhebrew;05E7 05B1
+qofhebrew;05E7
+qofhiriq;05E7 05B4
+qofhiriqhebrew;05E7 05B4
+qofholam;05E7 05B9
+qofholamhebrew;05E7 05B9
+qofpatah;05E7 05B7
+qofpatahhebrew;05E7 05B7
+qofqamats;05E7 05B8
+qofqamatshebrew;05E7 05B8
+qofqubuts;05E7 05BB
+qofqubutshebrew;05E7 05BB
+qofsegol;05E7 05B6
+qofsegolhebrew;05E7 05B6
+qofsheva;05E7 05B0
+qofshevahebrew;05E7 05B0
+qoftsere;05E7 05B5
+qoftserehebrew;05E7 05B5
+qparen;24AC
+quarternote;2669
+qubuts;05BB
+qubuts18;05BB
+qubuts25;05BB
+qubuts31;05BB
+qubutshebrew;05BB
+qubutsnarrowhebrew;05BB
+qubutsquarterhebrew;05BB
+qubutswidehebrew;05BB
+question;003F
+questionarabic;061F
+questionarmenian;055E
+questiondown;00BF
+questiondownsmall;F7BF
+questiongreek;037E
+questionmonospace;FF1F
+questionsmall;F73F
+quotedbl;0022
+quotedblbase;201E
+quotedblleft;201C
+quotedblmonospace;FF02
+quotedblprime;301E
+quotedblprimereversed;301D
+quotedblright;201D
+quoteleft;2018
+quoteleftreversed;201B
+quotereversed;201B
+quoteright;2019
+quoterightn;0149
+quotesinglbase;201A
+quotesingle;0027
+quotesinglemonospace;FF07
+r;0072
+raarmenian;057C
+rabengali;09B0
+racute;0155
+radeva;0930
+radical;221A
+radicalex;F8E5
+radoverssquare;33AE
+radoverssquaredsquare;33AF
+radsquare;33AD
+rafe;05BF
+rafehebrew;05BF
+ragujarati;0AB0
+ragurmukhi;0A30
+rahiragana;3089
+rakatakana;30E9
+rakatakanahalfwidth;FF97
+ralowerdiagonalbengali;09F1
+ramiddlediagonalbengali;09F0
+ramshorn;0264
+ratio;2236
+rbopomofo;3116
+rcaron;0159
+rcedilla;0157
+rcircle;24E1
+rcommaaccent;0157
+rdblgrave;0211
+rdotaccent;1E59
+rdotbelow;1E5B
+rdotbelowmacron;1E5D
+referencemark;203B
+reflexsubset;2286
+reflexsuperset;2287
+registered;00AE
+registersans;F8E8
+registerserif;F6DA
+reharabic;0631
+reharmenian;0580
+rehfinalarabic;FEAE
+rehiragana;308C
+rehyehaleflamarabic;0631 FEF3 FE8E 0644
+rekatakana;30EC
+rekatakanahalfwidth;FF9A
+resh;05E8
+reshdageshhebrew;FB48
+reshhatafpatah;05E8 05B2
+reshhatafpatahhebrew;05E8 05B2
+reshhatafsegol;05E8 05B1
+reshhatafsegolhebrew;05E8 05B1
+reshhebrew;05E8
+reshhiriq;05E8 05B4
+reshhiriqhebrew;05E8 05B4
+reshholam;05E8 05B9
+reshholamhebrew;05E8 05B9
+reshpatah;05E8 05B7
+reshpatahhebrew;05E8 05B7
+reshqamats;05E8 05B8
+reshqamatshebrew;05E8 05B8
+reshqubuts;05E8 05BB
+reshqubutshebrew;05E8 05BB
+reshsegol;05E8 05B6
+reshsegolhebrew;05E8 05B6
+reshsheva;05E8 05B0
+reshshevahebrew;05E8 05B0
+reshtsere;05E8 05B5
+reshtserehebrew;05E8 05B5
+reversedtilde;223D
+reviahebrew;0597
+reviamugrashhebrew;0597
+revlogicalnot;2310
+rfishhook;027E
+rfishhookreversed;027F
+rhabengali;09DD
+rhadeva;095D
+rho;03C1
+rhook;027D
+rhookturned;027B
+rhookturnedsuperior;02B5
+rhosymbolgreek;03F1
+rhotichookmod;02DE
+rieulacirclekorean;3271
+rieulaparenkorean;3211
+rieulcirclekorean;3263
+rieulhieuhkorean;3140
+rieulkiyeokkorean;313A
+rieulkiyeoksioskorean;3169
+rieulkorean;3139
+rieulmieumkorean;313B
+rieulpansioskorean;316C
+rieulparenkorean;3203
+rieulphieuphkorean;313F
+rieulpieupkorean;313C
+rieulpieupsioskorean;316B
+rieulsioskorean;313D
+rieulthieuthkorean;313E
+rieultikeutkorean;316A
+rieulyeorinhieuhkorean;316D
+rightangle;221F
+righttackbelowcmb;0319
+righttriangle;22BF
+rihiragana;308A
+rikatakana;30EA
+rikatakanahalfwidth;FF98
+ring;02DA
+ringbelowcmb;0325
+ringcmb;030A
+ringhalfleft;02BF
+ringhalfleftarmenian;0559
+ringhalfleftbelowcmb;031C
+ringhalfleftcentered;02D3
+ringhalfright;02BE
+ringhalfrightbelowcmb;0339
+ringhalfrightcentered;02D2
+rinvertedbreve;0213
+rittorusquare;3351
+rlinebelow;1E5F
+rlongleg;027C
+rlonglegturned;027A
+rmonospace;FF52
+rohiragana;308D
+rokatakana;30ED
+rokatakanahalfwidth;FF9B
+roruathai;0E23
+rparen;24AD
+rrabengali;09DC
+rradeva;0931
+rragurmukhi;0A5C
+rreharabic;0691
+rrehfinalarabic;FB8D
+rrvocalicbengali;09E0
+rrvocalicdeva;0960
+rrvocalicgujarati;0AE0
+rrvocalicvowelsignbengali;09C4
+rrvocalicvowelsigndeva;0944
+rrvocalicvowelsigngujarati;0AC4
+rsuperior;F6F1
+rtblock;2590
+rturned;0279
+rturnedsuperior;02B4
+ruhiragana;308B
+rukatakana;30EB
+rukatakanahalfwidth;FF99
+rupeemarkbengali;09F2
+rupeesignbengali;09F3
+rupiah;F6DD
+ruthai;0E24
+rvocalicbengali;098B
+rvocalicdeva;090B
+rvocalicgujarati;0A8B
+rvocalicvowelsignbengali;09C3
+rvocalicvowelsigndeva;0943
+rvocalicvowelsigngujarati;0AC3
+s;0073
+sabengali;09B8
+sacute;015B
+sacutedotaccent;1E65
+sadarabic;0635
+sadeva;0938
+sadfinalarabic;FEBA
+sadinitialarabic;FEBB
+sadmedialarabic;FEBC
+sagujarati;0AB8
+sagurmukhi;0A38
+sahiragana;3055
+sakatakana;30B5
+sakatakanahalfwidth;FF7B
+sallallahoualayhewasallamarabic;FDFA
+samekh;05E1
+samekhdagesh;FB41
+samekhdageshhebrew;FB41
+samekhhebrew;05E1
+saraaathai;0E32
+saraaethai;0E41
+saraaimaimalaithai;0E44
+saraaimaimuanthai;0E43
+saraamthai;0E33
+saraathai;0E30
+saraethai;0E40
+saraiileftthai;F886
+saraiithai;0E35
+saraileftthai;F885
+saraithai;0E34
+saraothai;0E42
+saraueeleftthai;F888
+saraueethai;0E37
+saraueleftthai;F887
+sarauethai;0E36
+sarauthai;0E38
+sarauuthai;0E39
+sbopomofo;3119
+scaron;0161
+scarondotaccent;1E67
+scedilla;015F
+schwa;0259
+schwacyrillic;04D9
+schwadieresiscyrillic;04DB
+schwahook;025A
+scircle;24E2
+scircumflex;015D
+scommaaccent;0219
+sdotaccent;1E61
+sdotbelow;1E63
+sdotbelowdotaccent;1E69
+seagullbelowcmb;033C
+second;2033
+secondtonechinese;02CA
+section;00A7
+seenarabic;0633
+seenfinalarabic;FEB2
+seeninitialarabic;FEB3
+seenmedialarabic;FEB4
+segol;05B6
+segol13;05B6
+segol1f;05B6
+segol2c;05B6
+segolhebrew;05B6
+segolnarrowhebrew;05B6
+segolquarterhebrew;05B6
+segoltahebrew;0592
+segolwidehebrew;05B6
+seharmenian;057D
+sehiragana;305B
+sekatakana;30BB
+sekatakanahalfwidth;FF7E
+semicolon;003B
+semicolonarabic;061B
+semicolonmonospace;FF1B
+semicolonsmall;FE54
+semivoicedmarkkana;309C
+semivoicedmarkkanahalfwidth;FF9F
+sentisquare;3322
+sentosquare;3323
+seven;0037
+sevenarabic;0667
+sevenbengali;09ED
+sevencircle;2466
+sevencircleinversesansserif;2790
+sevendeva;096D
+seveneighths;215E
+sevengujarati;0AED
+sevengurmukhi;0A6D
+sevenhackarabic;0667
+sevenhangzhou;3027
+sevenideographicparen;3226
+seveninferior;2087
+sevenmonospace;FF17
+sevenoldstyle;F737
+sevenparen;247A
+sevenperiod;248E
+sevenpersian;06F7
+sevenroman;2176
+sevensuperior;2077
+seventeencircle;2470
+seventeenparen;2484
+seventeenperiod;2498
+seventhai;0E57
+sfthyphen;00AD
+shaarmenian;0577
+shabengali;09B6
+shacyrillic;0448
+shaddaarabic;0651
+shaddadammaarabic;FC61
+shaddadammatanarabic;FC5E
+shaddafathaarabic;FC60
+shaddafathatanarabic;0651 064B
+shaddakasraarabic;FC62
+shaddakasratanarabic;FC5F
+shade;2592
+shadedark;2593
+shadelight;2591
+shademedium;2592
+shadeva;0936
+shagujarati;0AB6
+shagurmukhi;0A36
+shalshelethebrew;0593
+shbopomofo;3115
+shchacyrillic;0449
+sheenarabic;0634
+sheenfinalarabic;FEB6
+sheeninitialarabic;FEB7
+sheenmedialarabic;FEB8
+sheicoptic;03E3
+sheqel;20AA
+sheqelhebrew;20AA
+sheva;05B0
+sheva115;05B0
+sheva15;05B0
+sheva22;05B0
+sheva2e;05B0
+shevahebrew;05B0
+shevanarrowhebrew;05B0
+shevaquarterhebrew;05B0
+shevawidehebrew;05B0
+shhacyrillic;04BB
+shimacoptic;03ED
+shin;05E9
+shindagesh;FB49
+shindageshhebrew;FB49
+shindageshshindot;FB2C
+shindageshshindothebrew;FB2C
+shindageshsindot;FB2D
+shindageshsindothebrew;FB2D
+shindothebrew;05C1
+shinhebrew;05E9
+shinshindot;FB2A
+shinshindothebrew;FB2A
+shinsindot;FB2B
+shinsindothebrew;FB2B
+shook;0282
+sigma;03C3
+sigma1;03C2
+sigmafinal;03C2
+sigmalunatesymbolgreek;03F2
+sihiragana;3057
+sikatakana;30B7
+sikatakanahalfwidth;FF7C
+siluqhebrew;05BD
+siluqlefthebrew;05BD
+similar;223C
+sindothebrew;05C2
+siosacirclekorean;3274
+siosaparenkorean;3214
+sioscieuckorean;317E
+sioscirclekorean;3266
+sioskiyeokkorean;317A
+sioskorean;3145
+siosnieunkorean;317B
+siosparenkorean;3206
+siospieupkorean;317D
+siostikeutkorean;317C
+six;0036
+sixarabic;0666
+sixbengali;09EC
+sixcircle;2465
+sixcircleinversesansserif;278F
+sixdeva;096C
+sixgujarati;0AEC
+sixgurmukhi;0A6C
+sixhackarabic;0666
+sixhangzhou;3026
+sixideographicparen;3225
+sixinferior;2086
+sixmonospace;FF16
+sixoldstyle;F736
+sixparen;2479
+sixperiod;248D
+sixpersian;06F6
+sixroman;2175
+sixsuperior;2076
+sixteencircle;246F
+sixteencurrencydenominatorbengali;09F9
+sixteenparen;2483
+sixteenperiod;2497
+sixthai;0E56
+slash;002F
+slashmonospace;FF0F
+slong;017F
+slongdotaccent;1E9B
+smileface;263A
+smonospace;FF53
+sofpasuqhebrew;05C3
+softhyphen;00AD
+softsigncyrillic;044C
+sohiragana;305D
+sokatakana;30BD
+sokatakanahalfwidth;FF7F
+soliduslongoverlaycmb;0338
+solidusshortoverlaycmb;0337
+sorusithai;0E29
+sosalathai;0E28
+sosothai;0E0B
+sosuathai;0E2A
+space;0020
+spacehackarabic;0020
+spade;2660
+spadesuitblack;2660
+spadesuitwhite;2664
+sparen;24AE
+squarebelowcmb;033B
+squarecc;33C4
+squarecm;339D
+squarediagonalcrosshatchfill;25A9
+squarehorizontalfill;25A4
+squarekg;338F
+squarekm;339E
+squarekmcapital;33CE
+squareln;33D1
+squarelog;33D2
+squaremg;338E
+squaremil;33D5
+squaremm;339C
+squaremsquared;33A1
+squareorthogonalcrosshatchfill;25A6
+squareupperlefttolowerrightfill;25A7
+squareupperrighttolowerleftfill;25A8
+squareverticalfill;25A5
+squarewhitewithsmallblack;25A3
+srsquare;33DB
+ssabengali;09B7
+ssadeva;0937
+ssagujarati;0AB7
+ssangcieuckorean;3149
+ssanghieuhkorean;3185
+ssangieungkorean;3180
+ssangkiyeokkorean;3132
+ssangnieunkorean;3165
+ssangpieupkorean;3143
+ssangsioskorean;3146
+ssangtikeutkorean;3138
+ssuperior;F6F2
+sterling;00A3
+sterlingmonospace;FFE1
+strokelongoverlaycmb;0336
+strokeshortoverlaycmb;0335
+subset;2282
+subsetnotequal;228A
+subsetorequal;2286
+succeeds;227B
+suchthat;220B
+suhiragana;3059
+sukatakana;30B9
+sukatakanahalfwidth;FF7D
+sukunarabic;0652
+summation;2211
+sun;263C
+superset;2283
+supersetnotequal;228B
+supersetorequal;2287
+svsquare;33DC
+syouwaerasquare;337C
+t;0074
+tabengali;09A4
+tackdown;22A4
+tackleft;22A3
+tadeva;0924
+tagujarati;0AA4
+tagurmukhi;0A24
+taharabic;0637
+tahfinalarabic;FEC2
+tahinitialarabic;FEC3
+tahiragana;305F
+tahmedialarabic;FEC4
+taisyouerasquare;337D
+takatakana;30BF
+takatakanahalfwidth;FF80
+tatweelarabic;0640
+tau;03C4
+tav;05EA
+tavdages;FB4A
+tavdagesh;FB4A
+tavdageshhebrew;FB4A
+tavhebrew;05EA
+tbar;0167
+tbopomofo;310A
+tcaron;0165
+tccurl;02A8
+tcedilla;0163
+tcheharabic;0686
+tchehfinalarabic;FB7B
+tchehinitialarabic;FB7C
+tchehmedialarabic;FB7D
+tchehmeeminitialarabic;FB7C FEE4
+tcircle;24E3
+tcircumflexbelow;1E71
+tcommaaccent;0163
+tdieresis;1E97
+tdotaccent;1E6B
+tdotbelow;1E6D
+tecyrillic;0442
+tedescendercyrillic;04AD
+teharabic;062A
+tehfinalarabic;FE96
+tehhahinitialarabic;FCA2
+tehhahisolatedarabic;FC0C
+tehinitialarabic;FE97
+tehiragana;3066
+tehjeeminitialarabic;FCA1
+tehjeemisolatedarabic;FC0B
+tehmarbutaarabic;0629
+tehmarbutafinalarabic;FE94
+tehmedialarabic;FE98
+tehmeeminitialarabic;FCA4
+tehmeemisolatedarabic;FC0E
+tehnoonfinalarabic;FC73
+tekatakana;30C6
+tekatakanahalfwidth;FF83
+telephone;2121
+telephoneblack;260E
+telishagedolahebrew;05A0
+telishaqetanahebrew;05A9
+tencircle;2469
+tenideographicparen;3229
+tenparen;247D
+tenperiod;2491
+tenroman;2179
+tesh;02A7
+tet;05D8
+tetdagesh;FB38
+tetdageshhebrew;FB38
+tethebrew;05D8
+tetsecyrillic;04B5
+tevirhebrew;059B
+tevirlefthebrew;059B
+thabengali;09A5
+thadeva;0925
+thagujarati;0AA5
+thagurmukhi;0A25
+thalarabic;0630
+thalfinalarabic;FEAC
+thanthakhatlowleftthai;F898
+thanthakhatlowrightthai;F897
+thanthakhatthai;0E4C
+thanthakhatupperleftthai;F896
+theharabic;062B
+thehfinalarabic;FE9A
+thehinitialarabic;FE9B
+thehmedialarabic;FE9C
+thereexists;2203
+therefore;2234
+theta;03B8
+theta1;03D1
+thetasymbolgreek;03D1
+thieuthacirclekorean;3279
+thieuthaparenkorean;3219
+thieuthcirclekorean;326B
+thieuthkorean;314C
+thieuthparenkorean;320B
+thirteencircle;246C
+thirteenparen;2480
+thirteenperiod;2494
+thonangmonthothai;0E11
+thook;01AD
+thophuthaothai;0E12
+thorn;00FE
+thothahanthai;0E17
+thothanthai;0E10
+thothongthai;0E18
+thothungthai;0E16
+thousandcyrillic;0482
+thousandsseparatorarabic;066C
+thousandsseparatorpersian;066C
+three;0033
+threearabic;0663
+threebengali;09E9
+threecircle;2462
+threecircleinversesansserif;278C
+threedeva;0969
+threeeighths;215C
+threegujarati;0AE9
+threegurmukhi;0A69
+threehackarabic;0663
+threehangzhou;3023
+threeideographicparen;3222
+threeinferior;2083
+threemonospace;FF13
+threenumeratorbengali;09F6
+threeoldstyle;F733
+threeparen;2476
+threeperiod;248A
+threepersian;06F3
+threequarters;00BE
+threequartersemdash;F6DE
+threeroman;2172
+threesuperior;00B3
+threethai;0E53
+thzsquare;3394
+tihiragana;3061
+tikatakana;30C1
+tikatakanahalfwidth;FF81
+tikeutacirclekorean;3270
+tikeutaparenkorean;3210
+tikeutcirclekorean;3262
+tikeutkorean;3137
+tikeutparenkorean;3202
+tilde;02DC
+tildebelowcmb;0330
+tildecmb;0303
+tildecomb;0303
+tildedoublecmb;0360
+tildeoperator;223C
+tildeoverlaycmb;0334
+tildeverticalcmb;033E
+timescircle;2297
+tipehahebrew;0596
+tipehalefthebrew;0596
+tippigurmukhi;0A70
+titlocyrilliccmb;0483
+tiwnarmenian;057F
+tlinebelow;1E6F
+tmonospace;FF54
+toarmenian;0569
+tohiragana;3068
+tokatakana;30C8
+tokatakanahalfwidth;FF84
+tonebarextrahighmod;02E5
+tonebarextralowmod;02E9
+tonebarhighmod;02E6
+tonebarlowmod;02E8
+tonebarmidmod;02E7
+tonefive;01BD
+tonesix;0185
+tonetwo;01A8
+tonos;0384
+tonsquare;3327
+topatakthai;0E0F
+tortoiseshellbracketleft;3014
+tortoiseshellbracketleftsmall;FE5D
+tortoiseshellbracketleftvertical;FE39
+tortoiseshellbracketright;3015
+tortoiseshellbracketrightsmall;FE5E
+tortoiseshellbracketrightvertical;FE3A
+totaothai;0E15
+tpalatalhook;01AB
+tparen;24AF
+trademark;2122
+trademarksans;F8EA
+trademarkserif;F6DB
+tretroflexhook;0288
+triagdn;25BC
+triaglf;25C4
+triagrt;25BA
+triagup;25B2
+ts;02A6
+tsadi;05E6
+tsadidagesh;FB46
+tsadidageshhebrew;FB46
+tsadihebrew;05E6
+tsecyrillic;0446
+tsere;05B5
+tsere12;05B5
+tsere1e;05B5
+tsere2b;05B5
+tserehebrew;05B5
+tserenarrowhebrew;05B5
+tserequarterhebrew;05B5
+tserewidehebrew;05B5
+tshecyrillic;045B
+tsuperior;F6F3
+ttabengali;099F
+ttadeva;091F
+ttagujarati;0A9F
+ttagurmukhi;0A1F
+tteharabic;0679
+ttehfinalarabic;FB67
+ttehinitialarabic;FB68
+ttehmedialarabic;FB69
+tthabengali;09A0
+tthadeva;0920
+tthagujarati;0AA0
+tthagurmukhi;0A20
+tturned;0287
+tuhiragana;3064
+tukatakana;30C4
+tukatakanahalfwidth;FF82
+tusmallhiragana;3063
+tusmallkatakana;30C3
+tusmallkatakanahalfwidth;FF6F
+twelvecircle;246B
+twelveparen;247F
+twelveperiod;2493
+twelveroman;217B
+twentycircle;2473
+twentyhangzhou;5344
+twentyparen;2487
+twentyperiod;249B
+two;0032
+twoarabic;0662
+twobengali;09E8
+twocircle;2461
+twocircleinversesansserif;278B
+twodeva;0968
+twodotenleader;2025
+twodotleader;2025
+twodotleadervertical;FE30
+twogujarati;0AE8
+twogurmukhi;0A68
+twohackarabic;0662
+twohangzhou;3022
+twoideographicparen;3221
+twoinferior;2082
+twomonospace;FF12
+twonumeratorbengali;09F5
+twooldstyle;F732
+twoparen;2475
+twoperiod;2489
+twopersian;06F2
+tworoman;2171
+twostroke;01BB
+twosuperior;00B2
+twothai;0E52
+twothirds;2154
+u;0075
+uacute;00FA
+ubar;0289
+ubengali;0989
+ubopomofo;3128
+ubreve;016D
+ucaron;01D4
+ucircle;24E4
+ucircumflex;00FB
+ucircumflexbelow;1E77
+ucyrillic;0443
+udattadeva;0951
+udblacute;0171
+udblgrave;0215
+udeva;0909
+udieresis;00FC
+udieresisacute;01D8
+udieresisbelow;1E73
+udieresiscaron;01DA
+udieresiscyrillic;04F1
+udieresisgrave;01DC
+udieresismacron;01D6
+udotbelow;1EE5
+ugrave;00F9
+ugujarati;0A89
+ugurmukhi;0A09
+uhiragana;3046
+uhookabove;1EE7
+uhorn;01B0
+uhornacute;1EE9
+uhorndotbelow;1EF1
+uhorngrave;1EEB
+uhornhookabove;1EED
+uhorntilde;1EEF
+uhungarumlaut;0171
+uhungarumlautcyrillic;04F3
+uinvertedbreve;0217
+ukatakana;30A6
+ukatakanahalfwidth;FF73
+ukcyrillic;0479
+ukorean;315C
+umacron;016B
+umacroncyrillic;04EF
+umacrondieresis;1E7B
+umatragurmukhi;0A41
+umonospace;FF55
+underscore;005F
+underscoredbl;2017
+underscoremonospace;FF3F
+underscorevertical;FE33
+underscorewavy;FE4F
+union;222A
+universal;2200
+uogonek;0173
+uparen;24B0
+upblock;2580
+upperdothebrew;05C4
+upsilon;03C5
+upsilondieresis;03CB
+upsilondieresistonos;03B0
+upsilonlatin;028A
+upsilontonos;03CD
+uptackbelowcmb;031D
+uptackmod;02D4
+uragurmukhi;0A73
+uring;016F
+ushortcyrillic;045E
+usmallhiragana;3045
+usmallkatakana;30A5
+usmallkatakanahalfwidth;FF69
+ustraightcyrillic;04AF
+ustraightstrokecyrillic;04B1
+utilde;0169
+utildeacute;1E79
+utildebelow;1E75
+uubengali;098A
+uudeva;090A
+uugujarati;0A8A
+uugurmukhi;0A0A
+uumatragurmukhi;0A42
+uuvowelsignbengali;09C2
+uuvowelsigndeva;0942
+uuvowelsigngujarati;0AC2
+uvowelsignbengali;09C1
+uvowelsigndeva;0941
+uvowelsigngujarati;0AC1
+v;0076
+vadeva;0935
+vagujarati;0AB5
+vagurmukhi;0A35
+vakatakana;30F7
+vav;05D5
+vavdagesh;FB35
+vavdagesh65;FB35
+vavdageshhebrew;FB35
+vavhebrew;05D5
+vavholam;FB4B
+vavholamhebrew;FB4B
+vavvavhebrew;05F0
+vavyodhebrew;05F1
+vcircle;24E5
+vdotbelow;1E7F
+vecyrillic;0432
+veharabic;06A4
+vehfinalarabic;FB6B
+vehinitialarabic;FB6C
+vehmedialarabic;FB6D
+vekatakana;30F9
+venus;2640
+verticalbar;007C
+verticallineabovecmb;030D
+verticallinebelowcmb;0329
+verticallinelowmod;02CC
+verticallinemod;02C8
+vewarmenian;057E
+vhook;028B
+vikatakana;30F8
+viramabengali;09CD
+viramadeva;094D
+viramagujarati;0ACD
+visargabengali;0983
+visargadeva;0903
+visargagujarati;0A83
+vmonospace;FF56
+voarmenian;0578
+voicediterationhiragana;309E
+voicediterationkatakana;30FE
+voicedmarkkana;309B
+voicedmarkkanahalfwidth;FF9E
+vokatakana;30FA
+vparen;24B1
+vtilde;1E7D
+vturned;028C
+vuhiragana;3094
+vukatakana;30F4
+w;0077
+wacute;1E83
+waekorean;3159
+wahiragana;308F
+wakatakana;30EF
+wakatakanahalfwidth;FF9C
+wakorean;3158
+wasmallhiragana;308E
+wasmallkatakana;30EE
+wattosquare;3357
+wavedash;301C
+wavyunderscorevertical;FE34
+wawarabic;0648
+wawfinalarabic;FEEE
+wawhamzaabovearabic;0624
+wawhamzaabovefinalarabic;FE86
+wbsquare;33DD
+wcircle;24E6
+wcircumflex;0175
+wdieresis;1E85
+wdotaccent;1E87
+wdotbelow;1E89
+wehiragana;3091
+weierstrass;2118
+wekatakana;30F1
+wekorean;315E
+weokorean;315D
+wgrave;1E81
+whitebullet;25E6
+whitecircle;25CB
+whitecircleinverse;25D9
+whitecornerbracketleft;300E
+whitecornerbracketleftvertical;FE43
+whitecornerbracketright;300F
+whitecornerbracketrightvertical;FE44
+whitediamond;25C7
+whitediamondcontainingblacksmalldiamond;25C8
+whitedownpointingsmalltriangle;25BF
+whitedownpointingtriangle;25BD
+whiteleftpointingsmalltriangle;25C3
+whiteleftpointingtriangle;25C1
+whitelenticularbracketleft;3016
+whitelenticularbracketright;3017
+whiterightpointingsmalltriangle;25B9
+whiterightpointingtriangle;25B7
+whitesmallsquare;25AB
+whitesmilingface;263A
+whitesquare;25A1
+whitestar;2606
+whitetelephone;260F
+whitetortoiseshellbracketleft;3018
+whitetortoiseshellbracketright;3019
+whiteuppointingsmalltriangle;25B5
+whiteuppointingtriangle;25B3
+wihiragana;3090
+wikatakana;30F0
+wikorean;315F
+wmonospace;FF57
+wohiragana;3092
+wokatakana;30F2
+wokatakanahalfwidth;FF66
+won;20A9
+wonmonospace;FFE6
+wowaenthai;0E27
+wparen;24B2
+wring;1E98
+wsuperior;02B7
+wturned;028D
+wynn;01BF
+x;0078
+xabovecmb;033D
+xbopomofo;3112
+xcircle;24E7
+xdieresis;1E8D
+xdotaccent;1E8B
+xeharmenian;056D
+xi;03BE
+xmonospace;FF58
+xparen;24B3
+xsuperior;02E3
+y;0079
+yaadosquare;334E
+yabengali;09AF
+yacute;00FD
+yadeva;092F
+yaekorean;3152
+yagujarati;0AAF
+yagurmukhi;0A2F
+yahiragana;3084
+yakatakana;30E4
+yakatakanahalfwidth;FF94
+yakorean;3151
+yamakkanthai;0E4E
+yasmallhiragana;3083
+yasmallkatakana;30E3
+yasmallkatakanahalfwidth;FF6C
+yatcyrillic;0463
+ycircle;24E8
+ycircumflex;0177
+ydieresis;00FF
+ydotaccent;1E8F
+ydotbelow;1EF5
+yeharabic;064A
+yehbarreearabic;06D2
+yehbarreefinalarabic;FBAF
+yehfinalarabic;FEF2
+yehhamzaabovearabic;0626
+yehhamzaabovefinalarabic;FE8A
+yehhamzaaboveinitialarabic;FE8B
+yehhamzaabovemedialarabic;FE8C
+yehinitialarabic;FEF3
+yehmedialarabic;FEF4
+yehmeeminitialarabic;FCDD
+yehmeemisolatedarabic;FC58
+yehnoonfinalarabic;FC94
+yehthreedotsbelowarabic;06D1
+yekorean;3156
+yen;00A5
+yenmonospace;FFE5
+yeokorean;3155
+yeorinhieuhkorean;3186
+yerahbenyomohebrew;05AA
+yerahbenyomolefthebrew;05AA
+yericyrillic;044B
+yerudieresiscyrillic;04F9
+yesieungkorean;3181
+yesieungpansioskorean;3183
+yesieungsioskorean;3182
+yetivhebrew;059A
+ygrave;1EF3
+yhook;01B4
+yhookabove;1EF7
+yiarmenian;0575
+yicyrillic;0457
+yikorean;3162
+yinyang;262F
+yiwnarmenian;0582
+ymonospace;FF59
+yod;05D9
+yoddagesh;FB39
+yoddageshhebrew;FB39
+yodhebrew;05D9
+yodyodhebrew;05F2
+yodyodpatahhebrew;FB1F
+yohiragana;3088
+yoikorean;3189
+yokatakana;30E8
+yokatakanahalfwidth;FF96
+yokorean;315B
+yosmallhiragana;3087
+yosmallkatakana;30E7
+yosmallkatakanahalfwidth;FF6E
+yotgreek;03F3
+yoyaekorean;3188
+yoyakorean;3187
+yoyakthai;0E22
+yoyingthai;0E0D
+yparen;24B4
+ypogegrammeni;037A
+ypogegrammenigreekcmb;0345
+yr;01A6
+yring;1E99
+ysuperior;02B8
+ytilde;1EF9
+yturned;028E
+yuhiragana;3086
+yuikorean;318C
+yukatakana;30E6
+yukatakanahalfwidth;FF95
+yukorean;3160
+yusbigcyrillic;046B
+yusbigiotifiedcyrillic;046D
+yuslittlecyrillic;0467
+yuslittleiotifiedcyrillic;0469
+yusmallhiragana;3085
+yusmallkatakana;30E5
+yusmallkatakanahalfwidth;FF6D
+yuyekorean;318B
+yuyeokorean;318A
+yyabengali;09DF
+yyadeva;095F
+z;007A
+zaarmenian;0566
+zacute;017A
+zadeva;095B
+zagurmukhi;0A5B
+zaharabic;0638
+zahfinalarabic;FEC6
+zahinitialarabic;FEC7
+zahiragana;3056
+zahmedialarabic;FEC8
+zainarabic;0632
+zainfinalarabic;FEB0
+zakatakana;30B6
+zaqefgadolhebrew;0595
+zaqefqatanhebrew;0594
+zarqahebrew;0598
+zayin;05D6
+zayindagesh;FB36
+zayindageshhebrew;FB36
+zayinhebrew;05D6
+zbopomofo;3117
+zcaron;017E
+zcircle;24E9
+zcircumflex;1E91
+zcurl;0291
+zdot;017C
+zdotaccent;017C
+zdotbelow;1E93
+zecyrillic;0437
+zedescendercyrillic;0499
+zedieresiscyrillic;04DF
+zehiragana;305C
+zekatakana;30BC
+zero;0030
+zeroarabic;0660
+zerobengali;09E6
+zerodeva;0966
+zerogujarati;0AE6
+zerogurmukhi;0A66
+zerohackarabic;0660
+zeroinferior;2080
+zeromonospace;FF10
+zerooldstyle;F730
+zeropersian;06F0
+zerosuperior;2070
+zerothai;0E50
+zerowidthjoiner;FEFF
+zerowidthnonjoiner;200C
+zerowidthspace;200B
+zeta;03B6
+zhbopomofo;3113
+zhearmenian;056A
+zhebrevecyrillic;04C2
+zhecyrillic;0436
+zhedescendercyrillic;0497
+zhedieresiscyrillic;04DD
+zihiragana;3058
+zikatakana;30B8
+zinorhebrew;05AE
+zlinebelow;1E95
+zmonospace;FF5A
+zohiragana;305E
+zokatakana;30BE
+zparen;24B5
+zretroflexhook;0290
+zstroke;01B6
+zuhiragana;305A
+zukatakana;30BA
 """
 
 
@@ -1481,8 +4711,8 @@ def adobe_glyph_names():
   for line in lines:
     if line:
       fields = string.split( line, ';' )
-#     print fields[0] + ' - ' + fields[1]
-      glyphs.append( fields[1] )
+#     print fields[1] + ' - ' + fields[0]
+      glyphs.append( fields[0] )
 
   return glyphs
 
@@ -1497,9 +4727,11 @@ def adobe_glyph_values():
   for line in lines:
     if line:
       fields = string.split( line, ';' )
-#     print fields[0] + ' - ' + fields[1]
-      glyphs.append( fields[1] )
-      values.append( fields[0] )
+#     print fields[1] + ' - ' + fields[0]
+      subfields = string.split( fields[1], ' ' )
+      if len( subfields ) == 1:
+        glyphs.append( fields[0] )
+        values.append( fields[1] )
 
   return glyphs, values
 
@@ -1523,7 +4755,7 @@ def dump_mac_indices( file, all_glyphs ):
   write = file.write
 
   write( "  static const unsigned short  mac_standard_names[" + \
-        repr( len( mac_standard_names ) + 1 ) + "] =\n" )
+         repr( len( mac_standard_names ) + 1 ) + "] =\n" )
   write( "  {\n" )
 
   for name in mac_standard_names:
@@ -1581,7 +4813,7 @@ def dump_unicode_values( file, sid_list, adobe_list ):
   for name in sid_list:
     try:
       index = agl_names.index( name )
-      write( "    0x" + agl_unicodes[index] + ",\n" )
+      write( "    0x" + agl_unicodes[index] + "U,\n" )
     except:
       write( "    0,\n" )
 
@@ -1592,7 +4824,7 @@ def dump_unicode_values( file, sid_list, adobe_list ):
   for name in adobe_list:
     try:
       index = agl_names.index( name )
-      write( "    0x" + agl_unicodes[index] + ",\n" )
+      write( "    0x" + agl_unicodes[index] + "U,\n" )
     except:
       write( "    0,\n" )
 
@@ -1664,7 +4896,7 @@ def main():
   write( "/*                                                                         */\n" )
   write( "/*    PostScript glyph names (specification only).                         */\n" )
   write( "/*                                                                         */\n" )
-  write( "/*  Copyright 2000-2001 by                                                 */\n" )
+  write( "/*  Copyright 2000-2001, 2003 by                                           */\n" )
   write( "/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */\n" )
   write( "/*                                                                         */\n" )
   write( "/*  This file is part of the FreeType project, and may only be used,       */\n" )
diff --git a/reactos/lib/freetype/src/truetype/rules.mk b/reactos/lib/freetype/src/truetype/rules.mk
index 7c1f3e3a628..bbb0c9f8ec8 100644
--- a/reactos/lib/freetype/src/truetype/rules.mk
+++ b/reactos/lib/freetype/src/truetype/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001 by
+# Copyright 1996-2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,27 +15,26 @@
 
 # TrueType driver directory
 #
-TT_DIR  := $(SRC_)truetype
-TT_DIR_ := $(TT_DIR)$(SEP)
+TT_DIR := $(SRC_DIR)/truetype
 
 
 # compilation flags for the driver
 #
-TT_COMPILE := $(FT_COMPILE) $I$(TT_DIR)
+TT_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(TT_DIR))
 
 
 # TrueType driver sources (i.e., C files)
 #
-TT_DRV_SRC := $(TT_DIR_)ttobjs.c   \
-              $(TT_DIR_)ttpload.c  \
-              $(TT_DIR_)ttgload.c  \
-              $(TT_DIR_)ttinterp.c \
-              $(TT_DIR_)ttdriver.c
+TT_DRV_SRC := $(TT_DIR)/ttobjs.c   \
+              $(TT_DIR)/ttpload.c  \
+              $(TT_DIR)/ttgload.c  \
+              $(TT_DIR)/ttinterp.c \
+              $(TT_DIR)/ttdriver.c
 
 # TrueType driver headers
 #
 TT_DRV_H := $(TT_DRV_SRC:%.c=%.h) \
-            $(TT_DIR_)tterrors.h
+            $(TT_DIR)/tterrors.h
 
 
 # TrueType driver object(s)
@@ -43,24 +42,24 @@ TT_DRV_H := $(TT_DRV_SRC:%.c=%.h) \
 #   TT_DRV_OBJ_M is used during `multi' builds
 #   TT_DRV_OBJ_S is used during `single' builds
 #
-TT_DRV_OBJ_M := $(TT_DRV_SRC:$(TT_DIR_)%.c=$(OBJ_)%.$O)
-TT_DRV_OBJ_S := $(OBJ_)truetype.$O
+TT_DRV_OBJ_M := $(TT_DRV_SRC:$(TT_DIR)/%.c=$(OBJ_DIR)/%.$O)
+TT_DRV_OBJ_S := $(OBJ_DIR)/truetype.$O
 
 # TrueType driver source file for single build
 #
-TT_DRV_SRC_S := $(TT_DIR_)truetype.c
+TT_DRV_SRC_S := $(TT_DIR)/truetype.c
 
 
 # TrueType driver - single object
 #
 $(TT_DRV_OBJ_S): $(TT_DRV_SRC_S) $(TT_DRV_SRC) $(FREETYPE_H) $(TT_DRV_H)
-	$(TT_COMPILE) $T$@ $(TT_DRV_SRC_S)
+	$(TT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(TT_DRV_SRC_S))
 
 
 # driver - multiple objects
 #
-$(OBJ_)%.$O: $(TT_DIR_)%.c $(FREETYPE_H) $(TT_DRV_H)
-	$(TT_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(TT_DIR)/%.c $(FREETYPE_H) $(TT_DRV_H)
+	$(TT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -68,4 +67,5 @@ $(OBJ_)%.$O: $(TT_DIR_)%.c $(FREETYPE_H) $(TT_DRV_H)
 DRV_OBJS_S += $(TT_DRV_OBJ_S)
 DRV_OBJS_M += $(TT_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/truetype/ttdriver.c b/reactos/lib/freetype/src/truetype/ttdriver.c
index 0b5660228cc..193be06052f 100644
--- a/reactos/lib/freetype/src/truetype/ttdriver.c
+++ b/reactos/lib/freetype/src/truetype/ttdriver.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType font driver implementation (body).                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -115,7 +115,7 @@
 
       while ( left <= right )
       {
-        FT_Int    middle = left + ( ( right - left ) >> 1 );
+        FT_Long   middle = left + ( ( right - left ) >> 1 );
         FT_ULong  cur_pair;
 
 
@@ -226,7 +226,7 @@
 
     size->ttmetrics.valid = FALSE;
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-    size->strike_index    = 0xFFFF;
+    size->strike_index    = 0xFFFFU;
 #endif
 
     return tt_size_reset( size );
@@ -242,11 +242,6 @@
   /*    A driver method used to reset a size's character sizes (horizontal */
   /*    and vertical) expressed in integer pixels.                         */
   /*                                                                       */
-  /* <Input>                                                               */
-  /*    pixel_width  :: The character width expressed in integer pixels.   */
-  /*                                                                       */
-  /*    pixel_height :: The character height expressed in integer pixels.  */
-  /*                                                                       */
   /* <InOut>                                                               */
   /*    size         :: A handle to the target size object.                */
   /*                                                                       */
@@ -254,19 +249,14 @@
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   static FT_Error
-  Set_Pixel_Sizes( TT_Size  size,
-                   FT_UInt  pixel_width,
-                   FT_UInt  pixel_height )
+  Set_Pixel_Sizes( TT_Size  size )
   {
-    FT_UNUSED( pixel_width );
-    FT_UNUSED( pixel_height );
-
     /* many things have been pre-computed by the base layer */
 
     size->metrics         = size->root.metrics;
     size->ttmetrics.valid = FALSE;
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-    size->strike_index    = 0xFFFF;
+    size->strike_index    = 0xFFFFU;
 #endif
 
     return tt_size_reset( size );
@@ -382,10 +372,10 @@
   const FT_Driver_ClassRec  tt_driver_class =
   {
     {
-      ft_module_font_driver     |
-      ft_module_driver_scalable |
+      FT_MODULE_FONT_DRIVER        |
+      FT_MODULE_DRIVER_SCALABLE    |
 #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-      ft_module_driver_has_hinter,
+      FT_MODULE_DRIVER_HAS_HINTER,
 #else
       0,
 #endif
diff --git a/reactos/lib/freetype/src/truetype/ttgload.c b/reactos/lib/freetype/src/truetype/ttgload.c
index 42cf13ac777..a8b82eee834 100644
--- a/reactos/lib/freetype/src/truetype/ttgload.c
+++ b/reactos/lib/freetype/src/truetype/ttgload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType Glyph Loader (body).                                        */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -294,44 +294,47 @@
     FT_Int          n, n_points;
     FT_Int          byte_len   = load->byte_len;
 
+    FT_Byte         *flag, *flag_limit;
+    FT_Byte         c, count;
+    FT_Vector       *vec, *vec_limit;
+    FT_Pos          x;
+    FT_Short        *cont, *cont_limit;
+
 
     /* reading the contours endpoints & number of points */
-    {
-      short*  cur   = gloader->current.outline.contours;
-      short*  limit = cur + n_contours;
+    cont       = gloader->current.outline.contours;
+    cont_limit = cont + n_contours;
 
+    /* check space for contours array + instructions count */
+    byte_len -= 2 * ( n_contours + 1 );
+    if ( byte_len < 0 )
+      goto Invalid_Outline;
 
-      /* check space for contours array + instructions count */
-      byte_len -= 2 * ( n_contours + 1 );
-      if ( byte_len < 0 )
+    for ( ; cont < cont_limit; cont++ )
+      cont[0] = FT_GET_USHORT();
+
+    n_points = 0;
+    if ( n_contours > 0 )
+      n_points = cont[-1] + 1;
+
+    error = FT_GlyphLoader_CheckPoints( gloader, n_points + 2, 0 );
+    if ( error )
+      goto Fail;
+
+    /* we'd better check the contours table right now */
+    outline = &gloader->current.outline;
+
+    for ( cont = outline->contours + 1; cont < cont_limit; cont++ )
+      if ( cont[-1] >= cont[0] )
         goto Invalid_Outline;
 
-      for ( ; cur < limit; cur++ )
-        cur[0] = FT_GET_USHORT();
-
-      n_points = 0;
-      if ( n_contours > 0 )
-        n_points = cur[-1] + 1;
-
-      error = FT_GlyphLoader_CheckPoints( gloader, n_points + 2, 0 );
-      if ( error )
-        goto Fail;
-
-      /* we'd better check the contours table right now */
-      outline = &gloader->current.outline;
-
-      for ( cur = outline->contours + 1; cur < limit; cur++ )
-        if ( cur[-1] >= cur[0] )
-          goto Invalid_Outline;
-    }
-
     /* reading the bytecode instructions */
     slot->control_len  = 0;
     slot->control_data = 0;
 
     n_ins = FT_GET_USHORT();
 
-    FT_TRACE5(( "  Instructions size: %d\n", n_ins ));
+    FT_TRACE5(( "  Instructions size: %u\n", n_ins ));
 
     if ( n_ins > face->max_profile.maxSizeOfInstructions )
     {
@@ -340,7 +343,7 @@
       goto Fail;
     }
 
-    byte_len -= n_ins;
+    byte_len -= (FT_Int)n_ins;
     if ( byte_len < 0 )
     {
       FT_TRACE0(( "TT_Load_Simple_Glyph: Instruction count mismatch!\n" ));
@@ -357,112 +360,102 @@
       slot->control_len  = n_ins;
       slot->control_data = load->instructions;
 
-      FT_MEM_COPY( load->instructions, stream->cursor, n_ins );
+      FT_MEM_COPY( load->instructions, stream->cursor, (FT_Long)n_ins );
     }
 
 #endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
 
-    stream->cursor += n_ins;
+    stream->cursor += (FT_Int)n_ins;
 
     /* reading the point tags */
+    flag       = (FT_Byte*)outline->tags;
+    flag_limit = flag + n_points;
+
+    while ( flag < flag_limit )
     {
-      FT_Byte*  flag  = (FT_Byte*)outline->tags;
-      FT_Byte*  limit = flag + n_points;
-      FT_Byte   c, count;
+      if ( --byte_len < 0 )
+        goto Invalid_Outline;
 
-
-      while ( flag < limit )
+      *flag++ = c = FT_GET_BYTE();
+      if ( c & 8 )
       {
         if ( --byte_len < 0 )
           goto Invalid_Outline;
 
-        *flag++ = c = FT_GET_BYTE();
-        if ( c & 8 )
-        {
-          if ( --byte_len < 0 )
-            goto Invalid_Outline;
+        count = FT_GET_BYTE();
+        if ( flag + (FT_Int)count > flag_limit )
+          goto Invalid_Outline;
 
-          count = FT_GET_BYTE();
-          if ( flag + count > limit )
-            goto Invalid_Outline;
-
-          for ( ; count > 0; count-- )
-            *flag++ = c;
-        }
+        for ( ; count > 0; count-- )
+          *flag++ = c;
       }
-
-      /* check that there is enough room to load the coordinates */
-      for ( flag = (FT_Byte*)outline->tags; flag < limit; flag++ )
-      {
-        if ( *flag & 2 )
-          byte_len -= 1;
-        else if ( ( *flag & 16 ) == 0 )
-          byte_len -= 2;
-
-        if ( *flag & 4 )
-          byte_len -= 1;
-        else if ( ( *flag & 32 ) == 0 )
-          byte_len -= 2;
-      }
-
-      if ( byte_len < 0 )
-        goto Invalid_Outline;
     }
 
+    /* check that there is enough room to load the coordinates */
+    for ( flag = (FT_Byte*)outline->tags; flag < flag_limit; flag++ )
+    {
+      if ( *flag & 2 )
+        byte_len -= 1;
+      else if ( ( *flag & 16 ) == 0 )
+        byte_len -= 2;
+
+      if ( *flag & 4 )
+        byte_len -= 1;
+      else if ( ( *flag & 32 ) == 0 )
+        byte_len -= 2;
+    }
+
+    if ( byte_len < 0 )
+      goto Invalid_Outline;
+
     /* reading the X coordinates */
 
+    vec       = outline->points;
+    vec_limit = vec + n_points;
+    flag      = (FT_Byte*)outline->tags;
+    x         = 0;
+
+    for ( ; vec < vec_limit; vec++, flag++ )
     {
-      FT_Vector*  vec   = outline->points;
-      FT_Vector*  limit = vec + n_points;
-      FT_Byte*    flag  = (FT_Byte*)outline->tags;
-      FT_Pos      x     = 0;
+      FT_Pos  y = 0;
 
 
-      for ( ; vec < limit; vec++, flag++ )
+      if ( *flag & 2 )
       {
-        FT_Pos  y = 0;
-
-
-        if ( *flag & 2 )
-        {
-          y = FT_GET_BYTE();
-          if ( ( *flag & 16 ) == 0 )
-            y = -y;
-        }
-        else if ( ( *flag & 16 ) == 0 )
-          y = FT_GET_SHORT();
-
-        x     += y;
-        vec->x = x;
+        y = (FT_Pos)FT_GET_BYTE();
+        if ( ( *flag & 16 ) == 0 )
+          y = -y;
       }
+      else if ( ( *flag & 16 ) == 0 )
+        y = (FT_Pos)FT_GET_SHORT();
+
+      x     += y;
+      vec->x = x;
     }
 
     /* reading the Y coordinates */
 
+    vec       = gloader->current.outline.points;
+    vec_limit = vec + n_points;
+    flag      = (FT_Byte*)outline->tags;
+    x         = 0;
+
+    for ( ; vec < vec_limit; vec++, flag++ )
     {
-      FT_Vector*  vec   = gloader->current.outline.points;
-      FT_Vector*  limit = vec + n_points;
-      FT_Byte*    flag  = (FT_Byte*)outline->tags;
-      FT_Pos      x     = 0;
+      FT_Pos  y = 0;
 
 
-      for ( ; vec < limit; vec++, flag++ )
+      if ( *flag & 4 )
       {
-        FT_Pos  y = 0;
-
-
-        if ( *flag & 4 )
-        {
-          y = FT_GET_BYTE();
-          if ( ( *flag & 32 ) == 0 )
-            y = -y;
-        }
-        else if ( ( *flag & 32 ) == 0 )
-          y = FT_GET_SHORT();
-
-        x     += y;
-        vec->y = x;
+        y = (FT_Pos)FT_GET_BYTE();
+        if ( ( *flag & 32 ) == 0 )
+          y = -y;
       }
+      else if ( ( *flag & 32 ) == 0 )
+        y = (FT_Pos)FT_GET_SHORT();
+
+      x     += y;
+      vec->y = x;
     }
 
     /* clear the touch tags */
@@ -779,6 +772,7 @@
     FT_Bool               glyph_data_loaded = 0;
 #endif
 
+
     if ( recurse_count >= TT_MAX_COMPOSITE_RECURSE )
     {
       error = TT_Err_Invalid_Composite;
@@ -823,9 +817,10 @@
       {
         FT_Incremental_MetricsRec  metrics;
 
-		metrics.bearing_x = left_bearing;
-		metrics.bearing_y = 0;
-		metrics.advance = advance_width;
+
+        metrics.bearing_x = left_bearing;
+        metrics.bearing_y = 0;
+        metrics.advance = advance_width;
         error = face->root.internal->incremental_interface->funcs->get_glyph_metrics(
                   face->root.internal->incremental_interface->object,
                   glyph_index, FALSE, &metrics );
@@ -884,7 +879,7 @@
       count  = 0;
 
       if ( glyph_index < (FT_UInt)face->num_locations - 1 )
-        count = face->glyph_locations[glyph_index + 1] - offset;
+        count = (FT_UInt)( face->glyph_locations[glyph_index + 1] - offset );
     }
 
     if ( count == 0 )
@@ -1066,7 +1061,7 @@
           num_base_points = gloader->base.outline.n_points;
 
           error = load_truetype_glyph( loader, subglyph->index,
-                                       recurse_count+1 );
+                                       recurse_count + 1 );
           if ( error )
             goto Fail;
 
@@ -1182,16 +1177,16 @@
   /*                                                                       */
   /* This algorithm is a guess and works much better than the above.       */
   /*                                                                       */
-              int  mac_xscale = FT_SqrtFixed(
-                                  FT_MulFix( subglyph->transform.xx,
-                                             subglyph->transform.xx ) +
-                                  FT_MulFix( subglyph->transform.xy,
-                                             subglyph->transform.xy) );
-              int  mac_yscale = FT_SqrtFixed(
-                                  FT_MulFix( subglyph->transform.yy,
-                                             subglyph->transform.yy ) +
-                                  FT_MulFix( subglyph->transform.yx,
-                                             subglyph->transform.yx ) );
+              FT_Fixed  mac_xscale = FT_SqrtFixed(
+                                       FT_MulFix( subglyph->transform.xx,
+                                                  subglyph->transform.xx ) +
+                                       FT_MulFix( subglyph->transform.xy,
+                                                  subglyph->transform.xy) );
+              FT_Fixed  mac_yscale = FT_SqrtFixed(
+                                       FT_MulFix( subglyph->transform.yy,
+                                                  subglyph->transform.yy ) +
+                                       FT_MulFix( subglyph->transform.yx,
+                                                  subglyph->transform.yx ) );
 
 
               x = FT_MulFix( x, mac_xscale );
@@ -1278,6 +1273,10 @@
           if ( error )
             goto Fail;
 
+          error = FT_GlyphLoader_CheckPoints( gloader, num_points + 2, 0 );
+          if ( error )
+            goto Fail;
+
           /* prepare the execution context */
           tt_prepare_zone( &exec->pts, &gloader->base,
                            start_point, start_contour );
@@ -1492,9 +1491,10 @@
         FT_Incremental_MetricsRec  metrics;
         FT_Error                   error = 0;
 
-		metrics.bearing_x = 0;
-		metrics.bearing_y = top_bearing;
-		metrics.advance = advance_height;
+
+        metrics.bearing_x = 0;
+        metrics.bearing_y = top_bearing;
+        metrics.advance = advance_height;
         error =
           face->root.internal->incremental_interface->funcs->get_glyph_metrics(
             face->root.internal->incremental_interface->object,
@@ -1640,9 +1640,9 @@
 
 
       error = sfnt->load_sbit_image( face,
-                                     size->strike_index,
-                                     glyph_index,
-                                     load_flags,
+                                     (FT_ULong)size->strike_index,
+                                     (FT_UInt)glyph_index,
+                                     (FT_Int)load_flags,
                                      stream,
                                      &glyph->bitmap,
                                      &metrics );
@@ -1681,7 +1681,7 @@
 
     /* return immediately if we only want the embedded bitmaps */
     if ( load_flags & FT_LOAD_SBITS_ONLY )
-      return FT_Err_Invalid_Argument;
+      return TT_Err_Invalid_Argument;
 
     /* seek to the beginning of the glyph table.  For Type 42 fonts      */
     /* the table might be accessed from a Postscript stream or something */
diff --git a/reactos/lib/freetype/src/truetype/ttgload.h b/reactos/lib/freetype/src/truetype/ttgload.h
index 04097134f58..36c93da844d 100644
--- a/reactos/lib/freetype/src/truetype/ttgload.h
+++ b/reactos/lib/freetype/src/truetype/ttgload.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType Glyph Loader (specification).                               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -33,7 +33,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   TT_Get_Metrics( TT_HoriHeader*  header,
-                  FT_UInt         index,
+                  FT_UInt         idx,
                   FT_Short*       bearing,
                   FT_UShort*      advance );
 
diff --git a/reactos/lib/freetype/src/truetype/ttinterp.c b/reactos/lib/freetype/src/truetype/ttinterp.c
index 74726a136a7..2dca6a21293 100644
--- a/reactos/lib/freetype/src/truetype/ttinterp.c
+++ b/reactos/lib/freetype/src/truetype/ttinterp.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType bytecode interpreter (body).                                */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -43,9 +43,6 @@
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_ttinterp
 
-#undef  NO_APPLE_PATENT
-#define APPLE_THRESHOLD  0x4000000L
-
   /*************************************************************************/
   /*                                                                       */
   /* In order to detect infinite loops in the code, we set up a counter    */
@@ -168,9 +165,6 @@
 #define CUR_Func_dualproj( x, y ) \
           CUR.func_dualproj( EXEC_ARG_ x, y )
 
-#define CUR_Func_freeProj( x, y ) \
-          CUR.func_freeProj( EXEC_ARG_ x, y )
-
 #define CUR_Func_round( d, c ) \
           CUR.func_round( EXEC_ARG_ d, c )
 
@@ -221,13 +215,22 @@
   /*                                                                       */
 #define BOUNDS( x, n )  ( (FT_UInt)(x) >= (FT_UInt)(n) )
 
-
 #undef  SUCCESS
 #define SUCCESS  0
 
 #undef  FAILURE
 #define FAILURE  1
 
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+#define GUESS_VECTOR( V )                                         \
+  if ( CUR.face->unpatented_hinting )                             \
+  {                                                               \
+    CUR.GS.V.x = (FT_F2Dot14)( CUR.GS.both_x_axis ? 0x4000 : 0 ); \
+    CUR.GS.V.y = (FT_F2Dot14)( CUR.GS.both_x_axis ? 0 : 0x4000 ); \
+  }
+#else
+#define GUESS_VECTOR( V )
+#endif
 
   /*************************************************************************/
   /*                                                                       */
@@ -719,6 +722,10 @@
     exec->GS.freeVector = exec->GS.projVector;
     exec->GS.dualVector = exec->GS.projVector;
 
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    exec->GS.both_x_axis = TRUE;
+#endif
+
     exec->GS.round_state = 1;
     exec->GS.loop        = 1;
 
@@ -746,6 +753,11 @@
     { 0x4000, 0 },
     { 0x4000, 0 },
     { 0x4000, 0 },
+
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    TRUE,
+#endif
+
     1, 64, 1,
     TRUE, 68, 0, 0, 9, 3,
     0, FALSE, 2, 1, 1, 1
@@ -1344,24 +1356,38 @@
   static FT_Long
   Current_Ratio( EXEC_OP )
   {
-    if ( CUR.tt_metrics.ratio )
-      return CUR.tt_metrics.ratio;
-
-    if ( CUR.GS.projVector.y == 0 )
-      CUR.tt_metrics.ratio = CUR.tt_metrics.x_ratio;
-
-    else if ( CUR.GS.projVector.x == 0 )
-      CUR.tt_metrics.ratio = CUR.tt_metrics.y_ratio;
-
-    else
+    if ( !CUR.tt_metrics.ratio )
     {
-      FT_Long  x, y;
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+      if ( CUR.face->unpatented_hinting )
+      {
+        if ( CUR.GS.both_x_axis )
+          CUR.tt_metrics.ratio = CUR.tt_metrics.x_ratio;
+        else
+          CUR.tt_metrics.ratio = CUR.tt_metrics.y_ratio;
+      }
+      else
+#endif
+      {
+        if ( CUR.GS.projVector.y == 0 )
+          CUR.tt_metrics.ratio = CUR.tt_metrics.x_ratio;
 
-      x = TT_MULDIV( CUR.GS.projVector.x, CUR.tt_metrics.x_ratio, 0x4000 );
-      y = TT_MULDIV( CUR.GS.projVector.y, CUR.tt_metrics.y_ratio, 0x4000 );
-      CUR.tt_metrics.ratio = TT_VecLen( x, y );
+        else if ( CUR.GS.projVector.x == 0 )
+          CUR.tt_metrics.ratio = CUR.tt_metrics.y_ratio;
+
+        else
+        {
+          FT_Long  x, y;
+
+
+          x = TT_MULDIV( CUR.GS.projVector.x,
+                         CUR.tt_metrics.x_ratio, 0x4000 );
+          y = TT_MULDIV( CUR.GS.projVector.y,
+                         CUR.tt_metrics.y_ratio, 0x4000 );
+          CUR.tt_metrics.ratio = TT_VecLen( x, y );
+        }
+      }
     }
-
     return CUR.tt_metrics.ratio;
   }
 
@@ -1532,24 +1558,19 @@
     FT_F26Dot6  v;
 
 
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    FT_ASSERT( !CUR.face->unpatented_hinting );
+#endif
+
     v = CUR.GS.freeVector.x;
 
     if ( v != 0 )
     {
 
-#ifdef NO_APPLE_PATENT
-
-      if ( ABS( CUR.F_dot_P ) > APPLE_THRESHOLD )
-        zone->cur[point].x += distance;
-
-#else
-
       zone->cur[point].x += TT_MULDIV( distance,
                                        v * 0x10000L,
                                        CUR.F_dot_P );
 
-#endif
-
       zone->tags[point] |= FT_CURVE_TAG_TOUCH_X;
     }
 
@@ -1558,19 +1579,10 @@
     if ( v != 0 )
     {
 
-#ifdef NO_APPLE_PATENT
-
-      if ( ABS( CUR.F_dot_P ) > APPLE_THRESHOLD )
-        zone->cur[point].y += distance;
-
-#else
-
       zone->cur[point].y += TT_MULDIV( distance,
                                        v * 0x10000L,
                                        CUR.F_dot_P );
 
-#endif
-
       zone->tags[point] |= FT_CURVE_TAG_TOUCH_Y;
     }
   }
@@ -2075,7 +2087,7 @@
       break;
 
     case 0x30:
-      CUR.phase = GridPeriod * 3 / 4;
+      CUR.phase = CUR.period * 3 / 4;
       break;
     }
 
@@ -2110,13 +2122,16 @@
   Project( EXEC_OP_ FT_Vector*  v1,
                     FT_Vector*  v2 )
   {
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    FT_ASSERT( !CUR.face->unpatented_hinting );
+#endif
+
     return TT_DotFix14( v1->x - v2->x,
                         v1->y - v2->y,
                         CUR.GS.projVector.x,
                         CUR.GS.projVector.y );
   }
 
-
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ -2144,33 +2159,6 @@
   }
 
 
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    Free_Project                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Computes the projection of the vector given by (v2-v1) along the   */
-  /*    current freedom vector.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    v1 :: First input vector.                                          */
-  /*    v2 :: Second input vector.                                         */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The distance in F26dot6 format.                                    */
-  /*                                                                       */
-  static FT_F26Dot6
-  Free_Project( EXEC_OP_ FT_Vector*  v1,
-                         FT_Vector*  v2 )
-  {
-    return TT_DotFix14( v1->x - v2->x,
-                        v1->y - v2->y,
-                        CUR.GS.freeVector.x,
-                        CUR.GS.freeVector.y );
-  }
-
-
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ -2235,24 +2223,61 @@
   static void
   Compute_Funcs( EXEC_OP )
   {
-    if ( CUR.GS.freeVector.x == 0x4000 )
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    if ( CUR.face->unpatented_hinting )
     {
-      CUR.func_freeProj = (TT_Project_Func)Project_x;
-      CUR.F_dot_P       = CUR.GS.projVector.x * 0x10000L;
-    }
-    else
-    {
-      if ( CUR.GS.freeVector.y == 0x4000 )
+      /* If both vectors point rightwards along the x axis, set             */
+      /* `both-x-axis' true, otherwise set it false.  The x values only     */
+      /* need be tested because the vector has been normalised to a unit    */
+      /* vector of length 0x4000 = unity.                                   */
+      CUR.GS.both_x_axis = (FT_Bool)( CUR.GS.projVector.x == 0x4000 &&
+                                      CUR.GS.freeVector.x == 0x4000 );
+
+      /* Throw away projection and freedom vector information */
+      /* because the patents don't allow them to be stored.   */
+      /* The relevant US Patents are 5155805 and 5325479.     */
+      CUR.GS.projVector.x = 0;
+      CUR.GS.projVector.y = 0;
+      CUR.GS.freeVector.x = 0;
+      CUR.GS.freeVector.y = 0;
+
+      if ( CUR.GS.both_x_axis )
       {
-        CUR.func_freeProj = (TT_Project_Func)Project_y;
-        CUR.F_dot_P       = CUR.GS.projVector.y * 0x10000L;
+        CUR.func_project  = Project_x;
+        CUR.func_move     = Direct_Move_X;
       }
       else
       {
-        CUR.func_freeProj = (TT_Project_Func)Free_Project;
+        CUR.func_project  = Project_y;
+        CUR.func_move     = Direct_Move_Y;
+      }
+
+      if ( CUR.GS.dualVector.x == 0x4000 )
+        CUR.func_dualproj = Project_x;
+      else
+      {
+        if ( CUR.GS.dualVector.y == 0x4000 )
+          CUR.func_dualproj = Project_y;
+        else
+          CUR.func_dualproj = Dual_Project;
+      }
+
+      /* Force recalculation of cached aspect ratio */
+      CUR.tt_metrics.ratio = 0;
+
+      return;
+    }
+#endif /* TT_CONFIG_OPTION_UNPATENTED_HINTING */
+
+    if ( CUR.GS.freeVector.x == 0x4000 )
+      CUR.F_dot_P       = CUR.GS.projVector.x * 0x10000L;
+    else
+    {
+      if ( CUR.GS.freeVector.y == 0x4000 )
+        CUR.F_dot_P       = CUR.GS.projVector.y * 0x10000L;
+      else
         CUR.F_dot_P = (FT_Long)CUR.GS.projVector.x * CUR.GS.freeVector.x * 4 +
                       (FT_Long)CUR.GS.projVector.y * CUR.GS.freeVector.y * 4;
-      }
     }
 
     if ( CUR.GS.projVector.x == 0x4000 )
@@ -2503,6 +2528,8 @@
     CUR.GS.projVector.y = B;                \
     CUR.GS.dualVector.y = B;                \
                                             \
+    GUESS_VECTOR( freeVector );             \
+                                            \
     COMPUTE_Funcs();                        \
   }
 
@@ -2518,6 +2545,8 @@
     CUR.GS.freeVector.x = A;                \
     CUR.GS.freeVector.y = B;                \
                                             \
+    GUESS_VECTOR( projVector );             \
+                                            \
     COMPUTE_Funcs();                        \
   }
 
@@ -2529,6 +2558,7 @@
                     &CUR.GS.projVector ) == SUCCESS ) \
     {                                                 \
       CUR.GS.dualVector = CUR.GS.projVector;          \
+      GUESS_VECTOR( freeVector );                     \
       COMPUTE_Funcs();                                \
     }
 
@@ -2538,10 +2568,14 @@
                     (FT_UShort)args[0],               \
                     CUR.opcode,                       \
                     &CUR.GS.freeVector ) == SUCCESS ) \
-      COMPUTE_Funcs();
+    {                                                 \
+      GUESS_VECTOR( projVector );                     \
+      COMPUTE_Funcs();                                \
+    }
 
 
 #define DO_SFVTPV                          \
+    GUESS_VECTOR( projVector );            \
     CUR.GS.freeVector = CUR.GS.projVector; \
     COMPUTE_Funcs();
 
@@ -2561,6 +2595,7 @@
     NORMalize( X, Y, &CUR.GS.projVector );      \
                                                 \
     CUR.GS.dualVector = CUR.GS.projVector;      \
+    GUESS_VECTOR( freeVector );                 \
     COMPUTE_Funcs();                            \
   }
 
@@ -2578,18 +2613,47 @@
     X = S;                                      \
                                                 \
     NORMalize( X, Y, &CUR.GS.freeVector );      \
+    GUESS_VECTOR( projVector );                 \
     COMPUTE_Funcs();                            \
   }
 
 
-#define DO_GPV                     \
-    args[0] = CUR.GS.projVector.x; \
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+#define DO_GPV                                   \
+    if ( CUR.face->unpatented_hinting )          \
+    {                                            \
+      args[0] = CUR.GS.both_x_axis ? 0x4000 : 0; \
+      args[1] = CUR.GS.both_x_axis ? 0 : 0x4000; \
+    }                                            \
+    else                                         \
+    {                                            \
+      args[0] = CUR.GS.projVector.x;             \
+      args[1] = CUR.GS.projVector.y;             \
+    }
+#else
+#define DO_GPV                                   \
+    args[0] = CUR.GS.projVector.x;               \
     args[1] = CUR.GS.projVector.y;
+#endif
 
 
-#define DO_GFV                     \
-    args[0] = CUR.GS.freeVector.x; \
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+#define DO_GFV                                   \
+    if ( CUR.face->unpatented_hinting )          \
+    {                                            \
+      args[0] = CUR.GS.both_x_axis ? 0x4000 : 0; \
+      args[1] = CUR.GS.both_x_axis ? 0 : 0x4000; \
+    }                                            \
+    else                                         \
+    {                                            \
+      args[0] = CUR.GS.freeVector.x;             \
+      args[1] = CUR.GS.freeVector.y;             \
+    }
+#else
+#define DO_GFV                                   \
+    args[0] = CUR.GS.freeVector.x;               \
     args[1] = CUR.GS.freeVector.y;
+#endif
 
 
 #define DO_SRP0                      \
@@ -4750,6 +4814,8 @@
 
     NORMalize( A, B, &CUR.GS.projVector );
 
+    GUESS_VECTOR( freeVector );
+
     COMPUTE_Funcs();
   }
 
@@ -5123,21 +5189,30 @@
 
     d = CUR_Func_project( zp.cur + p, zp.org + p );
 
-#ifdef NO_APPLE_PATENT
-
-    *x = TT_MulFix14( d, CUR.GS.freeVector.x );
-    *y = TT_MulFix14( d, CUR.GS.freeVector.y );
-
-#else
-
-    *x = TT_MULDIV( d,
-                    (FT_Long)CUR.GS.freeVector.x * 0x10000L,
-                    CUR.F_dot_P );
-    *y = TT_MULDIV( d,
-                    (FT_Long)CUR.GS.freeVector.y * 0x10000L,
-                    CUR.F_dot_P );
-
-#endif /* NO_APPLE_PATENT */
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    if ( CUR.face->unpatented_hinting )
+    {
+      if ( CUR.GS.both_x_axis )
+      {
+        *x = d;
+        *y = 0;
+      }
+      else
+      {
+        *x = 0;
+        *y = d;
+      }    
+    }
+    else
+#endif
+    {
+      *x = TT_MULDIV( d,
+                      (FT_Long)CUR.GS.freeVector.x * 0x10000L,
+                      CUR.F_dot_P );
+      *y = TT_MULDIV( d,
+                      (FT_Long)CUR.GS.freeVector.y * 0x10000L,
+                      CUR.F_dot_P );
+    }
 
     return SUCCESS;
   }
@@ -5149,6 +5224,25 @@
                            FT_F26Dot6  dy,
                            FT_Bool     touch )
   {
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    if ( CUR.face->unpatented_hinting )
+    {
+      if ( CUR.GS.both_x_axis )
+      {
+        CUR.zp2.cur[point].x += dx;
+        if ( touch )
+          CUR.zp2.tags[point] |= FT_CURVE_TAG_TOUCH_X;
+      }
+      else
+      {
+        CUR.zp2.cur[point].y += dy;
+        if ( touch )
+          CUR.zp2.tags[point] |= FT_CURVE_TAG_TOUCH_Y;
+      }
+      return;
+    }
+#endif
+
     if ( CUR.GS.freeVector.x != 0 )
     {
       CUR.zp2.cur[point].x += dx;
@@ -5334,8 +5428,26 @@
       return;
     }
 
-    dx = TT_MulFix14( args[0], CUR.GS.freeVector.x );
-    dy = TT_MulFix14( args[0], CUR.GS.freeVector.y );
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    if ( CUR.face->unpatented_hinting )
+    {
+      if ( CUR.GS.both_x_axis )
+      {
+        dx = TT_MulFix14( args[0], 0x4000 );
+        dy = 0;
+      }
+      else
+      {
+        dx = 0;
+        dy = TT_MulFix14( args[0], 0x4000 );
+      }
+    }
+    else
+#endif
+    {
+      dx = TT_MulFix14( args[0], CUR.GS.freeVector.x );
+      dy = TT_MulFix14( args[0], CUR.GS.freeVector.y );
+    }
 
     while ( CUR.GS.loop > 0 )
     {
@@ -5551,7 +5663,8 @@
 
     /* single width cutin test */
 
-    if ( ABS( org_dist ) < CUR.GS.single_width_cutin )
+    if ( ABS( org_dist - CUR.GS.single_width_value ) <
+         CUR.GS.single_width_cutin )
     {
       if ( org_dist >= 0 )
         org_dist = CUR.GS.single_width_value;
@@ -5640,7 +5753,8 @@
 
     /* single width test */
 
-    if ( ABS( cvt_dist ) < CUR.GS.single_width_cutin )
+    if ( ABS( cvt_dist - CUR.GS.single_width_value ) <
+         CUR.GS.single_width_cutin )
     {
       if ( cvt_dist >= 0 )
         cvt_dist =  CUR.GS.single_width_value;
@@ -6231,6 +6345,22 @@
     FT_ULong   C;
     FT_Long    B;
 
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    /* Delta hinting is covered by US Patent 5159668. */
+    if ( CUR.face->unpatented_hinting )
+      {
+      FT_Long n = args[0] * 2;
+      if ( CUR.args < n )
+      {
+        CUR.error = TT_Err_Too_Few_Arguments;
+        return;
+      }
+
+      CUR.args -= n;
+      CUR.new_top = CUR.args;
+      return;
+    }
+#endif
 
     nump = (FT_ULong)args[0];   /* some points theoretically may occur more
                                    than once, thus UShort isn't enough */
@@ -6307,6 +6437,25 @@
     FT_Long   B;
 
 
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    /* Delta hinting is covered by US Patent 5159668. */
+    if ( CUR.face->unpatented_hinting )
+    {
+      FT_Long  n = args[0] * 2;
+
+
+      if ( CUR.args < n )
+      {
+        CUR.error = TT_Err_Too_Few_Arguments;
+        return;
+      }
+
+      CUR.args -= n;
+      CUR.new_top = CUR.args;
+      return;
+    }
+#endif
+
     nump = (FT_ULong)args[0];
 
     for ( k = 1; k <= nump; k++ )
@@ -6870,12 +7019,20 @@
               CUR.GS.dualVector.x = AA;
               CUR.GS.dualVector.y = BB;
             }
+            else
+            {
+              GUESS_VECTOR( projVector );
+            }
 
             if ( ( opcode & 2 ) == 0 )
             {
               CUR.GS.freeVector.x = AA;
               CUR.GS.freeVector.y = BB;
             }
+            else
+            {
+              GUESS_VECTOR( freeVector );
+            }
 
             COMPUTE_Funcs();
           }
diff --git a/reactos/lib/freetype/src/truetype/ttobjs.c b/reactos/lib/freetype/src/truetype/ttobjs.c
index 9d78baee783..e1e69cdf875 100644
--- a/reactos/lib/freetype/src/truetype/ttobjs.c
+++ b/reactos/lib/freetype/src/truetype/ttobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Objects manager (body).                                              */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -34,6 +34,9 @@
 #include "ttinterp.h"
 #endif
 
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+#include FT_TRUETYPE_UNPATENTED_H
+#endif
 
   /*************************************************************************/
   /*                                                                       */
@@ -70,6 +73,7 @@
   {
     FT_Memory  memory = zone->memory;
 
+
     if ( memory )
     {
       FT_FREE( zone->contours );
@@ -200,26 +204,43 @@
       goto Exit;
 
     if ( face->root.face_flags & FT_FACE_FLAG_SCALABLE )
-      {
+    {
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
 
-        if ( !face->root.internal->incremental_interface )
-          error = tt_face_load_loca( face, stream );
-        if ( !error )
-          error = tt_face_load_cvt      ( face, stream ) ||
-                  tt_face_load_fpgm ( face, stream );
+      if ( !face->root.internal->incremental_interface )
+        error = tt_face_load_loca( face, stream );
+      if ( !error )
+        error = tt_face_load_cvt( face, stream ) ||
+                tt_face_load_fpgm( face, stream );
 
 #else
 
-        if ( !error )
-          error = tt_face_load_loca( face, stream ) ||
-                  tt_face_load_cvt      ( face, stream ) ||
-                  tt_face_load_fpgm ( face, stream );
+      if ( !error )
+        error = tt_face_load_loca( face, stream ) ||
+                tt_face_load_cvt( face, stream )  ||
+                tt_face_load_fpgm( face, stream );
 
 #endif
 
-      }
+    }
+
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+
+    /* Determine whether unpatented hinting is to be used for this face. */
+    face->unpatented_hinting =
+       ( library->debug_hooks[ FT_DEBUG_HOOK_UNPATENTED_HINTING ] != NULL );
+
+    {
+      int  i;
+
+
+      for ( i = 0; i < num_params && !face->unpatented_hinting; i++ )
+        if ( params[i].tag == FT_PARAM_TAG_UNPATENTED_HINTING )
+          face->unpatented_hinting = TRUE;
+    }
+
+#endif /* TT_CONFIG_OPTION_UNPATENTED_HINTING */
 
     /* initialize standard glyph loading routines */
     TT_Init_Glyph_Loading( face );
@@ -569,7 +590,7 @@
       size->ttmetrics.y_ratio = 0x10000L;
     }
 
-    /* Compute root ascender, descender, test height, and max_advance */
+    /* Compute root ascender, descender, text height, and max_advance */
     metrics->ascender    = ( FT_MulFix( face->root.ascender,
                                         metrics->y_scale ) + 32 ) & -64;
     metrics->descender   = ( FT_MulFix( face->root.descender,
@@ -704,39 +725,38 @@
 
     sbit_metrics = &size->strike_metrics;
 
-    error = sfnt->set_sbit_strike(face,
-                                  metrics->x_ppem, metrics->y_ppem,
-                                  &strike_index);
+    error = sfnt->set_sbit_strike( face,
+                                   metrics->x_ppem, metrics->y_ppem,
+                                   &strike_index );
 
     if ( !error )
     {
       TT_SBit_Strike  strike = face->sbit_strikes + strike_index;
 
 
-      sbit_metrics->x_ppem      = metrics->x_ppem;
-      sbit_metrics->y_ppem      = metrics->y_ppem;
+      sbit_metrics->x_ppem = metrics->x_ppem;
+      sbit_metrics->y_ppem = metrics->y_ppem;
 #if 0
       /*
        * sbit_metrics->?_scale
        * are not used now.
        */
-      sbit_metrics->x_scale     = 1 << 16;
-      sbit_metrics->y_scale     = 1 << 16;
+      sbit_metrics->x_scale = 1 << 16;
+      sbit_metrics->y_scale = 1 << 16;
 #endif
 
-      sbit_metrics->ascender    = strike->hori.ascender  << 6;
-      sbit_metrics->descender   = strike->hori.descender << 6;
+      sbit_metrics->ascender  = strike->hori.ascender << 6;
+      sbit_metrics->descender = strike->hori.descender << 6;
 
       /* XXX: Is this correct? */
-      sbit_metrics->height      = sbit_metrics->ascender -
-                                  sbit_metrics->descender;
+      sbit_metrics->height = sbit_metrics->ascender - sbit_metrics->descender;
 
       /* XXX: Is this correct? */
       sbit_metrics->max_advance = ( strike->hori.min_origin_SB  +
                                     strike->hori.max_width      +
                                     strike->hori.min_advance_SB ) << 6;
 
-      size->strike_index = strike_index;
+      size->strike_index = (FT_UInt)strike_index;
     }
     else
     {
diff --git a/reactos/lib/freetype/src/truetype/ttobjs.h b/reactos/lib/freetype/src/truetype/ttobjs.h
index e462d6404c5..c7f556215fa 100644
--- a/reactos/lib/freetype/src/truetype/ttobjs.h
+++ b/reactos/lib/freetype/src/truetype/ttobjs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Objects manager (specification).                                     */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -83,6 +83,10 @@ FT_BEGIN_HEADER
     FT_UnitVector  projVector;
     FT_UnitVector  freeVector;
 
+#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
+    FT_Bool        both_x_axis;
+#endif
+
     FT_Long        loop;
     FT_F26Dot6     minimum_distance;
     FT_Int         round_state;
@@ -311,7 +315,7 @@ FT_BEGIN_HEADER
   {
     FT_SizeRec         root;
 
-    FT_Size_Metrics    metrics;    /* slightly different from the root metrics */
+    FT_Size_Metrics    metrics; /* slightly different from the root metrics */
     TT_Size_Metrics    ttmetrics;
 
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
diff --git a/reactos/lib/freetype/src/type1/rules.mk b/reactos/lib/freetype/src/type1/rules.mk
index 49a4e4ad1db..15087b03044 100644
--- a/reactos/lib/freetype/src/type1/rules.mk
+++ b/reactos/lib/freetype/src/type1/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001 by
+# Copyright 1996-2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,29 +15,28 @@
 
 # Type1 driver directory
 #
-T1_DIR  := $(SRC_)type1
-T1_DIR_ := $(T1_DIR)$(SEP)
+T1_DIR := $(SRC_DIR)/type1
 
 
 # compilation flags for the driver
 #
-T1_COMPILE := $(FT_COMPILE) $I$(T1_DIR)
+T1_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(T1_DIR))
 
 
 # Type1 driver sources (i.e., C files)
 #
-T1_DRV_SRC := $(T1_DIR_)t1parse.c  \
-              $(T1_DIR_)t1load.c   \
-              $(T1_DIR_)t1driver.c \
-              $(T1_DIR_)t1afm.c    \
-              $(T1_DIR_)t1gload.c  \
-              $(T1_DIR_)t1objs.c
+T1_DRV_SRC := $(T1_DIR)/t1parse.c  \
+              $(T1_DIR)/t1load.c   \
+              $(T1_DIR)/t1driver.c \
+              $(T1_DIR)/t1afm.c    \
+              $(T1_DIR)/t1gload.c  \
+              $(T1_DIR)/t1objs.c
 
 # Type1 driver headers
 #
 T1_DRV_H := $(T1_DRV_SRC:%.c=%.h) \
-            $(T1_DIR_)t1tokens.h  \
-            $(T1_DIR_)t1errors.h
+            $(T1_DIR)/t1tokens.h  \
+            $(T1_DIR)/t1errors.h
 
 
 # Type1 driver object(s)
@@ -45,24 +44,24 @@ T1_DRV_H := $(T1_DRV_SRC:%.c=%.h) \
 #   T1_DRV_OBJ_M is used during `multi' builds
 #   T1_DRV_OBJ_S is used during `single' builds
 #
-T1_DRV_OBJ_M := $(T1_DRV_SRC:$(T1_DIR_)%.c=$(OBJ_)%.$O)
-T1_DRV_OBJ_S := $(OBJ_)type1.$O
+T1_DRV_OBJ_M := $(T1_DRV_SRC:$(T1_DIR)/%.c=$(OBJ_DIR)/%.$O)
+T1_DRV_OBJ_S := $(OBJ_DIR)/type1.$O
 
 # Type1 driver source file for single build
 #
-T1_DRV_SRC_S := $(T1_DIR_)type1.c
+T1_DRV_SRC_S := $(T1_DIR)/type1.c
 
 
 # Type1 driver - single object
 #
 $(T1_DRV_OBJ_S): $(T1_DRV_SRC_S) $(T1_DRV_SRC) $(FREETYPE_H) $(T1_DRV_H)
-	$(T1_COMPILE) $T$@ $(T1_DRV_SRC_S)
+	$(T1_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(T1_DRV_SRC_S))
 
 
 # Type1 driver - multiple objects
 #
-$(OBJ_)%.$O: $(T1_DIR_)%.c $(FREETYPE_H) $(T1_DRV_H)
-	$(T1_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(T1_DIR)/%.c $(FREETYPE_H) $(T1_DRV_H)
+	$(T1_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -70,4 +69,5 @@ $(OBJ_)%.$O: $(T1_DIR_)%.c $(FREETYPE_H) $(T1_DRV_H)
 DRV_OBJS_S += $(T1_DRV_OBJ_S)
 DRV_OBJS_M += $(T1_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/type1/t1afm.c b/reactos/lib/freetype/src/type1/t1afm.c
index 71ccd1ea74b..9945ebdf6da 100644
--- a/reactos/lib/freetype/src/type1/t1afm.c
+++ b/reactos/lib/freetype/src/type1/t1afm.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    AFM support for Type 1 fonts (body).                                 */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -148,7 +148,7 @@
     FT_ULong  index2 = KERN_INDEX( pair2->glyph1, pair2->glyph2 );
 
 
-    return ( index1 - index2 );
+    return (int)( index1 - index2 );
   }
 
 
diff --git a/reactos/lib/freetype/src/type1/t1driver.c b/reactos/lib/freetype/src/type1/t1driver.c
index b255f9d7cb5..ebd6a65907e 100644
--- a/reactos/lib/freetype/src/type1/t1driver.c
+++ b/reactos/lib/freetype/src/type1/t1driver.c
@@ -227,15 +227,13 @@
 #endif /* T1_CONFIG_OPTION_NO_AFM */
 
 
-
-
   FT_CALLBACK_TABLE_DEF
   const FT_Driver_ClassRec  t1_driver_class =
   {
     {
-      ft_module_font_driver      |
-      ft_module_driver_scalable  |
-      ft_module_driver_has_hinter,
+      FT_MODULE_FONT_DRIVER       |
+      FT_MODULE_DRIVER_SCALABLE   |
+      FT_MODULE_DRIVER_HAS_HINTER,
 
       sizeof( FT_DriverRec ),
 
diff --git a/reactos/lib/freetype/src/type1/t1gload.c b/reactos/lib/freetype/src/type1/t1gload.c
index 6ebb8723c0d..b4573d60f71 100644
--- a/reactos/lib/freetype/src/type1/t1gload.c
+++ b/reactos/lib/freetype/src/type1/t1gload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 Glyph Loader (body).                                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -98,8 +98,8 @@
       FT_Incremental_MetricsRec  metrics;
 
       metrics.bearing_x = decoder->builder.left_bearing.x;
-	  metrics.bearing_y = decoder->builder.left_bearing.y;
-	  metrics.advance   = decoder->builder.advance.x;
+      metrics.bearing_y = decoder->builder.left_bearing.y;
+      metrics.advance   = decoder->builder.advance.x;
       error = face->root.internal->incremental_interface->funcs->get_glyph_metrics(
                 face->root.internal->incremental_interface->object,
                 glyph_index, FALSE, &metrics );
@@ -130,7 +130,7 @@
       T1_Face  face = (T1_Face)decoder->builder.face;
 
 
-	  if ( face->root.internal->incremental_interface )
+      if ( face->root.internal->incremental_interface )
         face->root.internal->incremental_interface->funcs->free_glyph_data(
           face->root.internal->incremental_interface->object,
           &glyph_data );
@@ -143,7 +143,7 @@
 
   FT_LOCAL_DEF( FT_Error )
   T1_Compute_Max_Advance( T1_Face  face,
-                          FT_Int*  max_advance )
+                          FT_Pos*  max_advance )
   {
     FT_Error       error;
     T1_DecoderRec  decoder;
@@ -185,7 +185,7 @@
       if ( glyph_index == 0 || decoder.builder.advance.x > *max_advance )
         *max_advance = decoder.builder.advance.x;
         
-      /* ignore the error if one occured - skip to next glyph */
+      /* ignore the error if one occurred - skip to next glyph */
     }
 
     return T1_Err_Ok;
@@ -226,7 +226,9 @@
     FT_Matrix               font_matrix;
     FT_Vector               font_offset;
     FT_Data                 glyph_data;
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
     FT_Bool                 glyph_data_loaded = 0;
+#endif
 
 
     if ( load_flags & FT_LOAD_NO_RECURSE )
@@ -267,7 +269,9 @@
                                                 &glyph_data );
     if ( error )
       goto Exit;
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
     glyph_data_loaded = 1;
+#endif
 
     font_matrix = decoder.font_matrix;
     font_offset = decoder.font_offset;
@@ -300,6 +304,7 @@
       {
         FT_BBox            cbox;
         FT_Glyph_Metrics*  metrics = &glyph->root.metrics;
+        FT_Vector          advance;
 
 
         /* copy the _unscaled_ advance width */
@@ -326,6 +331,15 @@
         FT_Outline_Translate( &glyph->root.outline,
                               font_offset.x,
                               font_offset.y );
+
+        advance.x = metrics->horiAdvance;
+        advance.y = 0;
+        FT_Vector_Transform( &advance, &font_matrix );
+        metrics->horiAdvance = advance.x + font_offset.x;
+        advance.x = 0;
+        advance.y = metrics->vertAdvance;
+        FT_Vector_Transform( &advance, &font_matrix );
+        metrics->vertAdvance = advance.y + font_offset.y;
 #endif
 
         if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
diff --git a/reactos/lib/freetype/src/type1/t1gload.h b/reactos/lib/freetype/src/type1/t1gload.h
index 0324a0d1546..de87896dc0e 100644
--- a/reactos/lib/freetype/src/type1/t1gload.h
+++ b/reactos/lib/freetype/src/type1/t1gload.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 Glyph Loader (specification).                                 */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,7 +29,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( FT_Error )
   T1_Compute_Max_Advance( T1_Face  face,
-                          FT_Int*  max_advance );
+                          FT_Pos*  max_advance );
 
   FT_LOCAL( FT_Error )
   T1_Load_Glyph( T1_GlyphSlot  glyph,
diff --git a/reactos/lib/freetype/src/type1/t1load.c b/reactos/lib/freetype/src/type1/t1load.c
index 5873ae00a21..6bc7b928583 100644
--- a/reactos/lib/freetype/src/type1/t1load.c
+++ b/reactos/lib/freetype/src/type1/t1load.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 font loader (body).                                           */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -425,7 +425,7 @@
         token->start++;
 
       len = token->limit - token->start;
-      if ( len <= 0 )
+      if ( len == 0 )
       {
         error = T1_Err_Invalid_File_Format;
         goto Exit;
@@ -693,9 +693,9 @@
 
 
   static FT_Error
-  t1_load_keyword( T1_Face    face,
-                   T1_Loader  loader,
-                   T1_Field   field )
+  t1_load_keyword( T1_Face         face,
+                   T1_Loader       loader,
+                   const T1_Field  field )
   {
     FT_Error  error;
     void*     dummy_object;
@@ -795,7 +795,7 @@
              c != '}' &&
              c != '/' &&
              c != '%' &&
-             ! is_space( c ) 
+             ! is_space( c )
              );
  }
 
@@ -842,71 +842,6 @@
   /* the `/Encoding', `/Subrs', and `/CharStrings'  */
   /* dictionaries                                   */
 
-  static void
-  parse_font_name( T1_Face    face,
-                   T1_Loader  loader )
-  {
-    T1_Parser   parser = &loader->parser;
-    FT_Error    error;
-    FT_Memory   memory = parser->root.memory;
-    FT_PtrDist  len;
-    FT_Byte*    cur;
-    FT_Byte*    cur2;
-    FT_Byte*    limit;
-
-
-    if ( face->type1.font_name )
-      /*  with synthetic fonts, it's possible we get here twice  */
-      return;
-
-    T1_Skip_Spaces( parser );
-
-    cur   = parser->root.cursor;
-    limit = parser->root.limit;
-
-    if ( cur >= limit - 1 || *cur != '/' )
-      return;
-
-    cur++;
-    cur2 = cur;
-    while ( cur2 < limit && is_name_char( *cur2 ) )
-      cur2++;
-
-    len = cur2 - cur;
-    if ( len > 0 )
-    {
-      if ( FT_ALLOC( face->type1.font_name, len + 1 ) )
-      {
-        parser->root.error = error;
-        return;
-      }
-
-      FT_MEM_COPY( face->type1.font_name, cur, len );
-      face->type1.font_name[len] = '\0';
-    }
-    parser->root.cursor = cur2;
-  }
-
-
-#if 0
-  static void
-  parse_font_bbox( T1_Face    face,
-                   T1_Loader  loader )
-  {
-    T1_Parser  parser = &loader->parser;
-    FT_Fixed   temp[4];
-    FT_BBox*   bbox   = &face->type1.font_bbox;
-
-
-    (void)T1_ToFixedArray( parser, 4, temp, 0 );
-    bbox->xMin = FT_RoundFix( temp[0] );
-    bbox->yMin = FT_RoundFix( temp[1] );
-    bbox->xMax = FT_RoundFix( temp[2] );
-    bbox->yMax = FT_RoundFix( temp[3] );
-  }
-#endif
-
-
   static void
   parse_font_matrix( T1_Face    face,
                      T1_Loader  loader )
@@ -1213,12 +1148,12 @@
         FT_MEM_COPY( temp, base, size );
         psaux->t1_decrypt( temp, size, 4330 );
         size -= face->type1.private_dict.lenIV;
-        error = T1_Add_Table( table, idx,
+        error = T1_Add_Table( table, (FT_Int)idx,
                               temp + face->type1.private_dict.lenIV, size );
         FT_FREE( temp );
       }
       else
-        error = T1_Add_Table( table, idx, base, size );
+        error = T1_Add_Table( table, (FT_Int)idx, base, size );
       if ( error )
         goto Fail;
     }
@@ -1498,10 +1433,6 @@
 #include "t1tokens.h"
 
     /* now add the special functions... */
-    T1_FIELD_CALLBACK( "FontName", parse_font_name )
-#if 0
-    T1_FIELD_CALLBACK( "FontBBox", parse_font_bbox )
-#endif
     T1_FIELD_CALLBACK( "FontMatrix", parse_font_matrix )
     T1_FIELD_CALLBACK( "Encoding", parse_encoding )
     T1_FIELD_CALLBACK( "Subrs", parse_subrs )
@@ -1519,11 +1450,16 @@
   };
 
 
+#define T1_FIELD_COUNT                                           \
+          ( sizeof ( t1_keywords ) / sizeof ( t1_keywords[0] ) )
+
+
   static FT_Error
   parse_dict( T1_Face    face,
               T1_Loader  loader,
               FT_Byte*   base,
-              FT_Long    size )
+              FT_Long    size,
+              FT_Byte*   keyword_flags )
   {
     T1_Parser  parser = &loader->parser;
 
@@ -1588,7 +1524,8 @@
           {
             {
               /* now, compare the immediate name to the keyword table */
-              T1_Field  keyword = (T1_Field)t1_keywords;
+              T1_Field  keyword      = (T1_Field)t1_keywords;
+              FT_Byte*  keyword_flag = keyword_flags;
 
 
               for (;;)
@@ -1615,17 +1552,25 @@
                     /* we found it -- run the parsing callback! */
                     parser->root.cursor = cur2;
                     T1_Skip_Spaces( parser );
-                    parser->root.error = t1_load_keyword( face,
-                                                          loader,
-                                                          keyword );
-                    if ( parser->root.error )
-                      return parser->root.error;
+                    
+                    /* we only record the first instance of any      */
+                    /* field to deal adequately with synthetic fonts */
+                    if ( keyword_flag[0] == 0 )
+                    {
+                      parser->root.error = t1_load_keyword( face,
+                                                            loader,
+                                                            keyword );
+                      if ( parser->root.error )
+                        return parser->root.error;
+                    }
+                    keyword_flag[0] = 1;
 
                     cur = parser->root.cursor;
                     break;
                   }
                 }
                 keyword++;
+                keyword_flag++;
               }
             }
           }
@@ -1681,6 +1626,7 @@
     T1_Parser      parser;
     T1_Font        type1 = &face->type1;
     FT_Error       error;
+    FT_Byte        keyword_flags[T1_FIELD_COUNT];
 
     PSAux_Service  psaux = (PSAux_Service)face->psaux;
 
@@ -1701,7 +1647,16 @@
     if ( error )
       goto Exit;
 
-    error = parse_dict( face, &loader, parser->base_dict, parser->base_len );
+    {
+      FT_UInt  n;
+      
+
+      for ( n = 0; n < T1_FIELD_COUNT; n++ )
+        keyword_flags[n] = 0;
+    }
+
+    error = parse_dict( face, &loader, parser->base_dict, parser->base_len,
+                        keyword_flags );
     if ( error )
       goto Exit;
 
@@ -1710,7 +1665,8 @@
       goto Exit;
 
     error = parse_dict( face, &loader, parser->private_dict,
-                        parser->private_len );
+                        parser->private_len,
+                        keyword_flags );
     if ( error )
       goto Exit;
 
@@ -1793,6 +1749,15 @@
             }
           }
       }
+      /* Yes, this happens: Certain PDF-embedded fonts have only a ".notdef"
+       * glyph defined!
+       */
+      if ( min_char > max_char )
+      {
+        min_char = 0;
+        max_char = loader.encoding_table.max_elems;
+      }
+
       type1->encoding.code_first = min_char;
       type1->encoding.code_last  = max_char;
       type1->encoding.num_chars  = loader.num_chars;
diff --git a/reactos/lib/freetype/src/type1/t1objs.c b/reactos/lib/freetype/src/type1/t1objs.c
index 59e7cb68649..c62e72b7e12 100644
--- a/reactos/lib/freetype/src/type1/t1objs.c
+++ b/reactos/lib/freetype/src/type1/t1objs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 objects manager (body).                                       */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -118,9 +118,9 @@
 
     if ( funcs )
       error = funcs->set_scale( (PSH_Globals)size->root.internal,
-                                 size->root.metrics.x_scale,
-                                 size->root.metrics.y_scale,
-                                 0, 0 );
+                                size->root.metrics.x_scale,
+                                size->root.metrics.y_scale,
+                                0, 0 );
     return error;
   }
 
@@ -229,6 +229,9 @@
       FT_FREE( type1->encoding.char_name );
       FT_FREE( type1->font_name );
 
+      FT_FREE( type1->paint_type );
+      FT_FREE( type1->stroke_width );
+
 #ifndef T1_CONFIG_OPTION_NO_AFM
       /* release afm data if present */
       if ( face->afm_data )
@@ -275,10 +278,11 @@
                 FT_Int         num_params,
                 FT_Parameter*  params )
   {
-    FT_Error          error;
-    PSNames_Service   psnames;
-    PSAux_Service     psaux;
-    PSHinter_Service  pshinter;
+    FT_Error         error;
+    PSNames_Service  psnames;
+    PSAux_Service    psaux;
+    T1_Font          type1 = &face->type1;
+    PS_FontInfo      info = &type1->font_info;
 
     FT_UNUSED( num_params );
     FT_UNUSED( params );
@@ -298,9 +302,8 @@
 
     face->pshinter = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
                                               "pshinter" );
-    pshinter = (PSHinter_Service)face->pshinter;
 
-    /* open the tokenizer, this will also check the font format */
+    /* open the tokenizer; this will also check the font format */
     error = T1_Open_Face( face );
     if ( error )
       goto Exit;
@@ -317,22 +320,23 @@
       goto Exit;
     }
 
-    /* Now, load the font program into the face object */
+    /* now load the font program into the face object */
 
-    /* Init the face object fields */
-    /* Now set up root face fields */
+    /* initialize the face object fields */
+
+    /* set up root face fields */
     {
       FT_Face  root = (FT_Face)&face->root;
 
 
-      root->num_glyphs = face->type1.num_glyphs;
+      root->num_glyphs = type1->num_glyphs;
       root->face_index = face_index;
 
-      root->face_flags = FT_FACE_FLAG_SCALABLE;
+      root->face_flags  = FT_FACE_FLAG_SCALABLE;
       root->face_flags |= FT_FACE_FLAG_HORIZONTAL;
       root->face_flags |= FT_FACE_FLAG_GLYPH_NAMES;
 
-      if ( face->type1.font_info.is_fixed_pitch )
+      if ( info->is_fixed_pitch )
         root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
 
       if ( face->blend )
@@ -342,45 +346,55 @@
 
       /* get style name -- be careful, some broken fonts only */
       /* have a `/FontName' dictionary entry!                 */
-      root->family_name = face->type1.font_info.family_name;
+      root->family_name = info->family_name;
+      /* assume "Regular" style if we don't know better */
+      root->style_name = (char *)"Regular";
       if ( root->family_name )
       {
-        char*  full   = face->type1.font_info.full_name;
+        char*  full   = info->full_name;
         char*  family = root->family_name;
 
 
         if ( full )
         {
-          while ( *family && *full == *family )
+          while ( *full )
           {
-            family++;
-            full++;
+            if ( *full == *family )
+            {
+              family++;
+              full++;
+            }
+            else
+            {
+              if ( *full == ' ' || *full == '-' )
+                full++;
+              else if ( *family == ' ' || *family == '-' )
+                family++;
+              else
+              {
+                if ( !*family )
+                  root->style_name = full;
+                break;
+              }
+            }
           }
-
-          root->style_name = ( *full == ' ' ? full + 1
-                                            : (char *)"Regular" );
         }
-        else
-          root->style_name = (char *)"Regular";
       }
       else
       {
         /* do we have a `/FontName'? */
-        if ( face->type1.font_name )
-        {
-          root->family_name = face->type1.font_name;
-          root->style_name  = (char *)"Regular";
-        }
+        if ( type1->font_name )
+          root->family_name = type1->font_name;
       }
 
       /* compute style flags */
       root->style_flags = 0;
-      if ( face->type1.font_info.italic_angle )
+      if ( info->italic_angle )
         root->style_flags |= FT_STYLE_FLAG_ITALIC;
-      if ( face->type1.font_info.weight )
+      if ( info->weight )
       {
-        if ( !ft_strcmp( face->type1.font_info.weight, "Bold"  ) ||
-             !ft_strcmp( face->type1.font_info.weight, "Black" ) )
+        if ( !ft_strcmp( info->weight, "Bold"  ) ||
+             !ft_strcmp( info->weight, "Black" ) )
           root->style_flags |= FT_STYLE_FLAG_BOLD;
       }
 
@@ -388,10 +402,10 @@
       root->num_fixed_sizes = 0;
       root->available_sizes = 0;
 
-      root->bbox.xMin =   face->type1.font_bbox.xMin             >> 16;
-      root->bbox.yMin =   face->type1.font_bbox.yMin             >> 16;
-      root->bbox.xMax = ( face->type1.font_bbox.xMax + 0xFFFFU ) >> 16;
-      root->bbox.yMax = ( face->type1.font_bbox.yMax + 0xFFFFU ) >> 16;
+      root->bbox.xMin =   type1->font_bbox.xMin             >> 16;
+      root->bbox.yMin =   type1->font_bbox.yMin             >> 16;
+      root->bbox.xMax = ( type1->font_bbox.xMax + 0xFFFFU ) >> 16;
+      root->bbox.yMax = ( type1->font_bbox.yMax + 0xFFFFU ) >> 16;
 
       /* Set units_per_EM if we didn't set it in parse_font_matrix. */
       if ( !root->units_per_EM )
@@ -400,13 +414,13 @@
       root->ascender  = (FT_Short)( root->bbox.yMax );
       root->descender = (FT_Short)( root->bbox.yMin );
       root->height    = (FT_Short)(
-                          ( ( root->ascender - root->descender ) * 12 ) / 10 );
+        ( ( root->ascender - root->descender ) * 12 ) / 10 );
 
       /* now compute the maximum advance width */
       root->max_advance_width =
         (FT_Short)( root->bbox.xMax );
       {
-        FT_Int  max_advance;
+        FT_Pos  max_advance;
 
 
         error = T1_Compute_Max_Advance( face, &max_advance );
@@ -420,8 +434,8 @@
 
       root->max_advance_height = root->height;
 
-      root->underline_position  = face->type1.font_info.underline_position;
-      root->underline_thickness = face->type1.font_info.underline_thickness;
+      root->underline_position  = info->underline_position >> 16;
+      root->underline_thickness = info->underline_thickness >> 16;
 
       root->internal->max_points   = 0;
       root->internal->max_contours = 0;
@@ -451,7 +465,7 @@
         charmap.platform_id = 7;
         clazz               = NULL;
 
-        switch ( face->type1.encoding_type )
+        switch ( type1->encoding_type )
         {
         case T1_ENCODING_TYPE_STANDARD:
           charmap.encoding    = FT_ENCODING_ADOBE_STANDARD;
diff --git a/reactos/lib/freetype/src/type1/t1tokens.h b/reactos/lib/freetype/src/type1/t1tokens.h
index dea50547b89..23e04118327 100644
--- a/reactos/lib/freetype/src/type1/t1tokens.h
+++ b/reactos/lib/freetype/src/type1/t1tokens.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 tokenizer (specification).                                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -21,16 +21,17 @@
 #undef  T1CODE
 #define T1CODE        T1_FIELD_LOCATION_FONT_INFO
 
-  T1_FIELD_STRING   ( "version", version )
-  T1_FIELD_STRING   ( "Notice", notice )
-  T1_FIELD_STRING   ( "FullName", full_name )
-  T1_FIELD_STRING   ( "FamilyName", family_name )
-  T1_FIELD_STRING   ( "Weight", weight )
+  T1_FIELD_STRING( "version", version )
+  T1_FIELD_STRING( "Notice", notice )
+  T1_FIELD_STRING( "FullName", full_name )
+  T1_FIELD_STRING( "FamilyName", family_name )
+  T1_FIELD_STRING( "Weight", weight )
 
-  T1_FIELD_NUM      ( "ItalicAngle", italic_angle )
-  T1_FIELD_TYPE_BOOL( "isFixedPitch", is_fixed_pitch )
-  T1_FIELD_NUM      ( "UnderlinePosition", underline_position )
-  T1_FIELD_NUM      ( "UnderlineThickness", underline_thickness )
+  /* we use pointers to detect modifications made by synthetic fonts */
+  T1_FIELD_NUM   ( "ItalicAngle", italic_angle )
+  T1_FIELD_BOOL  ( "isFixedPitch", is_fixed_pitch )
+  T1_FIELD_NUM   ( "UnderlinePosition", underline_position )
+  T1_FIELD_NUM   ( "UnderlineThickness", underline_thickness )
 
 
 #undef  FT_STRUCTURE
@@ -43,7 +44,7 @@
   T1_FIELD_NUM       ( "LanguageGroup", language_group )
   T1_FIELD_NUM       ( "password", password )
 
-  T1_FIELD_FIXED     ( "BlueScale", blue_scale )
+  T1_FIELD_FIXED_1000( "BlueScale", blue_scale )
   T1_FIELD_NUM       ( "BlueShift", blue_shift )
   T1_FIELD_NUM       ( "BlueFuzz",  blue_fuzz )
 
@@ -65,9 +66,10 @@
 #undef  T1CODE
 #define T1CODE        T1_FIELD_LOCATION_FONT_DICT
 
-  T1_FIELD_NUM( "PaintType", paint_type )
-  T1_FIELD_NUM( "FontType", font_type )
-  T1_FIELD_NUM( "StrokeWidth", stroke_width )
+  T1_FIELD_KEY  ( "FontName", font_name )
+  T1_FIELD_NUM  ( "PaintType", paint_type )
+  T1_FIELD_NUM  ( "FontType", font_type )
+  T1_FIELD_FIXED( "StrokeWidth", stroke_width )
 
 #undef  FT_STRUCTURE
 #define FT_STRUCTURE  FT_BBox
diff --git a/reactos/lib/freetype/src/type42/rules.mk b/reactos/lib/freetype/src/type42/rules.mk
index f991449f5f2..55630619554 100644
--- a/reactos/lib/freetype/src/type42/rules.mk
+++ b/reactos/lib/freetype/src/type42/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2002 by
+# Copyright 2002, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,25 +15,24 @@
 
 # Type42 driver directory
 #
-T42_DIR  := $(SRC_)type42
-T42_DIR_ := $(T42_DIR)$(SEP)
+T42_DIR := $(SRC_DIR)/type42
 
 
 # compilation flags for the driver
 #
-T42_COMPILE := $(FT_COMPILE) $I$(T42_DIR)
+T42_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(T42_DIR))
 
 
 # Type42 driver source
 #
-T42_DRV_SRC := $(T42_DIR_)t42objs.c  \
-               $(T42_DIR_)t42parse.c \
-               $(T42_DIR_)t42drivr.c
+T42_DRV_SRC := $(T42_DIR)/t42objs.c  \
+               $(T42_DIR)/t42parse.c \
+               $(T42_DIR)/t42drivr.c
 
 # Type42 driver headers
 #
 T42_DRV_H := $(T42_DRV_SRC:%.c=%.h) \
-             $(T42_DIR_)t42error.h
+             $(T42_DIR)/t42error.h
 
 
 # Type42 driver object(s)
@@ -41,24 +40,24 @@ T42_DRV_H := $(T42_DRV_SRC:%.c=%.h) \
 #   T42_DRV_OBJ_M is used during `multi' builds
 #   T42_DRV_OBJ_S is used during `single' builds
 #
-T42_DRV_OBJ_M := $(T42_DRV_SRC:$(T42_DIR_)%.c=$(OBJ_)%.$O)
-T42_DRV_OBJ_S := $(OBJ_)type42.$O
+T42_DRV_OBJ_M := $(T42_DRV_SRC:$(T42_DIR)/%.c=$(OBJ_DIR)/%.$O)
+T42_DRV_OBJ_S := $(OBJ_DIR)/type42.$O
 
 # Type42 driver source file for single build
 #
-T42_DRV_SRC_S := $(T42_DIR_)type42.c
+T42_DRV_SRC_S := $(T42_DIR)/type42.c
 
 
 # Type42 driver - single object
 #
 $(T42_DRV_OBJ_S): $(T42_DRV_SRC_S) $(T42_DRV_SRC) $(FREETYPE_H) $(T42_DRV_H)
-	$(T42_COMPILE) $T$@ $(T42_DRV_SRC_S)
+	$(T42_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(T42_DRV_SRC_S))
 
 
 # Type42 driver - multiple objects
 #
-$(OBJ_)%.$O: $(T42_DIR_)%.c $(FREETYPE_H) $(T42_DRV_H)
-	$(T42_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(T42_DIR)/%.c $(FREETYPE_H) $(T42_DRV_H)
+	$(T42_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -66,4 +65,5 @@ $(OBJ_)%.$O: $(T42_DIR_)%.c $(FREETYPE_H) $(T42_DRV_H)
 DRV_OBJS_S += $(T42_DRV_OBJ_S)
 DRV_OBJS_M += $(T42_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/type42/t42drivr.c b/reactos/lib/freetype/src/type42/t42drivr.c
index 65bf2e8aaf9..d9668775c9c 100644
--- a/reactos/lib/freetype/src/type42/t42drivr.c
+++ b/reactos/lib/freetype/src/type42/t42drivr.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    High-level Type 42 driver interface (body).                          */
 /*                                                                         */
-/*  Copyright 2002 by Roberto Alameda.                                     */
+/*  Copyright 2002, 2003 by Roberto Alameda.                               */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
@@ -123,10 +123,10 @@
   const FT_Driver_ClassRec  t42_driver_class =
   {
     {
-      ft_module_font_driver      |
-      ft_module_driver_scalable  |
+      FT_MODULE_FONT_DRIVER       |
+      FT_MODULE_DRIVER_SCALABLE   |
 #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-      ft_module_driver_has_hinter,
+      FT_MODULE_DRIVER_HAS_HINTER,
 #else
       0,
 #endif
diff --git a/reactos/lib/freetype/src/type42/t42error.h b/reactos/lib/freetype/src/type42/t42error.h
index cb6642b747a..b230910012f 100644
--- a/reactos/lib/freetype/src/type42/t42error.h
+++ b/reactos/lib/freetype/src/type42/t42error.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 42 error codes (specification only).                            */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,7 +30,7 @@
 #undef __FTERRORS_H__
 
 #define FT_ERR_PREFIX  T42_Err_
-#define FT_ERR_BASE    FT_Mod_Err_T42
+#define FT_ERR_BASE    FT_Mod_Err_Type42
 
 #include FT_ERRORS_H
 
diff --git a/reactos/lib/freetype/src/type42/t42objs.c b/reactos/lib/freetype/src/type42/t42objs.c
index c4856344b68..bb4120571e4 100644
--- a/reactos/lib/freetype/src/type42/t42objs.c
+++ b/reactos/lib/freetype/src/type42/t42objs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 42 objects manager (body).                                      */
 /*                                                                         */
-/*  Copyright 2002 by Roberto Alameda.                                     */
+/*  Copyright 2002, 2003 by Roberto Alameda.                               */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
@@ -149,10 +149,12 @@
                  FT_Int         num_params,
                  FT_Parameter*  params )
   {
-    FT_Error          error;
-    PSNames_Service   psnames;
-    PSAux_Service     psaux;
-    FT_Face           root    = (FT_Face)&face->root;
+    FT_Error         error;
+    PSNames_Service  psnames;
+    PSAux_Service    psaux;
+    FT_Face          root  = (FT_Face)&face->root;
+    T1_Font          type1 = &face->type1;
+    PS_FontInfo      info  = &type1->font_info;
 
     FT_UNUSED( num_params );
     FT_UNUSED( params );
@@ -193,7 +195,7 @@
     /* Init the face object fields */
     /* Now set up root face fields */
 
-    root->num_glyphs   = face->type1.num_glyphs;
+    root->num_glyphs   = type1->num_glyphs;
     root->num_charmaps = 0;
     root->face_index   = face_index;
 
@@ -201,42 +203,52 @@
     root->face_flags |= FT_FACE_FLAG_HORIZONTAL;
     root->face_flags |= FT_FACE_FLAG_GLYPH_NAMES;
 
-    if ( face->type1.font_info.is_fixed_pitch )
+    if ( info->is_fixed_pitch )
       root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
 
     /* XXX: TODO -- add kerning with .afm support */
 
     /* get style name -- be careful, some broken fonts only */
     /* have a `/FontName' dictionary entry!                 */
-    root->family_name = face->type1.font_info.family_name;
+    root->family_name = info->family_name;
+    /* assume "Regular" style if we don't know better */
+    root->style_name = (char *)"Regular";
     if ( root->family_name )
     {
-      char*  full   = face->type1.font_info.full_name;
+      char*  full   = info->full_name;
       char*  family = root->family_name;
 
 
       if ( full )
       {
-        while ( *family && *full == *family )
+        while ( *full )
         {
-          family++;
-          full++;
+          if ( *full == *family )
+          {
+            family++;
+            full++;
+          }
+          else
+          {
+            if ( *full == ' ' || *full == '-' )
+              full++;
+            else if ( *family == ' ' || *family == '-' )
+              family++;
+            else
+            {
+              if ( !*family )
+                root->style_name = full;
+              break;
+            }
+          }
         }
-
-        root->style_name = ( *full == ' ' ? full + 1
-                                          : (char *)"Regular" );
       }
-      else
-        root->style_name = (char *)"Regular";
     }
     else
     {
       /* do we have a `/FontName'? */
-      if ( face->type1.font_name )
-      {
-        root->family_name = face->type1.font_name;
-        root->style_name  = (char *)"Regular";
-      }
+      if ( type1->font_name )
+        root->family_name = type1->font_name;
     }
 
     /* no embedded bitmap support */
@@ -266,15 +278,15 @@
     root->max_advance_width  = face->ttf_face->max_advance_width;
     root->max_advance_height = face->ttf_face->max_advance_height;
 
-    root->underline_position  = face->type1.font_info.underline_position;
-    root->underline_thickness = face->type1.font_info.underline_thickness;
+    root->underline_position  = info->underline_position >> 16;
+    root->underline_thickness = info->underline_thickness >> 16;
 
     root->internal->max_points   = 0;
     root->internal->max_contours = 0;
 
     /* compute style flags */
     root->style_flags = 0;
-    if ( face->type1.font_info.italic_angle )
+    if ( info->italic_angle )
       root->style_flags |= FT_STYLE_FLAG_ITALIC;
 
     if ( face->ttf_face->style_flags & FT_STYLE_FLAG_BOLD )
@@ -304,7 +316,7 @@
         charmap.platform_id = 7;
         clazz               = NULL;
 
-        switch ( face->type1.encoding_type )
+        switch ( type1->encoding_type )
         {
         case T1_ENCODING_TYPE_STANDARD:
           charmap.encoding    = FT_ENCODING_ADOBE_STANDARD;
@@ -386,6 +398,9 @@
       FT_FREE( type1->encoding.char_name );
       FT_FREE( type1->font_name );
 
+      FT_FREE( type1->paint_type );
+      FT_FREE( type1->stroke_width );
+
       FT_FREE( face->ttf_data );
 
 #if 0
@@ -532,7 +547,7 @@
     T42_Face  t42face = (T42_Face)face;
 
 
-    FT_Activate_Size(size->ttsize);
+    FT_Activate_Size( size->ttsize );
 
     return FT_Set_Char_Size( t42face->ttf_face,
                              char_width,
@@ -551,7 +566,7 @@
     T42_Face  t42face = (T42_Face)face;
 
 
-    FT_Activate_Size(size->ttsize);
+    FT_Activate_Size( size->ttsize );
 
     return FT_Set_Pixel_Sizes( t42face->ttf_face,
                                pixel_width,
diff --git a/reactos/lib/freetype/src/type42/t42parse.c b/reactos/lib/freetype/src/type42/t42parse.c
index 8bb2e7ba6c5..ae4b7fcd57d 100644
--- a/reactos/lib/freetype/src/type42/t42parse.c
+++ b/reactos/lib/freetype/src/type42/t42parse.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 42 font parser (body).                                          */
 /*                                                                         */
-/*  Copyright 2002 by Roberto Alameda.                                     */
+/*  Copyright 2002, 2003 by Roberto Alameda.                               */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
@@ -33,25 +33,17 @@
 #define FT_COMPONENT  trace_t42
 
 
-  static void
-  t42_parse_font_name( T42_Face    face,
-                       T42_Loader  loader );
-                       
-  static void
-  t42_parse_font_bbox( T42_Face    face,
-                       T42_Loader  loader );
-                       
   static void
   t42_parse_font_matrix( T42_Face    face,
                          T42_Loader  loader );
   static void
   t42_parse_encoding( T42_Face    face,
                       T42_Loader  loader );
-                      
+
   static void
   t42_parse_charstrings( T42_Face    face,
                          T42_Loader  loader );
-                         
+
   static void
   t42_parse_sfnts( T42_Face    face,
                    T42_Loader  loader );
@@ -65,27 +57,33 @@
 #undef  T1CODE
 #define T1CODE        T1_FIELD_LOCATION_FONT_INFO
 
-    T1_FIELD_STRING   ( "version",            version )
-    T1_FIELD_STRING   ( "Notice",             notice )
-    T1_FIELD_STRING   ( "FullName",           full_name )
-    T1_FIELD_STRING   ( "FamilyName",         family_name )
-    T1_FIELD_STRING   ( "Weight",             weight )
-    T1_FIELD_NUM      ( "ItalicAngle",        italic_angle )
-    T1_FIELD_TYPE_BOOL( "isFixedPitch",       is_fixed_pitch )
-    T1_FIELD_NUM      ( "UnderlinePosition",  underline_position )
-    T1_FIELD_NUM      ( "UnderlineThickness", underline_thickness )
+    T1_FIELD_STRING( "version",            version )
+    T1_FIELD_STRING( "Notice",             notice )
+    T1_FIELD_STRING( "FullName",           full_name )
+    T1_FIELD_STRING( "FamilyName",         family_name )
+    T1_FIELD_STRING( "Weight",             weight )
+    T1_FIELD_NUM   ( "ItalicAngle",        italic_angle )
+    T1_FIELD_BOOL  ( "isFixedPitch",       is_fixed_pitch )
+    T1_FIELD_NUM   ( "UnderlinePosition",  underline_position )
+    T1_FIELD_NUM   ( "UnderlineThickness", underline_thickness )
 
 #undef  FT_STRUCTURE
 #define FT_STRUCTURE  T1_FontRec
 #undef  T1CODE
 #define T1CODE        T1_FIELD_LOCATION_FONT_DICT
 
-    T1_FIELD_NUM( "PaintType",   paint_type )
-    T1_FIELD_NUM( "FontType",    font_type )
-    T1_FIELD_NUM( "StrokeWidth", stroke_width )
+    T1_FIELD_KEY  ( "FontName",    font_name )
+    T1_FIELD_NUM  ( "PaintType",   paint_type )
+    T1_FIELD_NUM  ( "FontType",    font_type )
+    T1_FIELD_FIXED( "StrokeWidth", stroke_width )
+
+#undef  FT_STRUCTURE
+#define FT_STRUCTURE  FT_BBox
+#undef  T1CODE
+#define T1CODE        T1_FIELD_LOCATION_BBOX
+
+    T1_FIELD_BBOX("FontBBox", xMin )
 
-    T1_FIELD_CALLBACK( "FontName",    t42_parse_font_name )
-    T1_FIELD_CALLBACK( "FontBBox",    t42_parse_font_bbox )
     T1_FIELD_CALLBACK( "FontMatrix",  t42_parse_font_matrix )
     T1_FIELD_CALLBACK( "Encoding",    t42_parse_encoding )
     T1_FIELD_CALLBACK( "CharStrings", t42_parse_charstrings )
@@ -95,6 +93,10 @@
   };
 
 
+#define T42_KEYWORD_COUNT                                          \
+          ( sizeof ( t42_keywords ) / sizeof ( t42_keywords[0] ) )
+
+
 #define T1_Add_Table( p, i, o, l )  (p)->funcs.add( (p), i, o, l )
 #define T1_Done_Table( p )          \
           do                        \
@@ -247,63 +249,6 @@
   }
 
 
-  static void
-  t42_parse_font_name( T42_Face    face,
-                       T42_Loader  loader )
-  {
-    T42_Parser  parser = &loader->parser;
-    FT_Error    error;
-    FT_Memory   memory = parser->root.memory;
-    FT_Int      len;
-    FT_Byte*    cur;
-    FT_Byte*    cur2;
-    FT_Byte*    limit;
-
-
-    T1_Skip_Spaces( parser );
-
-    cur   = parser->root.cursor;
-    limit = parser->root.limit;
-
-    if ( cur >= limit - 1              ||
-         ( *cur != '/' && *cur != '(') )
-      return;
-
-    cur++;
-    cur2 = cur;
-    while ( cur2 < limit && t42_is_alpha( *cur2 ) )
-      cur2++;
-
-    len = (FT_Int)( cur2 - cur );
-    if ( len > 0 )
-    {
-      if ( FT_ALLOC( face->type1.font_name, len + 1 ) )
-      {
-        parser->root.error = error;
-        return;
-      }
-
-      FT_MEM_COPY( face->type1.font_name, cur, len );
-      face->type1.font_name[len] = '\0';
-    }
-    parser->root.cursor = cur2;
-  }
-
-
-  static void
-  t42_parse_font_bbox( T42_Face   face,
-                       T42_Loader  loader )
-  {
-    T42_Parser  parser = &loader->parser;
-    FT_BBox*    bbox   = &face->type1.font_bbox;
-
-    bbox->xMin = T1_ToInt( parser );
-    bbox->yMin = T1_ToInt( parser );
-    bbox->xMax = T1_ToInt( parser );
-    bbox->yMax = T1_ToInt( parser );
-  }
-
-
   static void
   t42_parse_font_matrix( T42_Face    face,
                          T42_Loader  loader )
@@ -383,7 +328,7 @@
 
 
       /* read the number of entries in the encoding, should be 256 */
-      count = T1_ToInt( parser );
+      count = (FT_Int)T1_ToInt( parser );
       if ( parser->root.error )
         return;
 
@@ -451,7 +396,7 @@
 
 
           parser->root.cursor = cur;
-          charcode = T1_ToInt( parser );
+          charcode = (FT_Int)T1_ToInt( parser );
           cur      = parser->root.cursor;
 
           /* skip whitespace */
@@ -515,28 +460,28 @@
   t42_hexval( FT_Byte  v )
   {
     FT_UInt  d;
-    
+
     d = (FT_UInt)( v - 'A' );
     if ( d < 6 )
     {
       d += 10;
       goto Exit;
     }
-      
+
     d = (FT_UInt)( v - 'a' );
     if ( d < 6 )
     {
       d += 10;
       goto Exit;
     }
-      
+
     d = (FT_UInt)( v - '0' );
     if ( d < 10 )
       goto Exit;
-      
+
     d = 0;
- 
-  Exit:         
+
+  Exit:
     return d;
   }
 
@@ -668,7 +613,7 @@
           for ( i = 0; i < num_tables; i++ )
           {
             FT_Byte*  p = face->ttf_data + 12 + 16*i + 12;
-            
+
             len = FT_PEEK_ULONG( p );
 
             /* Pad to a 4-byte boundary length */
@@ -715,7 +660,7 @@
     FT_Int         n;
 
 
-    loader->num_glyphs = T1_ToInt( parser );
+    loader->num_glyphs = (FT_Int)T1_ToInt( parser );
     if ( parser->root.error )
       return;
 
@@ -837,14 +782,18 @@
     {
     case T1_FIELD_LOCATION_FONT_INFO:
       dummy_object = &face->type1.font_info;
-      objects      = &dummy_object;
+      break;
+
+    case T1_FIELD_LOCATION_BBOX:
+      dummy_object = &face->type1.font_bbox;
       break;
 
     default:
       dummy_object = &face->type1;
-      objects      = &dummy_object;
     }
 
+    objects = &dummy_object;
+
     if ( field->type == T1_FIELD_TYPE_INTEGER_ARRAY ||
          field->type == T1_FIELD_TYPE_FIXED_ARRAY   )
       error = T1_Load_Field_Table( &loader->parser, field,
@@ -864,12 +813,21 @@
                   FT_Byte*    base,
                   FT_Long     size )
   {
-    T42_Parser  parser = &loader->parser;
-    FT_Byte*    cur    = base;
-    FT_Byte*    limit  = cur + size;
-    FT_UInt     n_keywords = sizeof ( t42_keywords ) / 
-                             sizeof ( t42_keywords[0] );
+    T42_Parser  parser     = &loader->parser;
+    FT_Byte*    cur        = base;
+    FT_Byte*    limit      = cur + size;
+    FT_UInt     n_keywords = (FT_UInt)( sizeof ( t42_keywords ) /
+                                        sizeof ( t42_keywords[0] ) );
 
+    FT_Byte     keyword_flags[T42_KEYWORD_COUNT];
+
+    {
+      FT_UInt  n;
+
+
+      for ( n = 0; n < T42_KEYWORD_COUNT; n++ )
+        keyword_flags[n] = 0;
+    }
 
     parser->root.cursor = base;
     parser->root.limit  = base + size;
@@ -942,11 +900,19 @@
               /* we found it -- run the parsing callback! */
               parser->root.cursor = cur2;
               T1_Skip_Spaces( parser );
-              parser->root.error = t42_load_keyword(face,
-                                                    loader,
-                                                    keyword );
-              if ( parser->root.error )
-                return parser->root.error;
+
+              /* only record the first instance of each field/keyword */
+              /* to deal with synthetic fonts correctly               */
+              if ( keyword_flags[i] == 0 )
+              {
+                parser->root.error = t42_load_keyword(face,
+                                                      loader,
+                                                      keyword );
+                if ( parser->root.error )
+                  return parser->root.error;
+              }
+              keyword_flags[i] = 1;
+
               cur = parser->root.cursor;
               break;
             }
diff --git a/reactos/lib/freetype/src/type42/t42parse.h b/reactos/lib/freetype/src/type42/t42parse.h
index 9bcb657309f..7339aa63b52 100644
--- a/reactos/lib/freetype/src/type42/t42parse.h
+++ b/reactos/lib/freetype/src/type42/t42parse.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 42 font parser (specification).                                 */
 /*                                                                         */
-/*  Copyright 2002 by Roberto Alameda.                                     */
+/*  Copyright 2002, 2003 by Roberto Alameda.                               */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
@@ -31,7 +31,7 @@ FT_BEGIN_HEADER
     FT_Stream     stream;
 
     FT_Byte*      base_dict;
-    FT_Int        base_len;
+    FT_Long       base_len;
 
     FT_Byte       in_memory;
 
diff --git a/reactos/lib/freetype/src/winfonts/rules.mk b/reactos/lib/freetype/src/winfonts/rules.mk
index 994eef83300..71a7df2d8ab 100644
--- a/reactos/lib/freetype/src/winfonts/rules.mk
+++ b/reactos/lib/freetype/src/winfonts/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001 by
+# Copyright 1996-2000, 2001, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -15,21 +15,20 @@
 
 # Windows driver directory
 #
-FNT_DIR  := $(SRC_)winfonts
-FNT_DIR_ := $(FNT_DIR)$(SEP)
+FNT_DIR := $(SRC_DIR)/winfonts
 
 
-FNT_COMPILE := $(FT_COMPILE) $I$(FNT_DIR)
+FNT_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(FNT_DIR))
 
 
 # Windows driver sources (i.e., C files)
 #
-FNT_DRV_SRC := $(FNT_DIR_)winfnt.c
+FNT_DRV_SRC := $(FNT_DIR)/winfnt.c
 
 # Windows driver headers
 #
 FNT_DRV_H := $(FNT_DRV_SRC:%.c=%.h) \
-             $(FNT_DIR_)fnterrs.h
+             $(FNT_DIR)/fnterrs.h
 
 
 # Windows driver object(s)
@@ -37,24 +36,24 @@ FNT_DRV_H := $(FNT_DRV_SRC:%.c=%.h) \
 #   FNT_DRV_OBJ_M is used during `multi' builds
 #   FNT_DRV_OBJ_S is used during `single' builds
 #
-FNT_DRV_OBJ_M := $(FNT_DRV_SRC:$(FNT_DIR_)%.c=$(OBJ_)%.$O)
-FNT_DRV_OBJ_S := $(OBJ_)winfnt.$O
+FNT_DRV_OBJ_M := $(FNT_DRV_SRC:$(FNT_DIR)/%.c=$(OBJ_DIR)/%.$O)
+FNT_DRV_OBJ_S := $(OBJ_DIR)/winfnt.$O
 
 # Windows driver source file for single build
 #
-FNT_DRV_SRC_S := $(FNT_DIR_)winfnt.c
+FNT_DRV_SRC_S := $(FNT_DIR)/winfnt.c
 
 
 # Windows driver - single object
 #
 $(FNT_DRV_OBJ_S): $(FNT_DRV_SRC_S) $(FNT_DRV_SRC) $(FREETYPE_H) $(FNT_DRV_H)
-	$(FNT_COMPILE) $T$@ $(FNT_DRV_SRC_S)
+	$(FNT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(FNT_DRV_SRC_S))
 
 
 # Windows driver - multiple objects
 #
-$(OBJ_)%.$O: $(FNT_DIR_)%.c $(FREETYPE_H) $(FNT_DRV_H)
-	$(FNT_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(FNT_DIR)/%.c $(FREETYPE_H) $(FNT_DRV_H)
+	$(FNT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
 
 # update main driver object lists
@@ -62,4 +61,5 @@ $(OBJ_)%.$O: $(FNT_DIR_)%.c $(FREETYPE_H) $(FNT_DRV_H)
 DRV_OBJS_S += $(FNT_DRV_OBJ_S)
 DRV_OBJS_M += $(FNT_DRV_OBJ_M)
 
+
 # EOF
diff --git a/reactos/lib/freetype/src/winfonts/winfnt.c b/reactos/lib/freetype/src/winfonts/winfnt.c
index a82f5ebeec6..b2e315f63cd 100644
--- a/reactos/lib/freetype/src/winfonts/winfnt.c
+++ b/reactos/lib/freetype/src/winfonts/winfnt.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType font driver for Windows FNT/FON files                       */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -113,14 +113,21 @@
 
 
   static void
-  fnt_font_done( FNT_Font   font,
-                 FT_Stream  stream )
+  fnt_font_done( FNT_Face face )
   {
+    FT_Memory  memory = FT_FACE( face )->memory;
+    FT_Stream  stream = FT_FACE( face )->stream;
+    FNT_Font   font   = face->font;
+
+
+    if ( !font )
+      return;
+
     if ( font->fnt_frame )
       FT_FRAME_RELEASE( font->fnt_frame );
 
-    font->fnt_size  = 0;
-    font->fnt_frame = 0;
+    FT_FREE( font );
+    face->font = 0;
   }
 
 
@@ -133,7 +140,7 @@
 
 
     /* first of all, read the FNT header */
-    if ( FT_STREAM_SEEK( font->offset )                   ||
+    if ( FT_STREAM_SEEK( font->offset )                        ||
          FT_STREAM_READ_FIELDS( winfnt_header_fields, header ) )
       goto Exit;
 
@@ -164,11 +171,7 @@
       goto Exit;
     }
 
-    /* small fixup -- some fonts have the `pixel_width' field set to 0 */
-    if ( header->pixel_width == 0 )
-      header->pixel_width = header->pixel_height;
-
-    /* this is a FNT file/table, we now extract its frame */
+    /* this is a FNT file/table; extract its frame */
     if ( FT_STREAM_SEEK( font->offset )                         ||
          FT_FRAME_EXTRACT( header->file_size, font->fnt_frame ) )
       goto Exit;
@@ -178,25 +181,9 @@
   }
 
 
-  static void
-  fnt_face_done_fonts( FNT_Face  face )
-  {
-    FT_Memory  memory = FT_FACE( face )->memory;
-    FT_Stream  stream = FT_FACE( face )->stream;
-    FNT_Font   cur    = face->fonts;
-    FNT_Font   limit  = cur + face->num_fonts;
-
-
-    for ( ; cur < limit; cur++ )
-      fnt_font_done( cur, stream );
-
-    FT_FREE( face->fonts );
-    face->num_fonts = 0;
-  }
-
-
   static FT_Error
-  fnt_face_get_dll_fonts( FNT_Face  face )
+  fnt_face_get_dll_font( FNT_Face  face,
+                         FT_Int    face_index )
   {
     FT_Error         error;
     FT_Stream        stream = FT_FACE( face )->stream;
@@ -204,38 +191,36 @@
     WinMZ_HeaderRec  mz_header;
 
 
-    face->fonts     = 0;
-    face->num_fonts = 0;
+    face->font = 0;
 
-    /* does it begin with a MZ header? */
-    if ( FT_STREAM_SEEK( 0 )                                 ||
+    /* does it begin with an MZ header? */
+    if ( FT_STREAM_SEEK( 0 )                                      ||
          FT_STREAM_READ_FIELDS( winmz_header_fields, &mz_header ) )
       goto Exit;
 
     error = FNT_Err_Unknown_File_Format;
     if ( mz_header.magic == WINFNT_MZ_MAGIC )
     {
-      /* yes, now look for a NE header in the file */
+      /* yes, now look for an NE header in the file */
       WinNE_HeaderRec  ne_header;
 
 
-      if ( FT_STREAM_SEEK( mz_header.lfanew )                  ||
+      if ( FT_STREAM_SEEK( mz_header.lfanew )                       ||
            FT_STREAM_READ_FIELDS( winne_header_fields, &ne_header ) )
         goto Exit;
 
       error = FNT_Err_Unknown_File_Format;
       if ( ne_header.magic == WINFNT_NE_MAGIC )
       {
-        /* good, now look in the resource table for each FNT resource */
-        FT_ULong   res_offset = mz_header.lfanew +
-                                ne_header.resource_tab_offset;
-
+        /* good, now look into the resource table for each FNT resource */
+        FT_ULong   res_offset  = mz_header.lfanew +
+                                   ne_header.resource_tab_offset;
         FT_UShort  size_shift;
         FT_UShort  font_count  = 0;
         FT_ULong   font_offset = 0;
 
 
-        if ( FT_STREAM_SEEK( res_offset ) ||
+        if ( FT_STREAM_SEEK( res_offset )                    ||
              FT_FRAME_ENTER( ne_header.rname_tab_offset -
                              ne_header.resource_tab_offset ) )
           goto Exit;
@@ -253,7 +238,7 @@
 
           count = FT_GET_USHORT_LE();
 
-          if ( type_id == 0x8008 )
+          if ( type_id == 0x8008U )
           {
             font_count  = count;
             font_offset = (FT_ULong)( FT_STREAM_POS() + 4 +
@@ -263,6 +248,7 @@
 
           stream->cursor += 4 + count * 12;
         }
+
         FT_FRAME_EXIT();
 
         if ( !font_count || !font_offset )
@@ -272,57 +258,42 @@
           goto Exit;
         }
 
-        if ( FT_STREAM_SEEK( font_offset )           ||
-             FT_NEW_ARRAY( face->fonts, font_count ) )
-          goto Exit;
+        face->root.num_faces = font_count;
 
-        face->num_fonts = font_count;
-
-        if ( FT_FRAME_ENTER( (FT_Long)font_count * 12 ) )
-          goto Exit;
-
-        /* now read the offset and position of each FNT font */
+        if ( face_index >= font_count )
         {
-          FNT_Font  cur   = face->fonts;
-          FNT_Font  limit = cur + font_count;
-
-
-          for ( ; cur < limit; cur++ )
-          {
-            cur->offset     = (FT_ULong)FT_GET_USHORT_LE() << size_shift;
-            cur->fnt_size   = (FT_ULong)FT_GET_USHORT_LE() << size_shift;
-            cur->size_shift = size_shift;
-            stream->cursor += 8;
-          }
+          error = FNT_Err_Bad_Argument;
+          goto Exit;
         }
+
+        if ( FT_NEW( face->font ) )
+          goto Exit;
+
+        if ( FT_STREAM_SEEK( font_offset + face_index * 12 ) ||
+             FT_FRAME_ENTER( 12 )                            )
+          goto Fail;
+
+        face->font->offset     = (FT_ULong)FT_GET_USHORT_LE() << size_shift;
+        face->font->fnt_size   = (FT_ULong)FT_GET_USHORT_LE() << size_shift;
+        face->font->size_shift = size_shift;
+
+        stream->cursor += 8;
+
         FT_FRAME_EXIT();
 
-        /* finally, try to load each font there */
-        {
-          FNT_Font  cur   = face->fonts;
-          FNT_Font  limit = cur + font_count;
-
-
-          for ( ; cur < limit; cur++ )
-          {
-            error = fnt_font_load( cur, stream );
-            if ( error )
-              goto Fail;
-          }
-        }
+        error = fnt_font_load( face->font, stream );
       }
     }
 
   Fail:
     if ( error )
-      fnt_face_done_fonts( face );
+      fnt_font_done( face );
 
   Exit:
     return error;
   }
 
 
-
   typedef struct  FNT_CMapRec_
   {
     FT_CMapRec  cmap;
@@ -336,7 +307,7 @@
   fnt_cmap_init( FNT_CMap  cmap )
   {
     FNT_Face  face = (FNT_Face)FT_CMAP_FACE( cmap );
-    FNT_Font  font = face->fonts;
+    FNT_Font  font = face->font;
 
 
     cmap->first = (FT_UInt32)  font->header.first_char;
@@ -355,8 +326,8 @@
 
     char_code -= cmap->first;
     if ( char_code < cmap->count )
-      gindex = char_code + 1;
-
+      gindex = char_code + 1; /* we artificially increase the glyph index; */
+                              /* FNT_Load_Glyph reverts to the right one   */
     return gindex;
   }
 
@@ -403,14 +374,13 @@
   static FT_CMap_Class  fnt_cmap_class = &fnt_cmap_class_rec;
 
 
-
   static void
   FNT_Face_Done( FNT_Face  face )
   {
     FT_Memory  memory = FT_FACE_MEMORY( face );
 
 
-    fnt_face_done_fonts( face );
+    fnt_font_done( face );
 
     FT_FREE( face->root.available_sizes );
     face->root.num_fixed_sizes = 0;
@@ -429,23 +399,22 @@
 
     FT_UNUSED( num_params );
     FT_UNUSED( params );
-    FT_UNUSED( face_index );
 
 
-    /* try to load several fonts from a DLL */
-    error = fnt_face_get_dll_fonts( face );
+    /* try to load font from a DLL */
+    error = fnt_face_get_dll_font( face, face_index );
     if ( error )
     {
-      /* this didn't work, now try to load a single FNT font */
+      /* this didn't work; try to load a single FNT font */
       FNT_Font  font;
 
 
-      if ( FT_NEW( face->fonts ) )
+      if ( FT_NEW( face->font ) )
         goto Exit;
 
-      face->num_fonts = 1;
-      font            = face->fonts;
+      face->root.num_faces = 1;
 
+      font           = face->font;
       font->offset   = 0;
       font->fnt_size = stream->size;
 
@@ -454,48 +423,51 @@
         goto Fail;
     }
 
-    /* all right, one or more fonts were loaded; we now need to */
-    /* fill the root FT_Face fields with relevant information   */
+    /* we now need to fill the root FT_Face fields */
+    /* with relevant information                   */
     {
-      FT_Face   root  = FT_FACE( face );
-      FNT_Font  fonts = face->fonts;
-      FNT_Font  limit = fonts + face->num_fonts;
-      FNT_Font  cur;
+      FT_Face   root = FT_FACE( face );
+      FNT_Font  font = face->font;
 
 
-      root->num_faces  = 1;
       root->face_flags = FT_FACE_FLAG_FIXED_SIZES |
                          FT_FACE_FLAG_HORIZONTAL;
 
-      if ( fonts->header.avg_width == fonts->header.max_width )
+      if ( font->header.avg_width == font->header.max_width )
         root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
 
-      if ( fonts->header.italic )
+      if ( font->header.italic )
         root->style_flags |= FT_STYLE_FLAG_ITALIC;
 
-      if ( fonts->header.weight >= 800 )
+      if ( font->header.weight >= 800 )
         root->style_flags |= FT_STYLE_FLAG_BOLD;
 
-      /* Setup the `fixed_sizes' array */
-      if ( FT_NEW_ARRAY( root->available_sizes, face->num_fonts ) )
+      /* set up the `fixed_sizes' array */
+      if ( FT_NEW_ARRAY( root->available_sizes, 1 ) )
         goto Fail;
 
-      root->num_fixed_sizes = face->num_fonts;
+      root->num_fixed_sizes = 1;
 
       {
-        FT_Bitmap_Size*  size = root->available_sizes;
+        FT_Bitmap_Size*  bsize = root->available_sizes;
 
 
-        for ( cur = fonts; cur < limit; cur++, size++ )
-        {
-          size->width  = cur->header.pixel_width;
-          size->height = cur->header.pixel_height;
-        }
+        bsize->width  = font->header.avg_width;
+        bsize->height =
+          font->header.pixel_height + font->header.external_leading;
+        bsize->size   = font->header.nominal_point_size << 6;
+        bsize->x_ppem = 
+          (FT_Pos)( ( font->header.horizontal_resolution * bsize->size + 36 )
+                    / 72 );
+        bsize->y_ppem =
+          (FT_Pos)( ( font->header.vertical_resolution* bsize->size + 36 )
+                    / 72 );
       }
 
       {
         FT_CharMapRec  charmap;
 
+
         charmap.encoding    = FT_ENCODING_UNICODE;
         charmap.platform_id = 3;
         charmap.encoding_id = 1;
@@ -514,11 +486,13 @@
       }
 
       /* setup remaining flags */
-      root->num_glyphs = fonts->header.last_char -
-                         fonts->header.first_char + 1;
 
-      root->family_name = (FT_String*)fonts->fnt_frame +
-                          fonts->header.face_name_offset;
+      /* reserve one slot for the .notdef glyph at index 0 */
+      root->num_glyphs = font->header.last_char -
+                           font->header.first_char + 1 + 1;
+
+      root->family_name = (FT_String*)font->fnt_frame +
+                            font->header.face_name_offset;
       root->style_name  = (char *)"Regular";
 
       if ( root->style_flags & FT_STYLE_FLAG_BOLD )
@@ -542,63 +516,58 @@
 
 
   static FT_Error
-  FNT_Size_Set_Pixels( FNT_Size  size )
+  FNT_Size_Set_Pixels( FT_Size  size )
   {
-    /* look up a font corresponding to the current pixel size */
-    FNT_Face  face  = (FNT_Face)FT_SIZE_FACE( size );
-    FNT_Font  cur   = face->fonts;
-    FNT_Font  limit = cur + face->num_fonts;
+    FNT_Face  face = (FNT_Face)FT_SIZE_FACE( size );
+    FT_Face   root = FT_FACE( face );
 
 
-    size->font = 0;
-    for ( ; cur < limit; cur++ )
+    if ( size->metrics.y_ppem == root->available_sizes->height )
     {
-      /* we only compare the character height, as fonts used some strange */
-      /* values                                                           */
-      if ( cur->header.pixel_height == size->root.metrics.y_ppem )
-      {
-        size->font = cur;
+      FNT_Font  font = face->font;
 
-        size->root.metrics.ascender  = cur->header.ascent * 64;
-        size->root.metrics.descender = ( cur->header.pixel_height -
-                                           cur->header.ascent ) * 64;
-        size->root.metrics.height    = cur->header.pixel_height * 64;
-        break;
-      }
+
+      size->metrics.ascender    = font->header.ascent * 64;
+      size->metrics.descender   = ( font->header.pixel_height -
+                                      font->header.ascent ) * 64;
+      size->metrics.height      = font->header.pixel_height * 64;
+      size->metrics.max_advance = font->header.max_width * 64;
+
+      return FNT_Err_Ok;
     }
-
-    return ( size->font ? FNT_Err_Ok : FNT_Err_Invalid_Pixel_Size );
+    else
+      return FNT_Err_Invalid_Pixel_Size;
   }
 
 
   static FT_Error
   FNT_Load_Glyph( FT_GlyphSlot  slot,
-                  FNT_Size      size,
+                  FT_Size       size,
                   FT_UInt       glyph_index,
                   FT_Int32      load_flags )
   {
-    FNT_Font    font  = size->font;
-    FT_Error    error = 0;
+    FNT_Face    face   = (FNT_Face)FT_SIZE_FACE( size );
+    FNT_Font    font   = face->font;
+    FT_Error    error  = FNT_Err_Ok;
     FT_Byte*    p;
     FT_Int      len;
     FT_Bitmap*  bitmap = &slot->bitmap;
     FT_ULong    offset;
     FT_Bool     new_format;
 
-    FT_UNUSED( slot );
     FT_UNUSED( load_flags );
 
 
-    if ( !font )
+    if ( !face || !font )
     {
       error = FNT_Err_Invalid_Argument;
       goto Exit;
     }
 
     if ( glyph_index > 0 )
-      glyph_index--;
+      glyph_index--;                           /* revert to real index */
     else
-      glyph_index = font->header.default_char - font->header.first_char;
+      glyph_index = font->header.default_char; /* the .notdef glyph */
 
     new_format = FT_BOOL( font->header.version == 0x300 );
     len        = new_format ? 6 : 4;
@@ -618,21 +587,37 @@
 
     /* allocate and build bitmap */
     {
+      FT_Memory  memory = FT_FACE_MEMORY( slot->face );
       FT_Int     pitch  = ( bitmap->width + 7 ) >> 3;
+      FT_Byte*   column;
+      FT_Byte*   write;
 
 
       bitmap->pitch      = pitch;
       bitmap->rows       = font->header.pixel_height;
       bitmap->pixel_mode = FT_PIXEL_MODE_MONO;
 
-      /* note: we don't allocate a new buffer for the bitmap since we */
-      /*       already store the images in the FT_Face                */
-      ft_glyphslot_set_bitmap( slot, p );
+      /* note: since glyphs are stored in columns and not in rows we */
+      /*       can't use ft_glyphslot_set_bitmap                     */
+      if ( FT_ALLOC( bitmap->buffer, pitch * bitmap->rows ) )
+        goto Exit;
+
+      column = (FT_Byte*)bitmap->buffer;
+
+      for ( ; pitch > 0; pitch--, column++ )
+      {
+        FT_Byte*  limit = p + bitmap->rows;
+
+
+        for ( write = column; p < limit; p++, write += bitmap->pitch )
+          *write = *p;
+      }
     }
 
-    slot->bitmap_left = 0;
-    slot->bitmap_top  = font->header.ascent;
-    slot->format      = FT_GLYPH_FORMAT_BITMAP;
+    slot->internal->flags = FT_GLYPH_OWN_BITMAP;
+    slot->bitmap_left     = 0;
+    slot->bitmap_top      = font->header.ascent;
+    slot->format          = FT_GLYPH_FORMAT_BITMAP;
 
     /* now set up metrics */
     slot->metrics.horiAdvance  = bitmap->width << 6;
@@ -651,7 +636,8 @@
   const FT_Driver_ClassRec  winfnt_driver_class =
   {
     {
-      ft_module_font_driver,
+      FT_MODULE_FONT_DRIVER        |
+      FT_MODULE_DRIVER_NO_OUTLINES,
       sizeof ( FT_DriverRec ),
 
       "winfonts",
@@ -666,7 +652,7 @@
     },
 
     sizeof( FNT_FaceRec ),
-    sizeof( FNT_SizeRec ),
+    sizeof( FT_SizeRec ),
     sizeof( FT_GlyphSlotRec ),
 
     (FT_Face_InitFunc)        FNT_Face_Init,
diff --git a/reactos/lib/freetype/tests/gview.c b/reactos/lib/freetype/tests/gview.c
index 0e76e19ef13..77f15bcdf07 100644
--- a/reactos/lib/freetype/tests/gview.c
+++ b/reactos/lib/freetype/tests/gview.c
@@ -7,9 +7,7 @@
 
 /* include FreeType internals to debug hints */
 #include <../src/pshinter/pshrec.h>
-#include <../src/pshinter/pshalgo1.h>
-#include <../src/pshinter/pshalgo2.h>
-#include <../src/pshinter/pshalgo3.h>
+#include <../src/pshinter/pshalgo.h>
 
 #include <../src/autohint/ahtypes.h>
 
@@ -24,9 +22,9 @@
 
 #include <time.h>    /* for clock() */
 
-/* SunOS 4.1.* does not define CLOCKS_PER_SEC, so include <sys/param.h> */
-/* to get the HZ macro which is the equivalent.                         */
-#if defined(__sun__) && !defined(SVR4) && !defined(__SVR4)
+  /* SunOS 4.1.* does not define CLOCKS_PER_SEC, so include <sys/param.h> */
+  /* to get the HZ macro which is the equivalent.                         */
+#if defined( __sun__ ) && !defined( SVR4 ) && !defined( __SVR4 )
 #include <sys/param.h>
 #define CLOCKS_PER_SEC HZ
 #endif
@@ -56,6 +54,7 @@ static  NV_Scale      grid_scale = 1.0;
 static  int   glyph_index;
 static  int   pixel_size = 12;
 
+
  /************************************************************************/
  /************************************************************************/
  /*****                                                              *****/
@@ -116,6 +115,7 @@ static  NV_Path   symbol_rect_v  = NULL;
 #define  LINK_COLOR        0xF0FFFF00
 #define  SERIF_LINK_COLOR  0xF0FF808F
 
+
 /* print message and abort program */
 static void
 Panic( const char*  message )
@@ -144,6 +144,7 @@ init_symbols( void )
   nv_path_new_circle( renderer, 0, 0, 2., &symbol_dot );
  }
 
+
 static void
 done_symbols( void )
 {
@@ -154,36 +155,39 @@ done_symbols( void )
   nv_path_destroy( symbol_square );
 }
 
- /************************************************************************/
- /************************************************************************/
- /*****                                                              *****/
- /*****                     COMMON GRID DRAWING ROUTINES             *****/
- /*****                                                              *****/
- /************************************************************************/
- /************************************************************************/
+
+  /************************************************************************/
+  /************************************************************************/
+  /*****                                                              *****/
+  /*****               COMMON GRID DRAWING ROUTINES                   *****/
+  /*****                                                              *****/
+  /************************************************************************/
+  /************************************************************************/
 
 static void
 reset_scale( NV_Scale  scale )
 {
- /* compute font units -> grid pixels scale factor */
+  /* compute font units -> grid pixels scale factor */
   glyph_scale = target->width*0.75 / face->units_per_EM * scale;
 
- /* setup font units -> grid pixels transform */
+  /* setup font units -> grid pixels transform */
   nv_transform_set_scale( &glyph_transform, glyph_scale, -glyph_scale );
   glyph_org_x = glyph_transform.delta.x = target->width*0.125;
   glyph_org_y = glyph_transform.delta.y = target->height*0.875;
 
- /* setup subpixels -> grid pixels transform */
-  nv_transform_set_scale( &size_transform,
-                            glyph_scale/nv_fromfixed(face->size->metrics.x_scale),
-                          - glyph_scale/nv_fromfixed(face->size->metrics.y_scale) );
+  /* setup subpixels -> grid pixels transform */
+  nv_transform_set_scale(
+    &size_transform,
+    glyph_scale / nv_fromfixed( face->size->metrics.x_scale ),
+    -glyph_scale / nv_fromfixed( face->size->metrics.y_scale ) );
 
   size_transform.delta = glyph_transform.delta;
 }
 
 
 static void
-reset_size( int  pixel_size, NV_Scale  scale )
+reset_size( int       pixel_size,
+            NV_Scale  scale )
 {
   FT_Set_Pixel_Sizes( face, pixel_size, pixel_size );
   reset_scale( scale );
@@ -204,34 +208,36 @@ draw_grid( void )
   int  x = (int)glyph_org_x;
   int  y = (int)glyph_org_y;
 
+
   /* draw grid */
   if ( option_show_grid )
   {
     NV_Scale  min, max, x, step;
 
+
     /* draw vertical grid bars */
     step = 64. * size_transform.matrix.xx;
-    if (step > 1.)
+    if ( step > 1. )
     {
-      min  = max = glyph_org_x;
+      min = max = glyph_org_x;
       while ( min - step >= 0 )             min -= step;
       while ( max + step < target->width )  max += step;
 
       for ( x = min; x <= max; x += step )
-        nv_pixmap_fill_rect( target, (NV_Int)(x+.5), 0,
+        nv_pixmap_fill_rect( target, (NV_Int)(x + .5), 0,
                              1, target->height, GRID_COLOR );
     }
 
     /* draw horizontal grid bars */
     step = -64. * size_transform.matrix.yy;
-    if (step > 1.)
+    if ( step > 1. )
     {
-      min  = max = glyph_org_y;
+      min = max = glyph_org_y;
       while ( min - step >= 0 )              min -= step;
       while ( max + step < target->height )  max += step;
 
       for ( x = min; x <= max; x += step )
-        nv_pixmap_fill_rect( target, 0, (NV_Int)(x+.5),
+        nv_pixmap_fill_rect( target, 0, (NV_Int)(x + .5),
                              target->width, 1, GRID_COLOR );
     }
   }
@@ -249,6 +255,7 @@ draw_grid( void )
     NV_Path  stroke;
     NV_UInt  units = (NV_UInt)face->units_per_EM;
 
+
     nv_path_new_rectangle( renderer, 0, 0, units, units, 0, 0, &path );
     nv_path_transform( path, &glyph_transform );
 
@@ -265,13 +272,13 @@ draw_grid( void )
 }
 
 
- /************************************************************************/
- /************************************************************************/
- /*****                                                              *****/
- /*****            POSTSCRIPT GLOBALS ROUTINES                       *****/
- /*****                                                              *****/
- /************************************************************************/
- /************************************************************************/
+  /************************************************************************/
+  /************************************************************************/
+  /*****                                                              *****/
+  /*****                 POSTSCRIPT GLOBALS ROUTINES                  *****/
+  /*****                                                              *****/
+  /************************************************************************/
+  /************************************************************************/
 
 #include <../src/pshinter/pshglob.h>
 
@@ -287,6 +294,7 @@ draw_ps_blue_zones( void )
     FT_UInt         count;
     PSH_Blue_Zone   zone;
 
+
     /* draw top zones */
     table = &blues->normal_top;
     count = table->count;
@@ -348,7 +356,7 @@ draw_ps_blue_zones( void )
       y2 = (int)(v.y + 0.5);
 
       nv_pixmap_fill_rect( target, 0, y1,
-                           target->width, y2-y1+1,
+                           target->width, y2 - y1 + 1,
                            BLUES_BOT_COLOR );
 
 #if 0
@@ -358,21 +366,20 @@ draw_ps_blue_zones( void )
   }
 }
 
+
  /************************************************************************/
  /************************************************************************/
  /*****                                                              *****/
- /*****            POSTSCRIPT HINTER ALGORITHM 1 ROUTINES            *****/
+ /*****            POSTSCRIPT HINTER ALGORITHM ROUTINES              *****/
  /*****                                                              *****/
  /************************************************************************/
  /************************************************************************/
 
-#include <../src/pshinter/pshalgo1.h>
-
-static int pshint_cpos     = 0;
-static int pshint_vertical = -1;
+#include <../src/pshinter/pshalgo.h>
 
 static void
-draw_ps1_hint( PSH1_Hint   hint, FT_Bool  vertical )
+draw_ps_hint( PSH_Hint  hint, 
+              FT_Bool   vertical )
 {
   int        x1, x2;
   NV_Vector  v;
@@ -380,7 +387,7 @@ draw_ps1_hint( PSH1_Hint   hint, FT_Bool  vertical )
 
   if ( pshint_vertical != vertical )
   {
-    if (vertical)
+    if ( vertical )
       pshint_cpos = 40;
     else
       pshint_cpos = 10;
@@ -388,7 +395,7 @@ draw_ps1_hint( PSH1_Hint   hint, FT_Bool  vertical )
     pshint_vertical = vertical;
   }
 
-  if (vertical)
+  if ( !vertical )
   {
     if ( !option_show_vert_hints )
       return;
@@ -404,25 +411,25 @@ draw_ps1_hint( PSH1_Hint   hint, FT_Bool  vertical )
     x2 = (int)(v.x + 0.5);
 
     nv_pixmap_fill_rect( target, x1, 0, 1, target->height,
-                         psh1_hint_is_ghost(hint)
+                         psh_hint_is_ghost( hint )
                          ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
 
-    if ( psh1_hint_is_ghost(hint) )
+    if ( psh_hint_is_ghost( hint ) )
     {
       x1 --;
       x2 = x1 + 2;
     }
     else
       nv_pixmap_fill_rect( target, x2, 0, 1, target->height,
-                           psh1_hint_is_ghost(hint)
+                           psh_hint_is_ghost( hint )
                            ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
 
-    nv_pixmap_fill_rect( target, x1, pshint_cpos, x2+1-x1, 1,
+    nv_pixmap_fill_rect( target, x1, pshint_cpos, x2 + 1 - x1, 1,
                          STEM_JOIN_COLOR );
   }
   else
   {
-    if (!option_show_horz_hints)
+    if ( !option_show_horz_hints )
       return;
 
     v.y = hint->cur_pos;
@@ -436,120 +443,20 @@ draw_ps1_hint( PSH1_Hint   hint, FT_Bool  vertical )
     x2 = (int)(v.y + 0.5);
 
     nv_pixmap_fill_rect( target, 0, x1, target->width, 1,
-                         psh1_hint_is_ghost(hint)
+                         psh_hint_is_ghost( hint )
                          ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
 
-    if ( psh1_hint_is_ghost(hint) )
+    if ( psh_hint_is_ghost( hint ) )
     {
       x1 --;
       x2 = x1 + 2;
     }
     else
       nv_pixmap_fill_rect( target, 0, x2, target->width, 1,
-                           psh1_hint_is_ghost(hint)
+                           psh_hint_is_ghost(hint)
                            ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
 
-    nv_pixmap_fill_rect( target, pshint_cpos, x2, 1, x1+1-x2,
-                         STEM_JOIN_COLOR );
-  }
-
-#if 0
-  printf( "[%7.3f %7.3f] %c\n", hint->cur_pos/64.0, (hint->cur_pos+hint->cur_len)/64.0, vertical ? 'v' : 'h' );
-#endif
-
-  pshint_cpos += 10;
-}
-
-
-
- /************************************************************************/
- /************************************************************************/
- /*****                                                              *****/
- /*****            POSTSCRIPT HINTER ALGORITHM 2 ROUTINES            *****/
- /*****                                                              *****/
- /************************************************************************/
- /************************************************************************/
-
-#include <../src/pshinter/pshalgo2.h>
-
-static void
-draw_ps2_hint( PSH2_Hint   hint, FT_Bool  vertical )
-{
-  int        x1, x2;
-  NV_Vector  v;
-
-  if ( pshint_vertical != vertical )
-  {
-    if (vertical)
-      pshint_cpos = 40;
-    else
-      pshint_cpos = 10;
-
-    pshint_vertical = vertical;
-  }
-
-  if (vertical)
-  {
-    if ( !option_show_vert_hints )
-      return;
-
-    v.x = hint->cur_pos;
-    v.y = 0;
-    nv_vector_transform( &v, &size_transform );
-    x1 = (int)(v.x + 0.5);
-
-    v.x = hint->cur_pos + hint->cur_len;
-    v.y = 0;
-    nv_vector_transform( &v, &size_transform );
-    x2 = (int)(v.x + 0.5);
-
-    nv_pixmap_fill_rect( target, x1, 0, 1, target->height,
-                         psh2_hint_is_ghost(hint)
-                         ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
-
-    if ( psh2_hint_is_ghost(hint) )
-    {
-      x1 --;
-      x2 = x1 + 2;
-    }
-    else
-      nv_pixmap_fill_rect( target, x2, 0, 1, target->height,
-                           psh2_hint_is_ghost(hint)
-                           ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
-
-    nv_pixmap_fill_rect( target, x1, pshint_cpos, x2+1-x1, 1,
-                         STEM_JOIN_COLOR );
-  }
-  else
-  {
-    if (!option_show_horz_hints)
-      return;
-
-    v.y = hint->cur_pos;
-    v.x = 0;
-    nv_vector_transform( &v, &size_transform );
-    x1 = (int)(v.y + 0.5);
-
-    v.y = hint->cur_pos + hint->cur_len;
-    v.x = 0;
-    nv_vector_transform( &v, &size_transform );
-    x2 = (int)(v.y + 0.5);
-
-    nv_pixmap_fill_rect( target, 0, x1, target->width, 1,
-                         psh2_hint_is_ghost(hint)
-                         ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
-
-    if ( psh2_hint_is_ghost(hint) )
-    {
-      x1 --;
-      x2 = x1 + 2;
-    }
-    else
-      nv_pixmap_fill_rect( target, 0, x2, target->width, 1,
-                           psh2_hint_is_ghost(hint)
-                           ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
-
-    nv_pixmap_fill_rect( target, pshint_cpos, x2, 1, x1+1-x2,
+    nv_pixmap_fill_rect( target, pshint_cpos, x2, 1, x1 + 1 - x2,
                          STEM_JOIN_COLOR );
   }
 
@@ -562,195 +469,48 @@ draw_ps2_hint( PSH2_Hint   hint, FT_Bool  vertical )
 
 
 static void
-ps2_draw_control_points( void )
+ps_draw_control_points( void )
 {
-  if ( ps2_debug_glyph )
+  if ( ps_debug_glyph )
   {
-    PSH2_Glyph    glyph = ps2_debug_glyph;
-    PSH2_Point    point = glyph->points;
+    PSH_Glyph     glyph = ps_debug_glyph;
+    PSH_Point     point = glyph->points;
     FT_UInt       count = glyph->num_points;
     NV_Transform  transform, *trans = &transform;
     NV_Path       vert_rect;
     NV_Path       horz_rect;
     NV_Path       dot, circle;
 
+
     for ( ; count > 0; count--, point++ )
     {
       NV_Vector  vec;
 
+
       vec.x = point->cur_x;
       vec.y = point->cur_y;
       nv_vector_transform( &vec, &size_transform );
 
       nv_transform_set_translate( trans, vec.x, vec.y );
 
-      if ( option_show_smooth && !psh2_point_is_smooth(point) )
+      if ( option_show_smooth && !psh_point_is_smooth(point) )
       {
         nv_painter_set_color( painter, SMOOTH_COLOR, 256 );
         nv_painter_fill_path( painter, trans, 0, symbol_circle );
       }
 
-      if (option_show_horz_hints)
+      if ( option_show_horz_hints )
       {
-        if ( point->flags_y & PSH2_POINT_STRONG )
+        if ( point->flags_y & PSH_POINT_STRONG )
         {
           nv_painter_set_color( painter, STRONG_COLOR, 256 );
           nv_painter_fill_path( painter, trans, 0, symbol_rect_h );
         }
       }
 
-      if (option_show_vert_hints)
+      if ( option_show_vert_hints )
       {
-        if ( point->flags_x & PSH2_POINT_STRONG )
-        {
-          nv_painter_set_color( painter, STRONG_COLOR, 256 );
-          nv_painter_fill_path( painter, trans, 0, symbol_rect_v );
-        }
-      }
-    }
-  }
-}
-
- /************************************************************************/
- /************************************************************************/
- /*****                                                              *****/
- /*****            POSTSCRIPT HINTER ALGORITHM 3 ROUTINES            *****/
- /*****                                                              *****/
- /************************************************************************/
- /************************************************************************/
-
-#include <../src/pshinter/pshalgo3.h>
-
-static void
-draw_ps3_hint( PSH3_Hint   hint, FT_Bool  vertical )
-{
-  int        x1, x2;
-  NV_Vector  v;
-
-  if ( pshint_vertical != vertical )
-  {
-    if (vertical)
-      pshint_cpos = 40;
-    else
-      pshint_cpos = 10;
-
-    pshint_vertical = vertical;
-  }
-
-  if (!vertical)
-  {
-    if ( !option_show_vert_hints )
-      return;
-
-    v.x = hint->cur_pos;
-    v.y = 0;
-    nv_vector_transform( &v, &size_transform );
-    x1 = (int)(v.x + 0.5);
-
-    v.x = hint->cur_pos + hint->cur_len;
-    v.y = 0;
-    nv_vector_transform( &v, &size_transform );
-    x2 = (int)(v.x + 0.5);
-
-    nv_pixmap_fill_rect( target, x1, 0, 1, target->height,
-                         psh3_hint_is_ghost(hint)
-                         ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
-
-    if ( psh3_hint_is_ghost(hint) )
-    {
-      x1 --;
-      x2 = x1 + 2;
-    }
-    else
-      nv_pixmap_fill_rect( target, x2, 0, 1, target->height,
-                           psh3_hint_is_ghost(hint)
-                           ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
-
-    nv_pixmap_fill_rect( target, x1, pshint_cpos, x2+1-x1, 1,
-                         STEM_JOIN_COLOR );
-  }
-  else
-  {
-    if (!option_show_horz_hints)
-      return;
-
-    v.y = hint->cur_pos;
-    v.x = 0;
-    nv_vector_transform( &v, &size_transform );
-    x1 = (int)(v.y + 0.5);
-
-    v.y = hint->cur_pos + hint->cur_len;
-    v.x = 0;
-    nv_vector_transform( &v, &size_transform );
-    x2 = (int)(v.y + 0.5);
-
-    nv_pixmap_fill_rect( target, 0, x1, target->width, 1,
-                         psh3_hint_is_ghost(hint)
-                         ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
-
-    if ( psh3_hint_is_ghost(hint) )
-    {
-      x1 --;
-      x2 = x1 + 2;
-    }
-    else
-      nv_pixmap_fill_rect( target, 0, x2, target->width, 1,
-                           psh3_hint_is_ghost(hint)
-                           ? GHOST_HINT_COLOR : STEM_HINT_COLOR );
-
-    nv_pixmap_fill_rect( target, pshint_cpos, x2, 1, x1+1-x2,
-                         STEM_JOIN_COLOR );
-  }
-
-#if 0
-  printf( "[%7.3f %7.3f] %c\n", hint->cur_pos/64.0, (hint->cur_pos+hint->cur_len)/64.0, vertical ? 'v' : 'h' );
-#endif
-
-  pshint_cpos += 10;
-}
-
-
-static void
-ps3_draw_control_points( void )
-{
-  if ( ps3_debug_glyph )
-  {
-    PSH3_Glyph    glyph = ps3_debug_glyph;
-    PSH3_Point    point = glyph->points;
-    FT_UInt       count = glyph->num_points;
-    NV_Transform  transform, *trans = &transform;
-    NV_Path       vert_rect;
-    NV_Path       horz_rect;
-    NV_Path       dot, circle;
-
-    for ( ; count > 0; count--, point++ )
-    {
-      NV_Vector  vec;
-
-      vec.x = point->cur_x;
-      vec.y = point->cur_y;
-      nv_vector_transform( &vec, &size_transform );
-
-      nv_transform_set_translate( trans, vec.x, vec.y );
-
-      if ( option_show_smooth && !psh3_point_is_smooth(point) )
-      {
-        nv_painter_set_color( painter, SMOOTH_COLOR, 256 );
-        nv_painter_fill_path( painter, trans, 0, symbol_circle );
-      }
-
-      if (option_show_horz_hints)
-      {
-        if ( point->flags_y & PSH3_POINT_STRONG )
-        {
-          nv_painter_set_color( painter, STRONG_COLOR, 256 );
-          nv_painter_fill_path( painter, trans, 0, symbol_rect_h );
-        }
-      }
-
-      if (option_show_vert_hints)
-      {
-        if ( point->flags_x & PSH3_POINT_STRONG )
+        if ( point->flags_x & PSH_POINT_STRONG )
         {
           nv_painter_set_color( painter, STRONG_COLOR, 256 );
           nv_painter_fill_path( painter, trans, 0, symbol_rect_v );
@@ -767,7 +527,7 @@ ps_print_hints( void )
   if ( ps_debug_hints )
   {
     FT_Int         dimension;
-    PSH_Dimension  dim;
+
 
     for ( dimension = 1; dimension >= 0; dimension-- )
     {
@@ -775,6 +535,7 @@ ps_print_hints( void )
       PS_Mask       mask  = dim->masks.masks;
       FT_UInt       count = dim->masks.num_masks;
 
+
       printf( "%s hints -------------------------\n",
               dimension ? "vertical" : "horizontal" );
 
@@ -782,6 +543,7 @@ ps_print_hints( void )
       {
         FT_UInt  index;
 
+
         printf( "mask -> %d\n", mask->end_point );
         for ( index = 0; index < mask->num_bits; index++ )
         {
@@ -789,6 +551,7 @@ ps_print_hints( void )
           {
             PS_Hint  hint = dim->hints.hints + index;
 
+
             printf( "%c [%3d %3d (%4d)]\n", dimension ? "v" : "h",
                     hint->pos, hint->pos + hint->len, hint->len );
           }
@@ -798,23 +561,25 @@ ps_print_hints( void )
   }
 }
 
- /************************************************************************/
- /************************************************************************/
- /*****                                                              *****/
- /*****            AUTOHINTER DRAWING ROUTINES                       *****/
- /*****                                                              *****/
- /************************************************************************/
- /************************************************************************/
+
+  /************************************************************************/
+  /************************************************************************/
+  /*****                                                              *****/
+  /*****            AUTOHINTER DRAWING ROUTINES                       *****/
+  /*****                                                              *****/
+  /************************************************************************/
+  /************************************************************************/
 
 static NV_Path
-ah_link_path( NV_Vector*   p1,
-              NV_Vector*   p4,
-              NV_Bool      vertical )
+ah_link_path( NV_Vector*  p1,
+              NV_Vector*  p4,
+              NV_Bool     vertical )
 {
   NV_PathWriter  writer;
   NV_Vector      p2, p3;
   NV_Path        path, stroke;
 
+
   if ( vertical )
   {
     p2.x = p4->x;
@@ -840,7 +605,9 @@ ah_link_path( NV_Vector*   p1,
   path = nv_path_writer_get_path( writer );
   nv_path_writer_destroy( writer );
 
-  nv_path_stroke( path, 1., nv_path_linecap_butt, nv_path_linejoin_round, 1.,  &stroke );
+  nv_path_stroke( path, 1.,
+                  nv_path_linecap_butt, nv_path_linejoin_round,
+                  1., &stroke );
 
   nv_path_destroy( path );
 
@@ -857,6 +624,7 @@ ah_draw_smooth_points( void )
     FT_UInt      count = glyph->num_points;
     AH_Point     point = glyph->points;
 
+
     nv_painter_set_color( painter, SMOOTH_COLOR, 256 );
 
     for ( ; count > 0; count--, point++ )
@@ -866,6 +634,7 @@ ah_draw_smooth_points( void )
         NV_Transform  transform, *trans = &transform;
         NV_Vector     vec;
 
+
         vec.x = point->x - ah_debug_hinter->pp1.x;
         vec.y = point->y;
         nv_vector_transform( &vec, &size_transform );
@@ -883,10 +652,11 @@ ah_draw_edges( void )
 {
   if ( ah_debug_hinter )
   {
-    AH_Outline   glyph = ah_debug_hinter->glyph;
-    FT_UInt      count;
-    AH_Edge      edge;
-    FT_Pos       pp1 = ah_debug_hinter->pp1.x;
+    AH_Outline  glyph = ah_debug_hinter->glyph;
+    FT_UInt     count;
+    AH_Edge     edge;
+    FT_Pos      pp1 = ah_debug_hinter->pp1.x;
+
 
     nv_painter_set_color( painter, EDGE_COLOR, 256 );
 
@@ -899,8 +669,9 @@ ah_draw_edges( void )
         edge  = glyph->vert_edges;
         for ( ; count > 0; count--, edge++ )
         {
-          NV_Vector     vec;
-          NV_Pos        x;
+          NV_Vector  vec;
+          NV_Pos     x;
+
 
           vec.x = edge->pos - pp1;
           vec.y = 0;
@@ -919,8 +690,9 @@ ah_draw_edges( void )
         edge  = glyph->horz_edges;
         for ( ; count > 0; count--, edge++ )
         {
-          NV_Vector     vec;
-          NV_Pos        x;
+          NV_Vector  vec;
+          NV_Pos     x;
+
 
           vec.x = 0;
           vec.y = edge->pos;
@@ -938,8 +710,9 @@ ah_draw_edges( void )
       /* draw vertical segments */
       if ( option_show_vert_hints )
       {
-        AH_Segment   seg   = glyph->vert_segments;
-        FT_UInt      count = glyph->num_vsegments;
+        AH_Segment  seg   = glyph->vert_segments;
+        FT_UInt     count = glyph->num_vsegments;
+
 
         for ( ; count > 0; count--, seg++ )
         {
@@ -947,6 +720,7 @@ ah_draw_edges( void )
           NV_Vector  v1, v2;
           NV_Pos     y1, y2, x;
 
+
           first = seg->first;
           last  = seg->last;
 
@@ -970,21 +744,24 @@ ah_draw_edges( void )
           y2 = (NV_Pos)( v2.y + 0.5 );
           x  = (NV_Pos)( v1.x + 0.5 );
 
-          nv_pixmap_fill_rect( target, x-1, y2, 3, ABS(y1-y2)+1, SEGMENT_COLOR );
+          nv_pixmap_fill_rect( target, x - 1, y2, 3,
+                               ABS( y1 - y2 ) + 1, SEGMENT_COLOR );
         }
       }
 
       /* draw horizontal segments */
       if ( option_show_horz_hints )
       {
-        AH_Segment   seg   = glyph->horz_segments;
-        FT_UInt      count = glyph->num_hsegments;
+        AH_Segment  seg   = glyph->horz_segments;
+        FT_UInt     count = glyph->num_hsegments;
+
 
         for ( ; count > 0; count--, seg++ )
         {
           AH_PointRec  *first, *last;
-          NV_Vector  v1, v2;
-          NV_Pos     y1, y2, x;
+          NV_Vector    v1, v2;
+          NV_Pos       y1, y2, x;
+
 
           first = seg->first;
           last  = seg->last;
@@ -1009,21 +786,23 @@ ah_draw_edges( void )
           y2 = (NV_Pos)( v2.x + 0.5 );
           x  = (NV_Pos)( v1.y + 0.5 );
 
-          nv_pixmap_fill_rect( target, y1, x-1, ABS(y1-y2)+1, 3, SEGMENT_COLOR );
+          nv_pixmap_fill_rect( target, y1, x - 1,
+                               ABS( y1 - y2 ) + 1, 3, SEGMENT_COLOR );
         }
       }
 
-
       if ( option_show_vert_hints && option_show_links )
       {
-        AH_Segment   seg   = glyph->vert_segments;
-        FT_UInt      count = glyph->num_vsegments;
+        AH_Segment  seg   = glyph->vert_segments;
+        FT_UInt     count = glyph->num_vsegments;
+
 
         for ( ; count > 0; count--, seg++ )
         {
-          AH_Segment   seg2 = NULL;
-          NV_Path      link;
-          NV_Vector    v1, v2;
+          AH_Segment  seg2 = NULL;
+          NV_Path     link;
+          NV_Vector   v1, v2;
+
 
           if ( seg->link )
           {
@@ -1037,12 +816,14 @@ ah_draw_edges( void )
           {
             v1.x = seg->first->x  - pp1;
             v2.x = seg2->first->x - pp1;
-            v1.y = (seg->first->y + seg->last->y)/2;
-            v2.y = (seg2->first->y + seg2->last->y)/2;
+            v1.y = ( seg->first->y + seg->last->y ) / 2;
+            v2.y = ( seg2->first->y + seg2->last->y ) / 2;
 
             link = ah_link_path( &v1, &v2, 1 );
 
-            nv_painter_set_color( painter, seg->serif ? SERIF_LINK_COLOR : LINK_COLOR, 256 );
+            nv_painter_set_color( painter,
+                                  seg->serif ? SERIF_LINK_COLOR : LINK_COLOR,
+                                  256 );
             nv_painter_fill_path( painter, &size_transform, 0, link );
 
             nv_path_destroy( link );
@@ -1052,14 +833,16 @@ ah_draw_edges( void )
 
       if ( option_show_horz_hints && option_show_links )
       {
-        AH_Segment   seg   = glyph->horz_segments;
-        FT_UInt      count = glyph->num_hsegments;
+        AH_Segment  seg   = glyph->horz_segments;
+        FT_UInt     count = glyph->num_hsegments;
+
 
         for ( ; count > 0; count--, seg++ )
         {
-          AH_Segment   seg2 = NULL;
-          NV_Path      link;
-          NV_Vector    v1, v2;
+          AH_Segment  seg2 = NULL;
+          NV_Path     link;
+          NV_Vector   v1, v2;
+
 
           if ( seg->link )
           {
@@ -1073,12 +856,14 @@ ah_draw_edges( void )
           {
             v1.y = seg->first->y;
             v2.y = seg2->first->y;
-            v1.x = (seg->first->x + seg->last->x)/2 - pp1;
-            v2.x = (seg2->first->x + seg2->last->x)/2 - pp1;
+            v1.x = ( seg->first->x + seg->last->x ) / 2 - pp1;
+            v2.x = ( seg2->first->x + seg2->last->x ) / 2 - pp1;
 
             link = ah_link_path( &v1, &v2, 0 );
 
-            nv_painter_set_color( painter, seg->serif ? SERIF_LINK_COLOR : LINK_COLOR, 256 );
+            nv_painter_set_color( painter,
+                                  seg->serif ? SERIF_LINK_COLOR : LINK_COLOR,
+                                  256 );
             nv_painter_fill_path( painter, &size_transform, 0, link );
 
             nv_path_destroy( link );
@@ -1089,29 +874,30 @@ ah_draw_edges( void )
   }
 }
 
- /************************************************************************/
- /************************************************************************/
- /*****                                                              *****/
- /*****                        MAIN LOOP(S)                          *****/
- /*****                                                              *****/
- /************************************************************************/
- /************************************************************************/
+
+  /************************************************************************/
+  /************************************************************************/
+  /*****                                                              *****/
+  /*****                        MAIN LOOP(S)                          *****/
+  /*****                                                              *****/
+  /************************************************************************/
+  /************************************************************************/
 
 static void
 draw_glyph( int  glyph_index )
 {
   NV_Path   path;
 
-  pshint_vertical    = -1;
 
-  ps1_debug_hint_func = option_show_ps_hints ? draw_ps1_hint : 0;
-  ps2_debug_hint_func = option_show_ps_hints ? draw_ps2_hint : 0;
-  ps3_debug_hint_func = option_show_ps_hints ? draw_ps3_hint : 0;
+  pshint_vertical = -1;
+
+  ps_debug_hint_func = option_show_ps_hints ? draw_ps_hint : 0;
 
   ah_debug_hinter = NULL;
 
   error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_BITMAP );
-  if (error) Panic( "could not load glyph" );
+  if ( error )
+    Panic( "could not load glyph" );
 
   if ( face->glyph->format != FT_GLYPH_FORMAT_OUTLINE )
     Panic( "could not load glyph outline" );
@@ -1120,27 +906,30 @@ draw_glyph( int  glyph_index )
                                     (NV_Outline*)&face->glyph->outline,
                                     &size_transform,
                                     &path );
-  if (error) Panic( "could not create glyph path" );
+  if ( error )
+    Panic( "could not create glyph path" );
 
   /* tracé du glyphe plein */
   if ( option_show_glyph )
   {
-    nv_painter_set_color ( painter, 0xFF404080, 128 );
-    nv_painter_fill_path ( painter, 0, 0, path );
+    nv_painter_set_color( painter, 0xFF404080, 128 );
+    nv_painter_fill_path( painter, 0, 0, path );
   }
 
   if ( option_show_stroke )
   {
-    NV_Path   stroke;
+    NV_Path  stroke;
+
 
     error = nv_path_stroke( path, 0.6,
                             nv_path_linecap_butt,
                             nv_path_linejoin_miter,
                             1.0, &stroke );
-    if (error) Panic( "could not stroke glyph path" );
+    if ( error )
+      Panic( "could not stroke glyph path" );
 
-    nv_painter_set_color ( painter, 0xFF000040, 256 );
-    nv_painter_fill_path ( painter, 0, 0, stroke );
+    nv_painter_set_color( painter, 0xFF000040, 256 );
+    nv_painter_fill_path( painter, 0, 0, stroke );
 
     nv_path_destroy( stroke );
   }
@@ -1153,6 +942,7 @@ draw_glyph( int  glyph_index )
     NV_Scale    r = 2;
     NV_Int      n, first, last;
 
+
     nv_path_get_outline( path, NULL, memory, &out );
 
     first = 0;
@@ -1163,6 +953,7 @@ draw_glyph( int  glyph_index )
       NV_Color       color;
       NV_SubVector*  vec;
 
+
       last  = out.contours[n];
 
       for ( m = first; m <= last; m++ )
@@ -1173,7 +964,7 @@ draw_glyph( int  glyph_index )
 
         vec = out.points + m;
 
-        nv_transform_set_translate( &trans, vec->x/64.0, vec->y/64.0 );
+        nv_transform_set_translate( &trans, vec->x / 64.0, vec->y / 64.0 );
 
         nv_painter_set_color( painter, color, 256 );
         nv_painter_fill_path( painter, &trans, 0, symbol_dot );
@@ -1182,8 +973,9 @@ draw_glyph( int  glyph_index )
         {
           char  temp[5];
 
+
           sprintf( temp, "%d", m );
-          nv_pixmap_cell_text( target, vec->x/64 + 4, vec->y/64 - 4,
+          nv_pixmap_cell_text( target, vec->x / 64 + 4, vec->y / 64 - 4,
                                temp, TEXT_COLOR );
         }
       }
@@ -1202,7 +994,9 @@ draw_glyph( int  glyph_index )
     char  temp[1024];
     char  temp2[64];
 
-    sprintf( temp, "font name : %s (%s)", face->family_name, face->style_name );
+
+    sprintf( temp, "font name : %s (%s)", face->family_name,
+                                          face->style_name );
     nv_pixmap_cell_text( target, 0, 0, temp, TEXT_COLOR );
 
     FT_Get_Glyph_Name( face, glyph_index, temp2, 63 );
@@ -1220,133 +1014,134 @@ draw_glyph( int  glyph_index )
 }
 
 
-
 #define  TOGGLE_OPTION(var,prefix)                           \
+            do                                               \
             {                                                \
               var = !var;                                    \
               sprintf( temp_message, prefix " is now %s",    \
                        var ? "on" : "off" );                 \
-              break;                                         \
-            }
+            }                                                \
+            while()
 
 
 #define  TOGGLE_OPTION_NEG(var,prefix)                       \
+            do                                               \
             {                                                \
               var = !var;                                    \
               sprintf( temp_message, prefix " is now %s",    \
                        !var ? "on" : "off" );                \
-              break;                                         \
-            }
+            }                                                \
+            while
 
 
 static void
-handle_event( NVV_EventRec*   ev )
+handle_event( NVV_EventRec*  ev )
 {
-  switch (ev->key)
+  switch ( ev->key )
   {
-    case NVV_Key_Left:
-      {
-        if ( glyph_index > 0 )
-          glyph_index--;
-        break;
-      }
+  case NVV_Key_Left:
+    if ( glyph_index > 0 )
+      glyph_index--;
+    break;
 
-    case NVV_Key_Right:
-      {
-        if ( glyph_index+1 < face->num_glyphs )
-          glyph_index++;
-        break;
-      }
+  case NVV_Key_Right:
+    if ( glyph_index + 1 < face->num_glyphs )
+      glyph_index++;
+    break;
 
-    case NVV_KEY('x'):
-      TOGGLE_OPTION( option_show_axis, "grid axis display" )
+  case NVV_KEY( 'x' ):
+    TOGGLE_OPTION( option_show_axis, "grid axis display" );
+    break;
 
-    case NVV_KEY('s'):
-      TOGGLE_OPTION( option_show_stroke, "glyph stroke display" )
+  case NVV_KEY( 's' ):
+    TOGGLE_OPTION( option_show_stroke, "glyph stroke display" );
+    break;
 
-    case NVV_KEY('g'):
-      TOGGLE_OPTION( option_show_glyph, "glyph fill display" )
+  case NVV_KEY( 'g' ):
+    TOGGLE_OPTION( option_show_glyph, "glyph fill display" );
+    break;
 
-    case NVV_KEY('d'):
-      TOGGLE_OPTION( option_show_dots, "control points display" )
+  case NVV_KEY( 'd' ):
+    TOGGLE_OPTION( option_show_dots, "control points display" );
+    break
 
-    case NVV_KEY('e'):
-      TOGGLE_OPTION( option_show_em, "EM square display" )
+  case NVV_KEY( 'e' ):
+    TOGGLE_OPTION( option_show_em, "EM square display" );
+    break;
 
-    case NVV_KEY('+'):
-      {
-        grid_scale *= 1.2;
-        reset_scale( grid_scale );
-        break;
-      }
+  case NVV_KEY( '+' ):
+    grid_scale *= 1.2;
+    reset_scale( grid_scale );
+    break;
 
-    case NVV_KEY('-'):
-      {
-        if (grid_scale > 0.3)
-        {
-          grid_scale /= 1.2;
-          reset_scale( grid_scale );
-        }
-        break;
-      }
+  case NVV_KEY( '-' ):
+    if ( grid_scale > 0.3 )
+    {
+      grid_scale /= 1.2;
+      reset_scale( grid_scale );
+    }
+    break;
 
-    case NVV_Key_Up:
-      {
-        pixel_size++;
-        reset_size( pixel_size, grid_scale );
-        sprintf( temp_message, "pixel size = %d", pixel_size );
-        break;
-      }
+  case NVV_Key_Up:
+    pixel_size++;
+    reset_size( pixel_size, grid_scale );
+    sprintf( temp_message, "pixel size = %d", pixel_size );
+    break;
 
-    case NVV_Key_Down:
-      {
-        if (pixel_size > 1)
-        {
-          pixel_size--;
-          reset_size( pixel_size, grid_scale );
-          sprintf( temp_message, "pixel size = %d", pixel_size );
-        }
-        break;
-      }
+  case NVV_Key_Down:
+    if ( pixel_size > 1 )
+    {
+      pixel_size--;
+      reset_size( pixel_size, grid_scale );
+      sprintf( temp_message, "pixel size = %d", pixel_size );
+    }
+    break;
 
-    case NVV_KEY('z'):
-      TOGGLE_OPTION_NEG( ps_debug_no_vert_hints, "vertical hints processing" )
+  case NVV_KEY( 'z' ):
+    TOGGLE_OPTION_NEG( ps_debug_no_vert_hints, "vertical hints processing" );
+    break;
 
-    case NVV_KEY('a'):
-      TOGGLE_OPTION_NEG( ps_debug_no_horz_hints, "horizontal hints processing" )
+  case NVV_KEY( 'a' ):
+    TOGGLE_OPTION_NEG( ps_debug_no_horz_hints, "horizontal hints processing" );
+    break;
 
-    case NVV_KEY('Z'):
-      TOGGLE_OPTION( option_show_vert_hints, "vertical hints display" )
+  case NVV_KEY( 'Z' ):
+    TOGGLE_OPTION( option_show_vert_hints, "vertical hints display" );
+    break;
 
-    case NVV_KEY('A'):
-      TOGGLE_OPTION( option_show_horz_hints, "horizontal hints display" )
+  case NVV_KEY( 'A' ):
+    TOGGLE_OPTION( option_show_horz_hints, "horizontal hints display" );
+    break;
 
-    case NVV_KEY('S'):
-      TOGGLE_OPTION( option_show_smooth, "smooth points display" );
+  case NVV_KEY( 'S' ):
+    TOGGLE_OPTION( option_show_smooth, "smooth points display" );
+    break;
 
-    case NVV_KEY('i'):
-      TOGGLE_OPTION( option_show_indices, "point index display" );
+  case NVV_KEY( 'i' ):
+    TOGGLE_OPTION( option_show_indices, "point index display" );
+    break;
 
-    case NVV_KEY('b'):
-      TOGGLE_OPTION( option_show_blues, "blue zones display" );
+  case NVV_KEY( 'b' ):
+    TOGGLE_OPTION( option_show_blues, "blue zones display" );
+    break;
 
-    case NVV_KEY('h'):
-      ps_debug_no_horz_hints = option_hinting;
-      ps_debug_no_vert_hints = option_hinting;
+  case NVV_KEY( 'h' ):
+    ps_debug_no_horz_hints = option_hinting;
+    ps_debug_no_vert_hints = option_hinting;
 
-      TOGGLE_OPTION( option_hinting, "hinting" )
+    TOGGLE_OPTION( option_hinting, "hinting" );
+    break;
 
-    case NVV_KEY('H'):
-      ps_print_hints();
-      break;
+  case NVV_KEY( 'H' ):
+    ps_print_hints();
+    break;
 
-    default:
-      ;
+  default:
+    ;
   }
 }
 
 
-
 static void
 usage()
 {
@@ -1370,14 +1165,16 @@ usage()
 
 
 static void
-parse_options( int*  argc_p, char*** argv_p )
+parse_options( int*     argc_p,
+               char***  argv_p )
 {
-  int    argc = *argc_p;
-  char** argv = *argv_p;
+  int     argc = *argc_p;
+  char**  argv = *argv_p;
 
-  while (argc > 2 && argv[1][0] == '-')
+
+  while ( argc > 2 && argv[1][0] == '-' )
   {
-    switch (argv[1][1])
+    switch ( argv[1][1] )
     {
       OPTION2( 'f', first_glyph = atoi( argv[2] ); )
 
@@ -1393,11 +1190,13 @@ parse_options( int*  argc_p, char*** argv_p )
 }
 
 
-
-int  main( int  argc, char**  argv )
+int
+main( int     argc,
+      char**  argv )
 {
   char*  filename = "/winnt/fonts/arial.ttf";
 
+
   parse_options( &argc, &argv );
 
   if ( argc >= 2 )
@@ -1406,40 +1205,46 @@ int  main( int  argc, char**  argv )
 
   /* create library */
   error = nv_renderer_new( 0, &renderer );
-  if (error) Panic( "could not create Nirvana renderer" );
+  if ( error )
+    Panic( "could not create Nirvana renderer" );
 
   memory = nv_renderer_get_memory( renderer );
   init_symbols();
 
   error = nvv_display_new( renderer, &display );
-  if (error) Panic( "could not create display" );
+  if ( error )
+    Panic( "could not create display" );
 
   error = nvv_surface_new( display, 460, 460, nv_pixmap_type_argb, &surface );
-  if (error) Panic( "could not create surface" );
+  if ( error )
+    Panic( "could not create surface" );
 
   target = nvv_surface_get_pixmap( surface );
 
   error = nv_painter_new( renderer, &painter );
-  if (error) Panic( "could not create painter" );
+  if ( error )
+    Panic( "could not create painter" );
 
   nv_painter_set_target( painter, target );
 
   clear_background();
 
   error = FT_Init_FreeType( &freetype );
-  if (error) Panic( "could not initialise FreeType" );
+  if ( error )
+    Panic( "could not initialize FreeType" );
 
   error = FT_New_Face( freetype, filename, 0, &face );
-  if (error) Panic( "could not open font face" );
+  if ( error )
+    Panic( "could not open font face" );
 
   reset_size( pixel_size, grid_scale );
 
-
   nvv_surface_set_title( surface, "FreeType Glyph Viewer" );
 
   {
     NVV_EventRec  event;
 
+
     glyph_index = first_glyph;
     for ( ;; )
     {
@@ -1454,7 +1259,7 @@ int  main( int  argc, char**  argv )
 
       draw_ps_blue_zones();
       draw_glyph( glyph_index );
-      ps3_draw_control_points();
+      ps_draw_control_points();
 
       nvv_surface_refresh( surface, NULL );
 
@@ -1463,21 +1268,20 @@ int  main( int  argc, char**  argv )
         break;
 
       handle_event( &event );
-      switch (event.key)
+      switch ( event.key )
       {
-        case NVV_Key_Esc:
-          goto Exit;
+      case NVV_Key_Esc:
+        goto Exit;
 
-        default:
-          ;
+      default:
+        ;
       }
     }
   }
 
- Exit:
+Exit:
   /* wait for escape */
 
-
   /* destroy display (and surface) */
   nvv_display_unref( display );