763 files changed, 11050 insertions, 4456 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 24606f5f438..368d9d3f75f 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -12,7 +12,7 @@ See also comments in ../texk/README.
 cairo 1.12.16 - checked 10sep13
   http://cairographics.org/releases/
 
-freetype2 2.5.0.1 - checked 19jun13
+freetype2 2.5.1 - checked 25nov13
   http://savannah.nongnu.org/download/freetype/
 
 gd 2.1.0 - checked 26jun13
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index a201ea1babf..80b664f5bd3 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import freetype-2.5.1.
+	* version.ac: Adjust.
+
 2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use ../../am/rebuild.am.
diff --git a/Build/source/libs/freetype2/configure b/Build/source/libs/freetype2/configure
index 6d844e15dbd..b3e53c949b1 100755
--- a/Build/source/libs/freetype2/configure
+++ b/Build/source/libs/freetype2/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType (TeX Live) 2.5.0.1.
+# Generated by GNU Autoconf 2.69 for FreeType (TeX Live) 2.5.1.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -579,12 +579,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FreeType (TeX Live)'
 PACKAGE_TARNAME='freetype--tex-live-'
-PACKAGE_VERSION='2.5.0.1'
-PACKAGE_STRING='FreeType (TeX Live) 2.5.0.1'
+PACKAGE_VERSION='2.5.1'
+PACKAGE_STRING='FreeType (TeX Live) 2.5.1'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="freetype-2.5.0.1/builds/unix/ftconfig.in"
+ac_unique_file="freetype-2.5.1/builds/unix/ftconfig.in"
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -1235,7 +1235,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures FreeType (TeX Live) 2.5.0.1 to adapt to many kinds of systems.
+\`configure' configures FreeType (TeX Live) 2.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1302,7 +1302,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType (TeX Live) 2.5.0.1:";;
+     short | recursive ) echo "Configuration of FreeType (TeX Live) 2.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1398,7 +1398,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FreeType (TeX Live) configure 2.5.0.1
+FreeType (TeX Live) configure 2.5.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1499,7 +1499,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by FreeType (TeX Live) $as_me 2.5.0.1, which was
+It was created by FreeType (TeX Live) $as_me 2.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3422,7 +3422,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='freetype--tex-live-'
- VERSION='2.5.0.1'
+ VERSION='2.5.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4368,7 +4368,7 @@ else
 fi
 
 
-FREETYPE_TREE=freetype-2.5.0.1
+FREETYPE_TREE=freetype-2.5.1
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -4952,7 +4952,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by FreeType (TeX Live) $as_me 2.5.0.1, which was
+This file was extended by FreeType (TeX Live) $as_me 2.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5009,7 +5009,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-FreeType (TeX Live) config.status 2.5.0.1
+FreeType (TeX Live) config.status 2.5.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1-PATCHES/TL-Changes b/Build/source/libs/freetype2/freetype-2.5.0.1-PATCHES/TL-Changes
deleted file mode 100644
index e4e15307db2..00000000000
--- a/Build/source/libs/freetype2/freetype-2.5.0.1-PATCHES/TL-Changes
+++ /dev/null
@@ -1,32 +0,0 @@
-Changes applied to the freetype-2.5.0.1/ tree as obtained from:
-	http://savannah.nongnu.org/download/freetype/freetype-2.5.0.1.tar.bz2
-
-Updated:
-	builds/unix/config.guess
-	builds/unix/config.sub
-	builds/unix/install-sh
-
-Converted Dos/Win line ends to native:
-	builds/win32/vc2005/freetype.sln
-	builds/win32/vc2005/freetype.vcproj
-	builds/win32/vc2008/freetype.sln
-	builds/win32/vc2008/freetype.vcproj
-	builds/win32/vc2010/freetype.sln
-	builds/win32/vc2010/freetype.vcxproj
-	builds/win32/vc2010/freetype.vcxproj.filters
-	builds/win32/visualc/freetype.dsp
-	builds/win32/visualc/freetype.dsw
-	builds/win32/visualc/freetype.sln
-	builds/win32/visualc/freetype.vcproj
-	builds/win32/visualce/freetype.dsp
-	builds/win32/visualce/freetype.dsw
-	builds/win32/visualce/freetype.vcproj
-	builds/wince/vc2005-ce/freetype.sln
-	builds/wince/vc2005-ce/freetype.vcproj
-	builds/wince/vc2008-ce/freetype.sln
-	builds/wince/vc2008-ce/freetype.vcproj
-
-Added newline at end of file:
-	builds/win32/vc2005/freetype.vcproj
-	builds/wince/vc2005-ce/freetype.vcproj
-
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/symbian/bld.inf b/Build/source/libs/freetype2/freetype-2.5.0.1/builds/symbian/bld.inf
deleted file mode 100644
index dd5f559d4b1..00000000000
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/symbian/bld.inf
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// FreeType 2 project for the symbian platform
-//
-
-// Copyright 2008, 2009 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.
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_MMPFILES
-freetype.mmp
-
-PRJ_EXPORTS
-../../include/ft2build.h
-../../include/freetype/config/ftconfig.h	freetype/config/ftconfig.h
-../../include/freetype/config/ftheader.h	freetype/config/ftheader.h
-../../include/freetype/config/ftmodule.h	freetype/config/ftmodule.h
-../../include/freetype/config/ftoption.h	freetype/config/ftoption.h
-../../include/freetype/config/ftstdlib.h	freetype/config/ftstdlib.h
-../../include/freetype/freetype.h		freetype/freetype.h
-../../include/freetype/ftbbox.h			freetype/ftbbox.h
-../../include/freetype/ftbdf.h			freetype/ftbdf.h
-../../include/freetype/ftbitmap.h		freetype/ftbitmap.h
-../../include/freetype/ftcache.h		freetype/ftcache.h
-../../include/freetype/ftcid.h			freetype/ftcid.h
-../../include/freetype/fterrdef.h		freetype/fterrdef.h
-../../include/freetype/fterrors.h		freetype/fterrors.h
-../../include/freetype/ftgasp.h			freetype/ftgasp.h
-../../include/freetype/ftglyph.h		freetype/ftglyph.h
-../../include/freetype/ftgxval.h		freetype/ftgxval.h
-../../include/freetype/ftgzip.h			freetype/ftgzip.h
-../../include/freetype/ftbzip2.h		freetype/ftbzip2.h
-../../include/freetype/ftimage.h		freetype/ftimage.h
-../../include/freetype/ftincrem.h		freetype/ftincrem.h
-../../include/freetype/ftlcdfil.h		freetype/ftlcdfil.h
-../../include/freetype/ftlist.h			freetype/ftlist.h
-../../include/freetype/ftlzw.h			freetype/ftlzw.h
-../../include/freetype/ftmac.h			freetype/ftmac.h
-../../include/freetype/ftmm.h			freetype/ftmm.h
-../../include/freetype/ftmodapi.h		freetype/ftmodapi.h
-../../include/freetype/ftmoderr.h		freetype/ftmoderr.h
-../../include/freetype/ftotval.h		freetype/ftotval.h
-../../include/freetype/ftoutln.h		freetype/ftoutln.h
-../../include/freetype/ftpfr.h			freetype/ftpfr.h
-../../include/freetype/ftrender.h		freetype/ftrender.h
-../../include/freetype/ftsizes.h		freetype/ftsizes.h
-../../include/freetype/ftsnames.h		freetype/ftsnames.h
-../../include/freetype/ftstroke.h		freetype/ftstroke.h
-../../include/freetype/ftsynth.h		freetype/ftsynth.h
-../../include/freetype/ftsystem.h		freetype/ftsystem.h
-../../include/freetype/fttrigon.h		freetype/fttrigon.h
-../../include/freetype/fttypes.h		freetype/fttypes.h
-../../include/freetype/ftwinfnt.h		freetype/ftwinfnt.h
-../../include/freetype/ftxf86.h			freetype/ftxf86.h
-../../include/freetype/t1tables.h		freetype/t1tables.h
-../../include/freetype/ttnameid.h		freetype/ttnameid.h
-../../include/freetype/tttables.h		freetype/tttables.h
-../../include/freetype/tttags.h			freetype/tttags.h
-../../include/freetype/ttunpat.h		freetype/ttunpat.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ft2unix.h b/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ft2unix.h
deleted file mode 100644
index 6a3b8d90e9c..00000000000
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ft2unix.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ft2build.h                                                             */
-/*                                                                         */
-/*    Build macros of the FreeType 2 library.                              */
-/*                                                                         */
-/*  Copyright 1996-2001, 2003, 2006 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 is a Unix-specific version of <ft2build.h> that should be used   */
-  /* exclusively *after* installation of the library.                      */
-  /*                                                                       */
-  /* It assumes that `/usr/local/include/freetype2' (or whatever is        */
-  /* returned by the `freetype-config --cflags' or `pkg-config --cflags'   */
-  /* command) is in your compilation include path.                         */
-  /*                                                                       */
-  /* We don't need to do anything special in this release.  However, for   */
-  /* a future FreeType 2 release, the following installation changes will  */
-  /* be performed:                                                         */
-  /*                                                                       */
-  /*   - The contents of `freetype-2.x/include/freetype' will be installed */
-  /*     to `/usr/local/include/freetype2' instead of                      */
-  /*     `/usr/local/include/freetype2/freetype'.                          */
-  /*                                                                       */
-  /*   - This file will #include <freetype2/config/ftheader.h>, instead    */
-  /*     of <freetype/config/ftheader.h>.                                  */
-  /*                                                                       */
-  /*   - The contents of `ftheader.h' will be processed with `sed' to      */
-  /*     replace all `<freetype/xxx>' with `<freetype2/xxx>'.              */
-  /*                                                                       */
-  /*   - Adding `/usr/local/include/freetype2' to your compilation include */
-  /*     path will not be necessary anymore.                               */
-  /*                                                                       */
-  /* These changes will be transparent to client applications which use    */
-  /* freetype-config (or pkg-config).  No modifications will be necessary  */
-  /* to compile with the new scheme.                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FT2_BUILD_UNIX_H__
-#define __FT2_BUILD_UNIX_H__
-
-  /* `<prefix>/include/freetype2' must be in your current inclusion path */
-#include <freetype/config/ftheader.h>
-
-#endif /* __FT2_BUILD_UNIX_H__ */
-
-
-/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/vms/ftconfig.h b/Build/source/libs/freetype2/freetype-2.5.0.1/builds/vms/ftconfig.h
deleted file mode 100644
index 62fadac0fa2..00000000000
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/vms/ftconfig.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftconfig.h                                                             */
-/*                                                                         */
-/*    VMS-specific configuration file (specification only).                */
-/*                                                                         */
-/*  Copyright 1996-2004, 2006-2008, 2011 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 header file contains a number of macro definitions that are used */
-  /* by the rest of the engine.  Most of the macros here are automatically */
-  /* determined at compile time, and you should not need to change it to   */
-  /* port FreeType, except to compile the library with a non-ANSI          */
-  /* compiler.                                                             */
-  /*                                                                       */
-  /* Note however that if some specific modifications are needed, we       */
-  /* advise you to place a modified copy in your build directory.          */
-  /*                                                                       */
-  /* The build directory is usually `freetype/builds/<system>', and        */
-  /* contains system-specific files that are always included first when    */
-  /* building the library.                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTCONFIG_H__
-#define __FTCONFIG_H__
-
-
-  /* Include the header file containing all developer build options */
-#include <ft2build.h>
-#include FT_CONFIG_OPTIONS_H
-#include FT_CONFIG_STANDARD_LIBRARY_H
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*               PLATFORM-SPECIFIC CONFIGURATION MACROS                  */
-  /*                                                                       */
-  /* These macros can be toggled to suit a specific system.  The current   */
-  /* ones are defaults used to compile FreeType in an ANSI C environment   */
-  /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `freetype/builds/<system>' directory, and edit it to port the engine. */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#define HAVE_UNISTD_H  1
-#define HAVE_FCNTL_H   1
-
-#define SIZEOF_INT   4
-#define SIZEOF_LONG  4
-
-#define FT_SIZEOF_INT   4
-#define FT_SIZEOF_LONG  4
-
-#define FT_CHAR_BIT  8
-
-
-  /* FT_UNUSED is a macro used to indicate that a given parameter is not  */
-  /* used -- this is only used to get rid of unpleasant compiler warnings */
-#ifndef FT_UNUSED
-#define FT_UNUSED( arg )  ( (arg) = (arg) )
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                     AUTOMATIC CONFIGURATION MACROS                    */
-  /*                                                                       */
-  /* These macros are computed from the ones defined above.  Don't touch   */
-  /* their definition, unless you know precisely what you are doing.  No   */
-  /* porter should need to mess with them.                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Mac support                                                           */
-  /*                                                                       */
-  /*   This is the only necessary change, so it is defined here instead    */
-  /*   providing a new configuration file.                                 */
-  /*                                                                       */
-#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
-  /* no Carbon frameworks for 64bit 10.4.x */
-  /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
-  /* so guess the system version by maximum errno before inclusion */
-#include <errno.h>
-#ifdef ECANCELED /* defined since 10.2 */
-#include "AvailabilityMacros.h"
-#endif
-#if defined( __LP64__ ) && \
-    ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
-#undef FT_MACINTOSH
-#endif
-
-#elif defined( __SC__ ) || defined( __MRC__ )
-  /* Classic MacOS compilers */
-#include "ConditionalMacros.h"
-#if TARGET_OS_MAC
-#define FT_MACINTOSH 1
-#endif
-
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* IntN types                                                            */
-  /*                                                                       */
-  /*   Used to guarantee the size of some specific integers.               */
-  /*                                                                       */
-  typedef signed short    FT_Int16;
-  typedef unsigned short  FT_UInt16;
-
-#if FT_SIZEOF_INT == 4
-
-  typedef signed int      FT_Int32;
-  typedef unsigned int    FT_UInt32;
-
-#elif FT_SIZEOF_LONG == 4
-
-  typedef signed long     FT_Int32;
-  typedef unsigned long   FT_UInt32;
-
-#else
-#error "no 32bit type found -- please check your configuration files"
-#endif
-
-  /* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= 4
-
-  typedef int            FT_Fast;
-  typedef unsigned int   FT_UFast;
-
-#elif FT_SIZEOF_LONG >= 4
-
-  typedef long           FT_Fast;
-  typedef unsigned long  FT_UFast;
-
-#endif
-
-
-  /* determine whether we have a 64-bit int type for platforms without */
-  /* Autoconf                                                          */
-#if FT_SIZEOF_LONG == 8
-
-  /* FT_LONG64 must be defined if a 64-bit type is available */
-#define FT_LONG64
-#define FT_INT64  long
-
-#elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64  __int64
-
-#elif defined( __BORLANDC__ )  /* Borland C++ */
-
-  /* XXXX: We should probably check the value of __BORLANDC__ in order */
-  /*       to test the compiler version.                               */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64  __int64
-
-#elif defined( __WATCOMC__ )   /* Watcom C++ */
-
-  /* Watcom doesn't provide 64-bit data types */
-
-#elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */
-
-#define FT_LONG64
-#define FT_INT64  long long int
-
-#elif defined( __GNUC__ )
-
-  /* GCC provides the `long long' type */
-#define FT_LONG64
-#define FT_INT64  long long int
-
-#endif /* FT_SIZEOF_LONG == 8 */
-
-
-#define FT_BEGIN_STMNT  do {
-#define FT_END_STMNT    } while ( 0 )
-#define FT_DUMMY_STMNT  FT_BEGIN_STMNT FT_END_STMNT
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A 64-bit data type will create compilation problems if you compile    */
-  /* in strict ANSI mode.  To avoid them, we disable their use if          */
-  /* __STDC__ is defined.  You can however ignore this rule by             */
-  /* defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro.        */
-  /*                                                                       */
-#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 )
-
-#ifdef __STDC__
-
-  /* undefine the 64-bit macros in strict ANSI compilation mode */
-#undef FT_LONG64
-#undef FT_INT64
-
-#endif /* __STDC__ */
-
-#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
-
-
-#ifdef FT_MAKE_OPTION_SINGLE_OBJECT
-
-#define FT_LOCAL( x )      static  x
-#define FT_LOCAL_DEF( x )  static  x
-
-#else
-
-#ifdef __cplusplus
-#define FT_LOCAL( x )      extern "C"  x
-#define FT_LOCAL_DEF( x )  extern "C"  x
-#else
-#define FT_LOCAL( x )      extern  x
-#define FT_LOCAL_DEF( x )  x
-#endif
-
-#endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
-
-
-#ifndef FT_BASE
-
-#ifdef __cplusplus
-#define FT_BASE( x )  extern "C"  x
-#else
-#define FT_BASE( x )  extern  x
-#endif
-
-#endif /* !FT_BASE */
-
-
-#ifndef FT_BASE_DEF
-
-#ifdef __cplusplus
-#define FT_BASE_DEF( x )  extern "C"  x
-#else
-#define FT_BASE_DEF( x )  extern  x
-#endif
-
-#endif /* !FT_BASE_DEF */
-
-
-#ifndef FT_EXPORT
-
-#ifdef __cplusplus
-#define FT_EXPORT( x )  extern "C"  x
-#else
-#define FT_EXPORT( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT */
-
-
-#ifndef FT_EXPORT_DEF
-
-#ifdef __cplusplus
-#define FT_EXPORT_DEF( x )  extern "C"  x
-#else
-#define FT_EXPORT_DEF( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_DEF */
-
-
-#ifndef FT_EXPORT_VAR
-
-#ifdef __cplusplus
-#define FT_EXPORT_VAR( x )  extern "C"  x
-#else
-#define FT_EXPORT_VAR( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_VAR */
-
-  /* The following macros are needed to compile the library with a   */
-  /* C++ compiler and with 16bit compilers.                          */
-  /*                                                                 */
-
-  /* This is special.  Within C++, you must specify `extern "C"' for */
-  /* functions which are used via function pointers, and you also    */
-  /* must do that for structures which contain function pointers to  */
-  /* assure C linkage -- it's not possible to have (local) anonymous */
-  /* functions which are accessed by (global) function pointers.     */
-  /*                                                                 */
-  /*                                                                 */
-  /* FT_CALLBACK_DEF is used to _define_ a callback function.        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
-  /* contains pointers to callback functions.                        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable   */
-  /* that contains pointers to callback functions.                   */
-  /*                                                                 */
-  /*                                                                 */
-  /* Some 16bit compilers have to redefine these macros to insert    */
-  /* the infamous `_cdecl' or `__fastcall' declarations.             */
-  /*                                                                 */
-#ifndef FT_CALLBACK_DEF
-#ifdef __cplusplus
-#define FT_CALLBACK_DEF( x )  extern "C"  x
-#else
-#define FT_CALLBACK_DEF( x )  static  x
-#endif
-#endif /* FT_CALLBACK_DEF */
-
-#ifndef FT_CALLBACK_TABLE
-#ifdef __cplusplus
-#define FT_CALLBACK_TABLE      extern "C"
-#define FT_CALLBACK_TABLE_DEF  extern "C"
-#else
-#define FT_CALLBACK_TABLE      extern
-#define FT_CALLBACK_TABLE_DEF  /* nothing */
-#endif
-#endif /* FT_CALLBACK_TABLE */
-
-
-FT_END_HEADER
-
-
-#endif /* __FTCONFIG_H__ */
-
-
-/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/DEBUG b/Build/source/libs/freetype2/freetype-2.5.0.1/docs/DEBUG
deleted file mode 100644
index 3d6acd3bb0e..00000000000
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/DEBUG
+++ /dev/null
@@ -1,202 +0,0 @@
-Debugging within the FreeType sources
-=====================================
-
-I. Configuration macros
------------------------
-
-There  are several ways  to enable  debugging features  in a  FreeType 2
-builds.   This is controlled  through the  definition of  special macros
-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
-    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 macros FT_ERROR and
-    FT_TRACE.   This also  includes the  variants  FT_TRACE0, FT_TRACE1,
-    FT_TRACE2, ..., FT_TRACE7.
-
-    The  trace  macros are  used  to  send  debugging messages  when  an
-    appropriate  `debug  level' is  configured  at  runtime through  the
-    FT2_DEBUG environment variable (more on this later).
-
-  FT_DEBUG_MEMORY
-
-    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 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 unaffected.
-
-
-II. Debugging macros
---------------------
-
-Several macros can be used within the FreeType sources to help debugging
-its code:
-
-
-  1. FT_ERROR(( ... ))
-
-    This macro is  used to send debug messages  that indicate relatively
-    serious  errors (like  broken font  files),  but will  not stop  the
-    execution of  the running program.   Its code is compiled  only when
-    either FT_DEBUG_LEVEL_ERROR  or FT_DEBUG_LEVEL_TRACE are  defined in
-    `ftoption.h'.
-
-    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" ));
-
-
-  2. FT_ASSERT( condition )
-
-    This macro  is used to check  strong assertions at  runtime.  If its
-    condition isn't TRUE,  the program will abort with  a panic message.
-    Its   code   is  compiled   when   either  FT_DEBUG_LEVEL_ERROR   or
-    FT_DEBUG_LEVEL_TRACE are defined.  You don't need double parentheses
-    here.  For example
-
-      FT_ASSERT( ptr != NULL );
-
-
-  3. FT_TRACE( level, (message...) )
-
-    The  FT_TRACE  macro  is  used  to  send  general-purpose  debugging
-    messages during  program execution.   This macro uses  an *implicit*
-    macro named FT_COMPONENT used to name the current FreeType component
-    being run.
-
-    The developer should always  define FT_COMPONENT as appropriate, for
-    example as in
-
-      #undef  FT_COMPONENT
-      #define FT_COMPONENT  trace_io
-
-    The  value  of  the  FT_COMPONENT  macro  is  an  enumeration  named
-    trace_XXXX where XXXX  is one of the component  names defined in the
-    internal file `freetype/internal/fttrace.h'.  If you modify FreeType
-    source  and insert  new trace_XXXX macro,  you  must register  it in
-    fttrace.h. If you insert or remove many trace macros,  you can check
-    the undefined or the unused trace macro by src/tools/chktrcmp.py.
-
-    Each  such component  is assigned  a `debug  level', ranging  from 0
-    to  7,  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
-    the corresponding component level are filtered and never printed.
-
-    This  means that  trace messages  with level  0 are  always printed,
-    those with level 2 are only  printed when the component level is *at
-    least* 2.
-
-    The  second  parameter  to  FT_TRACE must  contain  parentheses  and
-    correspond to a printf-like call, as in
-
-      FT_TRACE( 2, ( "your %s is not %s\n", "foo", "bar" ) )
-
-    The shortcut macros  FT_TRACE0, FT_TRACE1, FT_TRACE2, ..., FT_TRACE7
-    can be  used with  constant level indices,  and are much  cleaner to
-    use, as in
-
-     FT_TRACE2(( "your %s is not %s\n", "foo", "bar" ));
-
-
-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
-    FT_DEBUG_LEVEL_TRACE defined.  It contains a list of component level
-    definitions, following this format:
-
-       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.   `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 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.
-
-
-  FT2_DEBUG_MEMORY
-
-    This  environment variable, when  defined, tells  FreeType to  use a
-    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  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.
-
-    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  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 bounds are checked at runtime.
-
-------------------------------------------------------------------------
-
-Copyright 2002, 2003, 2004, 2005, 2009 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.
-
-
---- end of DEBUG ---
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-cff_driver.html b/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-cff_driver.html
deleted file mode 100644
index 35d2f9404d3..00000000000
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-cff_driver.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
-<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; }
-  td { padding: 0 0.5em 0 0.5em; }
-  td.left { padding: 0 0.5em 0 0.5em;
-            text-align: left; }
-
-  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>
-</head>
-<body>
-
-<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
-<td width="100%"></td>
-<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
-
-<center><h1>
-The CFF driver
-</h1></center>
-<h2>Synopsis</h2>
-<table align=center cellspacing=5 cellpadding=0 border=0>
-<tr><td></td><td><a href="#hinting-engine">hinting-engine</a></td><td></td><td><a href="#FT_CFF_HINTING_XXX">FT_CFF_HINTING_XXX</a></td><td></td><td><a href="#no-stem-darkening">no-stem-darkening</a></td></tr>
-</table><br><br>
-
-<table align=center width="87%"><tr><td>
-<p>While FreeType's CFF driver doesn't expose API functions by itself, it is possible to control its behaviour with <a href="ft2-module_management.html#FT_Property_Set">FT_Property_Set</a> and <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a>. The following lists the available properties together with the necessary macros and structures.</p>
-<p>The CFF driver's module name is &lsquo;cff&rsquo;.</p>
-</td></tr></table><br>
-<table align=center width="75%"><tr><td>
-<h4><a name="hinting-engine">hinting-engine</a></h4>
-<table align=center width="87%"><tr><td>
-<p>Thanks to Adobe, which contributed a new hinting (and parsing) engine, an application can select between &lsquo;freetype&rsquo; and &lsquo;adobe&rsquo; if compiled with CFF_CONFIG_OPTION_OLD_ENGINE. If this configuration macro isn't defined, &lsquo;hinting-engine&rsquo; does nothing.</p>
-<p>The default engine is &lsquo;freetype&rsquo; if CFF_CONFIG_OPTION_OLD_ENGINE is defined, and &lsquo;adobe&rsquo; otherwise.</p>
-<p>The following example code demonstrates how to select Adobe's hinting engine (omitting the error handling).</p>
-<pre class="colored">
-  FT_Library  library;
-  FT_Face     face;
-  FT_UInt     hinting_engine = FT_CFF_HINTING_ADOBE;
-
-
-  FT_Init_FreeType( &amp;library );
-
-  FT_Property_Set( library, "cff",
-                            "hinting-engine", &amp;hinting_engine );
-</pre>
-</td></tr></table><br>
-<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>This property can be used with <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a> also.</p>
-</td></tr></table>
-</td></tr></table>
-<hr width="75%">
-<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
-<td width="100%"></td>
-<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-
-<table align=center width="75%"><tr><td>
-<h4><a name="FT_CFF_HINTING_XXX">FT_CFF_HINTING_XXX</a></h4>
-<table align=center width="87%"><tr><td>
-Defined in FT_CFF_DRIVER_H (freetype/ftcffdrv.h).
-</td></tr></table><br>
-<table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
-
-#define <a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_FREETYPE</a>  0
-#define <a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_ADOBE</a>     1
-
-</pre></table><br>
-<table align=center width="87%"><tr><td>
-<p>A list of constants used for the <a href="ft2-cff_driver.html#hinting-engine">hinting-engine</a> property to select the hinting engine for CFF fonts.</p>
-</td></tr></table><br>
-<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>values</b></em></td></tr><tr><td>
-<p></p>
-<table cellpadding=3 border=0>
-<tr valign=top><td colspan=0><b>FT_CFF_HINTING_FREETYPE</b></td></tr>
-<tr valign=top><td></td><td>
-<p>Use the old FreeType hinting engine.</p>
-</td></tr>
-<tr valign=top><td><b>FT_CFF_HINTING_ADOBE</b></td><td>
-<p>Use the hinting engine contributed by Adobe.</p>
-</td></tr>
-</table>
-</td></tr></table>
-</td></tr></table>
-<hr width="75%">
-<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
-<td width="100%"></td>
-<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-
-<table align=center width="75%"><tr><td>
-<h4><a name="no-stem-darkening">no-stem-darkening</a></h4>
-<table align=center width="87%"><tr><td>
-<p>By default, the Adobe CFF engine darkens stems at smaller sizes, regardless of hinting, to enhance contrast. Setting this property, stem darkening gets switched off.</p>
-<p>Note that stem darkening is never applied if <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a> is set.</p>
-<pre class="colored">
-  FT_Library  library;
-  FT_Face     face;
-  FT_Bool     no_stem_darkening = TRUE;
-
-
-  FT_Init_FreeType( &amp;library );
-
-  FT_Property_Set( library, "cff",
-                            "no-stem-darkening", &amp;no_stem_darkening );
-</pre>
-</td></tr></table><br>
-<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>This property can be used with <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a> also.</p>
-</td></tr></table>
-</td></tr></table>
-<hr width="75%">
-<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
-<td width="100%"></td>
-<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-
-</body>
-</html>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftcffdrv.h b/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftcffdrv.h
deleted file mode 100644
index ccbcbccaa86..00000000000
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftcffdrv.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcffdrv.h                                                             */
-/*                                                                         */
-/*    FreeType API for controlling the CFF driver (specification only).    */
-/*                                                                         */
-/*  Copyright 2013 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 __FTCFFDRV_H__
-#define __FTCFFDRV_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /**************************************************************************
-   *
-   * @section:
-   *   cff_driver
-   *
-   * @title:
-   *   The CFF driver
-   *
-   * @abstract:
-   *   Controlling the CFF driver module.
-   *
-   * @description:
-   *   While FreeType's CFF driver doesn't expose API functions by itself,
-   *   it is possible to control its behaviour with @FT_Property_Set and
-   *   @FT_Property_Get.  The following lists the available properties
-   *   together with the necessary macros and structures.
-   *
-   *   The CFF driver's module name is `cff'.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   hinting-engine
-   *
-   * @description:
-   *   Thanks to Adobe, which contributed a new hinting (and parsing)
-   *   engine, an application can select between `freetype' and `adobe' if
-   *   compiled with CFF_CONFIG_OPTION_OLD_ENGINE.  If this configuration
-   *   macro isn't defined, `hinting-engine' does nothing.
-   *
-   *   The default engine is `freetype' if CFF_CONFIG_OPTION_OLD_ENGINE is
-   *   defined, and `adobe' otherwise.
-   *
-   *   The following example code demonstrates how to select Adobe's hinting
-   *   engine (omitting the error handling).
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_Face     face;
-   *     FT_UInt     hinting_engine = FT_CFF_HINTING_ADOBE;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "cff",
-   *                               "hinting-engine", &hinting_engine );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   */
-
-
-  /**************************************************************************
-   *
-   * @enum:
-   *   FT_CFF_HINTING_XXX
-   *
-   * @description:
-   *   A list of constants used for the @hinting-engine property to select
-   *   the hinting engine for CFF fonts.
-   *
-   * @values:
-   *   FT_CFF_HINTING_FREETYPE ::
-   *     Use the old FreeType hinting engine.
-   *
-   *   FT_CFF_HINTING_ADOBE ::
-   *     Use the hinting engine contributed by Adobe.
-   *
-   */
-#define FT_CFF_HINTING_FREETYPE  0
-#define FT_CFF_HINTING_ADOBE     1
-
-
-  /**************************************************************************
-   *
-   * @property:
-   *   no-stem-darkening
-   *
-   * @description:
-   *   By default, the Adobe CFF engine darkens stems at smaller sizes,
-   *   regardless of hinting, to enhance contrast.  Setting this property,
-   *   stem darkening gets switched off.
-   *
-   *   Note that stem darkening is never applied if @FT_LOAD_NO_SCALE is set.
-   *
-   *   {
-   *     FT_Library  library;
-   *     FT_Face     face;
-   *     FT_Bool     no_stem_darkening = TRUE;
-   *
-   *
-   *     FT_Init_FreeType( &library );
-   *
-   *     FT_Property_Set( library, "cff",
-   *                               "no-stem-darkening", &no_stem_darkening );
-   *   }
-   *
-   * @note:
-   *   This property can be used with @FT_Property_Get also.
-   *
-   */
-
-
- /* */
-
-FT_END_HEADER
-
-
-#endif /* __FTCFFDRV_H__ */
-
-
-/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/rules.mk b/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/rules.mk
deleted file mode 100644
index d2a43a6a890..00000000000
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/rules.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# FreeType 2 GZip support configuration rules
-#
-
-
-# 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.
-
-
-# gzip driver directory
-#
-GZIP_DIR := $(SRC_DIR)/gzip
-
-
-# compilation flags for the driver
-#
-ifeq ($(SYSTEM_ZLIB),)
-  GZIP_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(GZIP_DIR))
-else
-  GZIP_COMPILE := $(FT_COMPILE)
-endif
-
-
-# gzip support sources (i.e., C files)
-#
-GZIP_DRV_SRC := $(GZIP_DIR)/ftgzip.c
-
-# gzip support headers
-#
-GZIP_DRV_H :=
-
-
-# gzip driver object(s)
-#
-#   GZIP_DRV_OBJ_M is used during `multi' builds
-#   GZIP_DRV_OBJ_S is used during `single' builds
-#
-ifeq ($(SYSTEM_ZLIB),)
-  GZIP_DRV_OBJ_M := $(GZIP_DRV_SRC:$(GZIP_DIR)/%.c=$(OBJ_DIR)/%.$O)
-else
-  GZIP_DRV_OBJ_M := $(OBJ_DIR)/ftgzip.$O
-endif
-GZIP_DRV_OBJ_S := $(OBJ_DIR)/ftgzip.$O
-
-# gzip support source file for single build
-#
-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$(subst /,$(COMPILER_SEP),$@ $(GZIP_DRV_SRC_S))
-
-
-# gzip support - multiple objects
-#
-$(OBJ_DIR)/%.$O: $(GZIP_DIR)/%.c $(FREETYPE_H) $(GZIP_DRV_H)
-	$(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
-
-
-# update main driver object lists
-#
-DRV_OBJS_S += $(GZIP_DRV_OBJ_S)
-DRV_OBJS_M += $(GZIP_DRV_OBJ_M)
-
-
-# EOF
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1-PATCHES/ChangeLog b/Build/source/libs/freetype2/freetype-2.5.1-PATCHES/ChangeLog
index c978c2104ef..b9fc4fc6eba 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1-PATCHES/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-2.5.1-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported freetype-2.5.1 source tree from:
+	  http://savannah.nongnu.org/download/freetype/
+
 2013-06-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported freetype-2.5.0.1 source tree from:
diff --git a/Build/source/libs/freetype2/freetype-2.5.1-PATCHES/TL-Changes b/Build/source/libs/freetype2/freetype-2.5.1-PATCHES/TL-Changes
new file mode 100644
index 00000000000..c942535fe6c
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1-PATCHES/TL-Changes
@@ -0,0 +1,15 @@
+Changes applied to the freetype-2.5.1/ tree as obtained from:
+	http://savannah.nongnu.org/download/freetype/freetype-2.5.1.tar.bz2
+
+Updated:
+	builds/unix/config.guess
+	builds/unix/config.sub
+	builds/unix/install-sh
+
+Converted Dos/Win line ends to native:
+	builds/win*/*/*
+
+Added newline at end of file:
+	builds/wince/vc2005-ce/freetype.vcproj
+	builds/windows/vc2005/freetype.vcproj
+
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/CMakeLists.txt b/Build/source/libs/freetype2/freetype-2.5.1/CMakeLists.txt
new file mode 100644
index 00000000000..2c9dd4b134c
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/CMakeLists.txt
@@ -0,0 +1,165 @@
+# CMakeLists.txt
+#
+# Copyright 2013 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# Written by John Cary <cary@txcorp.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.
+#
+#
+# Say
+#
+#   cmake CMakeLists.txt
+#
+# to create a Makefile that builds a static version of the library.  For a
+# dynamic library, use
+#
+#   cmake CMakeLists.txt -DBUILD_SHARED_LIBS:BOOL=true
+#
+# instead.  Please refer to the cmake manual for further options, in
+# particular, how to modify compilation and linking parameters.
+#
+# Some notes.
+#
+# . `cmake' will overwrite FreeType's original (top-level) `Makefile' file.
+#
+# . You can use `cmake' directly on a freshly cloned FreeType git
+#   repository.
+#
+# . `CMakeLists.txt'  is provided as-is since it is not used by the
+#   developer team.
+
+
+cmake_minimum_required(VERSION 2.6)
+
+project(freetype)
+
+set(VERSION_MAJOR "2")
+set(VERSION_MINOR "5")
+set(VERSION_PATCH "0")
+set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+
+# Compiler definitions for building the library
+add_definitions(-DFT2_BUILD_LIBRARY)
+
+# Specify library include directories
+include_directories("${PROJECT_SOURCE_DIR}/include")
+
+# Create the configuration file
+message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include.")
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include)
+
+# For the auto-generated ftconfig.h file
+include_directories("${PROJECT_BINARY_DIR}/include")
+message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/ftconfig.h.")
+execute_process(
+  COMMAND sed -e "s/FT_CONFIG_OPTIONS_H/<ftoption.h>/" -e "s/FT_CONFIG_STANDARD_LIBRARY_H/<ftstdlib.h>/" -e "s?/undef ?#undef ?"
+  INPUT_FILE ${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in
+  OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/ftconfig.h
+)
+
+set(BASE_SRCS
+  src/autofit/autofit.c
+  src/base/ftadvanc.c
+  src/base/ftbbox.c
+  src/base/ftbitmap.c
+  src/base/ftcalc.c
+  src/base/ftcid.c
+  src/base/ftdbgmem.c
+  src/base/ftdebug.c
+  src/base/ftfstype.c
+  src/base/ftgasp.c
+  src/base/ftgloadr.c
+  src/base/ftglyph.c
+  src/base/ftgxval.c
+  src/base/ftinit.c
+  src/base/ftlcdfil.c
+  src/base/ftmm.c
+  src/base/ftobjs.c
+  src/base/ftotval.c
+  src/base/ftoutln.c
+  src/base/ftpatent.c
+  src/base/ftpfr.c
+  src/base/ftrfork.c
+  src/base/ftsnames.c
+  src/base/ftstream.c
+  src/base/ftstroke.c
+  src/base/ftsynth.c
+  src/base/ftsystem.c
+  src/base/fttrigon.c
+  src/base/fttype1.c
+  src/base/ftutil.c
+  src/base/ftwinfnt.c
+  src/base/ftxf86.c
+  src/bdf/bdf.c
+  src/bzip2/ftbzip2.c
+  src/cache/ftcache.c
+  src/cff/cff.c
+  src/cid/type1cid.c
+  src/gzip/ftgzip.c
+  src/lzw/ftlzw.c
+  src/pcf/pcf.c
+  src/pfr/pfr.c
+  src/psaux/psaux.c
+  src/pshinter/pshinter.c
+  src/psnames/psmodule.c
+  src/raster/raster.c
+  src/sfnt/sfnt.c
+  src/smooth/smooth.c
+  src/truetype/truetype.c
+  src/type1/type1.c
+  src/type42/type42.c
+  src/winfonts/winfnt.c
+)
+
+include_directories("src/truetype")
+include_directories("src/sfnt")
+include_directories("src/autofit")
+include_directories("src/smooth")
+include_directories("src/raster")
+include_directories("src/psaux")
+include_directories("src/psnames")
+
+add_library(freetype ${BASE_SRCS})
+
+# Installations
+# Note the trailing slash in the argument to the `DIRECTORY' directive
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
+  DESTINATION include/freetype2
+  PATTERN "internal" EXCLUDE
+)
+install(TARGETS freetype
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+# Packaging
+# CPack version numbers for release tarball name.
+set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}})
+if (NOT DEFINED CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_NAME}")
+endif ()
+if (NOT DEFINED CPACK_SOURCE_PACKAGE_FILE_NAME)
+  set(CPACK_SOURCE_PACKAGE_FILE_NAME
+    "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}-r${PROJECT_REV}"
+    CACHE INTERNAL "tarball basename"
+  )
+endif ()
+set(CPACK_SOURCE_GENERATOR TGZ)
+set(CPACK_SOURCE_IGNORE_FILES
+  "/CVS/;/.svn/;.swp$;.#;/#;/build/;/serial/;/ser/;/parallel/;/par/;~;/preconfig.out;/autom4te.cache/;/.config")
+set(CPACK_GENERATOR TGZ)
+include(CPack)
+
+# add make dist target
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+# eof
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog
index 5cda57a46ec..2dc7a62c360 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog
@@ -1,3 +1,1451 @@
+2013-11-25  Werner Lemberg  <wl@gnu.org>
+
+	* Version 2.5.1 released.
+	=========================
+
+
+	Tag sources with `VER-2-5-1'.
+
+	* docs/VERSION.DLL: Update documentation and bump version number to
+	2.5.1.
+
+	* README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj,
+	builds/windows/vc2005/index.html,
+	builds/windows/vc2008/freetype.vcproj,
+	builds/windows/vc2008/index.html,
+	builds/windows/vc2010/freetype.vcxproj,
+	builds/windows/vc2010/index.html,
+	builds/windows/visualc/freetype.dsp,
+	builds/windows/visualc/freetype.vcproj,
+	builds/windows/visualc/index.html,
+	builds/windows/visualce/freetype.dsp,
+	builds/windows/visualce/freetype.vcproj,
+	builds/windows/visualce/index.html,
+	builds/wince/vc2005-ce/freetype.vcproj,
+	builds/wince/vc2005-ce/index.html,
+	builds/wince/vc2008-ce/freetype.vcproj,
+	builds/wince/vc2008-ce/index.html: s/2.5.0/2.5.1/, s/250/251/.
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 1.
+
+	* builds/unix/configure.raw (version_info): Set to 17:0:11.
+	* docs/CHANGES, docs/release: Updated.
+
+2013-11-23  Werner Lemberg  <wl@gnu.org>
+
+	[truetype]: Add tricky font names `hkscsiic.ttf' and `iicore.ttf'.
+
+	* src/truetype/ttobjs.c (TRICK_NAMES_MAX_CHARACTERS,
+	TRICK_NAMES_COUNT): Updated.
+	(trick_names): Add family name for the two fonts.
+
+2013-11-23  Werner Lemberg  <wl@gnu.org>
+
+	* src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap): Typo.
+
+2013-11-21  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Typo.
+
+	Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>.
+
+	* src/sfnt/sfobjs.c (sfnt_load_face): Return correct `bsize->width'
+	value if the font lacks an `OS/2' table.
+
+2013-11-21  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Improve handling of buggy embedded bitmap strikes.
+
+	We are now able to successfully load `AppleMyoungJo.ttf'.
+	Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>.
+
+	* src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap): Don't trust glyph
+	format.
+
+2013-11-20  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Don't trust `maxp's `maxSizeOfInstructions'.
+
+	Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>; see
+
+	  http://lists.nongnu.org/archive/html/freetype-devel/2013-08/msg00005.html
+
+	for details.
+
+	* src/base/ftobjs.c (FT_Load_Glyph): Check size of `fpgm' and `prep'
+	tables also for setting `autohint'.
+
+	* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Use code from
+	`TT_Process_Composite_Glyph' for handling unreliable values of
+	`maxSizeOfInstructions'.
+
+2013-11-16  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Fix `OS/2' table version 5 support.
+
+	We now follow the `official' announcement from Microsoft (on the
+	OpenType mailing list, which unfortunately hasn't a public archive).
+
+	* include/freetype/tttables.h (TT_OS2):
+	s/usLowerPointSize/usLowerOpticalPointSize/,
+	s/usUpperPointSize/usUpperOpticalPointSize/.
+
+	* src/sfnt/ttload.c (tt_face_load_os2): Update, and set correct
+	default values.
+
+2013-11-13  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/ft2unix.h: Remove.  No longer necessary.
+
+	* builds/unix/install.mk (install): Updated.
+
+2013-11-13  Werner Lemberg  <wl@gnu.org>
+
+	Simplify header file hierarchy.
+
+	This large patch changes the header file directory layout from
+	`include/freetype/...' to `include/...', effectively removing one
+	level.  Since the file `ft2build.h' is also located in `include'
+	(and it stays there even after installation), all FreeType header
+	files are now in a single directory.
+
+	Applications that use (a) `freetype-config' or FreeType's
+	`pkg-config' file to get the include directory for the compiler, and
+	(b) the documented way for header inclusion like
+
+	  #include <ft2build.h>
+	  #include FT_FREETYPE_H
+	  ...
+
+	don't need any change to the source code.
+
+	* include/freetype/*: Move up to...
+	* include/*: ... this directory.
+
+	* builds/amiga/include/freetype/*: Move up to...
+	* builds/amiga/include/*: ... this directory.
+
+	*/*: Essentially do `s@/freetype/@/@' where appropriate.
+
+	* CMakeList.txt: Simplify.
+	* builds/unix/freetype-config.in, builds/unix/freetype2.in: For
+	`--cflags', return a single directory.
+	* builds/unix/install.mk (install): No longer try to remove `cache'
+	and `internal' subdirectories; instead, remove the `freetype'
+	subdirectory.
+
+2013-11-12  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix last `truetype' commit.
+
+	* src/truetype/ttgload.c (tt_get_metrics): Preserve stream position.
+	Return error value.
+	(load_truetype_glyph): Updated.
+
+2013-11-10  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CMAKE: New dummy file.
+
+2013-11-08  Dave Arnold  <darnold@adobe.com>
+
+	[cff] Fix for hints that touch.
+
+	* src/cff/cf2hints.c (cf2_hintmap_insertHint): Fix condition for
+	finding index value of insertion point.
+
+2013-11-06  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix handling of phantom points in composite glyphs.
+	Problem reported by Nigel Tao <nigeltao@golang.org>.
+
+	This is a follow-up commit to the previous one.
+
+	* src/truetype/ttgload.c (load_truetype_glyph): Call
+	`tt_get_metrics' after loading the glyph header.
+
+2013-11-06  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Improve emulation of vertical metrics.
+
+	This commit also improves the start values of vertical phantom
+	points.  Kudos to Greg Hitchcock for help.
+
+	* src/truetype/ttgload.c (TT_Get_VMetrics): Add parameter to pass
+	`yMax' value.  Replace code with fixed Microsoft definition.
+	(tt_get_metrics): Updated.
+	(TT_LOADER_SET_PP): Add explanation how to initialize phantom
+	points, taken from both the OpenType specification and private
+	communication with Greg (which will eventually be added to the
+	standard).
+	Fix horizontal position of `pp3' and `pp4'.
+
+	* src/truetype/ttgload.h: Updated.
+
+	* src/truetype/ttdriver.c (tt_get_advances): Updated.
+
+	* docs/CHANGES: Updated.
+
+2013-11-05  Werner Lemberg  <wl@gnu.org>
+
+	* builds/windows/vc2010/freetype.vcxproj: s/v110/v100/.
+	PlatformToolSet version 110 is for VC2012.
+
+	Problem reported (with solution) by Dave Arnold <darnold@adobe.com>.
+
+2013-11-05  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Correctly reset point tags for glyph components.
+	Problem reported by Nigel Tao <nigeltao@golang.org>.
+
+	* src/truetype/ttgload.c (TT_Process_Composite_Glyph): Fix loop.
+
+2013-11-02  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix GETINFO opcode handling of subpixel hinting bits.
+
+	* src/truetype/ttinterp.c (Ins_GETINFO): Don't request bit 6 set to
+	get info on subpixel hinting.
+
+	* docs/CHANGES: Updated.
+
+2013-11-02  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #40451.
+
+	Simply apply the patch from the bug report.
+
+	* builds/unix/ftconfig.in, builds/vms/ftconfig.h,
+	include/freetype/config/ftconfig.h: The used #pragma directives only
+	work with gcc versions 4.6 and higher.
+
+2013-11-01  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES: Updated.
+
+2013-11-01  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Minor code refactoring.
+
+	Two benefits: The allocated FDEF (and IDEF) array gets slightly
+	smaller, and the `ttdebug' demo program has access to function
+	numbers without additional costs.
+
+	Fortunately, no changes to FontForge are necessary – this is the
+	only external TrueType debugger I know of, but others may exist and
+	should check the code accordingly.
+
+	* src/truetype/ttinterp.h (TT_CallRec): Replace `Cur_Restart' and
+	`Cur_End' with a pointer to the corresponding `TT_DefRecord'
+	structure.
+
+	* src/truetype/ttinterp.c (DO_JROT, DO_JMPR, DO_JROF, Ins_ENDF,
+	Ins_CALL, Ins_LOOPCALL, Ins_UNKNOWN, TT_RunIns <Invalid_Opcode>):
+	Updated.
+
+2013-10-27  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Implement support for `OS/2' table version 5.
+
+	See
+
+	  http://typedrawers.com/discussion/470/new-microsoft-size-specific-design-selection-mechanism
+
+	for the announcement.
+
+	* include/freetype/tttables.h (TT_OS2): Add fields
+	`usLowerPointSize' and `usUpperPointSize'.  Since FreeType returns
+	this structure only as a pointer through `FT_Get_Sfnt_Table', there
+	shouldn't be any ABI problems.
+
+	* src/sfnt/ttload.c (tt_face_load_os2): Implement it.
+
+	* docs/CHANGES: Updated.
+
+2013-10-24  Werner Lemberg  <wl@gnu.org>
+
+	* README.git, docs/CHANGES, docs/INSTALL: Updated.
+
+2013-10-24  John Cary  <cary@txcorp.com>
+
+	Provide cmake support.
+
+	* CMakeLists.txt: New file.
+
+2013-10-23  Kenneth Miller  <kennethadammiller@yahoo.com>
+	    Werner Lemberg  <wl@gnu.org>
+
+	Provide support for x64 builds in Visual C++ project files.
+
+	* src/builds/win32: Renamed to...
+	* src/builds/windows: This.
+
+	* src/builds/windows/vc2010/*: Updated to handle x64 target.
+
+	* src/builds/windows/*.mk, docs/INSTALL.GNU: s/win32/windows/ where
+	appropriate.
+
+2013-10-22  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/md5.c, src/base/md5.h: Updated to recent version.
+
+	* src/base/ftobjs.c: Updated; `md5.c' no longer uses `free'.
+
+	The canonical URL to get updates for this file is
+
+	  http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/popa3d/popa3d/md5/
+
+	as the author told me in private communication.
+
+2013-10-19  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] s/SMALL_TOP/X_HEIGHT/.
+
+	* src/autofit/afblue.dat: Updated.
+
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/aflatin.c, src/autofit/aflatin.h,
+	src/autofit/atlatin2.c: Updated.
+
+2013-10-19  Werner Lemberg  <wl@gnu.org>
+
+	* src/autofit/afblue.dat: s/MINOR/DESCENDER/.
+
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+2013-10-16  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Add description strings to script entries.
+
+	Currently, this is unused.
+
+	* src/autofit/afscript.h: Do it.
+	* src/autofit/afglobal.c, src/autofit/afpic.c,
+	src/autofit/aftypes.h: Updated.
+
+2013-10-16  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve tracing message for extra light flag.
+
+	* src/autofit/aflatin.c (af_latin_metrics_scale_dim): Do it.
+
+2013-10-15  Chongyu Zhu  <lembacon@gmail.com>
+
+	[arm] Fix thumb2 inline assembly under LLVM.
+
+	When using `ADD' with an immediate operand, the instruction is
+	actually `ADD Rd, Rn, #<imm12>', that is, the maximum of the
+	immediate operand cannot exceed 4095.  It will fail to compile with
+	LLVM.
+
+	However, in GCC, due to some legacy compatibility considerations,
+	`ADD.W' will be automatically emitted when the immediate operand is
+	larger than 4095.
+
+	* builds/unix/ftconfig.in, include/freetype/config/ftconfig.h
+	(FT_MulFix_arm) [__GNUC__]: Support clang compiler.
+
+	* src/truetype/ttinterp.c (TT_MulFix14_arm) [__GNUC__]: Ditto.
+
+2013-10-12  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve tracing of `latin' hinter.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Report blue
+	zone types.
+	(af_latin_metrics_scale_dim): Report scaling changes due to x height
+	alignment.
+	Report scaled stroke width and blue zone values.
+
+2013-10-03  Dave Arnold  <darnold@adobe.com>
+
+	* src/cff/cf2font.c (cf2_computeDarkening): Avoid division by zero.
+
+	Note that the old code avoided using a region of the piecewise
+	linear function where the slope was zero.  The recovery was to use a
+	different section of the function, which produced a different,
+	incorrect amount of darkening.
+
+2013-10-02  Darrell Bellert  <darrell.bellert@hl.konicaminolta.us>
+
+	* src/sfnt/ttload.c (tt_face_load_pclt): Fix `pclt_fields'.
+
+2013-10-02  Dave Arnold  <darnold@adobe.com>
+
+	* src/cff/cf2font.c (cf2_computeDarkening): Initialize darkenAmount.
+
+	This line was lost in commit 89ca1fd6 (from 2013-06-25).  The effect
+	is to use a previous darkening amount when producing an unhinted,
+	unscaled outline.  This can cause autohint samples in ftgrid and
+	ftview to be based on darkened CFF outlines instead of unhinted,
+	undarkened ones.
+
+2013-09-29  Dave Arnold  <darnold@adobe.com>
+
+	Fix Savannah bug #39295.
+
+	The bug was caused by switching to the initial hintmap (the one in
+	effect when `moveto' executes) just before drawing the final element
+	in the charstring.  This ensured that the path was closed (in both
+	Character Space and Device Space).  But if the final element was a
+	curve and if the final hintmap was different enough from the initial
+	one, then the curve was visibly distorted.
+
+	The first part of the fix is to draw the final curve using the final
+	hintmap as specified by the charstring.  This corrects the
+	distortion but does not ensure closing in Device Space.  It may
+	require the rasterizer to automatically generate an extra closing
+	line.  Depending on the hintmap differences, this line could be from
+	zero to a couple pixels in length.
+
+	The second part of the fix covers the case where the charstring
+	subpath is closed with an explicit line.  We now modify that line's
+	end point to avoid the distortion.
+
+	Some glyphs in the bug report font (TexGyreHeros-Regular) that show
+	the change are:
+
+	  25ppem    S (98)
+	  24ppem    eight (52)
+	  25.5ppem  p (85)
+
+	Curves at the *end* of a subpath are no longer distorted.  However,
+	some of these glyphs have bad hint substitutions in the middle of a
+	subpath, and these are not affected.
+
+	The patch has been tested with a set of 106 fonts that shipped with
+	Adobe Creative Suite 4, together with 756 Open Source CFF fonts from
+	Google Fonts.  There are 1.5 million glyphs, of which some 20k are
+	changed with the fix.  A sampling of a few hundred of these changes
+	have been examined more closely, and the changes look good (or at
+	least acceptable).
+
+	* src/cff/cf2hints.h (CF2_GlyphPathRec): New element `pathIsClosing'
+	to indicate that we synthesize a closepath line.
+
+	* src/cff/cf2hints.c (cf2_glyphpath_init): Updated.
+	(cf2_glyphpath_pushPrevElem): If closing, use first hint map (for
+	`lineto' operator) and adjust hint zone.
+	For synthesized closing lines, use end point in first hint zone.
+	(cf2_glyphpath_lineTo): Take care of synthesized closing lines.  In
+	particular, shift the detection of zero-length lines from character
+	space to device space.
+	(cf2_glyphpath_closeOpenPath): Remove assertion.
+	Updated.
+
+2013-09-25  Werner Lemberg  <wl@gnu.org>
+
+	* src/autofit/aflatin.c (af_{grek,cyrl}_uniranges): Fix arrays.
+
+2013-09-25  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[bdf, pcf] Refuse non-zero face_index.
+
+	Suggested by Akira Tagoh, see
+
+	  http://lists.gnu.org/archive/html/freetype/2013-09/msg00030.html
+
+	* src/bdf/bdfdrivr.c (BDF_Face_Init): Return `Invalid_Argument'
+	error if the font could be opened but non-zero `face_index' is
+	given.
+	* src/pcf/pcfdrivr.c (PCF_Face_Init): Ditto.
+
+	* src/type42/t42objs.c (T42_Face_Init): Remove unrequired FT_UNUSED
+	macro for `face_index' because it is validated later.
+
+2013-09-23  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #40090.
+
+	* src/autofit/afcjk.c (af_cjk_metrics_scale): Revert commit
+	306f8c5d (from 2013-08-25) affecting this function.
+
+2013-09-22  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Disunify Cyrillic and Greek handling from Latin.
+
+	* src/autofit/afscript.h: Add Cyrillic and Greek.
+
+	* src/autofit/afblue.dat (AF_BLUE_STRINGSET_GREK,
+	AF_BLUE_STRINGSET_CYRL): Add blue zones for Greek and Cyrillic.
+	(AF_BLUE_STRINGSET_LATN): Fix typo.
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/aflatin.c (af_grek_uniranges, af_cyrl_uniranges): New
+	arrays.
+	(af_grek_script_class, af_cyrl_script_class): New scripts.
+	* src/autofit/aflatin.h: Updated.
+
+2013-09-20  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES: Updated.
+
+2013-09-20  Behdad Esfahbod  <behdad@behdad.org>
+
+	Fix vertical size of emboldened glyphs.
+
+	Cf. https://bugzilla.gnome.org/show_bug.cgi?id=686709
+
+	* src/base/ftsynth.c (FT_GlyphSlot_Embolden): Adjust `horiBearingY'
+	also.
+
+2013-09-11  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	* include/freetype/ftoutln.h: Correct FT_Outline_Get_Orientation
+	algorithm description.
+
+2013-09-11  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve Hebrew rendering.
+
+	This change introduces a new blue zone property
+	`AF_BLUE_PROPERTY_LATIN_LONG' to make the auto-hinter ignore short
+	top segments.
+
+	* src/autofit/afblue.dat: Fix Hebrew blue strings.
+	Use AF_BLUE_PROPERTY_LATIN_LONG for AF_BLUE_STRING_HEBREW_TOP.
+
+	* src/autofit/afblue.hin (AF_BLUE_PROPERTY_LATIN_LONG): New macro.
+
+	* src/autofit/afblue.c, src/autofit/afblue.h: Updated.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Handle
+	`AF_LATIN_IS_LONG_BLUE'.
+
+	* src/autofit/aflatin.h (AF_LATIN_IS_LONG_BLUE): New macro.
+
+2013-08-28  Behdad Esfahbod  <behdad@google.com>
+
+	[sfnt] Fix frame access while reading WOFF table directory.
+
+	* src/sfnt/sfobjs.c (woff_open_font): Using single memory frame
+	while reading the directory entries for the whole loop.
+
+2013-08-29  Werner Lemberg  <wl@gnu.org>
+            Behdad Esfahbod  <behdad@google.com>
+
+	Implement support for WOFF containers.
+
+	We simply synthesize a SFNT from the WOFF, create a memory stream
+	for the new data, and load the SFNT as usual.
+
+	Does NOT add any API to access WOFF metadata or private blocks.
+
+	* include/freetype/internal/tttypes.h (WOFF_HeaderRec,
+	WOFF_TableRec): New structures.
+
+	* include/freetype/tttags.h (TTAG_wOFF): New macro.
+
+	* src/base/ftobjs.c (FT_Open_Face): Set `stream' after calling
+	`open_face'.
+
+	* src/sfnt/sfobjs.c [FT_CONFIG_OPTION_SYSTEM_ZLIB]: Include
+	`FT_GZIP_H'.
+	(WRITE_BYTE, WRITE_USHORT, WRITE_ULONG): New temporary macros for
+	writing to a stream.
+	(sfnt_stream_close, compare_offsets, woff_open_font): New functions.
+	(sfnt_open_font): Handle `TTAG_wOFF'.
+	(sfnt_init_face): Set `stream' after calling `sfnt_open_font'.
+
+	* src/truetype/ttobjs.c (tt_face_init): Set `stream' after calling
+	`sfnt->init_face'.
+
+	* src/base/ftobjs.c (open_face): Use a pointer to FT_Stream as an
+	argument so that a changed stream survives.
+	Update callers.
+
+2013-08-28  Werner Lemberg  <wl@gnu.org>
+
+	[gzip] New function `FT_Gzip_Uncompress'.
+
+	This is modeled after zlib's `uncompress' function.  We need this
+	for WOFF support.
+
+	* include/freetype/ftgzip.h, src/gzip/ftgzip.c (FT_Gzip_Uncompress):
+	New function.
+
+	* src/gzip/rules.mk: Rewrite to better reflect dependencies.
+
+2013-08-28  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix `make multi' compilation.
+
+	* src/autofit/afblue.cin, src/autofit/afblue.c: Don't include
+	`afblue.h' but `aftypes.h'.
+	* src/autofit/afcjk.c: Don't include `aftypes.h' but `afglobal.h'.
+
+2013-08-28  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix C++ compilation.
+
+	* src/autofit/afglobal.c (af_face_globals_get_metrics),
+	src/autofit/afdummy.c (af_dflt_script_class), src/autofit/afindic.c
+	(af_deva_script_class): Use proper casts.
+
+2013-08-27  Behdad Esfahbod  <behdad@google.com>
+
+	* src/sfnt/ttload.c (tt_face_load_font_dir): Fix sign typos.
+
+2013-08-27  Behdad Esfahbod  <behdad@google.com>
+
+	FT_Open_Face: Improve external stream handling.
+
+	If the font's `clazz->init_face' function wants to swap to new
+	stream, handling of whether original stream was external could
+	result to either memory leak or double free.  Mark externality into
+	face flags before calling `init_face' such that the clazz can handle
+	external streams properly.
+
+	* src/base/ftobjs.c (FT_Open_Face): Move code to set
+	FT_FACE_FLAG_EXTERNAL_STREAM to...
+	(open_face): This function.
+
+2013-08-27  Werner Lemberg  <wl@gnu.org>
+
+	Remove `FT_SqrtFixed' function.
+
+	It's no longer used.
+
+	* include/freetype/internal/ftcalc.h, src/base/ftcalc.c: Do it.
+
+2013-08-27  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] While tracing, report script names instead of ID values.
+
+	* src/autofit/afglobal.c (af_script_names) [FT_DEBUG_LEVEL_TRACE]:
+	New array.
+	* src/autofit/afglobal.h: Updated.
+
+	* src/autofit/afcjk.c (af_cjk_metrics_init_widths,
+	af_cjk_hint_edges): Use `af_script_names'.
+	* src/autofit/aflatin.c (af_latin_metrics_init_widths,
+	af_latin_hint_edges): Ditto.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Report used script while hinting a glyph.
+
+	* src/autofit/afcjk.c (af_cjk_hint_edges), src/autofit/aflatin.c
+	(af_latin_hint_edges): Implement it.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Add support for Hebrew script.
+
+	* src/autofit/afblue.dat: Add blue strings for Hebrew.
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/aflatin.c (af_hebr_uniranges): New array.
+	(af_hebr_script_class): New script.
+	* src/autofit/aflatin.h, src/autofit/afscript.h: Updated.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve tracing messages.
+
+	* src/autofit/afcjk.c (af_cjk_metrics_init_widths): Mention script
+	ID in tracing message.
+	(af_cjk_metrics_init_blues): Initialize `axis' outside of the inner
+	loop.
+	Improve tracing messages.
+	(af_cjk_hint_edges) [FT_DEBUG_LEVEL_TRACE]: New variable
+	`num_actions' to count hinting actions.
+	Improve tracing messages.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_widths): Mention
+	script ID in tracing message.
+	(af_latin_metrics_init_blues, af_latin_hint_edges): Improve tracing
+	messages.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	Better tracing of loaded glyphs.
+
+	Previously, the loading of a glyph was traced at level 4, if at all.
+	With this change, all font loading routines emit a tracing message
+	at level 1, making it easier to select tracing output (for example
+	using F2_DEBUG="any:1 afhints:7 aflatin:7").
+
+	* src/bdf/bdfdrivr.c (BDF_Glyph_Load): Add tracing message.
+	* src/cff/cffdrivr.c (cff_glyph_load): Ditto.
+	* src/cff/cffgload.c (cff_decoder_prepare): Improve tracing
+	messages.
+	* src/cid/cidgload.c (cid_load_glyph): Use level 1 for tracing
+	message.
+	* src/pcf/pcfdrivr.c (PCF_Glyph_Load): Ditto.
+	* src/pfr/pfrobjs.c (pfr_slot_load): Add tracing message.
+	* src/truetype/ttgload.c (TT_Load_Glyph): Ditto.
+	* src/type1/t1gload.c (T1_Load_Glyph): Ditto.
+	* src/type42/t42objs.c (T42_GlyphSlot_Load): Ditto.
+	* src/winfonts/winfnt.c (FNT_Load_Glyph): Ditto.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix script selection.
+
+	* src/autofit/afglobal.c (af_face_globals_get_metrics): Use
+	`AF_SCRIPT_DFLT', not value 0.
+	Simplify code.
+
+	* src/autofit/afscript.h: Sort by script name.
+
+2013-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Make `dummy' hinter work as expected.
+
+	* src/autofit/afdummy.c (af_dummy_hints_init): Properly set scaling
+	information.
+	(af_dummy_hints_apply): Scale the glyphs.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Make `cjk' module use blue stringsets.
+
+	* src/autofit/afcjk.c (AF_CJK_MAX_TEST_CHARACTERS): Removed.
+	(af_cjk_hani_blue_chars): Removed.
+	(AF_CJK_BLUE_TYPE_*): Removed.
+	(af_cjk_metrics_init_blues): Replace AF_CJK_MAX_TEST_CHARACTERS with
+	AF_BLUE_STRING_MAX_LEN.
+	Change loops to use offsets (in file `afblue.h') into the new arrays
+	`af_blue_stringsets' and `af_blue_strings' (in file `afblue.c').
+	Instead of three dimensions (as used in the old blue string array)
+	we now use properties to do the same, saving one loop nesting level.
+
+	* src/autofit/afcjk.h: Remove old enumeration values superseded by
+	the new data in `afblue.h'.
+	(AF_CJK_IS_TOP_BLUE, AF_CJK_IS_HORIZ_BLUE, AF_CJK_IS_FILLED_BLUE,
+	AF_CJK_IS_RIGHT_BLUE): New macros, to be used in
+	`af_cjk_metrics_init_blues'.
+	(AF_CJK_BLUE_IS_RIGHT): Remove this now redundant enum value.
+	(AF_CJK_BLUE_IS_TOP): Renamed to...
+	(AF_CJK_BLUE_TOP): This.
+	(AF_CJK_MAX_BLUES): Remove.
+	(AF_CJKAxisRec): Updated.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Typo.
+
+	* src/autofit/afblue.hin, src/autofit/afblue.c (GET_UTF8_CHAR): Use
+	cast.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Synchronize `cjk' with `latin' module (and vice versa).
+
+	* src/autofit/afcjk.c (af_cjk_metrics_init_widths): Add tracing
+	messages.
+	(af_cjk_metrics_init_blues): Don't pass blue string array as
+	argument but use the global array directly.
+	Use `outline' directly.
+	Update and add tracing messages.
+	(af_cjk_metrics_init): Simplify code.
+	(af_cjk_metrics_scale_dim): Improve tracing message.
+	(af_cjk_metrics_scale): Synchronize.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_widths,
+	af_latin_metrics_init_blues): Improve and add tracing messages.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Make `latin' module use blue stringsets.
+
+	* src/autofit/aflatin.c (AF_LATIN_MAX_TEST_CHARACTERS): Removed.
+	(af_latin_blue_chars): Removed.
+	(af_latin_metrics_init_blues): Replace AF_LATIN_MAX_TEST_CHARACTERS
+	with AF_BLUE_STRING_MAX_LEN.
+	Change loops to use offsets (in file `afblue.h') into the new arrays
+	`af_blue_stringsets' and `af_blue_strings' (in file `afblue.c').
+	Use `AF_LATIN_IS_SMALL_TOP_BLUE' macro.
+
+	* src/autofit/aflatin.h: Remove old enumeration values superseded by
+	the new data in `afblue.h'.
+	(AF_LATIN_IS_TOP_BLUE): Updated definition.
+	(AF_LATIN_IS_SMALL_TOP_BLUE): New macro.
+	(AF_LATIN_MAX_BLUES): Remove.
+	(AF_LatinAxisRec): Updated.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Add blue stringsets.
+
+	* src/autofit/aftypes.h: Include `afblue.h'.
+	(AF_ScriptClassRec): Add `blue_stringset' field.
+	(AF_DEFINE_SCRIPT_CLASS): Updated.
+
+	* src/autofit/autofit.c: Include `afblue.c'.
+
+	* src/autofit/afcjk.c (af_hani_script_class), src/autofit/afdummy.c
+	(af_dflt_script_class), src/autofit/afindic.c
+	(af_deva_script_class), src/autofit/aflatin.c
+	(af_latn_script_class), src/autofit/aflatin2.c
+	(af_ltn2_script_class): Updated.
+
+	* src/autofit/rules.mk (AUTOF_DRV_SRC): Add `afblue.c'.
+
+2013-08-25  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Introduce data file for blue strings.
+
+	The idea is to have a central file which gets processed by a Perl
+	script to create proper `.c' and `.h' files using templates.  There
+	are two other reasons to do that:
+
+	  . The data file should be easily readable.  We use UTF-8 encoding
+	    which then gets converted to single bytes.
+
+	  . Since the number of supported scripts will increase soon, the
+	    current usage of blue string arrays is a waste of space.  Using
+	    the Perl script it is possible to imitate jagged arrays,
+	    defining enumeration constants as offsets into the arrays.
+
+	This commit only adds files without changing any functionality.
+
+	* src/autofit/afblue.dat: New data file.
+	* src/tools/afblue.pl: New Perl script for processing `afblue.dat'.
+
+	* src/autofit/afblue.cin, src/autofit/afblue.hin: New template files
+	for...
+	* src/autofit/afblue.c, src/autofit/afblue.c: New source files.
+	To avoid a dependency on Perl, we add them too.
+
+2013-08-19  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[base] Enable new algorithm for `BBox_Cubic_Check'.
+
+	* src/base/ftbbox.c: Enable new BBox_Cubic_Check algorithm, remove
+	the old one.
+	Improve comments.
+
+2013-08-18  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/unix-def.in (freetype2.pc): Don't set executable bit.
+
+2013-08-18  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #39804.
+
+	* builds/unix/configure.raw (LIBPNG): Define and export.
+	* builds/unix/freetype-config.in, builds/unix/freetype2.in: Handle
+	libpng.
+
+2013-08-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[base] Clean up BBox_Conic_Check.
+
+	* src/base/ftbbox.c (BBox_Conic_Check): Remove redundant checks for
+	extremum at the segment ends, which are already within the bbox.
+	Slightly modify calculations.
+
+2013-08-15  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[base] Finish experimental (disabled) BBox_Cubic_Check implementation.
+
+	* src/base/ftbbox.c (BBox_Cubic_Check): Scale arguments to improve
+	accuracy and avoid overflows.
+
+2013-08-13  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[base] Refactor experimental (disabled) BBox_Cubic_Check.
+
+	* src/base/ftbbox.c (BBox_Cubic_Check): Implement the minimum search
+	as the mirror image of the maximum search implemented here...
+	(update_max): New function.
+
+2013-08-06  John Tytgat  <John.Tytgat@esko.com>
+
+	Fix Savannah bug #39702.
+
+	* src/cff/cffload.c (cff_index_get_pointers): Check for `cur_offset
+	!= 0'; this stronger test is mandated by the CFF specification.
+	Fix test for INDEX structures which have one or more empty entries
+	at the end.
+
+2013-08-05  Werner Lemberg  <wl@gnu.org>
+
+	Fix gcc pragmas, part 2.
+
+	* src/truetype/ttinterp.c (TT_MulFix14_long_long,
+	TT_DotFix14_long_long): `#pragma gcc diagnostic {push,pop}' has been
+	introduced with gcc version 4.6.
+
+2013-08-05  Werner Lemberg  <wl@gnu.org>
+
+	Fix gcc pragmas.
+
+	* src/truetype/ttinterp.c (TT_MulFix14_long_long,
+	TT_DotFix14_long_long): Older gcc versions don't accept diagnostic
+	pragmas within a function body.
+
+2013-08-05  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #39700.
+
+	* builds/unix/ftconfig.h: Synchronize with
+	`include/freetype/config/ftconfig.h'.
+
+	* builds/vms/ftconfig.h: Ditto.
+	Make the differences to the master `ftconfig.h' file as small as
+	possible for easier maintainance.
+
+2013-08-05  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve handling of `near' points.
+
+	Points which are very near to each other are now marked as such.
+	The `weak' flag is then computed by using the `in' vector of the
+	first and the `out' vector of the last point of a group of near
+	points.
+
+	For example, this fixes the rendering of glyph `Oslash' in
+	`Roboto-Thin.ttf'.
+
+	* src/autofit/afhints.h (AF_Flags): New value `AF_FLAGS_NEAR'.
+
+	* src/autofit/afhints.c (af_glyph_hints_reload): Introduce
+	the heuristic value `near_limit' to decide whether the current point
+	is near to the previous one, then set `AF_FLAG_NEAR' accordingly.
+	Store good `in' vector (of last non-near point) in
+	`last_good_in_{x,y}' and use it as an argument to
+	`ft_corner_is_flat' if necessary.
+
+2013-08-02  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/ftcffdrv.h: Improve documentation.
+	This is based on blog entries from David Lemon and Dave Arnold (both
+	from Adobe) with kind permission.  Dave also helped in
+	proof-reading.
+
+2013-08-02  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Move declaration of scripts into separate file.
+
+	This has the benefit that we don't need to duplicate the data at
+	different places.
+
+	* src/autofit/afscript.h: New file.
+
+	* src/autofit/aftypes.h (AF_Script): Include `afscript.h' to define
+	the enumeration values.
+
+	* src/autofit/afglobal.c: Include `afscript.h' to get the script
+	specific header files.
+	(af_script_classes): Include `afscript.h' to fill this array.
+
+	* src/autofit/afpic.c: Include `afscript.h' to get the script
+	specific header files.
+	(autofit_module_class_pic_init): Include `afscript.h' for
+	initialization.
+	* src/autofit/afpic.h (AF_SCRIPT_CLASSES_COUNT,
+	AF_SCRIPT_CLASSES_REC_COUNT): Removed.  Use `AF_SCRIPT_MAX' instead.
+
+	* src/autofit/rules.mk (AUTOF_DRV_H): Updated.
+
+2013-08-02  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Move declaration of writing systems into separate file.
+
+	This has the benefit that we don't need to duplicate the data at
+	different places.
+
+	* src/autofit/afwrtsys.h: New file.
+
+	* src/autofit/aftypes.h (AF_WritingSystem): Include `afwrtsys.h' to
+	define the enumeration values.
+
+	* src/autofit/afglobal.c: Include `afwrtsys.h' to get the writing
+	system specific header files.
+	Include `afpic.h'.
+	(af_writing_system_classes): Include `afwrtsys.h' to fill this
+	array.
+
+	* src/autofit/afpic.c: Include `afwrtsys.h' to get the writing
+	system specific header files.
+	(autofit_module_class_pic_init): Include `afwrtsys.h' for
+	initialization.
+	* src/autofit/afpic.h (AF_WRITING_SYSTEM_CLASSES_COUNT,
+	AF_WRITING_SYSTEM_CLASSES_REC_COUNT): Removed.  Use
+	`AF_WRITING_SYSTEM_MAX' instead.
+
+2013-08-02  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Fix compilation with g++.
+
+	* src/sfnt/pngshim.c (error_callback, read_data_from_FT_stream): Use
+	cast.
+	(Load_SBit_Png): Pacify compiler.
+
+2013-08-02  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+            Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix `make multi'.
+
+	* include/freetype/config/ftconfig.h (FT_LOCAL_ARRAY,
+	FT_LOCAL_ARRAY_DEF): New macros.
+
+	* src/autofit/afglobal.c (af_writing_system_classes,
+	af_script_classes): Use FT_LOCAL_ARRAY_DEF.
+	* src/autofit/afglobal.h: Declare `af_writing_system_classes' and
+	`af_script_classes'.
+	* src/autofit/afloader.c: Include `afpic.h'.
+
+2013-08-01  Werner Lemberg  <wl@gnu.org>
+
+	Another round of cppcheck nitpicks.
+
+	The call was (from the top-level of the FreeType tree):
+
+	  cppcheck --force \
+	           --enable=all \
+	           -I /usr/include \
+	           -I /usr/local/include \
+	           -I /usr/lib/gcc/i586-suse-linux/4.7/include \
+	           -I include \
+	           -I include/freetype \
+	           -I include/freetype/config \
+	           -I include/freetype/internal \
+	           -DFT2_BUILD_LIBRARY \
+	           . &> cppcheck.log
+
+	using cppcheck git commit f7e93f99.
+
+	Note that cppcheck still can't handle `#include FOO' (with `FOO' a
+	macro).
+
+	*/* Improve variable scopes.
+	*/* Remove redundant initializations which get overwritten.
+
+	* src/gxvalid/*: Comment out redundant code or guard it with
+	FT_DEBUG_LEVEL_TRACE.
+
+2013-07-30  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Introduce `writing systems'.
+
+	This patch adds a new top level to the auto-hinter's script class
+	hierarchy.  It defines `writing systems' which can contain multiple
+	scripts.
+
+	For example, the `latin' writing system (in file `aflatin.c') is
+	able to support scripts like Latin, Cyrillic, Armenian, etc., which
+	can be handled similarly.
+
+	Scripts are now named using four-letter OpenType tags.
+
+	* src/autofit/aftypes.h (AF_ScriptClassRec): Move relevant members
+	to...
+	(AF_WritingSystemClassRec): This new structure.  It holds pointers
+	to functions which can be shared among related scripts.
+	(AF_WritingSystem): New enumeration.
+	(AF_Script): Revised values using four-letter tags.
+	(AF_DEFINE_WRITING_SYSTEM_CLASS): New macro.
+	(AF_DEFINE_SCRIPT_CLASS): Updated.
+
+	* src/autofit/afglobal.c (af_writing_system_classes): New global,
+	constant array.
+	(af_script_classes): Updated.
+	(af_face_globals_free): Updated.
+	Remove assertion.
+	(af_face_globals_get_metrics): Updated.
+
+	* src/autofit/afglobal.h (AF_SCRIPT_FALLBACK)
+	[!AF_CONFIG_OPTION_CJK]: Handle this case.
+
+	* src/autofit/afloader.c (af_loader_load_g, af_loader_load_glyph):
+	Updated.
+
+	* src/autofit/afpic.c (autofit_module_class_pic_init): Updated;
+	initialize structures for both writing systems and scripts.
+	* src/autofit/afpic.h: Updated.
+	(AF_WRITING_SYSTEM_CLASSES_GET): New macro.
+
+	* src/autofit/afcjk.c (af_cjk_writing_system_class): New writing
+	system.
+	(af_cjk_uniranges): Renamed to...
+	(af_hani_uniranges): This.
+	(af_cjk_script_class): Reduced and renamed to...
+	(af_hani_script_class): This.
+	* src/autofit/afcjk.h: Updated.
+
+	* src/autofit/afdummy.c (af_dummy_writing_system_class): New writing
+	system.
+	(af_dummy_script_class): Reduced and renamed to...
+	(af_dflt_script_class): This.
+	* src/autofit/afdummy.h: Updated.
+
+	* src/autofit/afindic.c (af_indic_writing_system_class): New writing
+	system.
+	(af_indic_uniranges): Renamed to...
+	(af_deva_uniranges): This.
+	(af_indic_script_class): Reduced and renamed to...
+	(af_deva_script_class): This.
+	* src/autofit/afcjk.h: Updated.
+
+	* src/autofit/aflatin.c (af_latin_writing_system_class): New writing
+	system.
+	(af_latin_uniranges): Renamed to...
+	(af_latn_uniranges): This.
+	(af_latin_script_class): Reduced and renamed to...
+	(af_latn_script_class): This.
+	* src/autofit/aflatin.h: Updated.
+
+	* src/autofit/aflatin2.c (af_latin2_writing_system_class): New
+	writing system.
+	(af_latin2_uniranges): Renamed to...
+	(af_ltn2_uniranges): This.
+	Synchronize ranges with `latin'.
+	(af_latin2_script_class): Reduced and renamed to...
+	(af_ltn2_script_class): This.
+	* src/autofit/aflatin2.h: Updated.
+
+2013-07-30  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Variable renaming.
+
+	* src/autofit/aftypes.h (AF_ScriptMetricsRec):
+	s/clazz/script_class/.
+	Update all users.
+
+2013-07-30  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Ignore libpng-config under cross-building configuration,
+	because it will return the flags for the hosting environment.
+
+	* builds/unix/configure.raw: Ignore libpng-config when
+	`cross_compiling' == yes.
+
+2013-07-30  Behdad Esfahbod  <behdad@google.com>
+
+	Prevent division by zero by a transparent color.
+
+	* src/base/ftbitmap.c (ft_gray_for_premultiplied_srgb_bgra):
+	Return 0 immediately, when alpha channel is zero.
+
+2013-07-25  Behdad Esfahbod  <behdad@google.com>
+
+	Add FT_FACE_FLAG_COLOR and FT_HAS_COLOR.
+
+	Also disambiguate Google's color bitmap tables.
+
+	* include/freetype/freetype.h (FT_FACE_FLAG_COLOR, FT_HAS_COLOR):
+	New macros.
+
+	* include/freetype/internal/tttypes.h (TT_SbitTableType): Add
+	TT_SBIT_TABLE_TYPE_CBLC.
+
+	* src/sfnt/sfobjs.c (sfnt_load_face): Handle FT_FACE_FLAG_COLOR.
+
+	* src/sfnt/ttsbit.c (tt_face_load_sbit,
+	tt_face_load_strike_metrics, tt_face_load_sbit_image): Handle
+	TT_SBIT_TABLE_TYPE_CBLC.
+
+2013-07-24  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[sfnt] Fix for `make multi' target.
+
+	* src/sfnt/pngshim.c (Load_SBit_Png): Use FT_LOCAL_DEF().
+
+2013-07-20  Werner Lemberg  <wl@gnu.org>
+
+	* docs/INSTALL.GNU: Updated.
+
+2013-07-20  Behdad Esfahbod  <behdad@google.com>
+
+	[sfnt] Fix `sbix' table version handling.
+
+	* src/sfnt/ttsbit.c (tt_face_load_sbit) [TT_SBIT_TABLE_TYPE_SBIX]:
+	USHORT version numbers are to be considered as `minor'.
+
+2013-07-19  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix segment classification for blue zones.
+
+	The old code (essentially unchanged since the very beginning)
+	incorrectly handled this configuration
+
+	               x -o- x
+	                /   \
+	               /     \
+	              /       \
+	             o         o
+
+	as flat and this
+
+	                o               o
+	               /               /
+	             x|              x|
+	              |               |
+	              o---------------o
+
+	as round.  (`o' and `x' are on and off points, respectively).
+
+	This is a major change which should improve the rendering results
+	enormously for many TrueType fonts, especially in the range approx.
+	20-40ppem, fixing the appearance of many overshoots.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Look at the
+	first and last points of the segment, not the points right before
+	and after.
+
+2013-07-19  Behdad Esfahbod  <behdad@google.com>
+
+	[sfnt] `sbix' fix-ups.
+
+	* src/sfnt/sfobjs.c (sfnt_load_face): Apple's `sbix' color bitmaps
+	are rendered scaled and then the `glyf' outline rendered on top.  We
+	don't support that yet, so just ignore the `glyf' outline and
+	advertise it as a bitmap-only font.
+
+	* src/sfnt/ttsbit.c (tt_face_load_strike_metrics)
+	[TT_SBIT_TABLE_TYPE_SBIX]: Return metrics in 26.6 units.
+	(tt_face_load_sbix_image): Typo.
+
+2013-07-18  Behdad Esfahbod  <behdad@google.com>
+
+	[sfnt] Add support for Apple's `sbix' color bitmap table.
+
+	* include/freetype/internal/tttypes.h (TT_SBit_MetricsRec): Widen
+	fields to FT_Short and FT_UShort, respectively.
+	(TT_SBitTableType): New enumeration.
+	(TT_FaceRec): Add `sbit_table_type' field.
+
+	* include/freetype/tttags.h (TTAG_sbix): New macro.
+
+	* src/sfnt/pngshim.c (Load_SBit_Png): Pass a more generic
+	FT_GlyphSlot argument instead FT_Bitmap.
+	Add flag to control map and metrics handling.
+	Update all users.
+
+	* src/sfnt/ttsbit.c: Include `ttmtx.h'.
+	(tt_face_load_eblc): Renamed to...
+	(tt_face_load_sbit): This.
+	Handlic `sbix' bitmaps.
+	(tt_face_free_eblc): Renamed to...
+	(tt_face_load_sbit): This.
+	Updated.
+	(tt_face_load_strike_metrics): Handle `sbix' bitmaps.
+	(tt_face_load_sbix_image): New function.
+	(tt_sbit_decoder_alloc_bitmap, tt_sbit_decoder_load_image,
+	tt_sbit_decoder_load_byte_aligned, tt_sbit_decoder_load_bit_aligned,
+	tt_sbit_decoder_load_compound, tt_sbit_decoder_load_png,
+	tt_sbit_decoder_load_image, tt_sbit_decoder_load_bitmap): Don't pass
+	and handle load flags.
+	(tt_sbit_decoder_load_bitmap) [!FT_CONFIG_OPTION_USE_PNG]: Better
+	handle formats 17-19.
+	Move color to grayscale conversion to...
+	(tt_face_load_sbit_image): Here.
+	Handle `sbix' bitmaps.
+
+	* src/sfnt/pngshim.h: Updated.
+	* src/sfnt/ttsbit.h: Updated.
+	* src/sfnt/sfdriver.c: Updated.
+
+2013-07-18  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Ignore invalid magic number in `head' or `bhed'.
+
+	Other font engines seem to ignore it also.  Problem reported by
+	Hin-Tak Leung <htl10@users.sourceforge.net>.
+
+	* src/sfnt/ttload.c (check_table_dir): Don't abort but warn only if
+	we have an invalid magic number.
+
+2013-07-16  Werner Lemberg  <wl@gnu.org>
+
+	[smooth] Fix segfault caused by previous commit.
+
+	* src/smooth/ftgrays.c (gray_set_cell): Always compute
+	`ras.invalid'.
+
+2013-07-16  David Turner  <digit@google.com>
+
+	[smooth] Improve performance.
+
+	Provide a work-around for an ARM-specific performance bug in GCC.
+	This speeds up the rasterizer by more than 5%.
+
+	Also slightly optimize `set_gray_cell' and `gray_record_cell' (which
+	also improves performance on other platforms by a tiny bit (<1%).
+
+	* src/smooth/ftgrays.c (FT_DIV_MOD): New macro.
+	Use it where appropriate.
+
+	(gray_record_cell, gray_set_cell, gray_move_to,
+	gray_convert_glyph_inner): Streamline condition handling.
+
+2013-07-16  David Turner  <digit@google.com>
+
+	[truetype] Add assembler code for TT_MulFix14 and TT_DotFix14.
+
+	This patch provides slightly optimized versions for ARM, x86, and
+	x86_64 CPUs if built with GCC.
+
+	Also remove some dead code.
+
+	* src/truetype/ttinterp.c (TT_MulFix14_arm, TT_MulFix14_long_long,
+	TT_DotFix14_long_long): New functions.
+
+2013-07-16  David Turner  <digit@google.com>
+
+	Optimize FT_MulFix for x86_64 GCC builds.
+
+	This patch provides an optimized `FT_MulFix' implementation for
+	x86_64 machines when FreeType is built with GCC, or compatible
+	compilers like Clang.
+
+	Example:
+	  bin/ftbench -p -t 5 -s 14 -f 0008 Arial.ttf
+
+	Before:
+
+	  Load                       4.863 us/op
+	  Load_Advances (Normal)     4.816 us/op
+	  Load_Advances (Fast)       0.028 us/op
+	  Render                     2.753 us/op
+	  Get_Glyph                  0.463 us/op
+	  Get_CBox                   0.077 us/op
+	  Get_Char_Index             0.023 us/op
+	  Iterate CMap              13.898 us/op
+	  New_Face                  12.368 us/op
+	  Embolden                   0.028 us/op
+	  Get_BBox                   0.302 us/op
+
+	After:
+
+	  Load                       4.617 us/op
+	  Load_Advances (Normal)     4.645 us/op
+	  Load_Advances (Fast)       0.027 us/op
+	  Render                     2.789 us/op
+	  Get_Glyph                  0.460 us/op
+	  Get_CBox                   0.077 us/op
+	  Get_Char_Index             0.024 us/op
+	  Iterate CMap              13.403 us/op
+	  New_Face                  12.278 us/op
+	  Embolden                   0.028 us/op
+	  Get_BBox                   0.301 us/op
+
+	* builds/unix/ftconfig.in, include/freetype/config/ftconfig.h
+	(FT_MulFix_x86_64): New function.
+
+2013-07-16  David Turner  <digit@google.com>
+
+	Speed up ARMv7 support.
+
+	When building for ARMv7 with thumb2 instructions, the optimized
+	`FT_MulFix_arm' assembly routine was not being used.
+
+	The reason for this is in the `ftconfig.h' header, namely:
+
+	- The assembly routine uses the `smull' instruction which is not
+	  available when generating Thumb-1 machine code.  It is available
+	  in Thumb-2 mode, though.
+
+	- The header was written a long time ago before Thumb-2 became
+	  widely popular (e.g. with Android).  So it simply doesn't use the
+	  assembly routine if the `__thumb__' built-in macro is defined.
+
+	- When compiling in Thumb-2 mode, the compiler will define both
+	  `__thumb__' and `__thumb2__'.
+
+	By checking for `(__thumb2__ || !__thumb__)', we ensure that the
+	assembly routine is only avoided when generating Thumb-1 code.
+
+	Given that this is performance-sensitive function, this improves
+	`ftbench' as follows on a Galaxy Nexus:
+
+	                           Before (us/op)   After (us/op)
+
+	  - loading Arial.ttf glyphs at 14 ppem [1]
+
+	      Load                   34.285          33.098
+
+	  - same operation with the light auto-hinter [2]
+
+	      Load                   31.317          29.590
+
+	  - same operation without hinting [3]
+
+	      Load                    6.143           5.376
+
+	  - loading Arial.ttf advances at 14 ppem [4]
+
+	      Load_Advances (normal) 34.216          33.016
+	      Load_Advances (fast)    0.176           0.176
+
+	  [1] ftbench -t 5 -p -s 14 -b a -f 0008 Arial.ttf
+	  [2] ftbench -t 5 -p -s 14 -b a -r 1 -f 0028 Arial.ttf
+	  [3] ftbench -t 5 -p -s 14 -b a -f 000a Arial.ttf
+	  [4] ftbench -t 5 -p -s 14 -b b -f 0008 Arial.ttf
+
+	* builds/unix/ftconfig.in, include/freetype/config/ftconfig.h
+	(FT_MULFIX_ASSEMBLER): Fix handling for ARMv7.
+
+2013-06-28  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES: Updated.
+
+2013-06-27  Werner Lemberg  <wl@gnu.org>
+
+	* src/winfonts/winfnt.c (FNT_Load_Glyph): Fix bitmap width guard.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[cff] Add darkening limit to `darkening-parameters'.
+
+	* src/cff/cffdrivr.c (cff_property_set): Add check.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[cff] Add `darkening-parameters' property.
+
+	* include/freetype/ftcffdrv.h: Document it.
+
+	* src/cff/cffdrivr.c (cff_property_set, cff_property_get): Handle
+	`darkening-parameters' property.
+
+	* src/cff/cf2font.h (CF2_FontRec): Add `darkenParams' array.
+
+	* src/cff/cf2font.c (cf2_computeDarkening): Add `darkenParams'
+	argument and use it.
+	Update all callers.
+
+	* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Copy
+	`darken_params' values.
+
+	* src/cff/cffobjs.h (CFF_DriverRec): Add `darken_params' array.
+
+	* src/cff/cffobjs.c (cff_driver_init): Set default values for
+	`darken_params'.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[docmaker] Code shuffling.
+
+	* src/tools/docmaker/tohtml.py (re_url): Move regexp...
+	* src/tools/docmaker/sources.py: ... to this file.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[docmaker] Remove unused functions.
+
+	* src/tools/docmaker/content.py (DocMarkup.get_start,
+	DocBlock.get_markup_name): Removed.
+	* src/tools/docmaker/tohtml.py (html_quote0, dump_html_code,
+	HtmlFormatter.make_html_words): Removed.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	* builds/freetype.mk (dll): Remove target.
+
+	Problem reported by Jörg Günnewig <joerg.guennewig@googlemail.com>.
+
+2013-06-25  Werner Lemberg  <wl@gnu.org>
+
+	[docmaker] Recognise URLs.
+
+	* src/tools/docmaker/tohtml.py (re_url): New regular expression.
+	(make_html_para): Use it.
+
 2013-06-19  Werner Lemberg  <wl@gnu.org>
 
 	* Version 2.5.0.1 released.
@@ -295,7 +1743,7 @@
 	*/* Improve variable scopes.
 	*/* Remove redundant initializations which get overwritten.
 
-	* src/base/ftmac.c ,builds/mac/ftmac.c (count_faces_scalable):
+	* src/base/ftmac.c, builds/mac/ftmac.c (count_faces_scalable):
 	Remove unused variable.
 
 	* src/base/ftdbgmem.c (ft_mem_table_destroy): `table' can't be zero.
@@ -575,7 +2023,7 @@
 	[sfnt] Clean up bitmap code.
 
 	* src/sfnt/ttsbit.c: Deleted.
-	* src/sfnt/ttsbit0.c: Renamed to `ttsbit.c'. 
+	* src/sfnt/ttsbit0.c: Renamed to `ttsbit.c'.
 	* rules.mk (SFNT_DRV_H): Updated.
 
 2013-05-10  Werner Lemberg  <wl@gnu.org>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog.20 b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog.20
index 8fcc5e70ab4..8fcc5e70ab4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog.20
+++ b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog.20
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog.21 b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog.21
index d6371d17583..d6371d17583 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog.21
+++ b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog.21
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog.22 b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog.22
index 4144288a5bf..4144288a5bf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog.22
+++ b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog.22
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog.23 b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog.23
index 1a23848f88a..1a23848f88a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/ChangeLog.23
+++ b/Build/source/libs/freetype2/freetype-2.5.1/ChangeLog.23
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/Jamfile
index 2fec5f106f4..a097dffd52f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/Jamfile
@@ -1,6 +1,6 @@
 # FreeType 2 top Jamfile.
 #
-# Copyright 2001-2011 by
+# Copyright 2001-2011, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -140,9 +140,9 @@ DEFINES += FT2_BUILD_LIBRARY ;
 # 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.
+# The file <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.
 #
 HDRMACRO  [ FT2_SubDir  include freetype config ftheader.h ] ;
 HDRMACRO  [ FT2_SubDir  include freetype internal internal.h ] ;
@@ -177,7 +177,7 @@ actions GenExportSymbols1 bind APINAMES
   $(APINAMES) $(2) > $(1)
 }
 
-GenExportSymbols  ftexport.sym : include/freetype include/freetype/cache ;
+GenExportSymbols  ftexport.sym : include include/cache ;
 
 # Test files (hinter debugging).  Only used by FreeType developers.
 #
@@ -195,7 +195,7 @@ rule RefDoc
 
 actions RefDoc
 {
-  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.0 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
+  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h
 }
 
 RefDoc  refdoc ;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/Jamrules b/Build/source/libs/freetype2/freetype-2.5.1/Jamrules
index d8d1c7e617b..d8d1c7e617b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/Jamrules
+++ b/Build/source/libs/freetype2/freetype-2.5.1/Jamrules
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/Makefile b/Build/source/libs/freetype2/freetype-2.5.1/Makefile
index c1fa16cee54..c1fa16cee54 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/Makefile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/Makefile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/README b/Build/source/libs/freetype2/freetype-2.5.1/README
index 798715a4119..c694282a732 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/README
+++ b/Build/source/libs/freetype2/freetype-2.5.1/README
@@ -1,4 +1,4 @@
-  FreeType 2.5.0
+  FreeType 2.5.1
   ==============
 
   Homepage: http://www.freetype.org
@@ -24,9 +24,9 @@
 
   and download one of the following files.
 
-    freetype-doc-2.5.0.tar.bz2
-    freetype-doc-2.5.0.tar.gz
-    ftdoc250.zip
+    freetype-doc-2.5.1.tar.bz2
+    freetype-doc-2.5.1.tar.gz
+    ftdoc251.zip
 
   To view the documentation online, go to
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/README.git b/Build/source/libs/freetype2/freetype-2.5.1/README.git
index 47cb2423f16..021c121413d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/README.git
+++ b/Build/source/libs/freetype2/freetype-2.5.1/README.git
@@ -31,9 +31,13 @@ configure script is necessary at all; saying
 should work on all platforms which have GNU make (or makepp).
 
 
+Similarly, a  build with  `cmake' can  be done  directly from  the git
+repository.
+
+
 ----------------------------------------------------------------------
 
-Copyright 2005, 2006, 2007, 2008, 2009, 2010 by
+Copyright 2005-2010, 2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/autogen.sh b/Build/source/libs/freetype2/freetype-2.5.1/autogen.sh
index 0eaba395b5f..cc0e661ce5a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/autogen.sh
+++ b/Build/source/libs/freetype2/freetype-2.5.1/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010 by
+# Copyright 2005-2010, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -139,7 +139,7 @@ check_tool_version $LIBTOOLIZE libtoolize LIBTOOLIZE 2.2.4
 check_tool_version $AUTOCONF   autoconf   AUTOCONF   2.62
 
 # This sets freetype_major, freetype_minor, and freetype_patch.
-eval `sed -nf version.sed include/freetype/freetype.h`
+eval `sed -nf version.sed include/freetype.h`
 
 # We set freetype-patch to an empty value if it is zero.
 if test "$freetype_patch" = ".0"; then
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/README b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/README
index 2b8f8e87dbb..85fcc43308c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/README
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/README
@@ -1,7 +1,7 @@
 
 README for the builds/amiga subdirectory.
 
-Copyright 2005 by
+Copyright 2005, 2013 by
 Werner Lemberg and Detlef Würkner.
 
 This file is part of the FreeType project, and may only be used, modified,
@@ -51,8 +51,8 @@ directory.  The results are:
 
 - ftdebug.o, an object module containing the standard version of the
   debugging code which uses vprintf() and exit() (not pure).
-  Debugging can be turned on in FT:include/freetype/config/ftoption.h
-  and with FT_SetTraceLevel().
+  Debugging can be turned on in FT:include/config/ftoption.h and with
+  FT_SetTraceLevel().
 
 - ftdebugpure.o, an object module containing the pure version of the
   debugging code which uses KVPrintf() from lib:debug.lib and no
@@ -64,15 +64,14 @@ directory.  The results are:
   ftsystem.o would force ALL FreeType2 modules to be linked to your
   program, I decided to use a different scheme: You must #include
   FT:src/base/ftinit.c in your sourcecode and specify with #define
-  statements which modules you need.  See
-  include/freetype/config/ftmodule.h.
+  statements which modules you need.  See include/config/ftmodule.h.
 
 
 To use in your own programs:
 
 - Insert the #define and #include statements from top of
-  include/freetype/config/ftmodule.h in your source code and uncomment
-  the #define statements for the FreeType2 modules you need.
+  include/config/ftmodule.h in your source code and uncomment the
+  #define statements for the FreeType2 modules you need.
 
 - You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for
   calling the FreeType2 functions, because the link library and the
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/include/freetype/config/ftconfig.h b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/include/config/ftconfig.h
index c2c2ac8dbb6..a73ace671dd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/include/freetype/config/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/include/config/ftconfig.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific configuration file (specification only).              */
 /*                                                                         */
-/*  Copyright 2005, 2006, 2007 by                                          */
+/*  Copyright 2005-2007, 2013 by                                           */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -34,9 +34,9 @@
 /* Now include the original file */
 #ifndef __MORPHOS__
 #ifdef __SASC
-#include "FT:include/freetype/config/ftconfig.h"
+#include "FT:include/config/ftconfig.h"
 #else
-#include "/FT/include/freetype/config/ftconfig.h"
+#include "/FT/include/config/ftconfig.h"
 #endif
 #else
 /* We must define that, it seems that
@@ -45,7 +45,7 @@
  * binaries from http://www.morphos.de)
  */
 #define _LIBC_LIMITS_H_
-#include "/FT/include/freetype/config/ftconfig.h"
+#include "/FT/include/config/ftconfig.h"
 #endif
 
 /*
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/include/freetype/config/ftmodule.h b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/include/config/ftmodule.h
index 5873bab74fa..5873bab74fa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/include/freetype/config/ftmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/include/config/ftmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/makefile b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/makefile
index 379883deec0..8a1e4c61b15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/makefile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/makefile
@@ -5,7 +5,7 @@
 #
 
 
-# Copyright 2005, 2006, 2007, 2009 by
+# Copyright 2005-2007, 2009, 2013 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -43,7 +43,7 @@
 #
 # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
 # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
-# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).
 
 all:	libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/makefile.os4 b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/makefile.os4
index 13758bcebf1..a2e6ffcedf7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/makefile.os4
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/makefile.os4
@@ -4,7 +4,7 @@
 #
 
 
-# Copyright 2005, 2006, 2007, 2009 by
+# Copyright 2005-2007, 2009, 2013 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -40,7 +40,7 @@
 #
 # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
 # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
-# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).
 
 all:	assign libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/smakefile b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/smakefile
index 097aec9b064..aee7fb9d488 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/smakefile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/smakefile
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2005,2006, 2007, 2009 by
+# Copyright 2005-2007, 2009, 2013 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -40,7 +40,7 @@
 #
 # link your programs with ft2_680x0.lib and either ftsystem.o or ftsystempure.o
 # (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or
-# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).
 
 OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfstype.o ftgasp.o   \
 	  ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o ftpatent.o ftpfr.o \
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/src/base/ftdebug.c b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/src/base/ftdebug.c
index 4e13a6a6fc6..39688af783c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/src/base/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/src/base/ftdebug.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for amiga (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2004, 2005, 2013 by                         */
+/*  Copyright 1996-2002, 2004, 2005, 2013 by                               */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -176,7 +176,7 @@
   /* the memory and stream components which are set to 7 and 5,            */
   /* respectively.                                                         */
   /*                                                                       */
-  /* See the file <include/freetype/internal/fttrace.h> for details of the */
+  /* See the file <include/internal/fttrace.h> for details of the          */
   /* available toggle names.                                               */
   /*                                                                       */
   /* The level must be between 0 and 7; 0 means quiet (except for serious  */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/src/base/ftsystem.c b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/src/base/ftsystem.c
index 42a552dbe89..42a552dbe89 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/amiga/src/base/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/amiga/src/base/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/ansi/ansi-def.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/ansi/ansi-def.mk
index 2c585729515..2c585729515 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/ansi/ansi-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/ansi/ansi-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/ansi/ansi.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/ansi/ansi.mk
index 32b3bac3e3a..32b3bac3e3a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/ansi/ansi.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/ansi/ansi.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/ATARI.H b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/ATARI.H
index 9f78c924b83..9f78c924b83 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/ATARI.H
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/ATARI.H
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/FNames.SIC b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/FNames.SIC
index f3657179d91..f3657179d91 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/FNames.SIC
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/FNames.SIC
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/FREETYPE.PRJ b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/FREETYPE.PRJ
index 4776a5bc690..4776a5bc690 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/FREETYPE.PRJ
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/FREETYPE.PRJ
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/README.TXT b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/README.TXT
index 04eec63519b..04eec63519b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/README.TXT
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/README.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/deflinejoiner.awk b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/deflinejoiner.awk
index 16d9e6dd933..16d9e6dd933 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/deflinejoiner.awk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/deflinejoiner.awk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/gen-purec-patch.sh b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/gen-purec-patch.sh
index 1ec050c11fa..1ec050c11fa 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/atari/gen-purec-patch.sh
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/atari/gen-purec-patch.sh
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/beos/beos-def.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/beos/beos-def.mk
index 4371a30aa3c..4371a30aa3c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/beos/beos-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/beos/beos-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/beos/beos.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/beos/beos.mk
index b5c8bdabe32..b5c8bdabe32 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/beos/beos.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/beos/beos.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/beos/detect.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/beos/detect.mk
index 24a0878862a..24a0878862a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/beos/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/beos/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/ansi-cc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/ansi-cc.mk
index 3b668e20102..3b668e20102 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/ansi-cc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/ansi-cc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/bcc-dev.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/bcc-dev.mk
index 42a99b0c006..42a99b0c006 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/bcc-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/bcc-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/bcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/bcc.mk
index 855edadf0a3..855edadf0a3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/bcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/bcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/emx.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/emx.mk
index c237005cb1e..c237005cb1e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/emx.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/emx.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/gcc-dev.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/gcc-dev.mk
index c63e1262ebe..c63e1262ebe 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/gcc-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/gcc-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/gcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/gcc.mk
index f6b7101b38a..f6b7101b38a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/intelc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/intelc.mk
index 413ce5bacc7..413ce5bacc7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/intelc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/intelc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/unix-lcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/unix-lcc.mk
index d79f50846cb..d79f50846cb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/unix-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/unix-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/visualage.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/visualage.mk
index c109659bf73..c109659bf73 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/visualage.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/visualage.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/visualc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/visualc.mk
index 2e19ef86a31..2e19ef86a31 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/visualc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/visualc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/watcom.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/watcom.mk
index 4db1e7fecea..4db1e7fecea 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/watcom.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/watcom.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/win-lcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/win-lcc.mk
index 5d02d82462e..5d02d82462e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/compiler/win-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/compiler/win-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/detect.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/detect.mk
index 987ae51c41f..ce407baf6d3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001, 2002, 2003, 2006, 2008 by
+# Copyright 1996-2003, 2006, 2008, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -17,8 +17,8 @@
 # the following variables:
 #
 #   BUILD_DIR    The configuration and system-specific directory.  Usually
-#                `freetype/builds/$(PLATFORM)' but can be different for
-#                custom builds of the library.
+#                `builds/$(PLATFORM)' but can be different for custom builds
+#                of the library.
 #
 # The following variables must be defined in system specific `detect.mk'
 # files:
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/detect.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/detect.mk
index 700a1226885..700a1226885 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/dos-def.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/dos-def.mk
index 950f581a00b..950f581a00b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/dos-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/dos-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/dos-emx.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/dos-emx.mk
index 6ea8f6d872f..6ea8f6d872f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/dos-emx.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/dos-emx.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/dos-gcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/dos-gcc.mk
index e14255c1f27..e14255c1f27 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/dos-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/dos-gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/dos-wat.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/dos-wat.mk
index c763b163cd9..c763b163cd9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/dos/dos-wat.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/dos/dos-wat.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/exports.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/exports.mk
index 96b10db8747..96b10db8747 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/exports.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/exports.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/freetype.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/freetype.mk
index 7a89c8e3d01..2a58db32315 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/freetype.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/freetype.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 by
+# Copyright 1996-2006, 2008, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -97,7 +97,7 @@ BASE_DIR := $(SRC_DIR)/base
 
 # Other derived directories.
 #
-PUBLIC_DIR   := $(TOP_DIR)/include/freetype
+PUBLIC_DIR   := $(TOP_DIR)/include
 INTERNAL_DIR := $(PUBLIC_DIR)/internal
 SERVICES_DIR := $(INTERNAL_DIR)/services
 CONFIG_DIR   := $(PUBLIC_DIR)/config
@@ -116,8 +116,8 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A
 # IMPORTANT NOTE: The architecture-dependent directory must ALWAYS be placed
 #                 before the standard include list.  Porters are then able to
 #                 put their own version of some of the FreeType components
-#                 in the `freetype/builds/<system>' directory, as these
-#                 files will override the default sources.
+#                 in the `builds/<system>' directory, as these files will
+#                 override the default sources.
 #
 INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
                                       $(DEVEL_DIR) \
@@ -178,7 +178,7 @@ PUBLIC_H   := $(wildcard $(PUBLIC_DIR)/*.h)
 INTERNAL_H := $(wildcard $(INTERNAL_DIR)/*.h) \
               $(wildcard $(SERVICES_DIR)/*.h)
 CONFIG_H   := $(wildcard $(CONFIG_DIR)/*.h) \
-              $(wildcard $(BUILD_DIR)/freetype/config/*.h) \
+              $(wildcard $(BUILD_DIR)/config/*.h) \
               $(FTMODULE_H) \
               $(FTOPTION_H)
 DEVEL_H    := $(wildcard $(TOP_DIR)/devel/*.h)
@@ -261,8 +261,6 @@ objects: $(OBJECTS_LIST)
 
 library: $(PROJECT_LIBRARY)
 
-dll: $(PROJECT_LIBRARY) exported_symbols
-
 .c.$O:
 	$(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/link_dos.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/link_dos.mk
index c37ac7e52c1..c37ac7e52c1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/link_dos.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/link_dos.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/link_std.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/link_std.mk
index 0bd2163bb19..0bd2163bb19 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/link_std.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/link_std.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/FreeType.m68k_cfm.make.txt b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/FreeType.m68k_cfm.make.txt
index 425f9f9ce28..425f9f9ce28 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/FreeType.m68k_cfm.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/FreeType.m68k_cfm.make.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/FreeType.m68k_far.make.txt b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/FreeType.m68k_far.make.txt
index ebf5a1b56ab..ebf5a1b56ab 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/FreeType.m68k_far.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/FreeType.m68k_far.make.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/FreeType.ppc_carbon.make.txt b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/FreeType.ppc_carbon.make.txt
index 2926413f395..2926413f395 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/FreeType.ppc_carbon.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/FreeType.ppc_carbon.make.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/FreeType.ppc_classic.make.txt b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/FreeType.ppc_classic.make.txt
index 377de9ab98f..377de9ab98f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/FreeType.ppc_classic.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/FreeType.ppc_classic.make.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/README b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/README
index bd3df8ada4b..f58e47d4ad2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/README
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/README
@@ -1,8 +1,8 @@
 This folder contains
 
-  * Makefile skeltons for Apple MPW (Macintosh's Programmers Workshop)
+  * Makefile skeletons for Apple MPW (Macintosh's Programmer's Workshop)
 
-  * Python script to generate MPW makefile from skelton
+  * Python script to generate MPW makefile from skeleton
 
   * Metrowerks CodeWarrior 9.0 project file in XML format
 
@@ -51,7 +51,7 @@ environment by Metrowerks. GCC for MPW and Symantec
   Also you can find documents how to update by MPW-PR.
 
   Python is required to restore MPW makefiles from the
-  skeltons. Python bundled to Mac OS X is enough. For
+  skeletons. Python bundled to Mac OS X is enough. For
   classic MacOS, MacPython is available:
 
       http://homepages.cwi.nl/~jack/macpython/
@@ -78,10 +78,10 @@ environment by Metrowerks. GCC for MPW and Symantec
   Detailed building procedure by Apple MPW is
   described in following.
 
-    3-1-1. Generate MPW makefiles from the skeltons
+    3-1-1. Generate MPW makefiles from the skeletons
     ------------------------------------------------
 
-    Here are 4 skeltons for following targets are
+    Here are 4 skeletons for following targets are
     included.
 
     - FreeType.m68k_far.make.txt
@@ -109,7 +109,7 @@ environment by Metrowerks. GCC for MPW and Symantec
 
     MPW makefile syntax uses 8bit characters. To keep
     from violating them during version control, here
-    we store skeltons in pure ASCII format. You must
+    we store skeletons in pure ASCII format. You must
     generate MPW makefile by Python script ascii2mpw.py.
 
     In Mac OS X terminal, you can convert as:
@@ -118,10 +118,10 @@ environment by Metrowerks. GCC for MPW and Symantec
 		< builds/mac/FreeType.m68k_far.make.txt \
 		> FreeType.m68k_far.make
 
-    The skeltons are designed to use in the top
+    The skeletons are designed to use in the top
     directory where there are builds, include, src etc.
     You must name the generated MPW makefile by removing
-    ".txt" from source skelton name.
+    ".txt" from source skeleton name.
 
     3-1-2. Add resource forks to related files
     ------------------------------------------
@@ -392,12 +392,10 @@ ATSFontGetFileSpecification()         |    x    |    x    |    x    |    x    |
     ATS font manager is not published in these versions.
 
 ------------------------------------------------------------
-Last update: 2009-Jul-25.
+Last update: 2013-Nov-03.
 
 Currently maintained by
 	suzuki toshiya, <mpsuzuki@hiroshima-u.ac.jp>
 Originally prepared by
 	Leonard Rosenthol, <leonardr@lazerware.com>
 	Just van Rossum, <just@letterror.com>
-
-This directory is now actively maintained as part of the FreeType Project.
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/ascii2mpw.py b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/ascii2mpw.py
index ad32b219772..ad32b219772 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/ascii2mpw.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/ascii2mpw.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/ftlib.prj.xml b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/ftlib.prj.xml
index cbbc45ee55c..cbbc45ee55c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/ftlib.prj.xml
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/ftlib.prj.xml
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/ftmac.c b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/ftmac.c
index 16d50e87fff..40f6bd20c9b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/mac/ftmac.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/mac/ftmac.c
@@ -1392,7 +1392,6 @@ typedef short ResourceIndex;
     if ( !pathname )
       return FT_THROW( Invalid_Argument );
 
-    error  = FT_Err_Ok;
     *aface = NULL;
 
     /* try resourcefork based font: LWFN, FFIL */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/modules.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/modules.mk
index c4a882cbdb5..c4a882cbdb5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/modules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/modules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/newline b/Build/source/libs/freetype2/freetype-2.5.1/builds/newline
index 8b137891791..8b137891791 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/newline
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/newline
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/os2/detect.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/os2/detect.mk
index 47a40a2f857..47a40a2f857 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/os2/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/os2/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/os2/os2-def.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/os2/os2-def.mk
index 01cda9285af..01cda9285af 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/os2/os2-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/os2/os2-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/os2/os2-dev.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/os2/os2-dev.mk
index 83da8dea33e..83da8dea33e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/os2/os2-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/os2/os2-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/os2/os2-gcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/os2/os2-gcc.mk
index 446073e4f56..446073e4f56 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/os2/os2-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/os2/os2-gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/builds/symbian/bld.inf b/Build/source/libs/freetype2/freetype-2.5.1/builds/symbian/bld.inf
new file mode 100644
index 00000000000..bc8c1609c9d
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/symbian/bld.inf
@@ -0,0 +1,66 @@
+//
+// FreeType 2 project for the symbian platform
+//
+
+// Copyright 2008, 2009, 2013 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.
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_MMPFILES
+freetype.mmp
+
+PRJ_EXPORTS
+../../include/ft2build.h
+../../include/config/ftconfig.h	config/ftconfig.h
+../../include/config/ftheader.h	config/ftheader.h
+../../include/config/ftmodule.h	config/ftmodule.h
+../../include/config/ftoption.h	config/ftoption.h
+../../include/config/ftstdlib.h	config/ftstdlib.h
+../../include/freetype.h	freetype.h
+../../include/ftbbox.h		ftbbox.h
+../../include/ftbdf.h		ftbdf.h
+../../include/ftbitmap.h	ftbitmap.h
+../../include/ftcache.h		ftcache.h
+../../include/ftcid.h		ftcid.h
+../../include/fterrdef.h	fterrdef.h
+../../include/fterrors.h	fterrors.h
+../../include/ftgasp.h		ftgasp.h
+../../include/ftglyph.h		ftglyph.h
+../../include/ftgxval.h		ftgxval.h
+../../include/ftgzip.h		ftgzip.h
+../../include/ftbzip2.h		ftbzip2.h
+../../include/ftimage.h		ftimage.h
+../../include/ftincrem.h	ftincrem.h
+../../include/ftlcdfil.h	ftlcdfil.h
+../../include/ftlist.h		ftlist.h
+../../include/ftlzw.h		ftlzw.h
+../../include/ftmac.h		ftmac.h
+../../include/ftmm.h		ftmm.h
+../../include/ftmodapi.h	ftmodapi.h
+../../include/ftmoderr.h	ftmoderr.h
+../../include/ftotval.h		ftotval.h
+../../include/ftoutln.h		ftoutln.h
+../../include/ftpfr.h		ftpfr.h
+../../include/ftrender.h	ftrender.h
+../../include/ftsizes.h		ftsizes.h
+../../include/ftsnames.h	ftsnames.h
+../../include/ftstroke.h	ftstroke.h
+../../include/ftsynth.h		ftsynth.h
+../../include/ftsystem.h	ftsystem.h
+../../include/fttrigon.h	fttrigon.h
+../../include/fttypes.h		fttypes.h
+../../include/ftwinfnt.h	ftwinfnt.h
+../../include/ftxf86.h		ftxf86.h
+../../include/t1tables.h	t1tables.h
+../../include/ttnameid.h	ttnameid.h
+../../include/tttables.h	tttables.h
+../../include/tttags.h		tttags.h
+../../include/ttunpat.h		ttunpat.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/symbian/freetype.mmp b/Build/source/libs/freetype2/freetype-2.5.1/builds/symbian/freetype.mmp
index cb0008c4463..cb0008c4463 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/symbian/freetype.mmp
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/symbian/freetype.mmp
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/toplevel.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/toplevel.mk
index 03b6e28d5f4..968202853e1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/toplevel.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/toplevel.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012 by
+# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -176,7 +176,7 @@ include $(TOP_DIR)/builds/modules.mk
 
 # we check for `dist', not `distclean'
 ifneq ($(findstring distx,$(MAKECMDGOALS)x),)
-  FT_H := include/freetype/freetype.h
+  FT_H := include/freetype.h
 
   major := $(shell sed -n 's/.*FREETYPE_MAJOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H))
   minor := $(shell sed -n 's/.*FREETYPE_MINOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H))
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/aclocal.m4 b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/aclocal.m4
index b9312147fa9..94c65087799 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/aclocal.m4
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/config.guess b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/config.guess
index b79252d6b10..b79252d6b10 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/config.guess
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/config.guess
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/config.sub b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/config.sub
index 61cb4bc22db..61cb4bc22db 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/config.sub
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/config.sub
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/configure b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/configure
index 64acde93eb4..14d7bc95186 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/configure
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType 2.5.
+# Generated by GNU Autoconf 2.69 for FreeType 2.5.1.
 #
 # Report bugs to <freetype@nongnu.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FreeType'
 PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.5'
-PACKAGE_STRING='FreeType 2.5'
+PACKAGE_VERSION='2.5.1'
+PACKAGE_STRING='FreeType 2.5.1'
 PACKAGE_BUGREPORT='freetype@nongnu.org'
 PACKAGE_URL=''
 
@@ -662,6 +662,7 @@ DLLTOOL
 AS
 SYSTEM_ZLIB
 FT2_EXTRA_LIBS
+LIBPNG
 LIBBZ2
 LIBZ
 ftmac_c
@@ -1303,7 +1304,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures FreeType 2.5 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1368,7 +1369,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType 2.5:";;
+     short | recursive ) echo "Configuration of FreeType 2.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1485,7 +1486,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FreeType configure 2.5
+FreeType configure 2.5.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2083,7 +2084,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by FreeType $as_me 2.5, which was
+It was created by FreeType $as_me 2.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2439,7 +2440,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='16:2:10'
+version_info='17:0:11'
 
 ft_version=`echo $version_info | tr : .`
 
@@ -4776,7 +4777,12 @@ $as_echo_n "checking for libpng... " >&6; }
       as_fn_error $? "\`libpng-config' not found;
 either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
 or pass \`--without-png' to the \`configure' script." "$LINENO" 5
+    elif test ${cross_compiling} = yes; then
+      as_fn_error $? "\`libpng-config' should not be used in cross-building;
+either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
+or pass \`--without-png' to the \`configure' script." "$LINENO" 5
     fi
+    LIBPNG="`libpng-config --libs`"
     LIBPNG_CFLAGS="`libpng-config --cflags`"
     LIBPNG_LDFLAGS="`libpng-config --ldflags`"
   fi
@@ -5372,6 +5378,7 @@ esac
 
 
 
+
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -13363,7 +13370,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by FreeType $as_me 2.5, which was
+This file was extended by FreeType $as_me 2.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13429,7 +13436,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-FreeType config.status 2.5
+FreeType config.status 2.5.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/configure.ac b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/configure.ac
index e00d2cc334f..a28e836e239 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/configure.ac
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/configure.ac
@@ -11,13 +11,13 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
-AC_INIT([FreeType], [2.5], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.5.1], [freetype@nongnu.org], [freetype])
 AC_CONFIG_SRCDIR([ftconfig.in])
 
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='16:2:10'
+version_info='17:0:11'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -292,7 +292,12 @@ if test x$with_png != xno; then
       AC_MSG_ERROR([`libpng-config' not found;
 either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
 or pass `--without-png' to the `configure' script.])
+    elif test ${cross_compiling} = yes; then
+      AC_MSG_ERROR([`libpng-config' should not be used in cross-building;
+either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
+or pass `--without-png' to the `configure' script.])
     fi
+    LIBPNG="`libpng-config --libs`"
     LIBPNG_CFLAGS="`libpng-config --cflags`"
     LIBPNG_LDFLAGS="`libpng-config --ldflags`"
   fi
@@ -717,6 +722,7 @@ esac
 AC_SUBST([ftmac_c])
 AC_SUBST([LIBZ])
 AC_SUBST([LIBBZ2])
+AC_SUBST([LIBPNG])
 AC_SUBST([FT2_EXTRA_LIBS])
 AC_SUBST([SYSTEM_ZLIB])
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/configure.raw b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/configure.raw
index 6a6edc71575..508be9a3fa4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/configure.raw
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/configure.raw
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='16:2:10'
+version_info='17:0:11'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -292,7 +292,12 @@ if test x$with_png != xno; then
       AC_MSG_ERROR([`libpng-config' not found;
 either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
 or pass `--without-png' to the `configure' script.])
+    elif test ${cross_compiling} = yes; then
+      AC_MSG_ERROR([`libpng-config' should not be used in cross-building;
+either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
+or pass `--without-png' to the `configure' script.])
     fi
+    LIBPNG="`libpng-config --libs`"
     LIBPNG_CFLAGS="`libpng-config --cflags`"
     LIBPNG_LDFLAGS="`libpng-config --ldflags`"
   fi
@@ -717,6 +722,7 @@ esac
 AC_SUBST([ftmac_c])
 AC_SUBST([LIBZ])
 AC_SUBST([LIBBZ2])
+AC_SUBST([LIBPNG])
 AC_SUBST([FT2_EXTRA_LIBS])
 AC_SUBST([SYSTEM_ZLIB])
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/detect.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/detect.mk
index 0506e7d04b9..0506e7d04b9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/freetype-config.in b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/freetype-config.in
index 2edcd1135b1..e4c504d04a6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/freetype-config.in
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/freetype-config.in
@@ -119,13 +119,13 @@ else
 fi
 
 if test "$echo_ft_version" = "yes" ; then
-  major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
          | grep FREETYPE_MAJOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
          | grep FREETYPE_MINOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
          | grep FREETYPE_PATCH \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
   echo $major.$minor.$patch
@@ -133,15 +133,11 @@ fi
 
 if test "$echo_cflags" = "yes" ; then
   cflags="-I${SYSROOT}$includedir/freetype2"
-  if test "${SYSROOT}$includedir" != "/usr/include" ; then
-    echo $cflags -I${SYSROOT}$includedir
-  else
-    echo $cflags
-  fi
+  echo $cflags
 fi
 
 if test "$echo_libs" = "yes" ; then
-  libs="-lfreetype %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%"
+  libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%"
   if test "${SYSROOT}$libdir" != "/usr/lib"  &&
      test "${SYSROOT}$libdir" != "/usr/lib64"; then
     echo -L${SYSROOT}$libdir $libs
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/freetype2.in b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/freetype2.in
index c5c30276e9b..5e545b6fbdc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/freetype2.in
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/freetype2.in
@@ -1,12 +1,12 @@
 prefix="%prefix%"
 exec_prefix="%exec_prefix%"
 libdir="%libdir%"
-includedir="%includedir%"
+includedir="%includedir%/freetype2"
 
 Name: FreeType 2
 Description: A free, high-quality, and portable font engine.
 Version: %ft_version%
 Requires:
 Libs: -L${libdir} -lfreetype
-Libs.private: %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%
-Cflags: -I${includedir}/freetype2 -I${includedir}
+Libs.private: %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%
+Cflags: -I${includedir}
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/freetype2.m4 b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/freetype2.m4
index 3d0ecb35540..3d0ecb35540 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/freetype2.m4
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/freetype2.m4
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ft-munmap.m4 b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/ft-munmap.m4
index 68b3361e2b1..68b3361e2b1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ft-munmap.m4
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/ft-munmap.m4
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ftconfig.in b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/ftconfig.in
index d171e247607..ddaea25d643 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ftconfig.in
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/ftconfig.in
@@ -27,9 +27,9 @@
   /* Note however that if some specific modifications are needed, we       */
   /* advise you to place a modified copy in your build directory.          */
   /*                                                                       */
-  /* The build directory is usually `freetype/builds/<system>', and        */
-  /* contains system-specific files that are always included first when    */
-  /* building the library.                                                 */
+  /* The build directory is usually `builds/<system>', and contains        */
+  /* system-specific files that are always included first when building    */
+  /* the library.                                                          */
   /*                                                                       */
   /*************************************************************************/
 
@@ -52,7 +52,7 @@ FT_BEGIN_HEADER
   /* These macros can be toggled to suit a specific system.  The current   */
   /* ones are defaults used to compile FreeType in an ANSI C environment   */
   /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `freetype/builds/<system>' directory, and edit it to port the engine. */
+  /* `builds/<system>' directory, and edit it to port the engine.          */
   /*                                                                       */
   /*************************************************************************/
 
@@ -86,7 +86,7 @@ FT_BEGIN_HEADER
 #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
 
   /* Following cpp computation of the bit length of int and long */
-  /* is copied from default include/freetype/config/ftconfig.h.  */
+  /* is copied from default include/config/ftconfig.h.           */
   /* If any improvement is required for this file, it should be  */
   /* applied to the original header file for the builders that   */
   /* does not use configure script.                              */
@@ -293,13 +293,15 @@ FT_BEGIN_HEADER
 
   /* FT_LONG64 must be defined if a 64-bit type is available */
 #define FT_LONG64
-#define FT_INT64  long
+#define FT_INT64   long
+#define FT_UINT64  unsigned long
 
 #elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
 
   /* this compiler provides the __int64 type */
 #define FT_LONG64
-#define FT_INT64  __int64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64
 
 #elif defined( __BORLANDC__ )  /* Borland C++ */
 
@@ -308,7 +310,8 @@ FT_BEGIN_HEADER
 
   /* this compiler provides the __int64 type */
 #define FT_LONG64
-#define FT_INT64  __int64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64
 
 #elif defined( __WATCOMC__ )   /* Watcom C++ */
 
@@ -317,13 +320,15 @@ FT_BEGIN_HEADER
 #elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */
 
 #define FT_LONG64
-#define FT_INT64  long long int
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int
 
 #elif defined( __GNUC__ )
 
   /* GCC provides the `long long' type */
 #define FT_LONG64
-#define FT_INT64  long long int
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int
 
 #endif /* FT_SIZEOF_LONG == 8 */
 
@@ -366,6 +371,7 @@ FT_BEGIN_HEADER
   /* These must be defined `static __inline__' with GCC.             */
 
 #if defined( __CC_ARM ) || defined( __ARMCC__ )  /* RVCT */
+
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
 
   /* documentation is in freetype.h */
@@ -395,8 +401,10 @@ FT_BEGIN_HEADER
 
 #ifdef __GNUC__
 
-#if defined( __arm__ ) && !defined( __thumb__ )    && \
+#if defined( __arm__ )                                 && \
+    ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \
     !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
+
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
 
   /* documentation is in freetype.h */
@@ -411,7 +419,11 @@ FT_BEGIN_HEADER
     __asm__ __volatile__ (
       "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
       "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
+#ifdef __clang__
+      "add.w  %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+#else
       "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+#endif
       "adds   %1, %1, %0\n\t"           /* %1 += %0 */
       "adc    %2, %2, #0\n\t"           /* %2 += carry */
       "mov    %0, %1, lsr #16\n\t"      /* %0  = %1 >> 16 */
@@ -422,9 +434,13 @@ FT_BEGIN_HEADER
     return a;
   }
 
-#endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */
+#endif /* __arm__                      && */
+       /* ( __thumb2__ || !__thumb__ ) && */
+       /* !( __CC_ARM || __ARMCC__ )      */
+
 
 #if defined( __i386__ )
+
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
 
   /* documentation is in freetype.h */
@@ -493,6 +509,66 @@ FT_BEGIN_HEADER
 
 #endif /* _MSC_VER */
 
+
+#if defined( __GNUC__ ) && defined( __x86_64__ )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_x86_64
+
+  static __inline__ FT_Int32
+  FT_MulFix_x86_64( FT_Int32  a,
+                    FT_Int32  b )
+  {
+    /* Temporarily disable the warning that C90 doesn't support */
+    /* `long long'.                                             */
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+
+#if 1
+    /* Technically not an assembly fragment, but GCC does a really good */
+    /* job at inlining it and generating good machine code for it.      */
+    long long  ret, tmp;
+
+
+    ret  = (long long)a * b;
+    tmp  = ret >> 63;
+    ret += 0x8000 + tmp;
+
+    return (FT_Int32)( ret >> 16 );
+#else
+
+    /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine  */
+    /* code from the lines below.  The main issue is that `wide_a' is not  */
+    /* properly initialized by sign-extending `a'.  Instead, the generated */
+    /* machine code assumes that the register that contains `a' on input   */
+    /* can be used directly as a 64-bit value, which is wrong most of the  */
+    /* time.                                                               */
+    long long  wide_a = (long long)a;
+    long long  wide_b = (long long)b;
+    long long  result;
+
+
+    __asm__ __volatile__ (
+      "imul %2, %1\n"
+      "mov %1, %0\n"
+      "sar $63, %0\n"
+      "lea 0x8000(%1, %0), %0\n"
+      "sar $16, %0\n"
+      : "=&r"(result), "=&r"(wide_a)
+      : "r"(wide_b)
+      : "cc" );
+
+    return (FT_Int32)result;
+#endif
+
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic pop
+#endif
+  }
+
+#endif /* __GNUC__ && __x86_64__ */
+
 #endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
 
 
@@ -520,6 +596,9 @@ FT_BEGIN_HEADER
 
 #endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
 
+#define FT_LOCAL_ARRAY( x )      extern const  x
+#define FT_LOCAL_ARRAY_DEF( x )  const  x
+
 
 #ifndef FT_BASE
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ftsystem.c b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/ftsystem.c
index 92c7d921149..3ddc64f1980 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/ftsystem.c
@@ -268,9 +268,9 @@
 
     /* XXX: TODO -- real 64bit platform support                        */
     /*                                                                 */
-    /* `stream->size' is typedef'd to unsigned long (in                */
-    /* freetype/ftsystem.h); `stat_buf.st_size', however, is usually   */
-    /* typedef'd to off_t (in sys/stat.h).                             */
+    /* `stream->size' is typedef'd to unsigned long (in `ftsystem.h'); */
+    /* `stat_buf.st_size', however, is usually typedef'd to off_t      */
+    /* (in sys/stat.h).                                                */
     /* On some platforms, the former is 32bit and the latter is 64bit. */
     /* To avoid overflow caused by fonts in huge files larger than     */
     /* 2GB, do a test.  Temporary fix proposed by Sean McBride.        */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/install-sh b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/install-sh
index 377bb8687ff..a9244eb0786 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/install-sh
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-11-20.07; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
+	# Protect names problematic for `test' and other utilities.
 	case $dst_arg in
 	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
 	esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
+    # Protect names problematic for `test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call 'install-sh -d' without argument.
+  # It's OK to call `install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@ fi
 
 for src
 do
-  # Protect names problematic for 'test' and other utilities.
+  # Protect names problematic for `test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@ do
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
+		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/install.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/install.mk
index 056f46cd1c9..9cd95487576 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/install.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/install.mk
@@ -24,35 +24,34 @@
 
 # Unix installation and deinstallation targets.
 #
-# Note that we no longer install internal headers, and we remove any
-# `internal' subdirectory found in `$(includedir)/freetype2/freetype'.
+# Note that we remove any data in the `freetype' subdirectory found in
+# `$(includedir)/freetype2', which was the previous location of the header
+# files up to version 2.5.0.
 #
 install: $(PROJECT_LIBRARY)
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)                               \
-                         $(DESTDIR)$(libdir)/pkgconfig                     \
-                         $(DESTDIR)$(includedir)/freetype2/freetype/config \
-                         $(DESTDIR)$(bindir)                               \
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)                      \
+                         $(DESTDIR)$(libdir)/pkgconfig            \
+                         $(DESTDIR)$(includedir)/freetype2/config \
+                         $(DESTDIR)$(bindir)                      \
                          $(DESTDIR)$(datadir)/aclocal
 	$(LIBTOOL) --mode=install $(INSTALL)                             \
                                   $(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
-	-for P in $(PUBLIC_H) ; do                           \
-          $(INSTALL_DATA)                                    \
-            $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
+	-for P in $(PUBLIC_H) ; do                  \
+          $(INSTALL_DATA)                           \
+            $$P $(DESTDIR)$(includedir)/freetype2 ; \
         done
-	-for P in $(CONFIG_H) ; do                                  \
-          $(INSTALL_DATA)                                           \
-            $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
+	-for P in $(CONFIG_H) ; do                         \
+          $(INSTALL_DATA)                                  \
+            $$P $(DESTDIR)$(includedir)/freetype2/config ; \
         done
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/cache/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
-	$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
-          $(DESTDIR)$(includedir)/ft2build.h
-	$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h                        \
-          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h
-	$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h                          \
-          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
+	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
+	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
+	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
+	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
+	$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h               \
+          $(DESTDIR)$(includedir)/freetype2/config/ftconfig.h
+	$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h                 \
+          $(DESTDIR)$(includedir)/freetype2/config/ftmodule.h
 	$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \
           $(DESTDIR)$(bindir)/freetype-config
 	$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
@@ -63,12 +62,10 @@ install: $(PROJECT_LIBRARY)
 
 uninstall:
 	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
+	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/config/*
+	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/config
+	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/*
 	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
-	-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
 	-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
 	-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
 	-$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ltmain.sh b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/ltmain.sh
index 63ae69dc6fe..63ae69dc6fe 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/ltmain.sh
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/ltmain.sh
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/mkinstalldirs b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/mkinstalldirs
index ef7e16fdafe..ef7e16fdafe 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/mkinstalldirs
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/mkinstalldirs
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix-cc.in b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix-cc.in
index b84bc5d27b1..b84bc5d27b1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix-cc.in
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix-cc.in
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix-def.in b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix-def.in
index 010607b90b7..491e9748600 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix-def.in
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix-def.in
@@ -63,6 +63,7 @@ version_info := @version_info@
 FT2_EXTRA_LIBS     := @FT2_EXTRA_LIBS@
 LIBBZ2             := @LIBBZ2@
 LIBZ               := @LIBZ@
+LIBPNG             := @LIBPNG@
 build_libtool_libs := @build_libtool_libs@
 ft_version         := @ft_version@
 
@@ -102,6 +103,7 @@ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
 	sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \
 	    -e 's|%LIBBZ2%|$(LIBBZ2)|' \
 	    -e 's|%LIBZ%|$(LIBZ)|' \
+	    -e 's|%LIBPNG%|$(LIBPNG)|' \
 	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
 	    -e 's|%exec_prefix%|$(exec_prefix)|' \
 	    -e 's|%ft_version%|$(ft_version)|' \
@@ -119,6 +121,7 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
 	sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \
 	    -e 's|%LIBBZ2%|$(LIBBZ2)|' \
 	    -e 's|%LIBZ%|$(LIBZ)|' \
+	    -e 's|%LIBPNG%|$(LIBPNG)|' \
 	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
 	    -e 's|%exec_prefix%|$(exec_prefix)|' \
 	    -e 's|%ft_version%|$(ft_version)|' \
@@ -127,7 +130,6 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
 	    -e 's|%prefix%|$(prefix)|' \
 	    $< \
 	    > $@.tmp
-	chmod +x $@.tmp
 	chmod a-w $@.tmp
 	mv $@.tmp $@
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix-dev.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix-dev.mk
index 76bae3862ae..76bae3862ae 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix-lcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix-lcc.mk
index 6038e523921..6038e523921 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix.mk
index 7f9d9a34fb9..7f9d9a34fb9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unix.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unix.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unixddef.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unixddef.mk
index 130d6b0f623..130d6b0f623 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/unix/unixddef.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/unix/unixddef.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/builds/vms/ftconfig.h b/Build/source/libs/freetype2/freetype-2.5.1/builds/vms/ftconfig.h
new file mode 100644
index 00000000000..3fb8f84fdca
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/vms/ftconfig.h
@@ -0,0 +1,641 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftconfig.h                                                             */
+/*                                                                         */
+/*    VMS-specific configuration file (specification only).                */
+/*                                                                         */
+/*  Copyright 1996-2004, 2006-2008, 2011, 2013 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 header file contains a number of macro definitions that are used */
+  /* by the rest of the engine.  Most of the macros here are automatically */
+  /* determined at compile time, and you should not need to change it to   */
+  /* port FreeType, except to compile the library with a non-ANSI          */
+  /* compiler.                                                             */
+  /*                                                                       */
+  /* Note however that if some specific modifications are needed, we       */
+  /* advise you to place a modified copy in your build directory.          */
+  /*                                                                       */
+  /* The build directory is usually `builds/<system>', and contains        */
+  /* system-specific files that are always included first when building    */
+  /* the library.                                                          */
+  /*                                                                       */
+  /*************************************************************************/
+
+#ifndef __FTCONFIG_H__
+#define __FTCONFIG_H__
+
+#include <ft2build.h>
+#include FT_CONFIG_OPTIONS_H
+#include FT_CONFIG_STANDARD_LIBRARY_H
+
+
+FT_BEGIN_HEADER
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*               PLATFORM-SPECIFIC CONFIGURATION MACROS                  */
+  /*                                                                       */
+  /* These macros can be toggled to suit a specific system.  The current   */
+  /* ones are defaults used to compile FreeType in an ANSI C environment   */
+  /* (16bit compilers are also supported).  Copy this file to your own     */
+  /* `builds/<system>' directory, and edit it to port the engine.          */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+#define HAVE_UNISTD_H  1
+#define HAVE_FCNTL_H   1
+
+#define SIZEOF_INT   4
+#define SIZEOF_LONG  4
+
+#define FT_SIZEOF_INT   4
+#define FT_SIZEOF_LONG  4
+
+#define FT_CHAR_BIT  8
+
+
+  /* FT_UNUSED is a macro used to indicate that a given parameter is not  */
+  /* used -- this is only used to get rid of unpleasant compiler warnings */
+#ifndef FT_UNUSED
+#define FT_UNUSED( arg )  ( (arg) = (arg) )
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /*                     AUTOMATIC CONFIGURATION MACROS                    */
+  /*                                                                       */
+  /* These macros are computed from the ones defined above.  Don't touch   */
+  /* their definition, unless you know precisely what you are doing.  No   */
+  /* porter should need to mess with them.                                 */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Mac support                                                           */
+  /*                                                                       */
+  /*   This is the only necessary change, so it is defined here instead    */
+  /*   providing a new configuration file.                                 */
+  /*                                                                       */
+#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
+  /* no Carbon frameworks for 64bit 10.4.x */
+  /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
+  /* so guess the system version by maximum errno before inclusion */
+#include <errno.h>
+#ifdef ECANCELED /* defined since 10.2 */
+#include "AvailabilityMacros.h"
+#endif
+#if defined( __LP64__ ) && \
+    ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
+#undef FT_MACINTOSH
+#endif
+
+#elif defined( __SC__ ) || defined( __MRC__ )
+  /* Classic MacOS compilers */
+#include "ConditionalMacros.h"
+#if TARGET_OS_MAC
+#define FT_MACINTOSH 1
+#endif
+
+#endif
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Section>                                                             */
+  /*    basic_types                                                        */
+  /*                                                                       */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int16                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for a 16bit signed integer type.                         */
+  /*                                                                       */
+  typedef signed short  FT_Int16;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt16                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for a 16bit unsigned integer type.                       */
+  /*                                                                       */
+  typedef unsigned short  FT_UInt16;
+
+  /* */
+
+
+  /* this #if 0 ... #endif clause is for documentation purposes */
+#if 0
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int32                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for a 32bit signed integer type.  The size depends on    */
+  /*    the configuration.                                                 */
+  /*                                                                       */
+  typedef signed XXX  FT_Int32;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt32                                                          */
+  /*                                                                       */
+  /*    A typedef for a 32bit unsigned integer type.  The size depends on  */
+  /*    the configuration.                                                 */
+  /*                                                                       */
+  typedef unsigned XXX  FT_UInt32;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int64                                                           */
+  /*                                                                       */
+  /*    A typedef for a 64bit signed integer type.  The size depends on    */
+  /*    the configuration.  Only defined if there is real 64bit support;   */
+  /*    otherwise, it gets emulated with a structure (if necessary).       */
+  /*                                                                       */
+  typedef signed XXX  FT_Int64;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt64                                                          */
+  /*                                                                       */
+  /*    A typedef for a 64bit unsigned integer type.  The size depends on  */
+  /*    the configuration.  Only defined if there is real 64bit support;   */
+  /*    otherwise, it gets emulated with a structure (if necessary).       */
+  /*                                                                       */
+  typedef unsigned XXX  FT_UInt64;
+
+  /* */
+
+#endif
+
+#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)
+
+  typedef signed int      FT_Int32;
+  typedef unsigned int    FT_UInt32;
+
+#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT)
+
+  typedef signed long     FT_Int32;
+  typedef unsigned long   FT_UInt32;
+
+#else
+#error "no 32bit type found -- please check your configuration files"
+#endif
+
+
+  /* look up an integer type that is at least 32 bits */
+#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)
+
+  typedef int            FT_Fast;
+  typedef unsigned int   FT_UFast;
+
+#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT)
+
+  typedef long           FT_Fast;
+  typedef unsigned long  FT_UFast;
+
+#endif
+
+
+  /* determine whether we have a 64-bit int type for platforms without */
+  /* Autoconf                                                          */
+#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT)
+
+  /* FT_LONG64 must be defined if a 64-bit type is available */
+#define FT_LONG64
+#define FT_INT64   long
+#define FT_UINT64  unsigned long
+
+#elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
+
+  /* this compiler provides the __int64 type */
+#define FT_LONG64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64
+
+#elif defined( __BORLANDC__ )  /* Borland C++ */
+
+  /* XXXX: We should probably check the value of __BORLANDC__ in order */
+  /*       to test the compiler version.                               */
+
+  /* this compiler provides the __int64 type */
+#define FT_LONG64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64
+
+#elif defined( __WATCOMC__ )   /* Watcom C++ */
+
+  /* Watcom doesn't provide 64-bit data types */
+
+#elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */
+
+#define FT_LONG64
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int
+
+#elif defined( __GNUC__ )
+
+  /* GCC provides the `long long' type */
+#define FT_LONG64
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int
+
+#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* A 64-bit data type will create compilation problems if you compile    */
+  /* in strict ANSI mode.  To avoid them, we disable its use if __STDC__   */
+  /* is defined.  You can however ignore this rule by defining the         */
+  /* FT_CONFIG_OPTION_FORCE_INT64 configuration macro.                     */
+  /*                                                                       */
+#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 )
+
+#ifdef __STDC__
+
+  /* undefine the 64-bit macros in strict ANSI compilation mode */
+#undef FT_LONG64
+#undef FT_INT64
+
+#endif /* __STDC__ */
+
+#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
+
+#ifdef FT_LONG64
+  typedef FT_INT64   FT_Int64;
+  typedef FT_UINT64  FT_UInt64;
+#endif
+
+
+#define FT_BEGIN_STMNT  do {
+#define FT_END_STMNT    } while ( 0 )
+#define FT_DUMMY_STMNT  FT_BEGIN_STMNT FT_END_STMNT
+
+
+#ifndef  FT_CONFIG_OPTION_NO_ASSEMBLER
+  /* Provide assembler fragments for performance-critical functions. */
+  /* These must be defined `static __inline__' with GCC.             */
+
+#if defined( __CC_ARM ) || defined( __ARMCC__ )  /* RVCT */
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
+
+  /* documentation is in freetype.h */
+
+  static __inline FT_Int32
+  FT_MulFix_arm( FT_Int32  a,
+                 FT_Int32  b )
+  {
+    register FT_Int32  t, t2;
+
+
+    __asm
+    {
+      smull t2, t,  b,  a           /* (lo=t2,hi=t) = a*b */
+      mov   a,  t,  asr #31         /* a   = (hi >> 31) */
+      add   a,  a,  #0x8000         /* a  += 0x8000 */
+      adds  t2, t2, a               /* t2 += a */
+      adc   t,  t,  #0              /* t  += carry */
+      mov   a,  t2, lsr #16         /* a   = t2 >> 16 */
+      orr   a,  a,  t,  lsl #16     /* a  |= t << 16 */
+    }
+    return a;
+  }
+
+#endif /* __CC_ARM || __ARMCC__ */
+
+
+#ifdef __GNUC__
+
+#if defined( __arm__ )                                 && \
+    ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \
+    !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
+
+  /* documentation is in freetype.h */
+
+  static __inline__ FT_Int32
+  FT_MulFix_arm( FT_Int32  a,
+                 FT_Int32  b )
+  {
+    register FT_Int32  t, t2;
+
+
+    __asm__ __volatile__ (
+      "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
+      "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
+      "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+      "adds   %1, %1, %0\n\t"           /* %1 += %0 */
+      "adc    %2, %2, #0\n\t"           /* %2 += carry */
+      "mov    %0, %1, lsr #16\n\t"      /* %0  = %1 >> 16 */
+      "orr    %0, %0, %2, lsl #16\n\t"  /* %0 |= %2 << 16 */
+      : "=r"(a), "=&r"(t2), "=&r"(t)
+      : "r"(a), "r"(b)
+      : "cc" );
+    return a;
+  }
+
+#endif /* __arm__                      && */
+       /* ( __thumb2__ || !__thumb__ ) && */
+       /* !( __CC_ARM || __ARMCC__ )      */
+
+
+#if defined( __i386__ )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
+
+  /* documentation is in freetype.h */
+
+  static __inline__ FT_Int32
+  FT_MulFix_i386( FT_Int32  a,
+                  FT_Int32  b )
+  {
+    register FT_Int32  result;
+
+
+    __asm__ __volatile__ (
+      "imul  %%edx\n"
+      "movl  %%edx, %%ecx\n"
+      "sarl  $31, %%ecx\n"
+      "addl  $0x8000, %%ecx\n"
+      "addl  %%ecx, %%eax\n"
+      "adcl  $0, %%edx\n"
+      "shrl  $16, %%eax\n"
+      "shll  $16, %%edx\n"
+      "addl  %%edx, %%eax\n"
+      : "=a"(result), "=d"(b)
+      : "a"(a), "d"(b)
+      : "%ecx", "cc" );
+    return result;
+  }
+
+#endif /* i386 */
+
+#endif /* __GNUC__ */
+
+
+#ifdef _MSC_VER /* Visual C++ */
+
+#ifdef _M_IX86
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
+
+  /* documentation is in freetype.h */
+
+  static __inline FT_Int32
+  FT_MulFix_i386( FT_Int32  a,
+                  FT_Int32  b )
+  {
+    register FT_Int32  result;
+
+    __asm
+    {
+      mov eax, a
+      mov edx, b
+      imul edx
+      mov ecx, edx
+      sar ecx, 31
+      add ecx, 8000h
+      add eax, ecx
+      adc edx, 0
+      shr eax, 16
+      shl edx, 16
+      add eax, edx
+      mov result, eax
+    }
+    return result;
+  }
+
+#endif /* _M_IX86 */
+
+#endif /* _MSC_VER */
+
+
+#if defined( __GNUC__ ) && defined( __x86_64__ )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_x86_64
+
+  static __inline__ FT_Int32
+  FT_MulFix_x86_64( FT_Int32  a,
+                    FT_Int32  b )
+  {
+    /* Temporarily disable the warning that C90 doesn't support */
+    /* `long long'.                                             */
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+
+#if 1
+    /* Technically not an assembly fragment, but GCC does a really good */
+    /* job at inlining it and generating good machine code for it.      */
+    long long  ret, tmp;
+
+
+    ret  = (long long)a * b;
+    tmp  = ret >> 63;
+    ret += 0x8000 + tmp;
+
+    return (FT_Int32)( ret >> 16 );
+#else
+
+    /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine  */
+    /* code from the lines below.  The main issue is that `wide_a' is not  */
+    /* properly initialized by sign-extending `a'.  Instead, the generated */
+    /* machine code assumes that the register that contains `a' on input   */
+    /* can be used directly as a 64-bit value, which is wrong most of the  */
+    /* time.                                                               */
+    long long  wide_a = (long long)a;
+    long long  wide_b = (long long)b;
+    long long  result;
+
+
+    __asm__ __volatile__ (
+      "imul %2, %1\n"
+      "mov %1, %0\n"
+      "sar $63, %0\n"
+      "lea 0x8000(%1, %0), %0\n"
+      "sar $16, %0\n"
+      : "=&r"(result), "=&r"(wide_a)
+      : "r"(wide_b)
+      : "cc" );
+
+    return (FT_Int32)result;
+#endif
+
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic pop
+#endif
+  }
+
+#endif /* __GNUC__ && __x86_64__ */
+
+#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
+
+
+#ifdef FT_CONFIG_OPTION_INLINE_MULFIX
+#ifdef FT_MULFIX_ASSEMBLER
+#define FT_MULFIX_INLINED  FT_MULFIX_ASSEMBLER
+#endif
+#endif
+
+
+#ifdef FT_MAKE_OPTION_SINGLE_OBJECT
+
+#define FT_LOCAL( x )      static  x
+#define FT_LOCAL_DEF( x )  static  x
+
+#else
+
+#ifdef __cplusplus
+#define FT_LOCAL( x )      extern "C"  x
+#define FT_LOCAL_DEF( x )  extern "C"  x
+#else
+#define FT_LOCAL( x )      extern  x
+#define FT_LOCAL_DEF( x )  x
+#endif
+
+#endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
+
+#define FT_LOCAL_ARRAY( x )      extern const  x
+#define FT_LOCAL_ARRAY_DEF( x )  const  x
+
+
+#ifndef FT_BASE
+
+#ifdef __cplusplus
+#define FT_BASE( x )  extern "C"  x
+#else
+#define FT_BASE( x )  extern  x
+#endif
+
+#endif /* !FT_BASE */
+
+
+#ifndef FT_BASE_DEF
+
+#ifdef __cplusplus
+#define FT_BASE_DEF( x )  x
+#else
+#define FT_BASE_DEF( x )  x
+#endif
+
+#endif /* !FT_BASE_DEF */
+
+
+#ifndef FT_EXPORT
+
+#ifdef __cplusplus
+#define FT_EXPORT( x )  extern "C"  x
+#else
+#define FT_EXPORT( x )  extern  x
+#endif
+
+#endif /* !FT_EXPORT */
+
+
+#ifndef FT_EXPORT_DEF
+
+#ifdef __cplusplus
+#define FT_EXPORT_DEF( x )  extern "C"  x
+#else
+#define FT_EXPORT_DEF( x )  extern  x
+#endif
+
+#endif /* !FT_EXPORT_DEF */
+
+
+#ifndef FT_EXPORT_VAR
+
+#ifdef __cplusplus
+#define FT_EXPORT_VAR( x )  extern "C"  x
+#else
+#define FT_EXPORT_VAR( x )  extern  x
+#endif
+
+#endif /* !FT_EXPORT_VAR */
+
+  /* The following macros are needed to compile the library with a   */
+  /* C++ compiler and with 16bit compilers.                          */
+  /*                                                                 */
+
+  /* This is special.  Within C++, you must specify `extern "C"' for */
+  /* functions which are used via function pointers, and you also    */
+  /* must do that for structures which contain function pointers to  */
+  /* assure C linkage -- it's not possible to have (local) anonymous */
+  /* functions which are accessed by (global) function pointers.     */
+  /*                                                                 */
+  /*                                                                 */
+  /* FT_CALLBACK_DEF is used to _define_ a callback function.        */
+  /*                                                                 */
+  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
+  /* contains pointers to callback functions.                        */
+  /*                                                                 */
+  /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable   */
+  /* that contains pointers to callback functions.                   */
+  /*                                                                 */
+  /*                                                                 */
+  /* Some 16bit compilers have to redefine these macros to insert    */
+  /* the infamous `_cdecl' or `__fastcall' declarations.             */
+  /*                                                                 */
+#ifndef FT_CALLBACK_DEF
+#ifdef __cplusplus
+#define FT_CALLBACK_DEF( x )  extern "C"  x
+#else
+#define FT_CALLBACK_DEF( x )  static  x
+#endif
+#endif /* FT_CALLBACK_DEF */
+
+#ifndef FT_CALLBACK_TABLE
+#ifdef __cplusplus
+#define FT_CALLBACK_TABLE      extern "C"
+#define FT_CALLBACK_TABLE_DEF  extern "C"
+#else
+#define FT_CALLBACK_TABLE      extern
+#define FT_CALLBACK_TABLE_DEF  /* nothing */
+#endif
+#endif /* FT_CALLBACK_TABLE */
+
+
+FT_END_HEADER
+
+
+#endif /* __FTCONFIG_H__ */
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/vms/ftsystem.c b/Build/source/libs/freetype2/freetype-2.5.1/builds/vms/ftsystem.c
index 5c2819edb53..5c2819edb53 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/vms/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/vms/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/ftdebug.c b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/ftdebug.c
index 354f4f0a7f6..24f96582815 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/ftdebug.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for WinCE (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2005, 2008, 2009, 2013 by                   */
+/*  Copyright 1996-2002, 2005, 2008, 2009, 2013 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -148,8 +148,8 @@
   /* for the memory and stream components which are set to 6 and 5,        */
   /* respectively.                                                         */
   /*                                                                       */
-  /* See the file <freetype/internal/fttrace.h> for details of the         */
-  /* available toggle names.                                               */
+  /* See the file <internal/fttrace.h> for details of the available toggle */
+  /* names.                                                                */
   /*                                                                       */
   /* The level must be between 0 and 6; 0 means quiet (except for serious  */
   /* runtime errors), and 6 means _very_ verbose.                          */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2005-ce/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2005-ce/freetype.sln
index 67b2216dcd5..67b2216dcd5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2005-ce/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2005-ce/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2005-ce/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2005-ce/freetype.vcproj
index f6614dfc49f..ff70a8e1cd4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2005-ce/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2005-ce/freetype.vcproj
@@ -21,7 +21,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -41,7 +41,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -61,7 +61,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -81,7 +81,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -101,7 +101,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -121,7 +121,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -141,7 +141,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -161,7 +161,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -181,7 +181,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -201,7 +201,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -221,7 +221,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -241,7 +241,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -261,7 +261,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -281,7 +281,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -301,7 +301,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -321,7 +321,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -341,7 +341,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -361,7 +361,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -381,7 +381,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -401,7 +401,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -421,7 +421,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -441,7 +441,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -461,7 +461,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -481,7 +481,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -501,7 +501,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -521,7 +521,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -541,7 +541,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -561,7 +561,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -581,7 +581,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -601,7 +601,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -621,7 +621,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -641,7 +641,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -661,7 +661,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -681,7 +681,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -701,7 +701,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -721,7 +721,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -741,7 +741,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -758,7 +758,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype251MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -3822,15 +3822,15 @@
     <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">
       <File RelativePath="..\..\..\include\ft2build.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftconfig.h">
+      <File RelativePath="..\..\..\include\config\ftconfig.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftheader.h">
+      <File RelativePath="..\..\..\include\config\ftheader.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftmodule.h">
+      <File RelativePath="..\..\..\include\config\ftmodule.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftoption.h">
+      <File RelativePath="..\..\..\include\config\ftoption.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">
+      <File RelativePath="..\..\..\include\config\ftstdlib.h">
       </File>
     </Filter>
   </Files>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2005-ce/index.html b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2005-ce/index.html
index db538535690..fac9e7315af 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2005-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2005-ce/index.html
@@ -21,14 +21,14 @@ the following targets:
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.5.0 sources:</p>
+It compiles the following libraries from the FreeType 2.5.1 sources:</p>
 
 <ul>
   <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype251.lib     - release build; single threaded
+    freetype251_D.lib   - debug build;   single threaded
+    freetype251MT.lib   - release build; multi-threaded
+    freetype251MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2008-ce/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2008-ce/freetype.sln
index 0468e903b71..0468e903b71 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2008-ce/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2008-ce/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2008-ce/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2008-ce/freetype.vcproj
index e7f84d0af4d..14990c1f54a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2008-ce/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2008-ce/freetype.vcproj
@@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -177,7 +177,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -266,7 +266,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -355,7 +355,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -444,7 +444,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -533,7 +533,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -709,7 +709,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -797,7 +797,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -885,7 +885,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -973,7 +973,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1061,7 +1061,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1149,7 +1149,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1236,7 +1236,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1323,7 +1323,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1410,7 +1410,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1497,7 +1497,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1584,7 +1584,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1668,7 +1668,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1753,7 +1753,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1838,7 +1838,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1923,7 +1923,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2008,7 +2008,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2093,7 +2093,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2178,7 +2178,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2263,7 +2263,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2348,7 +2348,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2433,7 +2433,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2518,7 +2518,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2603,7 +2603,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2689,7 +2689,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2775,7 +2775,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2861,7 +2861,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2947,7 +2947,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3033,7 +3033,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3119,7 +3119,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3205,7 +3205,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3279,7 +3279,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -13469,23 +13469,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftconfig.h"
+				RelativePath="..\..\..\include\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftheader.h"
+				RelativePath="..\..\..\include\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftmodule.h"
+				RelativePath="..\..\..\include\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftoption.h"
+				RelativePath="..\..\..\include\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
+				RelativePath="..\..\..\include\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2008-ce/index.html b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2008-ce/index.html
index 50160ecb51e..ce4b02d3002 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/wince/vc2008-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/wince/vc2008-ce/index.html
@@ -21,14 +21,14 @@ the following targets:
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.5.0 sources:</p>
+It compiles the following libraries from the FreeType 2.5.1 sources:</p>
 
 <ul>
   <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype251.lib     - release build; single threaded
+    freetype251_D.lib   - debug build;   single threaded
+    freetype251MT.lib   - release build; multi-threaded
+    freetype251MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/detect.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/detect.mk
index 19065396090..19065396090 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/ftdebug.c b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/ftdebug.c
index 58b7f89ecfc..dd2c2ad7cdd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/ftdebug.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for Win32 (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2005, 2008, 2009, 2013 by                   */
+/*  Copyright 1996-2002, 2005, 2008, 2009, 2013 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -137,8 +137,8 @@
   /* for the memory and stream components which are set to 6 and 5,        */
   /* respectively.                                                         */
   /*                                                                       */
-  /* See the file <freetype/internal/fttrace.h> for details of the         */
-  /* available toggle names.                                               */
+  /* See the file <internal/fttrace.h> for details of the available toggle */
+  /* names.                                                                */
   /*                                                                       */
   /* The level must be between 0 and 6; 0 means quiet (except for serious  */
   /* runtime errors), and 6 means _very_ verbose.                          */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2005/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2005/freetype.sln
index b90da27bb36..b90da27bb36 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2005/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2005/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2005/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2005/freetype.vcproj
index 9e4c110f676..c9d5d88bd6f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2005/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2005/freetype.vcproj
@@ -16,7 +16,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype251.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -33,7 +33,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype251MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -50,7 +50,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype251ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -67,7 +67,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype251_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -84,7 +84,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype251ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -101,7 +101,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype251MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -629,15 +629,15 @@
     <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">
       <File RelativePath="..\..\..\include\ft2build.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftconfig.h">
+      <File RelativePath="..\..\..\include\config\ftconfig.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftheader.h">
+      <File RelativePath="..\..\..\include\config\ftheader.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftmodule.h">
+      <File RelativePath="..\..\..\include\config\ftmodule.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftoption.h">
+      <File RelativePath="..\..\..\include\config\ftoption.h">
       </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">
+      <File RelativePath="..\..\..\include\config\ftstdlib.h">
       </File>
     </Filter>
   </Files>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2005/index.html b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2005/index.html
index 788b83020d3..a80a4cb4022 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2005/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2005/index.html
@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.0 sources:</p>
+compiles the following libraries from the FreeType 2.5.1 sources:</p>
 
 <ul>
   <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype251.lib     - release build; single threaded
+    freetype251_D.lib   - debug build;   single threaded
+    freetype251MT.lib   - release build; multi-threaded
+    freetype251MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2008/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2008/freetype.sln
index 0995f806174..0995f806174 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2008/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2008/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2008/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2008/freetype.vcproj
index 67240250d94..74f88e94326 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2008/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2008/freetype.vcproj
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -145,7 +145,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250MT.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -220,7 +220,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250ST.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -365,7 +365,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -439,7 +439,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2154,23 +2154,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftconfig.h"
+				RelativePath="..\..\..\include\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftheader.h"
+				RelativePath="..\..\..\include\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftmodule.h"
+				RelativePath="..\..\..\include\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftoption.h"
+				RelativePath="..\..\..\include\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
+				RelativePath="..\..\..\include\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2008/index.html b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2008/index.html
index 498ba6d5ac9..a9f62973a29 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2008/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2008/index.html
@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.0 sources:</p>
+compiles the following libraries from the FreeType 2.5.1 sources:</p>
 
 <ul>
   <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype251.lib     - release build; single threaded
+    freetype251_D.lib   - debug build;   single threaded
+    freetype251MT.lib   - release build; multi-threaded
+    freetype251MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2010/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2010/freetype.sln
index 48fb9ae5733..48d41830b4f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2010/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2010/freetype.sln
@@ -1,30 +1,48 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual Studio Express 2012 for Windows Desktop
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug Multithreaded|Win32 = Debug Multithreaded|Win32
+		Debug Multithreaded|x64 = Debug Multithreaded|x64
 		Debug Singlethreaded|Win32 = Debug Singlethreaded|Win32
+		Debug Singlethreaded|x64 = Debug Singlethreaded|x64
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release Multithreaded|Win32 = Release Multithreaded|Win32
+		Release Multithreaded|x64 = Release Multithreaded|x64
 		Release Singlethreaded|Win32 = Release Singlethreaded|Win32
+		Release Singlethreaded|x64 = Release Singlethreaded|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.ActiveCfg = Debug Multithreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.Build.0 = Debug Multithreaded|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.ActiveCfg = Debug Singlethreaded|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.ActiveCfg = Debug Singlethreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.Build.0 = Debug Singlethreaded|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.ActiveCfg = Release Multithreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.Build.0 = Release Multithreaded|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.ActiveCfg = Release Singlethreaded|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.ActiveCfg = Release Singlethreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.Build.0 = Release Singlethreaded|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2010/freetype.vcxproj b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2010/freetype.vcxproj
index 731a11158d5..c73a39ce17f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2010/freetype.vcxproj
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2010/freetype.vcxproj
@@ -5,26 +5,50 @@
       <Configuration>Debug Multithreaded</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug Multithreaded|x64">
+      <Configuration>Debug Multithreaded</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug Singlethreaded|Win32">
       <Configuration>Debug Singlethreaded</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug Singlethreaded|x64">
+      <Configuration>Debug Singlethreaded</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release Multithreaded|Win32">
       <Configuration>Release Multithreaded</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release Multithreaded|x64">
+      <Configuration>Release Multithreaded</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release Singlethreaded|Win32">
       <Configuration>Release Singlethreaded</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release Singlethreaded|x64">
+      <Configuration>Release Singlethreaded</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}</ProjectGuid>
@@ -34,31 +58,73 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -78,29 +144,57 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">.\..\..\..\objs\win32\vc2010\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">.\..\..\..\objs\debug_mt\</IntDir>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype250_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype250MT_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype250ST_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype250</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype250MT</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype250ST</TargetName>
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype251_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">freetype251_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype251MT_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">freetype251MT_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype251ST_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">freetype251ST_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype251</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">freetype251</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype251MT</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">freetype251MT</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype251ST</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">freetype251ST</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>.\..\..\..\objs\win64\vc2010\</OutDir>
+    <IntDir>.\..\..\..\objs\debug\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -127,6 +221,31 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <DisableLanguageExtensions>true</DisableLanguageExtensions>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -152,6 +271,31 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <DisableLanguageExtensions>true</DisableLanguageExtensions>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -175,6 +319,29 @@
     </ResourceCompile>
     <Lib />
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <DisableLanguageExtensions>true</DisableLanguageExtensions>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib />
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -197,6 +364,28 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <DisableLanguageExtensions>true</DisableLanguageExtensions>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -219,6 +408,28 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <DisableLanguageExtensions>true</DisableLanguageExtensions>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -243,294 +454,576 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessToFile>false</PreprocessToFile>
+      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <DisableLanguageExtensions>true</DisableLanguageExtensions>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\autofit\autofit.c" />
     <ClCompile Include="..\..\..\src\bdf\bdf.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\cff\cff.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\base\ftbase.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\base\ftbitmap.c" />
     <ClCompile Include="..\..\..\src\cache\ftcache.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\ftdebug.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">false</DisableLanguageExtensions>
+      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">false</DisableLanguageExtensions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">false</DisableLanguageExtensions>
+      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">false</DisableLanguageExtensions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</DisableLanguageExtensions>
+      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DisableLanguageExtensions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">false</DisableLanguageExtensions>
+      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">false</DisableLanguageExtensions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">false</DisableLanguageExtensions>
+      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">false</DisableLanguageExtensions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</DisableLanguageExtensions>
+      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</DisableLanguageExtensions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\base\ftfstype.c" />
     <ClCompile Include="..\..\..\src\base\ftgasp.c" />
     <ClCompile Include="..\..\..\src\base\ftglyph.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\gzip\ftgzip.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\base\ftinit.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\lzw\ftlzw.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\base\ftstroke.c" />
     <ClCompile Include="..\..\..\src\base\ftsystem.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\smooth\smooth.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\base\ftbbox.c" />
     <ClCompile Include="..\..\..\src\base\ftmm.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\base\ftpfr.c" />
     <ClCompile Include="..\..\..\src\base\ftsynth.c" />
@@ -543,288 +1036,540 @@
     <ClCompile Include="..\..\..\src\base\ftpatent.c" />
     <ClCompile Include="..\..\..\src\pcf\pcf.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\pfr\pfr.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\psaux\psaux.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\pshinter\pshinter.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\psnames\psmodule.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\raster\raster.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\sfnt\sfnt.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\truetype\truetype.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\type1\type1.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\cid\type1cid.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\type42\type42.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\src\winfonts\winfnt.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\include\ft2build.h" />
-    <ClInclude Include="..\..\..\include\freetype\config\ftconfig.h" />
-    <ClInclude Include="..\..\..\include\freetype\config\ftheader.h" />
-    <ClInclude Include="..\..\..\include\freetype\config\ftmodule.h" />
-    <ClInclude Include="..\..\..\include\freetype\config\ftoption.h" />
-    <ClInclude Include="..\..\..\include\freetype\config\ftstdlib.h" />
+    <ClInclude Include="..\..\..\include\config\ftconfig.h" />
+    <ClInclude Include="..\..\..\include\config\ftheader.h" />
+    <ClInclude Include="..\..\..\include\config\ftmodule.h" />
+    <ClInclude Include="..\..\..\include\config\ftoption.h" />
+    <ClInclude Include="..\..\..\include\config\ftstdlib.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2010/freetype.vcxproj.filters b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2010/freetype.vcxproj.filters
index 1fe9d2519be..f2b3659b8af 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2010/freetype.vcxproj.filters
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2010/freetype.vcxproj.filters
@@ -136,19 +136,19 @@
     <ClInclude Include="..\..\..\include\ft2build.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftconfig.h">
+    <ClInclude Include="..\..\..\include\config\ftconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftheader.h">
+    <ClInclude Include="..\..\..\include\config\ftheader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftmodule.h">
+    <ClInclude Include="..\..\..\include\config\ftmodule.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftoption.h">
+    <ClInclude Include="..\..\..\include\config\ftoption.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftstdlib.h">
+    <ClInclude Include="..\..\..\include\config\ftstdlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2010/index.html b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2010/index.html
index caceac116a7..c6e2b946c6d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/vc2010/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/vc2010/index.html
@@ -1,26 +1,30 @@
 <html>
 <header>
 <title>
-  FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010
+  FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010 or newer
 </title>
 
 <body>
 <h1>
-  FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010
+  FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010 or newer
 </h1>
 
-<p>This directory contains a project file for Visual C++, named
-<tt>freetype.vcxproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.0 sources:</p>
+<p>This directory contains a project file for Visual C++ newer), named
+<tt>freetype.vcxproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.
+It compiles the following libraries from the FreeType 2.5.1 sources:</p>
 
 <ul>
   <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+freetype251.lib     - release build
+freetype251_D.lib   - debug build
+freetype251ST.lib   - release build; single threaded
+freetype251ST_D.lib - debug build;   single threaded
+freetype251MT.lib   - release build; multi-threaded
+freetype251MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
+<p>Both Win32 and x64 builds are supported.</p>
+
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
 archives are already stored this way, so no further action is required.  If
 you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/freetype.dsp b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/freetype.dsp
index f0cc24a4b8b..7fb0fff5dbb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/freetype.dsp
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/freetype.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"
 
@@ -92,7 +92,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\..\objs\debug_mt"
 # PROP Intermediate_Dir "..\..\..\objs\debug_mt"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
 # SUBTRACT BASE CPP /X
 # ADD CPP /MTd /Za /W4 /GX /Z7 /Od /I "..\..\..\include" /D "_DEBUG" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /GZ /c
 # SUBTRACT CPP /nologo /X /YX
@@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype250_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype251_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251MT_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"
 
@@ -117,7 +117,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\..\objs\release_mt"
 # PROP Intermediate_Dir "..\..\..\objs\release_mt"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\freetype\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
+# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
 # ADD CPP /MT /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /c
 # SUBTRACT CPP /nologo /Z<none> /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype250.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype251.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251MT.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"
 
@@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype250ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype251.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype251ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype251_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251ST_D.lib"
 
 !ENDIF 
 
@@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftconfig.h
+SOURCE=..\..\..\include\config\ftconfig.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftheader.h
+SOURCE=..\..\..\include\config\ftheader.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftmodule.h
+SOURCE=..\..\..\include\config\ftmodule.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftoption.h
+SOURCE=..\..\..\include\config\ftoption.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftstdlib.h
+SOURCE=..\..\..\include\config\ftstdlib.h
 # End Source File
 # End Group
 # End Target
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/freetype.dsw b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/freetype.dsw
index b1b375dbbc9..b1b375dbbc9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/freetype.dsw
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/freetype.dsw
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/freetype.sln
index 470d4fa3034..470d4fa3034 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/freetype.vcproj
index c2cd8ada83b..0195f75429a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/freetype.vcproj
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -219,7 +219,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -364,7 +364,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -438,7 +438,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2153,23 +2153,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftconfig.h"
+				RelativePath="..\..\..\include\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftheader.h"
+				RelativePath="..\..\..\include\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftmodule.h"
+				RelativePath="..\..\..\include\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftoption.h"
+				RelativePath="..\..\..\include\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
+				RelativePath="..\..\..\include\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/index.html b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/index.html
index ef6a5ed629c..74eafa72d02 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualc/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualc/index.html
@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.0 sources:</p>
+compiles the following libraries from the FreeType 2.5.1 sources:</p>
 
 <ul>
   <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype251.lib     - release build; single threaded
+    freetype251_D.lib   - debug build;   single threaded
+    freetype251MT.lib   - release build; multi-threaded
+    freetype251MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualce/freetype.dsp b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualce/freetype.dsp
index f0cc24a4b8b..7fb0fff5dbb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualce/freetype.dsp
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualce/freetype.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"
 
@@ -92,7 +92,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\..\objs\debug_mt"
 # PROP Intermediate_Dir "..\..\..\objs\debug_mt"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
 # SUBTRACT BASE CPP /X
 # ADD CPP /MTd /Za /W4 /GX /Z7 /Od /I "..\..\..\include" /D "_DEBUG" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /GZ /c
 # SUBTRACT CPP /nologo /X /YX
@@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype250_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype251_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251MT_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"
 
@@ -117,7 +117,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\..\objs\release_mt"
 # PROP Intermediate_Dir "..\..\..\objs\release_mt"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\freetype\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
+# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
 # ADD CPP /MT /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /c
 # SUBTRACT CPP /nologo /Z<none> /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype250.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype251.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251MT.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"
 
@@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype250ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype251.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype251ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype251_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251ST_D.lib"
 
 !ENDIF 
 
@@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftconfig.h
+SOURCE=..\..\..\include\config\ftconfig.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftheader.h
+SOURCE=..\..\..\include\config\ftheader.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftmodule.h
+SOURCE=..\..\..\include\config\ftmodule.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftoption.h
+SOURCE=..\..\..\include\config\ftoption.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\freetype\config\ftstdlib.h
+SOURCE=..\..\..\include\config\ftstdlib.h
 # End Source File
 # End Group
 # End Target
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualce/freetype.dsw b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualce/freetype.dsw
index b1b375dbbc9..b1b375dbbc9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualce/freetype.dsw
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualce/freetype.dsw
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualce/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualce/freetype.vcproj
index 0ca3b3d4815..776e14c5f65 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualce/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualce/freetype.vcproj
@@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -162,7 +162,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -309,7 +309,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -382,7 +382,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -456,7 +456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -534,7 +534,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -619,7 +619,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -704,7 +704,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -785,7 +785,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -867,7 +867,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -950,7 +950,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1036,7 +1036,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1121,7 +1121,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1206,7 +1206,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1287,7 +1287,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1369,7 +1369,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1452,7 +1452,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1538,7 +1538,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1623,7 +1623,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1708,7 +1708,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1789,7 +1789,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1871,7 +1871,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1954,7 +1954,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2040,7 +2040,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2125,7 +2125,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2210,7 +2210,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -2291,7 +2291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2373,7 +2373,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2456,7 +2456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2542,7 +2542,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2627,7 +2627,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2712,7 +2712,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -2793,7 +2793,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2875,7 +2875,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2958,7 +2958,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3044,7 +3044,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype251.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3129,7 +3129,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype251MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3214,7 +3214,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype251ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -3295,7 +3295,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype251_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3377,7 +3377,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype251ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3460,7 +3460,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype251MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -13859,23 +13859,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftconfig.h"
+				RelativePath="..\..\..\include\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftheader.h"
+				RelativePath="..\..\..\include\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftmodule.h"
+				RelativePath="..\..\..\include\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftoption.h"
+				RelativePath="..\..\..\include\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
+				RelativePath="..\..\..\include\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualce/index.html b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualce/index.html
index c97a861a1ce..417586e84f8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/visualce/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/visualce/index.html
@@ -21,14 +21,14 @@ the following targets:
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.5.0 sources:</p>
+It compiles the following libraries from the FreeType 2.5.1 sources:</p>
 
 <ul>
   <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype251.lib     - release build; single threaded
+    freetype251_D.lib   - debug build;   single threaded
+    freetype251MT.lib   - release build; multi-threaded
+    freetype251MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-bcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-bcc.mk
index a9f48fc60b0..87d8ea3c2bb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-bcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-bcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 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,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/freetype.def
 EXPORTS_OPTIONS   = /DEF:$(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -wB
 
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/bcc.mk
 
 # include linking instructions
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-bccd.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-bccd.mk
index 51b15d90324..dd21eddac0b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-bccd.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-bccd.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2006 by
+# Copyright 1996-2000, 2003, 2006, 2013 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 @@
 
 DEVEL_DIR := $(TOP_DIR)/devel
 
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 
 include $(TOP_DIR)/builds/compiler/bcc-dev.mk
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-dev.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-dev.mk
index 00cacb0f675..3561229473a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-dev.mk
@@ -5,7 +5,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2006 by
+# Copyright 1996-2000, 2003, 2006, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -21,7 +21,7 @@
 
 DEVEL_DIR := $(TOP_DIR)/devel
 
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 
 include $(TOP_DIR)/builds/compiler/gcc-dev.mk
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-gcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-gcc.mk
index 580afc5c94c..3bbdd3cc46e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-gcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -19,7 +19,7 @@ EXPORTS_OPTIONS   = $(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w
 
 # include Win32-specific definitions
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 
 # include gcc-specific definitions
 include $(TOP_DIR)/builds/compiler/gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-icc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-icc.mk
index 8819a1f49fb..44d26bd6c05 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-icc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-icc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2005 by
+# Copyright 1996-2000, 2005, 2013 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,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/freetype.def
 EXPORTS_OPTIONS   = /DEF:$(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w
 
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/visualage.mk
 
 # include linking instructions
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-intl.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-intl.mk
index ae62e1bcdae..0f3e22bc3fd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-intl.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-intl.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 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,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/freetype.def
 EXPORTS_OPTIONS   = /DEF:$(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w
 
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/intelc.mk
 
 # include linking instructions
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-lcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-lcc.mk
index a147c4cb617..8bd5b568542 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-lcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -14,7 +14,7 @@
 
 
 SEP := /
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/win-lcc.mk
 
 # include linking instructions
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-mingw32.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-mingw32.mk
index 04e9e211c0c..b35dbb0c096 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-mingw32.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-mingw32.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -19,7 +19,7 @@ EXPORTS_OPTIONS   = $(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w
 
 # include Win32-specific definitions
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 
 LIBRARY := lib$(PROJECT)
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-vcc.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-vcc.mk
index 7fb87948652..95f76858f85 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-vcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-vcc.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 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,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/freetype.def
 EXPORTS_OPTIONS   = /DEF:$(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w
 
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/visualc.mk
 
 # include linking instructions
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-wat.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-wat.mk
index 820b817358f..e1ddf66e351 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/w32-wat.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/w32-wat.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 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,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/watcom-ftexports.lbc
 EXPORTS_OPTIONS   = -\"export @$(EXPORTS_LIST)\"-
 APINAMES_OPTIONS := -wW
 
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/watcom.mk
 
 # include linking instructions
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/win32-def.mk b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/win32-def.mk
index e6ae31c3b2a..a65ea4f01b8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/builds/win32/win32-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/builds/windows/win32-def.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2005, 2006 by
+# Copyright 1996-2000, 2003, 2005, 2006, 2013 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 @@
 DELETE    := del
 CAT       := type
 SEP       := $(strip \ )
-BUILD_DIR := $(TOP_DIR)/builds/win32
+BUILD_DIR := $(TOP_DIR)/builds/windows
 PLATFORM  := win32
 
 # The executable file extension (for tools). NOTE: WE INCLUDE THE DOT HERE !!
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/configure b/Build/source/libs/freetype2/freetype-2.5.1/configure
index 4d8a945a5a9..4d8a945a5a9 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/configure
+++ b/Build/source/libs/freetype2/freetype-2.5.1/configure
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/devel/ft2build.h b/Build/source/libs/freetype2/freetype-2.5.1/devel/ft2build.h
index c1d38c35ae8..6cc34b77b42 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/devel/ft2build.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/devel/ft2build.h
@@ -2,10 +2,9 @@
 /*                                                                         */
 /*  ft2build.h                                                             */
 /*                                                                         */
-/*    FreeType 2 build and setup macros.                                   */
-/*    (Generic version)                                                    */
+/*    FreeType 2 build and setup macros (development version).             */
 /*                                                                         */
-/*  Copyright 1996-2001, 2003, 2006 by                                     */
+/*  Copyright 1996-2001, 2003, 2006, 2013 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -18,24 +17,24 @@
 
 
  /*
-  *  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.
+  *  This is a development version of <ft2build.h> to build the library in
+  *  debug mode.  Its only difference to the default version is that it
+  *  includes a local `ftoption.h' header file with different settings for
+  *  many configuration macros.
+  *
+  *  To use it, simply ensure that the directory containing this file is
+  *  scanned by the compiler before the default FreeType header directory.
   *
-  *  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.
   */
 
-#ifndef __FT2_BUILD_DEVEL_H__
-#define __FT2_BUILD_DEVEL_H__
+#ifndef __FT2BUILD_H__
+#define __FT2BUILD_H__
 
-#define  FT_CONFIG_OPTIONS_H   <ftoption.h>
+#define FT_CONFIG_OPTIONS_H  <ftoption.h>
 
-#include <freetype/config/ftheader.h>
+#include <config/ftheader.h>
 
-#endif /* __FT2_BUILD_DEVEL_H__ */
+#endif /* __FT2BUILD_H__ */
 
 
 /* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/devel/ftoption.h b/Build/source/libs/freetype2/freetype-2.5.1/devel/ftoption.h
index 220625df917..27d1bd9a5d7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/devel/ftoption.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/devel/ftoption.h
@@ -38,9 +38,9 @@ FT_BEGIN_HEADER
   /*    library from a single source directory.                            */
   /*                                                                       */
   /*  - You can put a copy of this file in your build directory, more      */
-  /*    precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD'   */
-  /*    is the name of a directory that is included _before_ the FreeType  */
-  /*    include path during compilation.                                   */
+  /*    precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the     */
+  /*    name of a directory that is included _before_ the FreeType include */
+  /*    path during compilation.                                           */
   /*                                                                       */
   /*    The default FreeType Makefiles and Jamfiles use the build          */
   /*    directory `builds/<system>' by default, but you can easily change  */
@@ -51,7 +51,7 @@ FT_BEGIN_HEADER
   /*    locate this file during the build.  For example,                   */
   /*                                                                       */
   /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <freetype/config/ftheader.h>                            */
+  /*      #include <config/ftheader.h>                                     */
   /*                                                                       */
   /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
   /*    definitions.                                                       */
@@ -59,7 +59,7 @@ FT_BEGIN_HEADER
   /*    Note also that you can similarly pre-define the macro              */
   /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
   /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <freetype/config/ftmodule.h>.                */
+  /*    default, this file is <config/ftmodule.h>.                         */
   /*                                                                       */
   /*  We highly recommend using the third method whenever possible.        */
   /*                                                                       */
@@ -528,7 +528,7 @@ FT_BEGIN_HEADER
   /* does not contain any glyph name though.                               */
   /*                                                                       */
   /* Accessing SFNT names is done through the functions declared in        */
-  /* `freetype/ftsnames.h'.                                                */
+  /* `ftsnames.h'.                                                         */
   /*                                                                       */
 #define TT_CONFIG_OPTION_SFNT_NAMES
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/CHANGES b/Build/source/libs/freetype2/freetype-2.5.1/docs/CHANGES
index a5db2d23a1e..8a8bfd50633 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/CHANGES
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/CHANGES
@@ -1,3 +1,106 @@
+CHANGES BETWEEN 2.5 and 2.5.1
+
+  I. IMPORTANT BUG FIXES
+
+    - For  some WinFNT  files,  the last  glyph  wasn't displayed  but
+      incorrectly marked as invalid.
+
+    - The vertical size of glyphs was  incorrectly set after a call to
+      `FT_GlyphSlot_Embolden', resulting in clipped glyphs.
+
+    - Many fields of the `PCLT' table in SFNT based fonts (if accessed
+      with `FT_Get_Sfnt_Table') were computed incorrectly.
+
+    - In TrueType fonts,  hinting of composite glyphs  could sometimes
+      deliver  incorrect positions  of  components or  even  distorted
+      shapes.
+
+
+  II. IMPORTANT CHANGES
+
+    - WOFF font format support has been added.
+
+    - The auto-hinter now supports Hebrew.  Greek and Cyrillic support
+      has been improved.
+
+    - Support for the forthcoming `OS/2'  SFNT table version 5, as can
+      be found e.g. in the `Sitka' font family for Windows 8.1.
+
+    - The header  file layout  has been changed.   After installation,
+      all files are now located in `<prefix>/include/freetype2'.
+
+      Applications  that  use   (a)  `freetype-config'  or  FreeType's
+      `pkg-config' file to get the include directory for the compiler,
+      and (b) the documented way for header inclusion like
+
+        #include <ft2build.h>
+        #include FT_FREETYPE_H
+        ...
+
+      don't need any change to the source code.
+
+
+  III. MISCELLANEOUS
+
+    - The stem  darkening feature  of the  new CFF  engine can  now be
+      fine-tuned with the new `darkening-parameters' property.
+
+    - `ftgrid' has been updated to toggle various engines with the `H'
+      key, similar to `ftview' and `ftdiff'.
+
+    - The functionality of `ttdebug' has been greatly enhanced.
+
+      . It now displays twilight, storage, and control value data; key
+        `T' shows the twilight point  table, key `S' the storage data,
+        and key `C' the control value table.
+
+      . Some  keys  have  been  reassigned  from  lowercase  to  their
+        uppercase equivalents; for example `q'  to quit the program is
+        now `Q'.
+
+      . Key `f' finishes the current function.
+
+      . Key `R' restarts the debugger.
+
+      . Keys `b' and `p' set a breakpoint.
+
+      . Key `B' provides a function call backtrace.
+
+    - Better support of ARMv7 and x86_64 processors.
+
+    - Apple's `sbix' color bitmap format is now supported.
+
+    - Improved   auto-hinter  rendering   for  many   TrueType  fonts,
+      especially in the range 20-40ppem.
+
+    - A  new face  flag  `FT_FACE_FLAG_COLOR' has  been  added (to  be
+      accessed with the macro `FT_HAS_COLOR').
+
+    - `FT_Gzip_Uncompress'   (modeled    after   zlib's   `uncompress'
+      function)  has been  added; this  is a  by-product of  the newly
+      added WOFF support.
+
+    - Support for  a build with  `cmake' has been contributed  by John
+      Cary <cary@txcorp.com>.
+
+    - Support for x64  builds with Visual C++ has  been contributed by
+      Kenneth Miller <kennethadammiller@yahoo.com>
+
+    - Manual pages for most demo programs have been added.
+
+    - The GETINFO bytecode instruction for TrueType fonts was buggy if
+      used to retrieve subpixel hinting information.  It was necessary
+      to set  selector bit 6  to get  results for selector  bits 7-10,
+      which is wrong.
+
+    - Improved computation  of emulated vertical metrics  for TrueType
+      fonts.
+
+    - Fixed horizontal start-up position of vertical phantom points in
+      TrueType bytecode.
+
+
+======================================================================
 
 CHANGES BETWEEN 2.4.12 and 2.5
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/docs/CMAKE b/Build/source/libs/freetype2/freetype-2.5.1/docs/CMAKE
new file mode 100644
index 00000000000..31237ae1516
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/CMAKE
@@ -0,0 +1,2 @@
+Support for a cmake build has been contributed.  See the remarks in the
+top-level `CMakeLists.txt' file for more.
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/CUSTOMIZE b/Build/source/libs/freetype2/freetype-2.5.1/docs/CUSTOMIZE
index 396eda38eae..dfadb4658d8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/CUSTOMIZE
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/CUSTOMIZE
@@ -8,10 +8,9 @@ How to customize the compilation of the library
 
 I. Configuration macros
 
-  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  should  be  active  while
-  building the library.
+  The  file found  in `include/config/ftoption.h'  contains a  list of
+  commented configuration macros that can  be toggled by developers to
+  indicate which features should be active while building the library.
 
   These  options range  from debug  level to  availability  of certain
   features,   like  native   TrueType  hinting   through   a  bytecode
@@ -36,9 +35,9 @@ II. Modules list
   can keep the source files `clean'.
 
   If  you don't  use  GNU make  you  have to  manually  edit the  file
-  `include/freetype/config/ftmodule.h'  (which is  *not* used  with if
-  compiled with GNU make) to  add or remove the drivers and components
-  you want  to compile into  the library.  See `INSTALL.ANY'  for more
+  `include/config/ftmodule.h' (which  is *not*  used with  if compiled
+  with GNU make) to add or  remove the drivers and components you want
+  to   compile  into   the  library.    See  `INSTALL.ANY'   for  more
   information.
 
 
@@ -96,19 +95,16 @@ IV. Overriding default configuration and module headers
       #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 <config/ftoption.h> and
+    <config/ftmodule.h>, you can do something like:
 
       custom/
-        freetype/
-          config/
-            ftoption.h    => custom options header
-            ftmodule.h    => custom modules list
+        config/
+          ftoption.h      => custom options header
+          ftmodule.h      => custom modules list
 
       include/            => normal FreeType 2 include
-        freetype/
-          ...
+        ...
 
     then change the C include path to always give the path to `custom'
     before the FreeType 2 `include'.
@@ -126,7 +122,7 @@ IV. Overriding default configuration and module headers
       #define FT_CONFIG_OPTIONS_H  <custom/my-ftoption.h>
       #define FT_CONFIG_MODULES_H  <custom/my-ftmodule.h>
 
-      #include <freetype/config/ftheader.h>
+      #include <config/ftheader.h>
 
       #endif /* __FT2_BUILD_MY_PLATFORM_H__ */
 
@@ -142,7 +138,7 @@ IV. Overriding default configuration and module headers
 
 ----------------------------------------------------------------------
 
-Copyright 2003, 2005, 2006, 2012 by
+Copyright 2003, 2005, 2006, 2012, 2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/docs/DEBUG b/Build/source/libs/freetype2/freetype-2.5.1/docs/DEBUG
new file mode 100644
index 00000000000..d8c79d187a5
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/DEBUG
@@ -0,0 +1,204 @@
+Debugging within the FreeType sources
+=====================================
+
+I. Configuration macros
+-----------------------
+
+There are  several ways to enable  debugging features in a  FreeType 2
+builds.  This is  controlled through the definition  of special macros
+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
+    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 macros FT_ERROR and
+    FT_TRACE.  This  also includes the variants  FT_TRACE0, FT_TRACE1,
+    FT_TRACE2, ..., FT_TRACE7.
+
+    The  trace macros  are used  to  send debugging  messages when  an
+    appropriate  `debug level'  is configured  at runtime  through the
+    FT2_DEBUG environment variable (more on this later).
+
+  FT_DEBUG_MEMORY
+
+    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 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 unaffected.
+
+
+II. Debugging macros
+--------------------
+
+Several  macros  can be  used  within  the  FreeType sources  to  help
+debugging its code:
+
+
+  1. FT_ERROR(( ... ))
+
+    This macro is used to send debug messages that indicate relatively
+    serious errors  (like broken  font files), but  will not  stop the
+    execution of the running program.   Its code is compiled only when
+    either FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined in
+    `ftoption.h'.
+
+    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" ));
+
+
+  2. FT_ASSERT( condition )
+
+    This macro is used to check  strong assertions at runtime.  If its
+    condition isn't TRUE, the program will abort with a panic message.
+    Its  code   is  compiled   when  either   FT_DEBUG_LEVEL_ERROR  or
+    FT_DEBUG_LEVEL_TRACE   are  defined.    You   don't  need   double
+    parentheses here.  For example
+
+      FT_ASSERT( ptr != NULL );
+
+
+  3. FT_TRACE( level, (message...) )
+
+    The  FT_TRACE  macro is  used  to  send general-purpose  debugging
+    messages during program execution.   This macro uses an *implicit*
+    macro  named  FT_COMPONENT  used  to  name  the  current  FreeType
+    component being run.
+
+    The developer  should always  define FT_COMPONENT  as appropriate,
+    for example as in
+
+      #undef  FT_COMPONENT
+      #define FT_COMPONENT  trace_io
+
+    The  value  of the  FT_COMPONENT  macro  is an  enumeration  named
+    `trace_XXXX' where `XXXX' is one of the component names defined in
+    the internal  file `internal/fttrace.h'.   If you  modify FreeType
+    source and insert new `trace_XXXX'  macro, you must register it in
+    `fttrace.h'. If  you insert or  remove many trace macros,  you can
+    check   the    undefined   or   the   unused    trace   macro   by
+    `src/tools/chktrcmp.py'.
+
+    Each such component is assigned a `debug level', ranging from 0 to
+    7,  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
+    the corresponding component level are filtered and never printed.
+
+    This means  that trace messages  with level 0 are  always printed,
+    those with  level 2 are only  printed when the component  level is
+    *at least* 2.
+
+    The  second parameter  to  FT_TRACE must  contain parentheses  and
+    correspond to a printf-like call, as in
+
+      FT_TRACE( 2, ( "your %s is not %s\n", "foo", "bar" ) )
+
+    The   shortcut  macros   FT_TRACE0,  FT_TRACE1,   FT_TRACE2,  ...,
+    FT_TRACE7 can  be used with  constant level indices, and  are much
+    cleaner to use, as in
+
+      FT_TRACE2(( "your %s is not %s\n", "foo", "bar" ));
+
+
+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
+    FT_DEBUG_LEVEL_TRACE  defined.  It  contains a  list of  component
+    level definitions, following this format:
+
+      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.  `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 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.
+
+
+  FT2_DEBUG_MEMORY
+
+    This environment variable,  when defined, tells FreeType  to use a
+    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  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.
+
+    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  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 bounds are checked at runtime.
+
+------------------------------------------------------------------------
+
+Copyright 2002-2005, 2009, 2013 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.
+
+
+--- end of DEBUG ---
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/FTL.TXT b/Build/source/libs/freetype2/freetype-2.5.1/docs/FTL.TXT
index bbaba33f47d..bbaba33f47d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/FTL.TXT
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/FTL.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/GPLv2.TXT b/Build/source/libs/freetype2/freetype-2.5.1/docs/GPLv2.TXT
index b2fe7b6af35..b2fe7b6af35 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/GPLv2.TXT
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/GPLv2.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL
index fc699a8d53c..456b76d2b55 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL
@@ -43,7 +43,12 @@ I. Normal installation and upgrades
     directory, where <system> stands for your OS or environment.
 
 
-  5. From you own IDE, or own Makefiles
+  5. Using cmake
+
+    See the top-level `CMakeLists.txt' file for more information.
+
+
+  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
@@ -70,7 +75,7 @@ II. Custom builds of the library
 
 ----------------------------------------------------------------------
 
-Copyright   2000-2008, 2010-2011
+Copyright   2000-2008, 2010-2011, 2013
 by David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.ANY b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.ANY
index 80f161c64d3..8aa394f1fc5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.ANY
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.ANY
@@ -33,25 +33,25 @@ I. Standard procedure
 
       src/base/ftbase.c
 
-      src/base/ftbbox.c       -- recommended, see <freetype/ftbbox.h>
-      src/base/ftglyph.c      -- recommended, see <freetype/ftglyph.h>
+      src/base/ftbbox.c       -- recommended, see <ftbbox.h>
+      src/base/ftglyph.c      -- recommended, see <ftglyph.h>
 
-      src/base/ftbdf.c        -- optional, see <freetype/ftbdf.h>
-      src/base/ftbitmap.c     -- optional, see <freetype/ftbitmap.h>
-      src/base/ftcid.c        -- optional, see <freetype/ftcid.h>
+      src/base/ftbdf.c        -- optional, see <ftbdf.h>
+      src/base/ftbitmap.c     -- optional, see <ftbitmap.h>
+      src/base/ftcid.c        -- optional, see <ftcid.h>
       src/base/ftfstype.c     -- optional
-      src/base/ftgasp.c       -- optional, see <freetype/ftgasp.h>
-      src/base/ftgxval.c      -- optional, see <freetype/ftgxval.h>
-      src/base/ftlcdfil.c     -- optional, see <freetype/ftlcdfil.h>
-      src/base/ftmm.c         -- optional, see <freetype/ftmm.h>
-      src/base/ftotval.c      -- optional, see <freetype/ftotval.h>
+      src/base/ftgasp.c       -- optional, see <ftgasp.h>
+      src/base/ftgxval.c      -- optional, see <ftgxval.h>
+      src/base/ftlcdfil.c     -- optional, see <ftlcdfil.h>
+      src/base/ftmm.c         -- optional, see <ftmm.h>
+      src/base/ftotval.c      -- optional, see <ftotval.h>
       src/base/ftpatent.c     -- optional
-      src/base/ftpfr.c        -- optional, see <freetype/ftpfr.h>
-      src/base/ftstroke.c     -- optional, see <freetype/ftstroke.h>
-      src/base/ftsynth.c      -- optional, see <freetype/ftsynth.h>
-      src/base/fttype1.c      -- optional, see <freetype/t1tables.h>
-      src/base/ftwinfnt.c     -- optional, see <freetype/ftwinfnt.h>
-      src/base/ftxf86.c       -- optional, see <freetype/ftxf86.h>
+      src/base/ftpfr.c        -- optional, see <ftpfr.h>
+      src/base/ftstroke.c     -- optional, see <ftstroke.h>
+      src/base/ftsynth.c      -- optional, see <ftsynth.h>
+      src/base/fttype1.c      -- optional, see <t1tables.h>
+      src/base/ftwinfnt.c     -- optional, see <ftwinfnt.h>
+      src/base/ftxf86.c       -- optional, see <ftxf86.h>
 
       src/base/ftmac.c        -- only on the Macintosh
 
@@ -143,7 +143,7 @@ II. Support for flat-directory compilation
 
 ----------------------------------------------------------------------
 
-Copyright 2003, 2005, 2006, 2009, 2010 by
+Copyright 2003, 2005, 2006, 2009, 2010, 2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.CROSS b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.CROSS
index 005d44293ef..005d44293ef 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.CROSS
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.CROSS
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.GNU b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.GNU
index 72df50a4eac..c2ff299a663 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.GNU
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.GNU
@@ -1,7 +1,7 @@
-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.UNIX 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  MinGW/MSYS  in Windows,  you  should  follow  the
+instructions in the file `INSTALL.UNIX' instead.
 
 
   FreeType 2 includes a powerful and flexible build system that allows
@@ -54,8 +54,8 @@ in the file INSTALL.UNIX instead.
 
         platform                     win32
         compiler                     gcc
-        configuration directory      .\builds\win32
-        configuration rules          .\builds\win32\w32-gcc.mk
+        configuration directory      .\builds\windows
+        configuration rules          .\builds\windows\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
@@ -138,15 +138,17 @@ in the file INSTALL.UNIX instead.
 
   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  have to
-    either   use  an   IDE-specific  project   file,  or   follow  the
+    The above instructions build a  _statically_ linked library of the
+    font engine in the `objs' directory.   On Windows, you can build a
+    DLL  either  with  MinGW  (within an  MSYS  shell,  following  the
+    instructions in `INSTALL.UNIX'), or you  use one of the Visual C++
+    project files; see  the  subdirectories  of `builds/windows'.  For
+    everything else,  you are on  your own,  and you might  follow the
     instructions in `INSTALL.ANY' to create your own Makefiles.
 
 ----------------------------------------------------------------------
 
-Copyright 2003, 2004, 2005, 2006, 2008 by
+Copyright 2003, 2004, 2005, 2006, 2008, 2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.MAC b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.MAC
index 42bb0d8637c..42bb0d8637c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.MAC
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.MAC
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.UNIX b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.UNIX
index 7175ca0935a..7175ca0935a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.UNIX
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.UNIX
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.VMS b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.VMS
index 994e566883f..994e566883f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/INSTALL.VMS
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/INSTALL.VMS
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/LICENSE.TXT b/Build/source/libs/freetype2/freetype-2.5.1/docs/LICENSE.TXT
index 99dc342d764..99dc342d764 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/LICENSE.TXT
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/LICENSE.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/MAKEPP b/Build/source/libs/freetype2/freetype-2.5.1/docs/MAKEPP
index 58eaf551df8..58eaf551df8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/MAKEPP
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/MAKEPP
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/PROBLEMS b/Build/source/libs/freetype2/freetype-2.5.1/docs/PROBLEMS
index 40bdc35a676..40bdc35a676 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/PROBLEMS
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/PROBLEMS
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/TODO b/Build/source/libs/freetype2/freetype-2.5.1/docs/TODO
index be60d6f040a..be60d6f040a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/TODO
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/TODO
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/VERSION.DLL b/Build/source/libs/freetype2/freetype-2.5.1/docs/VERSION.DLL
index 2d1cc9acff0..ee6ccdfb476 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/VERSION.DLL
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/VERSION.DLL
@@ -52,6 +52,7 @@ on _most_ systems, but not all of them:
 
     release     libtool     so
   -------------------------------
+     2.5.1      17.0.11   6.11.0
      2.5.0      16.2.10   6.10.2
      2.4.12     16.1.10   6.10.1
      2.4.11     16.0.10   6.10.0
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/formats.txt b/Build/source/libs/freetype2/freetype-2.5.1/docs/formats.txt
index aed885c89c2..aed885c89c2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/formats.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/formats.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/raster.txt b/Build/source/libs/freetype2/freetype-2.5.1/docs/raster.txt
index 95d9e24010b..95d9e24010b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/raster.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/raster.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/README b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/README
index 51b04d6f151..51b04d6f151 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/README
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-auto_hinter.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-auto_hinter.html
index f2cf72a9d00..4d9eb1e6174 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-auto_hinter.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-auto_hinter.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 The auto-hinter
@@ -57,7 +57,7 @@ The auto-hinter
 <p><b>Experimental</b> <b>only</b></p>
 <p>The auto-hinter provides various script modules to hint glyphs. Examples of supported scripts are Latin or CJK. Before a glyph is auto-hinted, the Unicode character map of the font gets examined, and the script is then determined based on Unicode character ranges, see below.</p>
 <p>OpenType fonts, however, often provide much more glyphs than character codes (small caps, superscripts, ligatures, swashes, etc.), to be controlled by so-called &lsquo;features&rsquo;. Handling OpenType features can be quite complicated and thus needs a separate library on top of FreeType.</p>
-<p>The mapping between glyph indices and scripts (in the auto-hinter sense, see the <a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_XXX</a> values) is stored as an array with &lsquo;num_glyphs&rsquo; elements, as found in the font's <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure. The &lsquo;glyph-to-script-map&rsquo; property returns a pointer to this array which can be modified as needed. Note that the modification should happen before the first glyph gets processed by the auto-hinter so that the global analysis of the font shapes actually uses the modified mapping.</p>
+<p>The mapping between glyph indices and scripts (in the auto-hinter sense, see the <a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_XXX</a> values) is stored as an array with &lsquo;num_glyphs&rsquo; elements, as found in the font's <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure. The &lsquo;glyph-to-script-map&rsquo; property returns a pointer to this array, which can be modified as needed. Note that the modification should happen before the first glyph gets processed by the auto-hinter so that the global analysis of the font shapes actually uses the modified mapping.</p>
 <p>The following example code demonstrates how to access it (omitting the error handling).</p>
 <pre class="colored">
   FT_Library                library;
@@ -87,7 +87,7 @@ The auto-hinter
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_AUTOHINTER_H (freetype/ftautoh.h).
+Defined in FT_AUTOHINTER_H (ftautoh.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -210,7 +210,7 @@ Defined in FT_AUTOHINTER_H (freetype/ftautoh.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Prop_GlyphToScriptMap">FT_Prop_GlyphToScriptMap</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_AUTOHINTER_H (freetype/ftautoh.h).
+Defined in FT_AUTOHINTER_H (ftautoh.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -250,7 +250,7 @@ Defined in FT_AUTOHINTER_H (freetype/ftautoh.h).
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>This property can be used with <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a> also.</p>
-<p>It's important to use the right timing for changing this value: The creation of the glyph-to-script map which eventually uses the fallback script value gets triggered either by setting or reading a face-specific property like <a href="ft2-auto_hinter.html#glyph-to-script-map">glyph-to-script-map</a>, or by auto-hinting any glyph from that face. In particular, if you have already created an <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure but not loaded any glyph (using the auto-hinter), a change of the fallback glyph will affect this face.</p>
+<p>It's important to use the right timing for changing this value: The creation of the glyph-to-script map that eventually uses the fallback script value gets triggered either by setting or reading a face-specific property like <a href="ft2-auto_hinter.html#glyph-to-script-map">glyph-to-script-map</a>, or by auto-hinting any glyph from that face. In particular, if you have already created an <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure but not loaded any glyph (using the auto-hinter), a change of the fallback glyph will affect this face.</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -292,7 +292,7 @@ Defined in FT_AUTOHINTER_H (freetype/ftautoh.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Prop_IncreaseXHeight">FT_Prop_IncreaseXHeight</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_AUTOHINTER_H (freetype/ftautoh.h).
+Defined in FT_AUTOHINTER_H (ftautoh.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-base_interface.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-base_interface.html
index 3b35b793bc0..628eb3e2930 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-base_interface.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-base_interface.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,41 +35,41 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Base Interface
 </h1></center>
 <h2>Synopsis</h2>
 <table align=center cellspacing=5 cellpadding=0 border=0>
-<tr><td></td><td><a href="#FT_Library">FT_Library</a></td><td></td><td><a href="#FT_IS_TRICKY">FT_IS_TRICKY</a></td><td></td><td><a href="#FT_Load_Char">FT_Load_Char</a></td></tr>
-<tr><td></td><td><a href="#FT_Face">FT_Face</a></td><td></td><td><a href="#FT_STYLE_FLAG_XXX">FT_STYLE_FLAG_XXX</a></td><td></td><td><a href="#FT_LOAD_XXX">FT_LOAD_XXX</a></td></tr>
-<tr><td></td><td><a href="#FT_Size">FT_Size</a></td><td></td><td><a href="#FT_Size_Internal">FT_Size_Internal</a></td><td></td><td><a href="#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_XXX</a></td></tr>
-<tr><td></td><td><a href="#FT_GlyphSlot">FT_GlyphSlot</a></td><td></td><td><a href="#FT_Size_Metrics">FT_Size_Metrics</a></td><td></td><td><a href="#FT_LOAD_TARGET_MODE">FT_LOAD_TARGET_MODE</a></td></tr>
-<tr><td></td><td><a href="#FT_CharMap">FT_CharMap</a></td><td></td><td><a href="#FT_SizeRec">FT_SizeRec</a></td><td></td><td><a href="#FT_Set_Transform">FT_Set_Transform</a></td></tr>
-<tr><td></td><td><a href="#FT_Encoding">FT_Encoding</a></td><td></td><td><a href="#FT_SubGlyph">FT_SubGlyph</a></td><td></td><td><a href="#FT_Render_Mode">FT_Render_Mode</a></td></tr>
-<tr><td></td><td><a href="#FT_Glyph_Metrics">FT_Glyph_Metrics</a></td><td></td><td><a href="#FT_Slot_Internal">FT_Slot_Internal</a></td><td></td><td><a href="#ft_render_mode_xxx">ft_render_mode_xxx</a></td></tr>
-<tr><td></td><td><a href="#FT_Bitmap_Size">FT_Bitmap_Size</a></td><td></td><td><a href="#FT_GlyphSlotRec">FT_GlyphSlotRec</a></td><td></td><td><a href="#FT_Render_Glyph">FT_Render_Glyph</a></td></tr>
-<tr><td></td><td><a href="#FT_Module">FT_Module</a></td><td></td><td><a href="#FT_Init_FreeType">FT_Init_FreeType</a></td><td></td><td><a href="#FT_Kerning_Mode">FT_Kerning_Mode</a></td></tr>
-<tr><td></td><td><a href="#FT_Driver">FT_Driver</a></td><td></td><td><a href="#FT_Done_FreeType">FT_Done_FreeType</a></td><td></td><td><a href="#ft_kerning_default">ft_kerning_default</a></td></tr>
-<tr><td></td><td><a href="#FT_Renderer">FT_Renderer</a></td><td></td><td><a href="#FT_OPEN_XXX">FT_OPEN_XXX</a></td><td></td><td><a href="#ft_kerning_unfitted">ft_kerning_unfitted</a></td></tr>
-<tr><td></td><td><a href="#FT_ENC_TAG">FT_ENC_TAG</a></td><td></td><td><a href="#FT_Parameter">FT_Parameter</a></td><td></td><td><a href="#ft_kerning_unscaled">ft_kerning_unscaled</a></td></tr>
-<tr><td></td><td><a href="#ft_encoding_xxx">ft_encoding_xxx</a></td><td></td><td><a href="#FT_Open_Args">FT_Open_Args</a></td><td></td><td><a href="#FT_Get_Kerning">FT_Get_Kerning</a></td></tr>
-<tr><td></td><td><a href="#FT_CharMapRec">FT_CharMapRec</a></td><td></td><td><a href="#FT_New_Face">FT_New_Face</a></td><td></td><td><a href="#FT_Get_Track_Kerning">FT_Get_Track_Kerning</a></td></tr>
-<tr><td></td><td><a href="#FT_Face_Internal">FT_Face_Internal</a></td><td></td><td><a href="#FT_New_Memory_Face">FT_New_Memory_Face</a></td><td></td><td><a href="#FT_Get_Glyph_Name">FT_Get_Glyph_Name</a></td></tr>
-<tr><td></td><td><a href="#FT_FaceRec">FT_FaceRec</a></td><td></td><td><a href="#FT_Open_Face">FT_Open_Face</a></td><td></td><td><a href="#FT_Get_Postscript_Name">FT_Get_Postscript_Name</a></td></tr>
-<tr><td></td><td><a href="#FT_FACE_FLAG_XXX">FT_FACE_FLAG_XXX</a></td><td></td><td><a href="#FT_Attach_File">FT_Attach_File</a></td><td></td><td><a href="#FT_Select_Charmap">FT_Select_Charmap</a></td></tr>
-<tr><td></td><td><a href="#FT_HAS_HORIZONTAL">FT_HAS_HORIZONTAL</a></td><td></td><td><a href="#FT_Attach_Stream">FT_Attach_Stream</a></td><td></td><td><a href="#FT_Set_Charmap">FT_Set_Charmap</a></td></tr>
-<tr><td></td><td><a href="#FT_HAS_VERTICAL">FT_HAS_VERTICAL</a></td><td></td><td><a href="#FT_Reference_Face">FT_Reference_Face</a></td><td></td><td><a href="#FT_Get_Charmap_Index">FT_Get_Charmap_Index</a></td></tr>
-<tr><td></td><td><a href="#FT_HAS_KERNING">FT_HAS_KERNING</a></td><td></td><td><a href="#FT_Done_Face">FT_Done_Face</a></td><td></td><td><a href="#FT_Get_Char_Index">FT_Get_Char_Index</a></td></tr>
-<tr><td></td><td><a href="#FT_IS_SCALABLE">FT_IS_SCALABLE</a></td><td></td><td><a href="#FT_Select_Size">FT_Select_Size</a></td><td></td><td><a href="#FT_Get_First_Char">FT_Get_First_Char</a></td></tr>
-<tr><td></td><td><a href="#FT_IS_SFNT">FT_IS_SFNT</a></td><td></td><td><a href="#FT_Size_Request_Type">FT_Size_Request_Type</a></td><td></td><td><a href="#FT_Get_Next_Char">FT_Get_Next_Char</a></td></tr>
-<tr><td></td><td><a href="#FT_IS_FIXED_WIDTH">FT_IS_FIXED_WIDTH</a></td><td></td><td><a href="#FT_Size_RequestRec">FT_Size_RequestRec</a></td><td></td><td><a href="#FT_Get_Name_Index">FT_Get_Name_Index</a></td></tr>
-<tr><td></td><td><a href="#FT_HAS_FIXED_SIZES">FT_HAS_FIXED_SIZES</a></td><td></td><td><a href="#FT_Size_Request">FT_Size_Request</a></td><td></td><td><a href="#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_XXX</a></td></tr>
-<tr><td></td><td><a href="#FT_HAS_FAST_GLYPHS">FT_HAS_FAST_GLYPHS</a></td><td></td><td><a href="#FT_Request_Size">FT_Request_Size</a></td><td></td><td><a href="#FT_Get_SubGlyph_Info">FT_Get_SubGlyph_Info</a></td></tr>
-<tr><td></td><td><a href="#FT_HAS_GLYPH_NAMES">FT_HAS_GLYPH_NAMES</a></td><td></td><td><a href="#FT_Set_Char_Size">FT_Set_Char_Size</a></td><td></td><td><a href="#FT_FSTYPE_XXX">FT_FSTYPE_XXX</a></td></tr>
-<tr><td></td><td><a href="#FT_HAS_MULTIPLE_MASTERS">FT_HAS_MULTIPLE_MASTERS</a></td><td></td><td><a href="#FT_Set_Pixel_Sizes">FT_Set_Pixel_Sizes</a></td><td></td><td><a href="#FT_Get_FSType_Flags">FT_Get_FSType_Flags</a></td></tr>
-<tr><td></td><td><a href="#FT_IS_CID_KEYED">FT_IS_CID_KEYED</a></td><td></td><td><a href="#FT_Load_Glyph">FT_Load_Glyph</a></td><td></td><td></td></tr>
+<tr><td></td><td><a href="#FT_Library">FT_Library</a></td><td></td><td><a href="#FT_IS_TRICKY">FT_IS_TRICKY</a></td><td></td><td><a href="#FT_Load_Glyph">FT_Load_Glyph</a></td></tr>
+<tr><td></td><td><a href="#FT_Face">FT_Face</a></td><td></td><td><a href="#FT_HAS_COLOR">FT_HAS_COLOR</a></td><td></td><td><a href="#FT_Load_Char">FT_Load_Char</a></td></tr>
+<tr><td></td><td><a href="#FT_Size">FT_Size</a></td><td></td><td><a href="#FT_STYLE_FLAG_XXX">FT_STYLE_FLAG_XXX</a></td><td></td><td><a href="#FT_LOAD_XXX">FT_LOAD_XXX</a></td></tr>
+<tr><td></td><td><a href="#FT_GlyphSlot">FT_GlyphSlot</a></td><td></td><td><a href="#FT_Size_Internal">FT_Size_Internal</a></td><td></td><td><a href="#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_XXX</a></td></tr>
+<tr><td></td><td><a href="#FT_CharMap">FT_CharMap</a></td><td></td><td><a href="#FT_Size_Metrics">FT_Size_Metrics</a></td><td></td><td><a href="#FT_LOAD_TARGET_MODE">FT_LOAD_TARGET_MODE</a></td></tr>
+<tr><td></td><td><a href="#FT_Encoding">FT_Encoding</a></td><td></td><td><a href="#FT_SizeRec">FT_SizeRec</a></td><td></td><td><a href="#FT_Set_Transform">FT_Set_Transform</a></td></tr>
+<tr><td></td><td><a href="#FT_Glyph_Metrics">FT_Glyph_Metrics</a></td><td></td><td><a href="#FT_SubGlyph">FT_SubGlyph</a></td><td></td><td><a href="#FT_Render_Mode">FT_Render_Mode</a></td></tr>
+<tr><td></td><td><a href="#FT_Bitmap_Size">FT_Bitmap_Size</a></td><td></td><td><a href="#FT_Slot_Internal">FT_Slot_Internal</a></td><td></td><td><a href="#ft_render_mode_xxx">ft_render_mode_xxx</a></td></tr>
+<tr><td></td><td><a href="#FT_Module">FT_Module</a></td><td></td><td><a href="#FT_GlyphSlotRec">FT_GlyphSlotRec</a></td><td></td><td><a href="#FT_Render_Glyph">FT_Render_Glyph</a></td></tr>
+<tr><td></td><td><a href="#FT_Driver">FT_Driver</a></td><td></td><td><a href="#FT_Init_FreeType">FT_Init_FreeType</a></td><td></td><td><a href="#FT_Kerning_Mode">FT_Kerning_Mode</a></td></tr>
+<tr><td></td><td><a href="#FT_Renderer">FT_Renderer</a></td><td></td><td><a href="#FT_Done_FreeType">FT_Done_FreeType</a></td><td></td><td><a href="#ft_kerning_default">ft_kerning_default</a></td></tr>
+<tr><td></td><td><a href="#FT_ENC_TAG">FT_ENC_TAG</a></td><td></td><td><a href="#FT_OPEN_XXX">FT_OPEN_XXX</a></td><td></td><td><a href="#ft_kerning_unfitted">ft_kerning_unfitted</a></td></tr>
+<tr><td></td><td><a href="#ft_encoding_xxx">ft_encoding_xxx</a></td><td></td><td><a href="#FT_Parameter">FT_Parameter</a></td><td></td><td><a href="#ft_kerning_unscaled">ft_kerning_unscaled</a></td></tr>
+<tr><td></td><td><a href="#FT_CharMapRec">FT_CharMapRec</a></td><td></td><td><a href="#FT_Open_Args">FT_Open_Args</a></td><td></td><td><a href="#FT_Get_Kerning">FT_Get_Kerning</a></td></tr>
+<tr><td></td><td><a href="#FT_Face_Internal">FT_Face_Internal</a></td><td></td><td><a href="#FT_New_Face">FT_New_Face</a></td><td></td><td><a href="#FT_Get_Track_Kerning">FT_Get_Track_Kerning</a></td></tr>
+<tr><td></td><td><a href="#FT_FaceRec">FT_FaceRec</a></td><td></td><td><a href="#FT_New_Memory_Face">FT_New_Memory_Face</a></td><td></td><td><a href="#FT_Get_Glyph_Name">FT_Get_Glyph_Name</a></td></tr>
+<tr><td></td><td><a href="#FT_FACE_FLAG_XXX">FT_FACE_FLAG_XXX</a></td><td></td><td><a href="#FT_Open_Face">FT_Open_Face</a></td><td></td><td><a href="#FT_Get_Postscript_Name">FT_Get_Postscript_Name</a></td></tr>
+<tr><td></td><td><a href="#FT_HAS_HORIZONTAL">FT_HAS_HORIZONTAL</a></td><td></td><td><a href="#FT_Attach_File">FT_Attach_File</a></td><td></td><td><a href="#FT_Select_Charmap">FT_Select_Charmap</a></td></tr>
+<tr><td></td><td><a href="#FT_HAS_VERTICAL">FT_HAS_VERTICAL</a></td><td></td><td><a href="#FT_Attach_Stream">FT_Attach_Stream</a></td><td></td><td><a href="#FT_Set_Charmap">FT_Set_Charmap</a></td></tr>
+<tr><td></td><td><a href="#FT_HAS_KERNING">FT_HAS_KERNING</a></td><td></td><td><a href="#FT_Reference_Face">FT_Reference_Face</a></td><td></td><td><a href="#FT_Get_Charmap_Index">FT_Get_Charmap_Index</a></td></tr>
+<tr><td></td><td><a href="#FT_IS_SCALABLE">FT_IS_SCALABLE</a></td><td></td><td><a href="#FT_Done_Face">FT_Done_Face</a></td><td></td><td><a href="#FT_Get_Char_Index">FT_Get_Char_Index</a></td></tr>
+<tr><td></td><td><a href="#FT_IS_SFNT">FT_IS_SFNT</a></td><td></td><td><a href="#FT_Select_Size">FT_Select_Size</a></td><td></td><td><a href="#FT_Get_First_Char">FT_Get_First_Char</a></td></tr>
+<tr><td></td><td><a href="#FT_IS_FIXED_WIDTH">FT_IS_FIXED_WIDTH</a></td><td></td><td><a href="#FT_Size_Request_Type">FT_Size_Request_Type</a></td><td></td><td><a href="#FT_Get_Next_Char">FT_Get_Next_Char</a></td></tr>
+<tr><td></td><td><a href="#FT_HAS_FIXED_SIZES">FT_HAS_FIXED_SIZES</a></td><td></td><td><a href="#FT_Size_RequestRec">FT_Size_RequestRec</a></td><td></td><td><a href="#FT_Get_Name_Index">FT_Get_Name_Index</a></td></tr>
+<tr><td></td><td><a href="#FT_HAS_FAST_GLYPHS">FT_HAS_FAST_GLYPHS</a></td><td></td><td><a href="#FT_Size_Request">FT_Size_Request</a></td><td></td><td><a href="#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_XXX</a></td></tr>
+<tr><td></td><td><a href="#FT_HAS_GLYPH_NAMES">FT_HAS_GLYPH_NAMES</a></td><td></td><td><a href="#FT_Request_Size">FT_Request_Size</a></td><td></td><td><a href="#FT_Get_SubGlyph_Info">FT_Get_SubGlyph_Info</a></td></tr>
+<tr><td></td><td><a href="#FT_HAS_MULTIPLE_MASTERS">FT_HAS_MULTIPLE_MASTERS</a></td><td></td><td><a href="#FT_Set_Char_Size">FT_Set_Char_Size</a></td><td></td><td><a href="#FT_FSTYPE_XXX">FT_FSTYPE_XXX</a></td></tr>
+<tr><td></td><td><a href="#FT_IS_CID_KEYED">FT_IS_CID_KEYED</a></td><td></td><td><a href="#FT_Set_Pixel_Sizes">FT_Set_Pixel_Sizes</a></td><td></td><td><a href="#FT_Get_FSType_Flags">FT_Get_FSType_Flags</a></td></tr>
 </table><br><br>
 
 <table align=center width="87%"><tr><td>
@@ -78,7 +78,7 @@ Base Interface
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Library">FT_Library</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -102,7 +102,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Face">FT_Face</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -129,7 +129,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Size">FT_Size</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -140,7 +140,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>A handle to an object used to model a face scaled to a given character size.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>Each <a href="ft2-base_interface.html#FT_Face">FT_Face</a> has an <i>active</i> <a href="ft2-base_interface.html#FT_Size">FT_Size</a> object that is used by functions like <a href="ft2-base_interface.html#FT_Load_Glyph">FT_Load_Glyph</a> to determine the scaling transformation which is used to load and hint glyphs and metrics.</p>
+<p>Each <a href="ft2-base_interface.html#FT_Face">FT_Face</a> has an <i>active</i> <a href="ft2-base_interface.html#FT_Size">FT_Size</a> object that is used by functions like <a href="ft2-base_interface.html#FT_Load_Glyph">FT_Load_Glyph</a> to determine the scaling transformation that in turn is used to load and hint glyphs and metrics.</p>
 <p>You can use <a href="ft2-base_interface.html#FT_Set_Char_Size">FT_Set_Char_Size</a>, <a href="ft2-base_interface.html#FT_Set_Pixel_Sizes">FT_Set_Pixel_Sizes</a>, <a href="ft2-base_interface.html#FT_Request_Size">FT_Request_Size</a> or even <a href="ft2-base_interface.html#FT_Select_Size">FT_Select_Size</a> to change the content (i.e., the scaling values) of the active <a href="ft2-base_interface.html#FT_Size">FT_Size</a>.</p>
 <p>You can use <a href="ft2-sizes_management.html#FT_New_Size">FT_New_Size</a> to create additional size objects for a given <a href="ft2-base_interface.html#FT_Face">FT_Face</a>, but they won't be used by other functions until you activate it through <a href="ft2-sizes_management.html#FT_Activate_Size">FT_Activate_Size</a>. Only one size can be activated at any given time per face.</p>
 </td></tr></table>
@@ -156,7 +156,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_GlyphSlot">FT_GlyphSlot</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -179,7 +179,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_CharMap">FT_CharMap</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -207,7 +207,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Encoding">FT_Encoding</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -261,10 +261,10 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>For example, if you want to access Unicode value U+1F028 (and the font contains it), use value 0x1F028 as the input value for <a href="ft2-base_interface.html#FT_Get_Char_Index">FT_Get_Char_Index</a>.</p>
 </td></tr>
 <tr valign=top><td><b>FT_ENCODING_MS_SYMBOL</b></td><td>
-<p>Corresponds to the Microsoft Symbol encoding, used to encode mathematical symbols in the 32..255 character code range. For more information, see &lsquo;http://www.ceviz.net/symbol.htm&rsquo;.</p>
+<p>Corresponds to the Microsoft Symbol encoding, used to encode mathematical symbols in the 32..255 character code range. For more information, see &lsquo;<a href="http://www.kostis.net/charsets/symbol.htm">http://www.kostis.net/charsets/symbol.htm</a>&rsquo;.</p>
 </td></tr>
 <tr valign=top><td><b>FT_ENCODING_SJIS</b></td><td>
-<p>Corresponds to Japanese SJIS encoding. More info at at &lsquo;http://langsupport.japanreference.com/encoding.shtml&rsquo;. See note on multi-byte encodings below.</p>
+<p>Corresponds to Japanese SJIS encoding. More info at at &lsquo;<a href="http://en.wikipedia.org/wiki/Shift_JIS">http://en.wikipedia.org/wiki/Shift_JIS</a>&rsquo;. See note on multi-byte encodings below.</p>
 </td></tr>
 <tr valign=top><td><b>FT_ENCODING_GB2312</b></td><td>
 <p>Corresponds to an encoding system for Simplified Chinese as used used in mainland China.</p>
@@ -273,7 +273,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>Corresponds to an encoding system for Traditional Chinese as used in Taiwan and Hong Kong.</p>
 </td></tr>
 <tr valign=top><td><b>FT_ENCODING_WANSUNG</b></td><td>
-<p>Corresponds to the Korean encoding system known as Wansung. For more information see &lsquo;http://www.microsoft.com/typography/unicode/949.txt&rsquo;.</p>
+<p>Corresponds to the Korean encoding system known as Wansung. For more information see &lsquo;<a href="http://msdn.microsoft.com/en-US/goglobal/cc305154">http://msdn.microsoft.com/en-US/goglobal/cc305154</a>&rsquo;.</p>
 </td></tr>
 <tr valign=top><td><b>FT_ENCODING_JOHAB</b></td><td>
 <p>The Korean standard character set (KS&nbsp;C 5601-1992), which corresponds to MS Windows code page 1361. This character set includes all possible Hangeul character combinations.</p>
@@ -324,8 +324,8 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>FT_ENCODING_NONE is set by the BDF and PCF drivers if the charmap is neither Unicode nor ISO-8859-1 (otherwise it is set to FT_ENCODING_UNICODE). Use <a href="ft2-bdf_fonts.html#FT_Get_BDF_Charset_ID">FT_Get_BDF_Charset_ID</a> to find out which encoding is really present. If, for example, the &lsquo;cs_registry&rsquo; field is &lsquo;KOI8&rsquo; and the &lsquo;cs_encoding&rsquo; field is &lsquo;R&rsquo;, the font is encoded in KOI8-R.</p>
 <p>FT_ENCODING_NONE is always set (with a single exception) by the winfonts driver. Use <a href="ft2-winfnt_fonts.html#FT_Get_WinFNT_Header">FT_Get_WinFNT_Header</a> and examine the &lsquo;charset&rsquo; field of the <a href="ft2-winfnt_fonts.html#FT_WinFNT_HeaderRec">FT_WinFNT_HeaderRec</a> structure to find out which encoding is really present. For example, <a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1251</a> (204) means Windows code page 1251 (for Russian).</p>
 <p>FT_ENCODING_NONE is set if &lsquo;platform_id&rsquo; is <a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_MACINTOSH</a> and &lsquo;encoding_id&rsquo; is not <a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ROMAN</a> (otherwise it is set to FT_ENCODING_APPLE_ROMAN).</p>
-<p>If &lsquo;platform_id&rsquo; is <a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_MACINTOSH</a>, use the function <a href="ft2-truetype_tables.html#FT_Get_CMap_Language_ID">FT_Get_CMap_Language_ID</a> to query the Mac language ID which may be needed to be able to distinguish Apple encoding variants. See</p>
-<p>http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/README.TXT</p>
+<p>If &lsquo;platform_id&rsquo; is <a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_MACINTOSH</a>, use the function <a href="ft2-truetype_tables.html#FT_Get_CMap_Language_ID">FT_Get_CMap_Language_ID</a> to query the Mac language ID that may be needed to be able to distinguish Apple encoding variants. See</p>
+<p><a href="http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/Readme.txt">http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/Readme.txt</a></p>
 <p>to get an idea how to do that. Basically, if the language ID is&nbsp;0, don't use it, otherwise subtract 1 from the language ID. Then examine &lsquo;encoding_id&rsquo;. If, for example, &lsquo;encoding_id&rsquo; is <a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ROMAN</a> and the language ID (minus&nbsp;1) is &lsquo;TT_MAC_LANGID_GREEK&rsquo;, it is the Greek encoding, not Roman. <a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ARABIC</a> with &lsquo;TT_MAC_LANGID_FARSI&rsquo; means the Farsi variant the Arabic encoding.</p>
 </td></tr></table>
 </td></tr></table>
@@ -337,7 +337,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph_Metrics">FT_Glyph_Metrics</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -402,7 +402,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Bitmap_Size">FT_Bitmap_Size</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -455,7 +455,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Module">FT_Module</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -474,7 +474,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Driver">FT_Driver</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -493,7 +493,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Renderer">FT_Renderer</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -512,7 +512,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ENC_TAG">FT_ENC_TAG</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -545,7 +545,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="ft_encoding_xxx">ft_encoding_xxx</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -578,7 +578,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_CharMapRec">FT_CharMapRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -621,7 +621,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Face_Internal">FT_Face_Internal</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -641,7 +641,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_FaceRec">FT_FaceRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -727,10 +727,10 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>For CID-keyed fonts, this value gives the highest CID used in the font.</p>
 </td></tr>
 <tr valign=top><td><b>family_name</b></td><td>
-<p>The face's family name. This is an ASCII string, usually in English, which describes the typeface's family (like &lsquo;Times New Roman&rsquo;, &lsquo;Bodoni&rsquo;, &lsquo;Garamond&rsquo;, etc). This is a least common denominator used to list fonts. Some formats (TrueType &amp; OpenType) provide localized and Unicode versions of this string. Applications should use the format specific interface to access them. Can be NULL (e.g., in fonts embedded in a PDF file).</p>
+<p>The face's family name. This is an ASCII string, usually in English, that describes the typeface's family (like &lsquo;Times New Roman&rsquo;, &lsquo;Bodoni&rsquo;, &lsquo;Garamond&rsquo;, etc). This is a least common denominator used to list fonts. Some formats (TrueType &amp; OpenType) provide localized and Unicode versions of this string. Applications should use the format specific interface to access them. Can be NULL (e.g., in fonts embedded in a PDF file).</p>
 </td></tr>
 <tr valign=top><td><b>style_name</b></td><td>
-<p>The face's style name. This is an ASCII string, usually in English, which describes the typeface's style (like &lsquo;Italic&rsquo;, &lsquo;Bold&rsquo;, &lsquo;Condensed&rsquo;, etc). Not all font formats provide a style name, so this field is optional, and can be set to NULL. As for &lsquo;family_name&rsquo;, some formats provide localized and Unicode versions of this string. Applications should use the format specific interface to access them.</p>
+<p>The face's style name. This is an ASCII string, usually in English, that describes the typeface's style (like &lsquo;Italic&rsquo;, &lsquo;Bold&rsquo;, &lsquo;Condensed&rsquo;, etc). Not all font formats provide a style name, so this field is optional, and can be set to NULL. As for &lsquo;family_name&rsquo;, some formats provide localized and Unicode versions of this string. Applications should use the format specific interface to access them.</p>
 </td></tr>
 <tr valign=top><td><b>num_fixed_sizes</b></td><td>
 <p>The number of bitmap strikes in the face. Even if the face is scalable, there might still be bitmap strikes, which are called &lsquo;sbits&rsquo; in that case.</p>
@@ -799,7 +799,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_FACE_FLAG_XXX">FT_FACE_FLAG_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -817,6 +817,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 #define <a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_HINTER</a>            ( 1L &lt;&lt; 11 )
 #define <a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_CID_KEYED</a>         ( 1L &lt;&lt; 12 )
 #define <a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_TRICKY</a>            ( 1L &lt;&lt; 13 )
+#define <a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_COLOR</a>             ( 1L &lt;&lt; 14 )
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -870,13 +871,16 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </td></tr>
 <tr valign=top><td><b>FT_FACE_FLAG_CID_KEYED</b></td><td>
 <p>Set if the font is CID-keyed. In that case, the font is not accessed by glyph indices but by CID values. For subsetted CID-keyed fonts this has the consequence that not all index values are a valid argument to FT_Load_Glyph. Only the CID values for which corresponding glyphs in the subsetted font exist make FT_Load_Glyph return successfully; in all other cases you get an &lsquo;FT_Err_Invalid_Argument&rsquo; error.</p>
-<p>Note that CID-keyed fonts which are in an SFNT wrapper don't have this flag set since the glyphs are accessed in the normal way (using contiguous indices); the &lsquo;CID-ness&rsquo; isn't visible to the application.</p>
+<p>Note that CID-keyed fonts that are in an SFNT wrapper don't have this flag set since the glyphs are accessed in the normal way (using contiguous indices); the &lsquo;CID-ness&rsquo; isn't visible to the application.</p>
 </td></tr>
 <tr valign=top><td><b>FT_FACE_FLAG_TRICKY</b></td><td>
-<p>Set if the font is &lsquo;tricky&rsquo;, this is, it always needs the font format's native hinting engine to get a reasonable result. A typical example is the Chinese font &lsquo;mingli.ttf&rsquo; which uses TrueType bytecode instructions to move and scale all of its subglyphs.</p>
+<p>Set if the font is &lsquo;tricky&rsquo;, this is, it always needs the font format's native hinting engine to get a reasonable result. A typical example is the Chinese font &lsquo;mingli.ttf&rsquo; that uses TrueType bytecode instructions to move and scale all of its subglyphs.</p>
 <p>It is not possible to autohint such fonts using <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_FORCE_AUTOHINT</a>; it will also ignore <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_HINTING</a>. You have to set both <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_HINTING</a> and <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_AUTOHINT</a> to really disable hinting; however, you probably never want this except for demonstration purposes.</p>
 <p>Currently, there are about a dozen TrueType fonts in the list of tricky fonts; they are hard-coded in file &lsquo;ttobjs.c&rsquo;.</p>
 </td></tr>
+<tr valign=top><td><b>FT_FACE_FLAG_COLOR</b></td><td>
+<p>Set if the font has color glyph tables. To access color glyphs use <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_COLOR</a>.</p>
+</td></tr>
 </table>
 </td></tr></table>
 </td></tr></table>
@@ -888,7 +892,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_HAS_HORIZONTAL">FT_HAS_HORIZONTAL</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -911,7 +915,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_HAS_VERTICAL">FT_HAS_VERTICAL</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -931,7 +935,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_HAS_KERNING">FT_HAS_KERNING</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -951,7 +955,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_IS_SCALABLE">FT_IS_SCALABLE</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -971,7 +975,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_IS_SFNT">FT_IS_SFNT</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -992,7 +996,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_IS_FIXED_WIDTH">FT_IS_FIXED_WIDTH</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1012,7 +1016,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_HAS_FIXED_SIZES">FT_HAS_FIXED_SIZES</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1032,7 +1036,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_HAS_FAST_GLYPHS">FT_HAS_FAST_GLYPHS</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1051,7 +1055,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_HAS_GLYPH_NAMES">FT_HAS_GLYPH_NAMES</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1071,7 +1075,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_HAS_MULTIPLE_MASTERS">FT_HAS_MULTIPLE_MASTERS</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1091,7 +1095,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_IS_CID_KEYED">FT_IS_CID_KEYED</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1112,7 +1116,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_IS_TRICKY">FT_IS_TRICKY</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1130,9 +1134,29 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
 
 <table align=center width="75%"><tr><td>
+<h4><a name="FT_HAS_COLOR">FT_HAS_COLOR</a></h4>
+<table align=center width="87%"><tr><td>
+Defined in FT_FREETYPE_H (freetype.h).
+</td></tr></table><br>
+<table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
+
+#define <b>FT_HAS_COLOR</b>( face ) \
+          ( face-&gt;face_flags &amp; <a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_COLOR</a> )
+
+</pre></table><br>
+<table align=center width="87%"><tr><td>
+<p>A macro that returns true whenever a face object contains tables for color glyphs.</p>
+</td></tr></table><br>
+</td></tr></table>
+<hr width="75%">
+<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
+<td width="100%"></td>
+<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
+
+<table align=center width="75%"><tr><td>
 <h4><a name="FT_STYLE_FLAG_XXX">FT_STYLE_FLAG_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1166,7 +1190,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Size_Internal">FT_Size_Internal</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1185,7 +1209,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Size_Metrics">FT_Size_Metrics</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1252,7 +1276,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_SizeRec">FT_SizeRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1276,7 +1300,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>Handle to the parent face object.</p>
 </td></tr>
 <tr valign=top><td><b>generic</b></td><td>
-<p>A typeless pointer, which is unused by the FreeType library or any of its drivers. It can be used by client applications to link their own data to each size object.</p>
+<p>A typeless pointer, unused by the FreeType library or any of its drivers. It can be used by client applications to link their own data to each size object.</p>
 </td></tr>
 <tr valign=top><td><b>metrics</b></td><td>
 <p>Metrics for this size object. This field is read-only.</p>
@@ -1292,7 +1316,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_SubGlyph">FT_SubGlyph</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1315,7 +1339,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Slot_Internal">FT_Slot_Internal</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1334,7 +1358,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_GlyphSlotRec">FT_GlyphSlotRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1391,7 +1415,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>In some cases (like some font tools), several glyph slots per face object can be a good thing. As this is rare, the glyph slots are listed through a direct, single-linked list using its &lsquo;next&rsquo; field.</p>
 </td></tr>
 <tr valign=top><td><b>generic</b></td><td>
-<p>A typeless pointer which is unused by the FreeType library or any of its drivers. It can be used by client applications to link their own data to each glyph slot object.</p>
+<p>A typeless pointer unused by the FreeType library or any of its drivers. It can be used by client applications to link their own data to each glyph slot object.</p>
 </td></tr>
 <tr valign=top><td><b>metrics</b></td><td>
 <p>The metrics of the last loaded glyph in the slot. The returned values depend on the last load flags (see the <a href="ft2-base_interface.html#FT_Load_Glyph">FT_Load_Glyph</a> API function) and can be expressed either in 26.6 fractional pixels or font units.</p>
@@ -1404,7 +1428,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>The advance height of the unhinted glyph. Its value is expressed in 16.16 fractional pixels, unless <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_LINEAR_DESIGN</a> is set when loading the glyph. This field can be important to perform correct WYSIWYG layout. Only relevant for outline glyphs.</p>
 </td></tr>
 <tr valign=top><td><b>advance</b></td><td>
-<p>This shorthand is, depending on <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_TRANSFORM</a>, the transformed advance width for the glyph (in 26.6 fractional pixel format). As specified with <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_VERTICAL_LAYOUT</a>, it uses either the &lsquo;horiAdvance&rsquo; or the &lsquo;vertAdvance&rsquo; value of &lsquo;metrics&rsquo; field.</p>
+<p>This shorthand is, depending on <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_TRANSFORM</a>, the transformed (hinted) advance width for the glyph, in 26.6 fractional pixel format. As specified with <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_VERTICAL_LAYOUT</a>, it uses either the &lsquo;horiAdvance&rsquo; or the &lsquo;vertAdvance&rsquo; value of &lsquo;metrics&rsquo; field.</p>
 </td></tr>
 <tr valign=top><td><b>format</b></td><td>
 <p>This field indicates the format of the image contained in the glyph slot. Typically <a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_BITMAP</a>, <a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_OUTLINE</a>, or <a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_COMPOSITE</a>, but others are possible.</p>
@@ -1451,7 +1475,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>Note that &lsquo;slot-&gt;bitmap_left&rsquo; and &lsquo;slot-&gt;bitmap_top&rsquo; are also used to specify the position of the bitmap relative to the current pen position (e.g., coordinates (0,0) on the baseline). Of course, &lsquo;slot-&gt;format&rsquo; is also changed to <a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_BITMAP</a>.</p>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>Here a small pseudo code fragment which shows how to use &lsquo;lsb_delta&rsquo; and &lsquo;rsb_delta&rsquo;:</p>
+<p>Here a small pseudo code fragment that shows how to use &lsquo;lsb_delta&rsquo; and &lsquo;rsb_delta&rsquo;:</p>
 <pre class="colored">
   FT_Pos  origin_x       = 0;                                      
   FT_Pos  prev_rsb_delta = 0;                                      
@@ -1485,7 +1509,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Init_FreeType">FT_Init_FreeType</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1521,7 +1545,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Done_FreeType">FT_Done_FreeType</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1552,7 +1576,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_OPEN_XXX">FT_OPEN_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1619,7 +1643,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Parameter">FT_Parameter</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1657,7 +1681,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Open_Args">FT_Open_Args</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1708,7 +1732,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </table>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>The stream type is determined by the contents of &lsquo;flags&rsquo; which are tested in the following order by <a href="ft2-base_interface.html#FT_Open_Face">FT_Open_Face</a>:</p>
+<p>The stream type is determined by the contents of &lsquo;flags&rsquo; that are tested in the following order by <a href="ft2-base_interface.html#FT_Open_Face">FT_Open_Face</a>:</p>
 <p>If the &lsquo;FT_OPEN_MEMORY&rsquo; bit is set, assume that this is a memory file of &lsquo;memory_size&rsquo; bytes, located at &lsquo;memory_address&rsquo;. The data are are not copied, and the client is responsible for releasing and destroying them <i>after</i> the corresponding call to <a href="ft2-base_interface.html#FT_Done_Face">FT_Done_Face</a>.</p>
 <p>Otherwise, if the &lsquo;FT_OPEN_STREAM&rsquo; bit is set, assume that a custom input stream &lsquo;stream&rsquo; is used.</p>
 <p>Otherwise, if the &lsquo;FT_OPEN_PATHNAME&rsquo; bit is set, assume that this is a normal file and use &lsquo;pathname&rsquo; to open it.</p>
@@ -1725,7 +1749,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_New_Face">FT_New_Face</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1781,7 +1805,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_New_Memory_Face">FT_New_Memory_Face</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1794,7 +1818,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>This function calls <a href="ft2-base_interface.html#FT_Open_Face">FT_Open_Face</a> to open a font which has been loaded into memory.</p>
+<p>This function calls <a href="ft2-base_interface.html#FT_Open_Face">FT_Open_Face</a> to open a font that has been loaded into memory.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>inout</b></em></td></tr><tr><td>
 <p></p>
@@ -1841,7 +1865,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Open_Face">FT_Open_Face</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1867,7 +1891,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p></p>
 <table cellpadding=3 border=0>
 <tr valign=top><td><b>args</b></td><td>
-<p>A pointer to an &lsquo;FT_Open_Args&rsquo; structure which must be filled by the caller.</p>
+<p>A pointer to an &lsquo;FT_Open_Args&rsquo; structure that must be filled by the caller.</p>
 </td></tr>
 <tr valign=top><td><b>face_index</b></td><td>
 <p>The index of the face within the font. The first face has index&nbsp;0.</p>
@@ -1886,8 +1910,8 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>FreeType error code. 0&nbsp;means success.</p>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>Unlike FreeType 1.x, this function automatically creates a glyph slot for the face object which can be accessed directly through &lsquo;face-&gt;glyph&rsquo;.</p>
-<p>FT_Open_Face can be used to quickly check whether the font format of a given font resource is supported by FreeType. If the &lsquo;face_index&rsquo; field is negative, the function's return value is&nbsp;0 if the font format is recognized, or non-zero otherwise; the function returns a more or less empty face handle in &lsquo;*aface&rsquo; (if &lsquo;aface&rsquo; isn't NULL). The only useful field in this special case is &lsquo;face-&gt;num_faces&rsquo; which gives the number of faces within the font file. After examination, the returned <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure should be deallocated with a call to <a href="ft2-base_interface.html#FT_Done_Face">FT_Done_Face</a>.</p>
+<p>Unlike FreeType 1.x, this function automatically creates a glyph slot for the face object that can be accessed directly through &lsquo;face-&gt;glyph&rsquo;.</p>
+<p>FT_Open_Face can be used to quickly check whether the font format of a given font resource is supported by FreeType. If the &lsquo;face_index&rsquo; field is negative, the function's return value is&nbsp;0 if the font format is recognized, or non-zero otherwise; the function returns a more or less empty face handle in &lsquo;*aface&rsquo; (if &lsquo;aface&rsquo; isn't NULL). The only useful field in this special case is &lsquo;face-&gt;num_faces&rsquo; that gives the number of faces within the font file. After examination, the returned <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure should be deallocated with a call to <a href="ft2-base_interface.html#FT_Done_Face">FT_Done_Face</a>.</p>
 <p>Each new face object created with this function also owns a default <a href="ft2-base_interface.html#FT_Size">FT_Size</a> object, accessible as &lsquo;face-&gt;size&rsquo;.</p>
 <p>One <a href="ft2-base_interface.html#FT_Library">FT_Library</a> instance can have multiple face objects, this is, <a href="ft2-base_interface.html#FT_Open_Face">FT_Open_Face</a> and its siblings can be called multiple times using the same &lsquo;library&rsquo; argument.</p>
 <p>See the discussion of reference counters in the description of <a href="ft2-base_interface.html#FT_Reference_Face">FT_Reference_Face</a>.</p>
@@ -1901,7 +1925,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Attach_File">FT_Attach_File</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1941,7 +1965,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Attach_Stream">FT_Attach_Stream</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1965,7 +1989,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p></p>
 <table cellpadding=3 border=0>
 <tr valign=top><td><b>parameters</b></td><td>
-<p>A pointer to <a href="ft2-base_interface.html#FT_Open_Args">FT_Open_Args</a> which must be filled by the caller.</p>
+<p>A pointer to <a href="ft2-base_interface.html#FT_Open_Args">FT_Open_Args</a> that must be filled by the caller.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -1985,7 +2009,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Reference_Face">FT_Reference_Face</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1995,7 +2019,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </pre></table><br>
 <table align=center width="87%"><tr><td>
 <p>A counter gets initialized to&nbsp;1 at the time an <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure is created. This function increments the counter. <a href="ft2-base_interface.html#FT_Done_Face">FT_Done_Face</a> then only destroys a face if the counter is&nbsp;1, otherwise it simply decrements the counter.</p>
-<p>This function helps in managing life-cycles of structures which reference <a href="ft2-base_interface.html#FT_Face">FT_Face</a> objects.</p>
+<p>This function helps in managing life-cycles of structures that reference <a href="ft2-base_interface.html#FT_Face">FT_Face</a> objects.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -2020,7 +2044,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Done_Face">FT_Done_Face</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2054,7 +2078,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Select_Size">FT_Select_Size</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2094,7 +2118,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Size_Request_Type">FT_Size_Request_Type</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2152,7 +2176,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Size_RequestRec">FT_Size_RequestRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2202,7 +2226,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Size_Request">FT_Size_Request</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2221,7 +2245,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Request_Size">FT_Request_Size</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2254,7 +2278,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>Although drivers may select the bitmap strike matching the request, you should not rely on this if you intend to select a particular bitmap strike. Use <a href="ft2-base_interface.html#FT_Select_Size">FT_Select_Size</a> instead in that case.</p>
-<p>The relation between the requested size and the resulting glyph size is dependent entirely on how the size is defined in the source face. The font designer chooses the final size of each glyph relative to this size. For more information refer to &lsquo;http://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html&rsquo;</p>
+<p>The relation between the requested size and the resulting glyph size is dependent entirely on how the size is defined in the source face. The font designer chooses the final size of each glyph relative to this size. For more information refer to &lsquo;<a href="http://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html">http://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html</a>&rsquo;</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -2265,7 +2289,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_Char_Size">FT_Set_Char_Size</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2323,7 +2347,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_Pixel_Sizes">FT_Set_Pixel_Sizes</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2370,7 +2394,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Load_Glyph">FT_Load_Glyph</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2407,7 +2431,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>The loaded glyph may be transformed. See <a href="ft2-base_interface.html#FT_Set_Transform">FT_Set_Transform</a> for the details.</p>
-<p>For subsetted CID-keyed fonts, &lsquo;FT_Err_Invalid_Argument&rsquo; is returned for invalid CID values (this is, for CID values which don't have a corresponding glyph in the font). See the discussion of the <a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_CID_KEYED</a> flag for more details.</p>
+<p>For subsetted CID-keyed fonts, &lsquo;FT_Err_Invalid_Argument&rsquo; is returned for invalid CID values (this is, for CID values that don't have a corresponding glyph in the font). See the discussion of the <a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_CID_KEYED</a> flag for more details.</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -2418,7 +2442,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Load_Char">FT_Load_Char</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2465,7 +2489,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_LOAD_XXX">FT_LOAD_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2575,7 +2599,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2616,7 +2640,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>You should use only <i>one</i> of the FT_LOAD_TARGET_XXX values in your &lsquo;load_flags&rsquo;. They can't be ORed.</p>
-<p>If <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_RENDER</a> is also set, the glyph is rendered in the corresponding mode (i.e., the mode which matches the used algorithm best). An exeption is FT_LOAD_TARGET_MONO since it implies <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_MONOCHROME</a>.</p>
+<p>If <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_RENDER</a> is also set, the glyph is rendered in the corresponding mode (i.e., the mode that matches the used algorithm best). An exeption is FT_LOAD_TARGET_MONO since it implies <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_MONOCHROME</a>.</p>
 <p>You can use a hinting algorithm that doesn't correspond to the same rendering mode. As an example, it is possible to use the &lsquo;light&rsquo; hinting algorithm and have the results rendered in horizontal LCD pixel mode, with code like</p>
 <pre class="colored">
   FT_Load_Glyph( face, glyph_index,
@@ -2634,7 +2658,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_LOAD_TARGET_MODE">FT_LOAD_TARGET_MODE</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2653,7 +2677,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_Transform">FT_Set_Transform</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2698,7 +2722,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Render_Mode">FT_Render_Mode</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2753,7 +2777,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="ft_render_mode_xxx">ft_render_mode_xxx</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2784,7 +2808,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Render_Glyph">FT_Render_Glyph</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2824,7 +2848,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Kerning_Mode">FT_Kerning_Mode</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2863,7 +2887,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="ft_kerning_default">ft_kerning_default</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2882,7 +2906,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="ft_kerning_unfitted">ft_kerning_unfitted</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2901,7 +2925,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="ft_kerning_unscaled">ft_kerning_unscaled</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2920,7 +2944,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Kerning">FT_Get_Kerning</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -2975,7 +2999,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Track_Kerning">FT_Get_Track_Kerning</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3027,7 +3051,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Glyph_Name">FT_Get_Glyph_Name</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3070,7 +3094,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>An error is returned if the face doesn't provide glyph names or if the glyph index is invalid. In all cases of failure, the first byte of &lsquo;buffer&rsquo; is set to&nbsp;0 to indicate an empty name.</p>
 <p>The glyph name is truncated to fit within the buffer if it is too long. The returned string is always zero-terminated.</p>
 <p>Be aware that FreeType reorders glyph indices internally so that glyph index&nbsp;0 always corresponds to the &lsquo;missing glyph&rsquo; (called &lsquo;.notdef&rsquo;).</p>
-<p>This function is not compiled within the library if the config macro &lsquo;FT_CONFIG_OPTION_NO_GLYPH_NAMES&rsquo; is defined in &lsquo;include/freetype/config/ftoptions.h&rsquo;.</p>
+<p>This function is not compiled within the library if the config macro &lsquo;FT_CONFIG_OPTION_NO_GLYPH_NAMES&rsquo; is defined in &lsquo;ftoptions.h&rsquo;.</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -3081,7 +3105,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Postscript_Name">FT_Get_Postscript_Name</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3115,7 +3139,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Select_Charmap">FT_Select_Charmap</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3148,7 +3172,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>This function returns an error if no charmap in the face corresponds to the encoding queried here.</p>
-<p>Because many fonts contain more than a single cmap for Unicode encoding, this function has some special code to select the one which covers Unicode best (&lsquo;best&rsquo; in the sense that a UCS-4 cmap is preferred to a UCS-2 cmap). It is thus preferable to <a href="ft2-base_interface.html#FT_Set_Charmap">FT_Set_Charmap</a> in this case.</p>
+<p>Because many fonts contain more than a single cmap for Unicode encoding, this function has some special code to select the one that covers Unicode best (&lsquo;best&rsquo; in the sense that a UCS-4 cmap is preferred to a UCS-2 cmap). It is thus preferable to <a href="ft2-base_interface.html#FT_Set_Charmap">FT_Set_Charmap</a> in this case.</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -3159,7 +3183,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_Charmap">FT_Set_Charmap</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3203,7 +3227,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Charmap_Index">FT_Get_Charmap_Index</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3234,7 +3258,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Char_Index">FT_Get_Char_Index</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3272,7 +3296,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_First_Char">FT_Get_First_Char</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3329,7 +3353,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Next_Char">FT_Get_Next_Char</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3377,7 +3401,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Name_Index">FT_Get_Name_Index</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3412,7 +3436,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3468,7 +3492,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_SubGlyph_Info">FT_Get_SubGlyph_Info</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3531,7 +3555,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_FSTYPE_XXX">FT_FSTYPE_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3545,7 +3569,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </pre></table><br>
 <table align=center width="87%"><tr><td>
 <p>A list of bit flags used in the &lsquo;fsType&rsquo; field of the OS/2 table in a TrueType or OpenType font and the &lsquo;FSType&rsquo; entry in a PostScript font. These bit flags are returned by <a href="ft2-base_interface.html#FT_Get_FSType_Flags">FT_Get_FSType_Flags</a>; they inform client applications of embedding and subsetting restrictions associated with a font.</p>
-<p>See http://www.adobe.com/devnet/acrobat/pdfs/FontPolicies.pdf for more details.</p>
+<p>See <a href="http://www.adobe.com/devnet/acrobat/pdfs/FontPolicies.pdf">http://www.adobe.com/devnet/acrobat/pdfs/FontPolicies.pdf</a> for more details.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>values</b></em></td></tr><tr><td>
 <p></p>
@@ -3588,7 +3612,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_FSType_Flags">FT_Get_FSType_Flags</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -3611,7 +3635,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>The fsType flags, <a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_XXX</a>.</p>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>Use this function rather than directly reading the &lsquo;fs_type&rsquo; field in the <a href="ft2-type1_tables.html#PS_FontInfoRec">PS_FontInfoRec</a> structure which is only guaranteed to return the correct results for Type&nbsp;1 fonts.</p>
+<p>Use this function rather than directly reading the &lsquo;fs_type&rsquo; field in the <a href="ft2-type1_tables.html#PS_FontInfoRec">PS_FontInfoRec</a> structure, which is only guaranteed to return the correct results for Type&nbsp;1 fonts.</p>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>since</b></em></td></tr><tr><td>
 <p>2.3.8</p>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-basic_types.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-basic_types.html
index 9ff0f736f57..5fee28c79a3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-basic_types.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-basic_types.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Basic Data Types
@@ -65,7 +65,7 @@ Basic Data Types
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Byte">FT_Byte</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -84,7 +84,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Bytes">FT_Bytes</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -103,7 +103,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Char">FT_Char</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -122,7 +122,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Int">FT_Int</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -141,7 +141,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_UInt">FT_UInt</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -160,7 +160,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Int16">FT_Int16</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
+Defined in FT_CONFIG_CONFIG_H (config/ftconfig.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -179,7 +179,7 @@ Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_UInt16">FT_UInt16</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
+Defined in FT_CONFIG_CONFIG_H (config/ftconfig.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -198,7 +198,7 @@ Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Int32">FT_Int32</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
+Defined in FT_CONFIG_CONFIG_H (config/ftconfig.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -217,7 +217,7 @@ Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_UInt32">FT_UInt32</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
+Defined in FT_CONFIG_CONFIG_H (config/ftconfig.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -233,7 +233,7 @@ Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Short">FT_Short</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -252,7 +252,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_UShort">FT_UShort</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -271,7 +271,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Long">FT_Long</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -290,7 +290,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ULong">FT_ULong</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -309,7 +309,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Bool">FT_Bool</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -328,7 +328,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Offset">FT_Offset</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -347,7 +347,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_PtrDist">FT_PtrDist</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -366,7 +366,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_String">FT_String</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -385,7 +385,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Tag">FT_Tag</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -404,7 +404,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Error">FT_Error</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -423,7 +423,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Fixed">FT_Fixed</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -442,7 +442,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Pointer">FT_Pointer</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -461,7 +461,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Pos">FT_Pos</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -480,7 +480,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Vector">FT_Vector</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -515,7 +515,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_BBox">FT_BBox</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -561,7 +561,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Matrix">FT_Matrix</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -606,7 +606,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_FWord">FT_FWord</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -625,7 +625,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_UFWord">FT_UFWord</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -644,7 +644,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_F2Dot14">FT_F2Dot14</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -663,7 +663,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_UnitVector">FT_UnitVector</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -698,7 +698,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_F26Dot6">FT_F26Dot6</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -717,7 +717,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Pixel_Mode">FT_Pixel_Mode</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -778,7 +778,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="ft_pixel_mode_xxx">ft_pixel_mode_xxx</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -821,7 +821,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Palette_Mode">FT_Palette_Mode</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -862,7 +862,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Bitmap">FT_Bitmap</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -927,7 +927,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_IMAGE_TAG">FT_IMAGE_TAG</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -959,7 +959,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph_Format">FT_Glyph_Format</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1010,7 +1010,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="ft_glyph_format_xxx">ft_glyph_format_xxx</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1056,7 +1056,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Data">FT_Data</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1091,7 +1091,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Generic_Finalizer">FT_Generic_Finalizer</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1102,7 +1102,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <p>Describe a function used to destroy the &lsquo;client&rsquo; data of any FreeType object. See the description of the <a href="ft2-basic_types.html#FT_Generic">FT_Generic</a> type for details of usage.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
-<p>The address of the FreeType object which is under finalization. Its client data is accessed through its &lsquo;generic&rsquo; field.</p>
+<p>The address of the FreeType object that is under finalization. Its client data is accessed through its &lsquo;generic&rsquo; field.</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -1113,7 +1113,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Generic">FT_Generic</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1150,7 +1150,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_MAKE_TAG">FT_MAKE_TAG</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1163,7 +1163,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>This macro converts four-letter tags which are used to label TrueType tables into an unsigned long to be used within FreeType.</p>
+<p>This macro converts four-letter tags that are used to label TrueType tables into an unsigned long, to be used within FreeType.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>The produced values <b>must</b> be 32-bit integers. Don't redefine this macro.</p>
@@ -1177,7 +1177,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Int64">FT_Int64</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
+Defined in FT_CONFIG_CONFIG_H (config/ftconfig.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1193,7 +1193,7 @@ Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_UInt64">FT_UInt64</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h).
+Defined in FT_CONFIG_CONFIG_H (config/ftconfig.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-bdf_fonts.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-bdf_fonts.html
index ecf25412d73..6def92bbe08 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-bdf_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-bdf_fonts.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 BDF and PCF Files
@@ -52,7 +52,7 @@ BDF and PCF Files
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_PropertyType">FT_PropertyType</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BDF_H (freetype/ftbdf.h).
+Defined in FT_BDF_H (ftbdf.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -97,7 +97,7 @@ Defined in FT_BDF_H (freetype/ftbdf.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="BDF_Property">BDF_Property</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BDF_H (freetype/ftbdf.h).
+Defined in FT_BDF_H (ftbdf.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -116,7 +116,7 @@ Defined in FT_BDF_H (freetype/ftbdf.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="BDF_PropertyRec">BDF_PropertyRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BDF_H (freetype/ftbdf.h).
+Defined in FT_BDF_H (ftbdf.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -162,7 +162,7 @@ Defined in FT_BDF_H (freetype/ftbdf.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_BDF_Charset_ID">FT_Get_BDF_Charset_ID</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BDF_H (freetype/ftbdf.h).
+Defined in FT_BDF_H (ftbdf.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -209,7 +209,7 @@ Defined in FT_BDF_H (freetype/ftbdf.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_BDF_Property">FT_Get_BDF_Property</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BDF_H (freetype/ftbdf.h).
+Defined in FT_BDF_H (ftbdf.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-bitmap_handling.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-bitmap_handling.html
index 8f18bebf5d4..1d0c250377e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-bitmap_handling.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-bitmap_handling.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Bitmap Handling
@@ -52,7 +52,7 @@ Bitmap Handling
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Bitmap_New">FT_Bitmap_New</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BITMAP_H (freetype/ftbitmap.h).
+Defined in FT_BITMAP_H (ftbitmap.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -80,7 +80,7 @@ Defined in FT_BITMAP_H (freetype/ftbitmap.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Bitmap_Copy">FT_Bitmap_Copy</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BITMAP_H (freetype/ftbitmap.h).
+Defined in FT_BITMAP_H (ftbitmap.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -124,7 +124,7 @@ Defined in FT_BITMAP_H (freetype/ftbitmap.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Bitmap_Embolden">FT_Bitmap_Embolden</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BITMAP_H (freetype/ftbitmap.h).
+Defined in FT_BITMAP_H (ftbitmap.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -176,7 +176,7 @@ Defined in FT_BITMAP_H (freetype/ftbitmap.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Bitmap_Convert">FT_Bitmap_Convert</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BITMAP_H (freetype/ftbitmap.h).
+Defined in FT_BITMAP_H (ftbitmap.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -229,7 +229,7 @@ Defined in FT_BITMAP_H (freetype/ftbitmap.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_GlyphSlot_Own_Bitmap">FT_GlyphSlot_Own_Bitmap</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BITMAP_H (freetype/ftbitmap.h).
+Defined in FT_BITMAP_H (ftbitmap.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -263,7 +263,7 @@ Defined in FT_BITMAP_H (freetype/ftbitmap.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Bitmap_Done">FT_Bitmap_Done</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BITMAP_H (freetype/ftbitmap.h).
+Defined in FT_BITMAP_H (ftbitmap.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-bzip2.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-bzip2.html
index 39e898c5e82..7548b85a9b2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-bzip2.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-bzip2.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 BZIP2 Streams
@@ -51,7 +51,7 @@ BZIP2 Streams
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stream_OpenBzip2">FT_Stream_OpenBzip2</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BZIP2_H (freetype/ftbzip2.h).
+Defined in FT_BZIP2_H (ftbzip2.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-cache_subsystem.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-cache_subsystem.html
index ae22194061a..62384a592e8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-cache_subsystem.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-cache_subsystem.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Cache Sub-System
@@ -76,7 +76,7 @@ Cache Sub-System
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Manager">FTC_Manager</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -98,7 +98,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_FaceID">FTC_FaceID</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -111,7 +111,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>Never use NULL as a valid <a href="ft2-cache_subsystem.html#FTC_FaceID">FTC_FaceID</a>.</p>
-<p>Face IDs are passed by the client to the cache manager, which calls, when needed, the <a href="ft2-cache_subsystem.html#FTC_Face_Requester">FTC_Face_Requester</a> to translate them into new <a href="ft2-base_interface.html#FT_Face">FT_Face</a> objects.</p>
+<p>Face IDs are passed by the client to the cache manager that calls, when needed, the <a href="ft2-cache_subsystem.html#FTC_Face_Requester">FTC_Face_Requester</a> to translate them into new <a href="ft2-base_interface.html#FT_Face">FT_Face</a> objects.</p>
 <p>If the content of a given face ID changes at runtime, or if the value becomes invalid (e.g., when uninstalling a font), you should immediately call <a href="ft2-cache_subsystem.html#FTC_Manager_RemoveFaceID">FTC_Manager_RemoveFaceID</a> before any other cache function.</p>
 <p>Failure to do so will result in incorrect behaviour or even memory leaks and crashes.</p>
 </td></tr></table>
@@ -124,7 +124,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Face_Requester">FTC_Face_Requester</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -176,7 +176,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Node">FTC_Node</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -197,7 +197,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Manager_New">FTC_Manager_New</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -257,7 +257,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Manager_Reset">FTC_Manager_Reset</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -285,7 +285,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Manager_Done">FTC_Manager_Done</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -313,7 +313,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Manager_LookupFace">FTC_Manager_LookupFace</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -364,7 +364,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_ScalerRec">FTC_ScalerRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -418,7 +418,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Scaler">FTC_Scaler</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -437,7 +437,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Manager_LookupSize">FTC_Manager_LookupSize</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -489,7 +489,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Node_Unref">FTC_Node_Unref</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -521,7 +521,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_Manager_RemoveFaceID">FTC_Manager_RemoveFaceID</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -557,7 +557,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_CMapCache">FTC_CMapCache</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -576,7 +576,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_CMapCache_New">FTC_CMapCache_New</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -619,7 +619,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_CMapCache_Lookup">FTC_CMapCache_Lookup</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -662,7 +662,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_ImageTypeRec">FTC_ImageTypeRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -705,7 +705,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_ImageType">FTC_ImageType</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -724,7 +724,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_ImageCache">FTC_ImageCache</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -743,7 +743,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_ImageCache_New">FTC_ImageCache_New</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -783,7 +783,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_ImageCache_Lookup">FTC_ImageCache_Lookup</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -840,7 +840,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_ImageCache_LookupScaler">FTC_ImageCache_LookupScaler</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -902,7 +902,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_SBit">FTC_SBit</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -921,7 +921,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_SBitRec">FTC_SBitRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -990,7 +990,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_SBitCache">FTC_SBitCache</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1009,7 +1009,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_SBitCache_New">FTC_SBitCache_New</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1049,7 +1049,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_SBitCache_Lookup">FTC_SBitCache_Lookup</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1107,7 +1107,7 @@ Defined in FT_CACHE_H (freetype/ftcache.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FTC_SBitCache_LookupScaler">FTC_SBitCache_LookupScaler</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CACHE_H (freetype/ftcache.h).
+Defined in FT_CACHE_H (ftcache.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-cff_driver.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-cff_driver.html
new file mode 100644
index 00000000000..a4b6b880773
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-cff_driver.html
@@ -0,0 +1,180 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>FreeType-2.5.1 API Reference</title>
+<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; }
+  td { padding: 0 0.5em 0 0.5em; }
+  td.left { padding: 0 0.5em 0 0.5em;
+            text-align: left; }
+
+  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>
+</head>
+<body>
+
+<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
+<td width="100%"></td>
+<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
+
+<center><h1>
+The CFF driver
+</h1></center>
+<h2>Synopsis</h2>
+<table align=center cellspacing=5 cellpadding=0 border=0>
+<tr><td></td><td><a href="#hinting-engine">hinting-engine</a></td><td></td><td><a href="#no-stem-darkening">no-stem-darkening</a></td><td></td><td></td></tr>
+<tr><td></td><td><a href="#FT_CFF_HINTING_XXX">FT_CFF_HINTING_XXX</a></td><td></td><td><a href="#darkening-parameters">darkening-parameters</a></td><td></td><td></td></tr>
+</table><br><br>
+
+<table align=center width="87%"><tr><td>
+<p>While FreeType's CFF driver doesn't expose API functions by itself, it is possible to control its behaviour with <a href="ft2-module_management.html#FT_Property_Set">FT_Property_Set</a> and <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a>. The list below gives the available properties together with the necessary macros and structures.</p>
+<p>The CFF driver's module name is &lsquo;cff&rsquo;.</p>
+<p><b>Hinting</b> <b>and</b> <b>antialiasing</b> <b>principles</b> <b>of</b> <b>the</b> <b>new</b> <b>engine</b></p>
+<p>The rasterizer is positioning horizontal features (e.g., ascender height &amp; x-height, or crossbars) on the pixel grid and minimizing the amount of antialiasing applied to them, while placing vertical features (vertical stems) on the pixel grid without hinting, thus representing the stem position and weight accurately. Sometimes the vertical stems may be only partially black. In this context, &lsquo;antialiasing&rsquo; means that stems are not positioned exactly on pixel borders, causing a fuzzy appearance.</p>
+<p>There are two principles behind this approach.</p>
+<p>1) No hinting in the horizontal direction: Unlike &lsquo;superhinted&rsquo; TrueType, which changes glyph widths to accommodate regular inter-glyph spacing, Adobe's approach is &lsquo;faithful to the design&rsquo; in representing both the glyph width and the inter-glyph spacing designed for the font. This makes the screen display as close as it can be to the result one would get with infinite resolution, while preserving what is considered the key characteristics of each glyph. Note that the distances between unhinted and grid-fitted positions at small sizes are comparable to kerning values and thus would be noticeable (and distracting) while reading if hinting were applied.</p>
+<p>One of the reasons to not hint horizontally is antialiasing for LCD screens: The pixel geometry of modern displays supplies three vertical sub-pixels as the eye moves horizontally across each visible pixel. On devices where we can be certain this characteristic is present a rasterizer can take advantage of the sub-pixels to add increments of weight. In Western writing systems this turns out to be the more critical direction anyway; the weights and spacing of vertical stems (see above) are central to Armenian, Cyrillic, Greek, and Latin type designs. Even when the rasterizer uses greyscale antialiasing instead of color (a necessary compromise when one doesn't know the screen characteristics), the unhinted vertical features preserve the design's weight and spacing much better than aliased type would.</p>
+<p>2) Aligment in the vertical direction: Weights and spacing along the y&nbsp;axis are less critical; what is much more important is the visual alignment of related features (like cap-height and x-height). The sense of alignment for these is enhanced by the sharpness of grid-fit edges, while the cruder vertical resolution (full pixels instead of 1/3 pixels) is less of a problem.</p>
+<p>On the technical side, horizontal alignment zones for ascender, x-height, and other important height values (traditionally called &lsquo;blue zones&rsquo;) as defined in the font are positioned independently, each being rounded to the nearest pixel edge, taking care of overshoot suppression at small sizes, stem darkening, and scaling.</p>
+<p>Hstems (this is, hint values defined in the font to help align horizontal features) that fall within a blue zone are said to be &lsquo;captured&rsquo; and are aligned to that zone. Uncaptured stems are moved in one of four ways, top edge up or down, bottom edge up or down. Unless there are conflicting hstems, the smallest movement is taken to minimize distortion.</p>
+</td></tr></table><br>
+<table align=center width="75%"><tr><td>
+<h4><a name="hinting-engine">hinting-engine</a></h4>
+<table align=center width="87%"><tr><td>
+<p>Thanks to Adobe, which contributed a new hinting (and parsing) engine, an application can select between &lsquo;freetype&rsquo; and &lsquo;adobe&rsquo; if compiled with CFF_CONFIG_OPTION_OLD_ENGINE. If this configuration macro isn't defined, &lsquo;hinting-engine&rsquo; does nothing.</p>
+<p>The default engine is &lsquo;freetype&rsquo; if CFF_CONFIG_OPTION_OLD_ENGINE is defined, and &lsquo;adobe&rsquo; otherwise.</p>
+<p>The following example code demonstrates how to select Adobe's hinting engine (omitting the error handling).</p>
+<pre class="colored">
+  FT_Library  library;
+  FT_UInt     hinting_engine = FT_CFF_HINTING_ADOBE;
+
+
+  FT_Init_FreeType( &amp;library );
+
+  FT_Property_Set( library, "cff",
+                            "hinting-engine", &amp;hinting_engine );
+</pre>
+</td></tr></table><br>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
+<p>This property can be used with <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a> also.</p>
+</td></tr></table>
+</td></tr></table>
+<hr width="75%">
+<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
+<td width="100%"></td>
+<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
+
+<table align=center width="75%"><tr><td>
+<h4><a name="FT_CFF_HINTING_XXX">FT_CFF_HINTING_XXX</a></h4>
+<table align=center width="87%"><tr><td>
+Defined in FT_CFF_DRIVER_H (ftcffdrv.h).
+</td></tr></table><br>
+<table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
+
+#define <a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_FREETYPE</a>  0
+#define <a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_ADOBE</a>     1
+
+</pre></table><br>
+<table align=center width="87%"><tr><td>
+<p>A list of constants used for the <a href="ft2-cff_driver.html#hinting-engine">hinting-engine</a> property to select the hinting engine for CFF fonts.</p>
+</td></tr></table><br>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>values</b></em></td></tr><tr><td>
+<p></p>
+<table cellpadding=3 border=0>
+<tr valign=top><td colspan=0><b>FT_CFF_HINTING_FREETYPE</b></td></tr>
+<tr valign=top><td></td><td>
+<p>Use the old FreeType hinting engine.</p>
+</td></tr>
+<tr valign=top><td><b>FT_CFF_HINTING_ADOBE</b></td><td>
+<p>Use the hinting engine contributed by Adobe.</p>
+</td></tr>
+</table>
+</td></tr></table>
+</td></tr></table>
+<hr width="75%">
+<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
+<td width="100%"></td>
+<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
+
+<table align=center width="75%"><tr><td>
+<h4><a name="no-stem-darkening">no-stem-darkening</a></h4>
+<table align=center width="87%"><tr><td>
+<p>By default, the Adobe CFF engine darkens stems at smaller sizes, regardless of hinting, to enhance contrast. This feature requires a rendering system with proper gamma correction. Setting this property, stem darkening gets switched off.</p>
+<p>Note that stem darkening is never applied if <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a> is set.</p>
+<pre class="colored">
+  FT_Library  library;
+  FT_Bool     no_stem_darkening = TRUE;
+
+
+  FT_Init_FreeType( &amp;library );
+
+  FT_Property_Set( library, "cff",
+                            "no-stem-darkening", &amp;no_stem_darkening );
+</pre>
+</td></tr></table><br>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
+<p>This property can be used with <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a> also.</p>
+</td></tr></table>
+</td></tr></table>
+<hr width="75%">
+<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
+<td width="100%"></td>
+<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
+
+<table align=center width="75%"><tr><td>
+<h4><a name="darkening-parameters">darkening-parameters</a></h4>
+<table align=center width="87%"><tr><td>
+<p>By default, the Adobe CFF engine darkens stems as follows (if the &lsquo;no-stem-darkening&rsquo; property isn't set):</p>
+<pre class="colored">
+  stem width &lt;= 0.5px:   darkening amount = 0.4px
+  stem width  = 1px:     darkening amount = 0.275px
+  stem width  = 1.667px: darkening amount = 0.275px
+  stem width &gt;= 2.333px: darkening amount = 0px
+</pre>
+<p>and piecewise linear in-between. Using the &lsquo;darkening-parameters&rsquo; property, these four control points can be changed, as the following example demonstrates.</p>
+<pre class="colored">
+  FT_Library  library;
+  FT_Int      darken_params[8] = {  500, 300,   // x1, y1
+                                   1000, 200,   // x2, y2
+                                   1500, 100,   // x3, y3
+                                   2000,   0 }; // x4, y4
+
+
+  FT_Init_FreeType( &amp;library );
+
+  FT_Property_Set( library, "cff",
+                            "darkening-parameters", darken_params );
+</pre>
+<p>The x&nbsp;values give the stem width, and the y&nbsp;values the darkening amount. The unit is 1000th of pixels. All coordinate values must be positive; the x&nbsp;values must be monotonically increasing; the y&nbsp;values must be monotonically decreasing and smaller than or equal to 500 (corresponding to half a pixel); the slope of each linear piece must be shallower than -1 (e.g., -.4).</p>
+</td></tr></table><br>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
+<p>This property can be used with <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a> also.</p>
+</td></tr></table>
+</td></tr></table>
+<hr width="75%">
+<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
+<td width="100%"></td>
+<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
+
+</body>
+</html>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-cid_fonts.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-cid_fonts.html
index a31eeace32c..59837d5db10 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-cid_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-cid_fonts.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 CID Fonts
@@ -53,7 +53,7 @@ CID Fonts
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_CID_Registry_Ordering_Supplement">FT_Get_CID_Registry_Ordering_Supplement</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CID_H (freetype/ftcid.h).
+Defined in FT_CID_H (ftcid.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -107,7 +107,7 @@ Defined in FT_CID_H (freetype/ftcid.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_CID_Is_Internally_CID_Keyed">FT_Get_CID_Is_Internally_CID_Keyed</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CID_H (freetype/ftcid.h).
+Defined in FT_CID_H (ftcid.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -153,7 +153,7 @@ Defined in FT_CID_H (freetype/ftcid.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_CID_From_Glyph_Index">FT_Get_CID_From_Glyph_Index</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_CID_H (freetype/ftcid.h).
+Defined in FT_CID_H (ftcid.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-computations.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-computations.html
index d19452b679f..361498ec9d7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-computations.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-computations.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Computations
@@ -58,7 +58,7 @@ Computations
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_MulDiv">FT_MulDiv</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -98,7 +98,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_MulFix">FT_MulFix</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -137,7 +137,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_DivFix">FT_DivFix</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -175,7 +175,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_RoundFix">FT_RoundFix</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -206,7 +206,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_CeilFix">FT_CeilFix</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -237,7 +237,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_FloorFix">FT_FloorFix</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -268,7 +268,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Vector_Transform">FT_Vector_Transform</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -308,7 +308,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Matrix_Multiply">FT_Matrix_Multiply</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -348,7 +348,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Matrix_Invert">FT_Matrix_Invert</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -379,7 +379,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Angle">FT_Angle</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -398,7 +398,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ANGLE_PI">FT_ANGLE_PI</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -417,7 +417,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ANGLE_2PI">FT_ANGLE_2PI</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -436,7 +436,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ANGLE_PI2">FT_ANGLE_PI2</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -455,7 +455,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ANGLE_PI4">FT_ANGLE_PI4</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -474,7 +474,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Sin">FT_Sin</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -508,7 +508,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Cos">FT_Cos</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -542,7 +542,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Tan">FT_Tan</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -573,7 +573,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Atan2">FT_Atan2</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -608,7 +608,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Angle_Diff">FT_Angle_Diff</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -643,7 +643,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Vector_Unit">FT_Vector_Unit</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -681,7 +681,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Vector_Rotate">FT_Vector_Rotate</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -718,7 +718,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Vector_Length">FT_Vector_Length</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -749,7 +749,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Vector_Polarize">FT_Vector_Polarize</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -790,7 +790,7 @@ Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Vector_From_Polar">FT_Vector_From_Polar</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h).
+Defined in FT_TRIGONOMETRY_H (fttrigon.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-font_formats.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-font_formats.html
index 0ba5734b259..1a6412538e9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-font_formats.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-font_formats.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Font Formats
@@ -52,7 +52,7 @@ Font Formats
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_X11_Font_Format">FT_Get_X11_Font_Format</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_XFREE86_H (freetype/ftxf86.h).
+Defined in FT_XFREE86_H (ftxf86.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -61,7 +61,7 @@ Defined in FT_XFREE86_H (freetype/ftxf86.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Return a string describing the format of a given face, using values which can be used as an X11 FONT_PROPERTY. Possible values are &lsquo;TrueType&rsquo;, &lsquo;Type&nbsp;1&rsquo;, &lsquo;BDF&rsquo;, &lsquo;PCF&rsquo;, &lsquo;Type&nbsp;42&rsquo;, &lsquo;CID&nbsp;Type&nbsp;1&rsquo;, &lsquo;CFF&rsquo;, &lsquo;PFR&rsquo;, and &lsquo;Windows&nbsp;FNT&rsquo;.</p>
+<p>Return a string describing the format of a given face, using values that can be used as an X11 FONT_PROPERTY. Possible values are &lsquo;TrueType&rsquo;, &lsquo;Type&nbsp;1&rsquo;, &lsquo;BDF&rsquo;, &lsquo;PCF&rsquo;, &lsquo;Type&nbsp;42&rsquo;, &lsquo;CID&nbsp;Type&nbsp;1&rsquo;, &lsquo;CFF&rsquo;, &lsquo;PFR&rsquo;, and &lsquo;Windows&nbsp;FNT&rsquo;.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-gasp_table.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-gasp_table.html
index 43307ae2b93..bf3bba83f12 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-gasp_table.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-gasp_table.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Gasp Table
@@ -51,7 +51,7 @@ Gasp Table
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_GASP_XXX">FT_GASP_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GASP_H (freetype/ftgasp.h).
+Defined in FT_GASP_H (ftgasp.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -103,7 +103,7 @@ Defined in FT_GASP_H (freetype/ftgasp.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Gasp">FT_Get_Gasp</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GASP_H (freetype/ftgasp.h).
+Defined in FT_GASP_H (ftgasp.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-glyph_management.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-glyph_management.html
index 201eb5385a8..940b429fd97 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-glyph_management.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-glyph_management.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Glyph Management
@@ -55,7 +55,7 @@ Glyph Management
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph">FT_Glyph</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -77,7 +77,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_GlyphRec">FT_GlyphRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -120,7 +120,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_BitmapGlyph">FT_BitmapGlyph</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -139,7 +139,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_BitmapGlyphRec">FT_BitmapGlyphRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -186,7 +186,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_OutlineGlyph">FT_OutlineGlyph</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -205,7 +205,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_OutlineGlyphRec">FT_OutlineGlyphRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -245,7 +245,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Glyph">FT_Get_Glyph</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -285,7 +285,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph_Copy">FT_Glyph_Copy</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -325,7 +325,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph_Transform">FT_Glyph_Transform</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -372,7 +372,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph_BBox_Mode">FT_Glyph_BBox_Mode</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -420,7 +420,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="ft_glyph_bbox_xxx">ft_glyph_bbox_xxx</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -464,7 +464,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph_Get_CBox">FT_Glyph_Get_CBox</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -475,8 +475,8 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Return a glyph's &lsquo;control box&rsquo;. The control box encloses all the outline's points, including Bézier control points. Though it coincides with the exact bounding box for most glyphs, it can be slightly larger in some situations (like when rotating an outline which contains Bézier outside arcs).</p>
-<p>Computing the control box is very fast, while getting the bounding box can take much more time as it needs to walk over all segments and arcs in the outline. To get the latter, you can use the &lsquo;ftbbox&rsquo; component which is dedicated to this single task.</p>
+<p>Return a glyph's &lsquo;control box&rsquo;. The control box encloses all the outline's points, including Bézier control points. Though it coincides with the exact bounding box for most glyphs, it can be slightly larger in some situations (like when rotating an outline that contains Bézier outside arcs).</p>
+<p>Computing the control box is very fast, while getting the bounding box can take much more time as it needs to walk over all segments and arcs in the outline. To get the latter, you can use the &lsquo;ftbbox&rsquo; component, which is dedicated to this single task.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -485,7 +485,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <p>A handle to the source glyph object.</p>
 </td></tr>
 <tr valign=top><td><b>mode</b></td><td>
-<p>The mode which indicates how to interpret the returned bounding box values.</p>
+<p>The mode that indicates how to interpret the returned bounding box values.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -500,7 +500,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>Coordinates are relative to the glyph origin, using the y&nbsp;upwards convention.</p>
 <p>If the glyph has been loaded with <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a>, &lsquo;bbox_mode&rsquo; must be set to <a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_UNSCALED</a> to get unscaled font units in 26.6 pixel format. The value <a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_SUBPIXELS</a> is another name for this constant.</p>
-<p>If the font is tricky and the glyph has been loaded with <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a>, the resulting CBox is meaningless. To get reasonable values for the CBox it is necessary to load the glyph at a large ppem value (so that the hinting instructions can properly shift and scale the subglyphs), then extracting the CBox which can be eventually converted back to font units.</p>
+<p>If the font is tricky and the glyph has been loaded with <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a>, the resulting CBox is meaningless. To get reasonable values for the CBox it is necessary to load the glyph at a large ppem value (so that the hinting instructions can properly shift and scale the subglyphs), then extracting the CBox, which can be eventually converted back to font units.</p>
 <p>Note that the maximum coordinates are exclusive, which means that one can compute the width and height of the glyph image (be it in integer or 26.6 pixels) as:</p>
 <pre class="colored">
   width  = bbox.xMax - bbox.xMin;                                  
@@ -525,7 +525,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph_To_Bitmap">FT_Glyph_To_Bitmap</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -644,7 +644,7 @@ Defined in FT_GLYPH_H (freetype/ftglyph.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Done_Glyph">FT_Done_Glyph</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GLYPH_H (freetype/ftglyph.h).
+Defined in FT_GLYPH_H (ftglyph.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-glyph_stroker.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-glyph_stroker.html
index 4b911012d91..36080a8bd59 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-glyph_stroker.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-glyph_stroker.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Glyph Stroker
@@ -62,7 +62,7 @@ Glyph Stroker
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker">FT_Stroker</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -81,7 +81,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_LineJoin">FT_Stroker_LineJoin</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -133,7 +133,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_LineCap">FT_Stroker_LineCap</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -175,7 +175,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_StrokerBorder">FT_StrokerBorder</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -215,7 +215,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_GetInsideBorder">FT_Outline_GetInsideBorder</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -246,7 +246,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_GetOutsideBorder">FT_Outline_GetOutsideBorder</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -277,7 +277,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_New">FT_Stroker_New</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -317,7 +317,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_Set">FT_Stroker_Set</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -364,7 +364,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_Rewind">FT_Stroker_Rewind</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -392,7 +392,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_ParseOutline">FT_Stroker_ParseOutline</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -436,7 +436,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_BeginSubPath">FT_Stroker_BeginSubPath</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -478,7 +478,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_EndSubPath">FT_Stroker_EndSubPath</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -512,7 +512,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_LineTo">FT_Stroker_LineTo</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -550,7 +550,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_ConicTo">FT_Stroker_ConicTo</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -592,7 +592,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_CubicTo">FT_Stroker_CubicTo</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -638,7 +638,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_GetBorderCounts">FT_Stroker_GetBorderCounts</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -691,7 +691,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_ExportBorder">FT_Stroker_ExportBorder</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -734,7 +734,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_GetCounts">FT_Stroker_GetCounts</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -778,7 +778,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_Export">FT_Stroker_Export</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -811,7 +811,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stroker_Done">FT_Stroker_Done</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -839,7 +839,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph_Stroke">FT_Glyph_Stroke</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -887,7 +887,7 @@ Defined in FT_STROKER_H (freetype/ftstroke.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Glyph_StrokeBorder">FT_Glyph_StrokeBorder</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_STROKER_H (freetype/ftstroke.h).
+Defined in FT_STROKER_H (ftstroke.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-glyph_variants.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-glyph_variants.html
index b27b509e584..a7d35fcfca8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-glyph_variants.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-glyph_variants.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Glyph Variants
@@ -50,7 +50,7 @@ Glyph Variants
 <table align=center width="87%"><tr><td>
 <p>Many CJK characters have variant forms. They are a sort of grey area somewhere between being totally irrelevant and semantically distinct; for this reason, the Unicode consortium decided to introduce Ideographic Variation Sequences (IVS), consisting of a Unicode base character and one of 240 variant selectors (U+E0100-U+E01EF), instead of further extending the already huge code range for CJK characters.</p>
 <p>An IVS is registered and unique; for further details please refer to Unicode Technical Standard #37, the Ideographic Variation Database:</p>
-<p>http://www.unicode.org/reports/tr37/</p>
+<p><a href="http://www.unicode.org/reports/tr37/">http://www.unicode.org/reports/tr37/</a></p>
 <p>To date (November 2012), the character with the most variants is U+9089, having 31 such IVS.</p>
 <p>Adobe and MS decided to support IVS with a new cmap subtable (format&nbsp;14). It is an odd subtable because it is not a mapping of input code points to glyphs, but contains lists of all variants supported by the font.</p>
 <p>A variant may be either &lsquo;default&rsquo; or &lsquo;non-default&rsquo;. A default variant is the one you will get for that code point if you look it up in the standard Unicode cmap. A non-default variant is a different glyph.</p>
@@ -58,7 +58,7 @@ Glyph Variants
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Face_GetCharVariantIndex">FT_Face_GetCharVariantIndex</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -104,7 +104,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Face_GetCharVariantIsDefault">FT_Face_GetCharVariantIsDefault</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -149,7 +149,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Face_GetVariantSelectors">FT_Face_GetVariantSelectors</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -186,7 +186,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Face_GetVariantsOfChar">FT_Face_GetVariantsOfChar</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -210,7 +210,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </table>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>return</b></em></td></tr><tr><td>
-<p>A pointer to an array of variant selector code points which are active for the given character, or NULL if the corresponding list is empty.</p>
+<p>A pointer to an array of variant selector code points that are active for the given character, or NULL if the corresponding list is empty.</p>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>The last item in the array is&nbsp;0; the array is owned by the <a href="ft2-base_interface.html#FT_Face">FT_Face</a> object but can be overwritten or released on the next call to a FreeType function.</p>
@@ -227,7 +227,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Face_GetCharsOfVariant">FT_Face_GetCharsOfVariant</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -251,7 +251,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </table>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>return</b></em></td></tr><tr><td>
-<p>A list of all the code points which are specified by this selector (both default and non-default codes are returned) or NULL if there is no valid cmap or the variant selector is invalid.</p>
+<p>A list of all the code points that are specified by this selector (both default and non-default codes are returned) or NULL if there is no valid cmap or the variant selector is invalid.</p>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>The last item in the array is&nbsp;0; the array is owned by the <a href="ft2-base_interface.html#FT_Face">FT_Face</a> object but can be overwritten or released on the next call to a FreeType function.</p>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-gx_validation.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-gx_validation.html
index 59343d3cb50..b70e1b94aaa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-gx_validation.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-gx_validation.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 TrueTypeGX/AAT Validation
@@ -53,7 +53,7 @@ TrueTypeGX/AAT Validation
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_VALIDATE_GX_LENGTH">FT_VALIDATE_GX_LENGTH</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
+Defined in FT_GX_VALIDATE_H (ftgxval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -72,7 +72,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_VALIDATE_GXXXX">FT_VALIDATE_GXXXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
+Defined in FT_GX_VALIDATE_H (ftgxval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -149,7 +149,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_TrueTypeGX_Validate">FT_TrueTypeGX_Validate</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
+Defined in FT_GX_VALIDATE_H (ftgxval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -161,7 +161,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Validate various TrueTypeGX tables to assure that all offsets and indices are valid. The idea is that a higher-level library which actually does the text layout can access those tables without error checking (which can be quite time consuming).</p>
+<p>Validate various TrueTypeGX tables to assure that all offsets and indices are valid. The idea is that a higher-level library that actually does the text layout can access those tables without error checking (which can be quite time consuming).</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -170,7 +170,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 <p>A handle to the input face.</p>
 </td></tr>
 <tr valign=top><td><b>validation_flags</b></td><td>
-<p>A bit field which specifies the tables to be validated. See <a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_GXXXX</a> for possible values.</p>
+<p>A bit field that specifies the tables to be validated. See <a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_GXXXX</a> for possible values.</p>
 </td></tr>
 <tr valign=top><td><b>table_length</b></td><td>
 <p>The size of the &lsquo;tables&rsquo; array. Normally, <a href="ft2-gx_validation.html#FT_VALIDATE_GX_LENGTH">FT_VALIDATE_GX_LENGTH</a> should be passed.</p>
@@ -201,7 +201,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_TrueTypeGX_Free">FT_TrueTypeGX_Free</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
+Defined in FT_GX_VALIDATE_H (ftgxval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -236,7 +236,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_VALIDATE_CKERNXXX">FT_VALIDATE_CKERNXXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
+Defined in FT_GX_VALIDATE_H (ftgxval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -272,7 +272,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ClassicKern_Validate">FT_ClassicKern_Validate</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
+Defined in FT_GX_VALIDATE_H (ftgxval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -283,7 +283,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Validate classic (16-bit format) kern table to assure that the offsets and indices are valid. The idea is that a higher-level library which actually does the text layout can access those tables without error checking (which can be quite time consuming).</p>
+<p>Validate classic (16-bit format) kern table to assure that the offsets and indices are valid. The idea is that a higher-level library that actually does the text layout can access those tables without error checking (which can be quite time consuming).</p>
 <p>The &lsquo;kern&rsquo; table validator in <a href="ft2-gx_validation.html#FT_TrueTypeGX_Validate">FT_TrueTypeGX_Validate</a> deals with both the new 32-bit format and the classic 16-bit format, while FT_ClassicKern_Validate only supports the classic 16-bit format.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
@@ -293,7 +293,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 <p>A handle to the input face.</p>
 </td></tr>
 <tr valign=top><td><b>validation_flags</b></td><td>
-<p>A bit field which specifies the dialect to be validated. See <a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_CKERNXXX</a> for possible values.</p>
+<p>A bit field that specifies the dialect to be validated. See <a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_CKERNXXX</a> for possible values.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -320,7 +320,7 @@ Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ClassicKern_Free">FT_ClassicKern_Free</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h).
+Defined in FT_GX_VALIDATE_H (ftgxval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-gzip.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-gzip.html
index 6de691ad01f..ac4c3e6bf3a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-gzip.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-gzip.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,14 +35,14 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 GZIP Streams
 </h1></center>
 <h2>Synopsis</h2>
 <table align=center cellspacing=5 cellpadding=0 border=0>
-<tr><td></td><td><a href="#FT_Stream_OpenGzip">FT_Stream_OpenGzip</a></td><td></td><td></td><td></td><td></td></tr>
+<tr><td></td><td><a href="#FT_Stream_OpenGzip">FT_Stream_OpenGzip</a></td><td></td><td><a href="#FT_Gzip_Uncompress">FT_Gzip_Uncompress</a></td><td></td><td></td></tr>
 </table><br><br>
 
 <table align=center width="87%"><tr><td>
@@ -51,7 +51,7 @@ GZIP Streams
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stream_OpenGzip">FT_Stream_OpenGzip</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_GZIP_H (freetype/ftgzip.h).
+Defined in FT_GZIP_H (ftgzip.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -90,5 +90,65 @@ Defined in FT_GZIP_H (freetype/ftgzip.h).
 <td width="100%"></td>
 <td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
 
+<table align=center width="75%"><tr><td>
+<h4><a name="FT_Gzip_Uncompress">FT_Gzip_Uncompress</a></h4>
+<table align=center width="87%"><tr><td>
+Defined in FT_GZIP_H (ftgzip.h).
+</td></tr></table><br>
+<table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
+
+  FT_EXPORT( <a href="ft2-basic_types.html#FT_Error">FT_Error</a> )
+  <b>FT_Gzip_Uncompress</b>( <a href="ft2-system_interface.html#FT_Memory">FT_Memory</a>       memory,
+                      <a href="ft2-basic_types.html#FT_Byte">FT_Byte</a>*        output,
+                      <a href="ft2-basic_types.html#FT_ULong">FT_ULong</a>*       output_len,
+                      <span class="keyword">const</span> <a href="ft2-basic_types.html#FT_Byte">FT_Byte</a>*  input,
+                      <a href="ft2-basic_types.html#FT_ULong">FT_ULong</a>        input_len );
+
+</pre></table><br>
+<table align=center width="87%"><tr><td>
+<p>Decompress a zipped input buffer into an output buffer. This function is modeled after zlib's &lsquo;uncompress&rsquo; function.</p>
+</td></tr></table><br>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
+<p></p>
+<table cellpadding=3 border=0>
+<tr valign=top><td><b>memory</b></td><td>
+<p>A FreeType memory handle.</p>
+</td></tr>
+<tr valign=top><td><b>input</b></td><td>
+<p>The input buffer.</p>
+</td></tr>
+<tr valign=top><td><b>input_len</b></td><td>
+<p>The length of the input buffer.</p>
+</td></tr>
+</table>
+</td></tr></table>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>output</b></em></td></tr><tr><td>
+<p></p>
+<table cellpadding=3 border=0>
+<tr valign=top><td><b>output</b></td><td>
+<p>The output buffer.</p>
+</td></tr>
+</table>
+</td></tr></table>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>inout</b></em></td></tr><tr><td>
+<p></p>
+<table cellpadding=3 border=0>
+<tr valign=top><td><b>output_len</b></td><td>
+<p>Before calling the function, this is the the total size of the output buffer, which must be large enough to hold the entire uncompressed data (so the size of the uncompressed data must be known in advance). After calling the function, &lsquo;output_len&rsquo; is the size of the used data in &lsquo;output&rsquo;.</p>
+</td></tr>
+</table>
+</td></tr></table>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>return</b></em></td></tr><tr><td>
+<p>FreeType error code. 0&nbsp;means success.</p>
+</td></tr></table>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
+<p>This function may return &lsquo;FT_Err_Unimplemented_Feature&rsquo; if your build of FreeType was not compiled with zlib support.</p>
+</td></tr></table>
+</td></tr></table>
+<hr width="75%">
+<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
+<td width="100%"></td>
+<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
+
 </body>
 </html>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-header_file_macros.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-header_file_macros.html
index 0f2a483d693..43a03ccca64 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-header_file_macros.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-header_file_macros.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Header File Macros
@@ -84,7 +84,7 @@ Header File Macros
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
 #ifndef <b>FT_CONFIG_CONFIG_H</b>
-#define <b>FT_CONFIG_CONFIG_H</b>  &lt;freetype/config/ftconfig.h&gt;
+#define <b>FT_CONFIG_CONFIG_H</b>  &lt;config/ftconfig.h&gt;
 #endif
 
 </pre></table><br>
@@ -102,7 +102,7 @@ Header File Macros
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
 #ifndef <b>FT_CONFIG_STANDARD_LIBRARY_H</b>
-#define <b>FT_CONFIG_STANDARD_LIBRARY_H</b>  &lt;freetype/config/ftstdlib.h&gt;
+#define <b>FT_CONFIG_STANDARD_LIBRARY_H</b>  &lt;config/ftstdlib.h&gt;
 #endif
 
 </pre></table><br>
@@ -120,7 +120,7 @@ Header File Macros
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
 #ifndef <b>FT_CONFIG_OPTIONS_H</b>
-#define <b>FT_CONFIG_OPTIONS_H</b>  &lt;freetype/config/ftoption.h&gt;
+#define <b>FT_CONFIG_OPTIONS_H</b>  &lt;config/ftoption.h&gt;
 #endif
 
 </pre></table><br>
@@ -138,7 +138,7 @@ Header File Macros
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
 #ifndef <b>FT_CONFIG_MODULES_H</b>
-#define <b>FT_CONFIG_MODULES_H</b>  &lt;freetype/config/ftmodule.h&gt;
+#define <b>FT_CONFIG_MODULES_H</b>  &lt;config/ftmodule.h&gt;
 #endif
 
 </pre></table><br>
@@ -155,7 +155,7 @@ Header File Macros
 <h4><a name="FT_FREETYPE_H">FT_FREETYPE_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_FREETYPE_H</b>  &lt;freetype/freetype.h&gt;
+#define <b>FT_FREETYPE_H</b>  &lt;freetype.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -171,7 +171,7 @@ Header File Macros
 <h4><a name="FT_ERRORS_H">FT_ERRORS_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_ERRORS_H</b>  &lt;freetype/fterrors.h&gt;
+#define <b>FT_ERRORS_H</b>  &lt;fterrors.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -188,7 +188,7 @@ Header File Macros
 <h4><a name="FT_MODULE_ERRORS_H">FT_MODULE_ERRORS_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_MODULE_ERRORS_H</b>  &lt;freetype/ftmoderr.h&gt;
+#define <b>FT_MODULE_ERRORS_H</b>  &lt;ftmoderr.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -204,7 +204,7 @@ Header File Macros
 <h4><a name="FT_SYSTEM_H">FT_SYSTEM_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_SYSTEM_H</b>  &lt;freetype/ftsystem.h&gt;
+#define <b>FT_SYSTEM_H</b>  &lt;ftsystem.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -221,7 +221,7 @@ Header File Macros
 <h4><a name="FT_IMAGE_H">FT_IMAGE_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_IMAGE_H</b>  &lt;freetype/ftimage.h&gt;
+#define <b>FT_IMAGE_H</b>  &lt;ftimage.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -238,7 +238,7 @@ Header File Macros
 <h4><a name="FT_TYPES_H">FT_TYPES_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_TYPES_H</b>  &lt;freetype/fttypes.h&gt;
+#define <b>FT_TYPES_H</b>  &lt;fttypes.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -255,7 +255,7 @@ Header File Macros
 <h4><a name="FT_LIST_H">FT_LIST_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_LIST_H</b>  &lt;freetype/ftlist.h&gt;
+#define <b>FT_LIST_H</b>  &lt;ftlist.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -272,7 +272,7 @@ Header File Macros
 <h4><a name="FT_OUTLINE_H">FT_OUTLINE_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_OUTLINE_H</b>  &lt;freetype/ftoutln.h&gt;
+#define <b>FT_OUTLINE_H</b>  &lt;ftoutln.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -288,7 +288,7 @@ Header File Macros
 <h4><a name="FT_SIZES_H">FT_SIZES_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_SIZES_H</b>  &lt;freetype/ftsizes.h&gt;
+#define <b>FT_SIZES_H</b>  &lt;ftsizes.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -304,7 +304,7 @@ Header File Macros
 <h4><a name="FT_MODULE_H">FT_MODULE_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_MODULE_H</b>  &lt;freetype/ftmodapi.h&gt;
+#define <b>FT_MODULE_H</b>  &lt;ftmodapi.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -320,7 +320,7 @@ Header File Macros
 <h4><a name="FT_RENDER_H">FT_RENDER_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_RENDER_H</b>  &lt;freetype/ftrender.h&gt;
+#define <b>FT_RENDER_H</b>  &lt;ftrender.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -336,7 +336,7 @@ Header File Macros
 <h4><a name="FT_AUTOHINTER_H">FT_AUTOHINTER_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_AUTOHINTER_H</b>  &lt;freetype/ftautoh.h&gt;
+#define <b>FT_AUTOHINTER_H</b>  &lt;ftautoh.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -352,7 +352,7 @@ Header File Macros
 <h4><a name="FT_CFF_DRIVER_H">FT_CFF_DRIVER_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_CFF_DRIVER_H</b>  &lt;freetype/ftcffdrv.h&gt;
+#define <b>FT_CFF_DRIVER_H</b>  &lt;ftcffdrv.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -368,7 +368,7 @@ Header File Macros
 <h4><a name="FT_TRUETYPE_DRIVER_H">FT_TRUETYPE_DRIVER_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_TRUETYPE_DRIVER_H</b>  &lt;freetype/ftttdrv.h&gt;
+#define <b>FT_TRUETYPE_DRIVER_H</b>  &lt;ftttdrv.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -384,7 +384,7 @@ Header File Macros
 <h4><a name="FT_TYPE1_TABLES_H">FT_TYPE1_TABLES_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_TYPE1_TABLES_H</b>  &lt;freetype/t1tables.h&gt;
+#define <b>FT_TYPE1_TABLES_H</b>  &lt;t1tables.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -400,7 +400,7 @@ Header File Macros
 <h4><a name="FT_TRUETYPE_IDS_H">FT_TRUETYPE_IDS_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_TRUETYPE_IDS_H</b>  &lt;freetype/ttnameid.h&gt;
+#define <b>FT_TRUETYPE_IDS_H</b>  &lt;ttnameid.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -416,7 +416,7 @@ Header File Macros
 <h4><a name="FT_TRUETYPE_TABLES_H">FT_TRUETYPE_TABLES_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_TRUETYPE_TABLES_H</b>  &lt;freetype/tttables.h&gt;
+#define <b>FT_TRUETYPE_TABLES_H</b>  &lt;tttables.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -432,7 +432,7 @@ Header File Macros
 <h4><a name="FT_TRUETYPE_TAGS_H">FT_TRUETYPE_TAGS_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_TRUETYPE_TAGS_H</b>  &lt;freetype/tttags.h&gt;
+#define <b>FT_TRUETYPE_TAGS_H</b>  &lt;tttags.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -448,7 +448,7 @@ Header File Macros
 <h4><a name="FT_BDF_H">FT_BDF_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_BDF_H</b>  &lt;freetype/ftbdf.h&gt;
+#define <b>FT_BDF_H</b>  &lt;ftbdf.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -464,7 +464,7 @@ Header File Macros
 <h4><a name="FT_CID_H">FT_CID_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_CID_H</b>  &lt;freetype/ftcid.h&gt;
+#define <b>FT_CID_H</b>  &lt;ftcid.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -480,7 +480,7 @@ Header File Macros
 <h4><a name="FT_GZIP_H">FT_GZIP_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_GZIP_H</b>  &lt;freetype/ftgzip.h&gt;
+#define <b>FT_GZIP_H</b>  &lt;ftgzip.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -496,7 +496,7 @@ Header File Macros
 <h4><a name="FT_LZW_H">FT_LZW_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_LZW_H</b>  &lt;freetype/ftlzw.h&gt;
+#define <b>FT_LZW_H</b>  &lt;ftlzw.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -512,7 +512,7 @@ Header File Macros
 <h4><a name="FT_BZIP2_H">FT_BZIP2_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_BZIP2_H</b>  &lt;freetype/ftbzip2.h&gt;
+#define <b>FT_BZIP2_H</b>  &lt;ftbzip2.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -528,7 +528,7 @@ Header File Macros
 <h4><a name="FT_WINFONTS_H">FT_WINFONTS_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_WINFONTS_H</b>   &lt;freetype/ftwinfnt.h&gt;
+#define <b>FT_WINFONTS_H</b>   &lt;ftwinfnt.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -544,7 +544,7 @@ Header File Macros
 <h4><a name="FT_GLYPH_H">FT_GLYPH_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_GLYPH_H</b>  &lt;freetype/ftglyph.h&gt;
+#define <b>FT_GLYPH_H</b>  &lt;ftglyph.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -560,7 +560,7 @@ Header File Macros
 <h4><a name="FT_BITMAP_H">FT_BITMAP_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_BITMAP_H</b>  &lt;freetype/ftbitmap.h&gt;
+#define <b>FT_BITMAP_H</b>  &lt;ftbitmap.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -576,7 +576,7 @@ Header File Macros
 <h4><a name="FT_BBOX_H">FT_BBOX_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_BBOX_H</b>  &lt;freetype/ftbbox.h&gt;
+#define <b>FT_BBOX_H</b>  &lt;ftbbox.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -592,7 +592,7 @@ Header File Macros
 <h4><a name="FT_CACHE_H">FT_CACHE_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_CACHE_H</b>  &lt;freetype/ftcache.h&gt;
+#define <b>FT_CACHE_H</b>  &lt;ftcache.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -661,7 +661,7 @@ Header File Macros
 <h4><a name="FT_MAC_H">FT_MAC_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_MAC_H</b>  &lt;freetype/ftmac.h&gt;
+#define <b>FT_MAC_H</b>  &lt;ftmac.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -678,7 +678,7 @@ Header File Macros
 <h4><a name="FT_MULTIPLE_MASTERS_H">FT_MULTIPLE_MASTERS_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_MULTIPLE_MASTERS_H</b>  &lt;freetype/ftmm.h&gt;
+#define <b>FT_MULTIPLE_MASTERS_H</b>  &lt;ftmm.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -694,7 +694,7 @@ Header File Macros
 <h4><a name="FT_SFNT_NAMES_H">FT_SFNT_NAMES_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_SFNT_NAMES_H</b>  &lt;freetype/ftsnames.h&gt;
+#define <b>FT_SFNT_NAMES_H</b>  &lt;ftsnames.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -710,7 +710,7 @@ Header File Macros
 <h4><a name="FT_OPENTYPE_VALIDATE_H">FT_OPENTYPE_VALIDATE_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_OPENTYPE_VALIDATE_H</b>  &lt;freetype/ftotval.h&gt;
+#define <b>FT_OPENTYPE_VALIDATE_H</b>  &lt;ftotval.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -726,7 +726,7 @@ Header File Macros
 <h4><a name="FT_GX_VALIDATE_H">FT_GX_VALIDATE_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_GX_VALIDATE_H</b>  &lt;freetype/ftgxval.h&gt;
+#define <b>FT_GX_VALIDATE_H</b>  &lt;ftgxval.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -742,7 +742,7 @@ Header File Macros
 <h4><a name="FT_PFR_H">FT_PFR_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_PFR_H</b>  &lt;freetype/ftpfr.h&gt;
+#define <b>FT_PFR_H</b>  &lt;ftpfr.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -758,7 +758,7 @@ Header File Macros
 <h4><a name="FT_STROKER_H">FT_STROKER_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_STROKER_H</b>  &lt;freetype/ftstroke.h&gt;
+#define <b>FT_STROKER_H</b>  &lt;ftstroke.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -774,7 +774,7 @@ Header File Macros
 <h4><a name="FT_SYNTHESIS_H">FT_SYNTHESIS_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_SYNTHESIS_H</b>  &lt;freetype/ftsynth.h&gt;
+#define <b>FT_SYNTHESIS_H</b>  &lt;ftsynth.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -790,7 +790,7 @@ Header File Macros
 <h4><a name="FT_XFREE86_H">FT_XFREE86_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_XFREE86_H</b>  &lt;freetype/ftxf86.h&gt;
+#define <b>FT_XFREE86_H</b>  &lt;ftxf86.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -806,7 +806,7 @@ Header File Macros
 <h4><a name="FT_TRIGONOMETRY_H">FT_TRIGONOMETRY_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_TRIGONOMETRY_H</b>  &lt;freetype/fttrigon.h&gt;
+#define <b>FT_TRIGONOMETRY_H</b>  &lt;fttrigon.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -822,7 +822,7 @@ Header File Macros
 <h4><a name="FT_LCD_FILTER_H">FT_LCD_FILTER_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_LCD_FILTER_H</b>  &lt;freetype/ftlcdfil.h&gt;
+#define <b>FT_LCD_FILTER_H</b>  &lt;ftlcdfil.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -838,7 +838,7 @@ Header File Macros
 <h4><a name="FT_UNPATENTED_HINTING_H">FT_UNPATENTED_HINTING_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_UNPATENTED_HINTING_H</b>  &lt;freetype/ttunpat.h&gt;
+#define <b>FT_UNPATENTED_HINTING_H</b>  &lt;ttunpat.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -854,7 +854,7 @@ Header File Macros
 <h4><a name="FT_INCREMENTAL_H">FT_INCREMENTAL_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_INCREMENTAL_H</b>  &lt;freetype/ftincrem.h&gt;
+#define <b>FT_INCREMENTAL_H</b>  &lt;ftincrem.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -870,7 +870,7 @@ Header File Macros
 <h4><a name="FT_GASP_H">FT_GASP_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_GASP_H</b>  &lt;freetype/ftgasp.h&gt;
+#define <b>FT_GASP_H</b>  &lt;ftgasp.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -886,7 +886,7 @@ Header File Macros
 <h4><a name="FT_ADVANCES_H">FT_ADVANCES_H</a></h4>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
-#define <b>FT_ADVANCES_H</b>  &lt;freetype/ftadvanc.h&gt;
+#define <b>FT_ADVANCES_H</b>  &lt;ftadvanc.h&gt;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-incremental.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-incremental.html
index 2c78c9ef2f4..cba592e4932 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-incremental.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-incremental.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Incremental Loading
@@ -57,7 +57,7 @@ Incremental Loading
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Incremental">FT_Incremental</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -80,7 +80,7 @@ Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Incremental_MetricsRec">FT_Incremental_MetricsRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -126,7 +126,7 @@ Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Incremental_Metrics">FT_Incremental_Metrics</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -145,7 +145,7 @@ Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Incremental_GetGlyphDataFunc">FT_Incremental_GetGlyphDataFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -194,7 +194,7 @@ Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Incremental_FreeGlyphDataFunc">FT_Incremental_FreeGlyphDataFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -226,7 +226,7 @@ Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Incremental_GetGlyphMetricsFunc">FT_Incremental_GetGlyphMetricsFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -275,7 +275,7 @@ Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Incremental_FuncsRec">FT_Incremental_FuncsRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -314,7 +314,7 @@ Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Incremental_InterfaceRec">FT_Incremental_InterfaceRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -362,7 +362,7 @@ Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Incremental_Interface">FT_Incremental_Interface</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -381,7 +381,7 @@ Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_PARAM_TAG_INCREMENTAL">FT_PARAM_TAG_INCREMENTAL</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_INCREMENTAL_H (freetype/ftincrem.h).
+Defined in FT_INCREMENTAL_H (ftincrem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-index.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-index.html
index 1369414d302..ad93bca7b56 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-index.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -34,270 +34,272 @@
 
 <table align=center><tr><td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <table align=center border=0 cellpadding=0 cellspacing=0>
-<tr><td><a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_ATOM</a></td><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LCD_FILTER_LIGHT</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_ParseOutline">FT_Stroker_ParseOutline</a></td></tr>
-<tr><td><a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_CARDINAL</a></td><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LCD_FILTER_NONE</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_Rewind">FT_Stroker_Rewind</a></td></tr>
-<tr><td><a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_INTEGER</a></td><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LcdFilter</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_Set">FT_Stroker_Set</a></td></tr>
-<tr><td><a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_NONE</a></td><td><a href="ft2-header_file_macros.html#FT_LIST_H">FT_LIST_H</a></td><td><a href="ft2-glyph_stroker.html#FT_StrokerBorder">FT_StrokerBorder</a></td></tr>
-<tr><td><a href="ft2-bdf_fonts.html#BDF_Property">BDF_Property</a></td><td><a href="ft2-base_interface.html#FT_Library">FT_Library</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_2X2</a></td></tr>
-<tr><td><a href="ft2-bdf_fonts.html#BDF_PropertyRec">BDF_PropertyRec</a></td><td><a href="ft2-lcd_filtering.html#FT_Library_SetLcdFilter">FT_Library_SetLcdFilter</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS</a></td></tr>
-<tr><td><a href="ft2-type1_tables.html#CID_FaceDict">CID_FaceDict</a></td><td><a href="ft2-lcd_filtering.html#FT_Library_SetLcdFilterWeights">FT_Library_SetLcdFilterWeights</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES</a></td></tr>
-<tr><td><a href="ft2-type1_tables.html#CID_FaceDictRec">CID_FaceDictRec</a></td><td><a href="ft2-version.html#FT_Library_Version">FT_Library_Version</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID</a></td></tr>
-<tr><td><a href="ft2-type1_tables.html#CID_FaceInfo">CID_FaceInfo</a></td><td><a href="ft2-list_processing.html#FT_List">FT_List</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_SCALE</a></td></tr>
-<tr><td><a href="ft2-type1_tables.html#CID_FaceInfoRec">CID_FaceInfoRec</a></td><td><a href="ft2-list_processing.html#FT_List_Add">FT_List_Add</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_USE_MY_METRICS</a></td></tr>
-<tr><td><a href="ft2-type1_tables.html#CID_Info">CID_Info</a></td><td><a href="ft2-list_processing.html#FT_List_Destructor">FT_List_Destructor</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_XXX</a></td></tr>
-<tr><td><a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MAJOR</a></td><td><a href="ft2-list_processing.html#FT_List_Finalize">FT_List_Finalize</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_XY_SCALE</a></td></tr>
-<tr><td><a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MINOR</a></td><td><a href="ft2-list_processing.html#FT_List_Find">FT_List_Find</a></td><td><a href="ft2-base_interface.html#FT_SubGlyph">FT_SubGlyph</a></td></tr>
-<tr><td><a href="ft2-version.html#FREETYPE_XXX">FREETYPE_PATCH</a></td><td><a href="ft2-list_processing.html#FT_List_Insert">FT_List_Insert</a></td><td><a href="ft2-header_file_macros.html#FT_SYNTHESIS_H">FT_SYNTHESIS_H</a></td></tr>
-<tr><td><a href="ft2-version.html#FREETYPE_XXX">FREETYPE_XXX</a></td><td><a href="ft2-list_processing.html#FT_List_Iterate">FT_List_Iterate</a></td><td><a href="ft2-header_file_macros.html#FT_SYSTEM_H">FT_SYSTEM_H</a></td></tr>
-<tr><td><a href="ft2-sizes_management.html#FT_Activate_Size">FT_Activate_Size</a></td><td><a href="ft2-list_processing.html#FT_List_Iterator">FT_List_Iterator</a></td><td><a href="ft2-basic_types.html#FT_Tag">FT_Tag</a></td></tr>
-<tr><td><a href="ft2-quick_advance.html#FT_ADVANCE_FLAG_FAST_ONLY">FT_ADVANCE_FLAG_FAST_ONLY</a></td><td><a href="ft2-list_processing.html#FT_List_Remove">FT_List_Remove</a></td><td><a href="ft2-computations.html#FT_Tan">FT_Tan</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_ADVANCES_H">FT_ADVANCES_H</a></td><td><a href="ft2-list_processing.html#FT_List_Up">FT_List_Up</a></td><td><a href="ft2-header_file_macros.html#FT_TRIGONOMETRY_H">FT_TRIGONOMETRY_H</a></td></tr>
-<tr><td><a href="ft2-module_management.html#FT_Add_Default_Modules">FT_Add_Default_Modules</a></td><td><a href="ft2-list_processing.html#FT_ListNode">FT_ListNode</a></td><td><a href="ft2-header_file_macros.html#FT_TRUETYPE_DRIVER_H">FT_TRUETYPE_DRIVER_H</a></td></tr>
-<tr><td><a href="ft2-module_management.html#FT_Add_Module">FT_Add_Module</a></td><td><a href="ft2-list_processing.html#FT_ListNodeRec">FT_ListNodeRec</a></td><td><a href="ft2-truetype_engine.html#FT_TrueTypeEngineType">FT_TRUETYPE_ENGINE_TYPE_NONE</a></td></tr>
-<tr><td><a href="ft2-system_interface.html#FT_Alloc_Func">FT_Alloc_Func</a></td><td><a href="ft2-list_processing.html#FT_ListRec">FT_ListRec</a></td><td><a href="ft2-truetype_engine.html#FT_TrueTypeEngineType">FT_TRUETYPE_ENGINE_TYPE_PATENTED</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_ANGLE_2PI">FT_ANGLE_2PI</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_COLOR</a></td><td><a href="ft2-truetype_engine.html#FT_TrueTypeEngineType">FT_TRUETYPE_ENGINE_TYPE_UNPATENTED</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_ANGLE_PI">FT_ANGLE_PI</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_CROP_BITMAP</a></td><td><a href="ft2-header_file_macros.html#FT_TRUETYPE_IDS_H">FT_TRUETYPE_IDS_H</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_ANGLE_PI2">FT_ANGLE_PI2</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_DEFAULT</a></td><td><a href="ft2-header_file_macros.html#FT_TRUETYPE_TABLES_H">FT_TRUETYPE_TABLES_H</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_ANGLE_PI4">FT_ANGLE_PI4</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_FORCE_AUTOHINT</a></td><td><a href="ft2-header_file_macros.html#FT_TRUETYPE_TAGS_H">FT_TRUETYPE_TAGS_H</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_Angle">FT_Angle</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH</a></td><td><a href="ft2-truetype_engine.html#FT_TrueTypeEngineType">FT_TrueTypeEngineType</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_Angle_Diff">FT_Angle_Diff</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_TRANSFORM</a></td><td><a href="ft2-gx_validation.html#FT_TrueTypeGX_Free">FT_TrueTypeGX_Free</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_Atan2">FT_Atan2</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_LINEAR_DESIGN</a></td><td><a href="ft2-gx_validation.html#FT_TrueTypeGX_Validate">FT_TrueTypeGX_Validate</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Attach_File">FT_Attach_File</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_MONOCHROME</a></td><td><a href="ft2-header_file_macros.html#FT_TYPE1_TABLES_H">FT_TYPE1_TABLES_H</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Attach_Stream">FT_Attach_Stream</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_AUTOHINT</a></td><td><a href="ft2-header_file_macros.html#FT_TYPES_H">FT_TYPES_H</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_AUTOHINTER_H">FT_AUTOHINTER_H</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_BITMAP</a></td><td><a href="ft2-basic_types.html#FT_UFWord">FT_UFWord</a></td></tr>
-<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_CJK</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_HINTING</a></td><td><a href="ft2-basic_types.html#FT_UInt">FT_UInt</a></td></tr>
-<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_INDIC</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_RECURSE</a></td><td><a href="ft2-basic_types.html#FT_UInt16">FT_UInt16</a></td></tr>
-<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_LATIN</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a></td><td><a href="ft2-basic_types.html#FT_UInt32">FT_UInt32</a></td></tr>
-<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_NONE</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_PEDANTIC</a></td><td><a href="ft2-basic_types.html#FT_UInt64">FT_UInt64</a></td></tr>
-<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_XXX</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_RENDER</a></td><td><a href="ft2-basic_types.html#FT_ULong">FT_ULong</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_BBOX_H">FT_BBOX_H</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_LCD</a></td><td><a href="ft2-header_file_macros.html#FT_UNPATENTED_HINTING_H">FT_UNPATENTED_HINTING_H</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_BBox">FT_BBox</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_LCD_V</a></td><td><a href="ft2-basic_types.html#FT_UnitVector">FT_UnitVector</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_BDF_H">FT_BDF_H</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_LIGHT</a></td><td><a href="ft2-basic_types.html#FT_UShort">FT_UShort</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_BITMAP_H">FT_BITMAP_H</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_MODE">FT_LOAD_TARGET_MODE</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_APPLE</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Bitmap">FT_Bitmap</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_MONO</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_BASE</a></td></tr>
-<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_Convert">FT_Bitmap_Convert</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_NORMAL</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_bsln</a></td></tr>
-<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_Copy">FT_Bitmap_Copy</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_XXX</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_CKERN</a></td></tr>
-<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_Done">FT_Bitmap_Done</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_VERTICAL_LAYOUT</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_CKERNXXX</a></td></tr>
-<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_Embolden">FT_Bitmap_Embolden</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_XXX</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_feat</a></td></tr>
-<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_New">FT_Bitmap_New</a></td><td><a href="ft2-base_interface.html#FT_Load_Char">FT_Load_Char</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_GDEF</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Bitmap_Size">FT_Bitmap_Size</a></td><td><a href="ft2-base_interface.html#FT_Load_Glyph">FT_Load_Glyph</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_GPOS</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_BitmapGlyph">FT_BitmapGlyph</a></td><td><a href="ft2-truetype_tables.html#FT_Load_Sfnt_Table">FT_Load_Sfnt_Table</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_GSUB</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_BitmapGlyphRec">FT_BitmapGlyphRec</a></td><td><a href="ft2-basic_types.html#FT_Long">FT_Long</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_GX</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Bool">FT_Bool</a></td><td><a href="ft2-header_file_macros.html#FT_LZW_H">FT_LZW_H</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GX_LENGTH">FT_VALIDATE_GX_LENGTH</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Byte">FT_Byte</a></td><td><a href="ft2-header_file_macros.html#FT_MAC_H">FT_MAC_H</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_GXXXX</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Bytes">FT_Bytes</a></td><td><a href="ft2-basic_types.html#FT_MAKE_TAG">FT_MAKE_TAG</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_JSTF</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_BZIP2_H">FT_BZIP2_H</a></td><td><a href="ft2-basic_types.html#FT_Matrix">FT_Matrix</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_just</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CACHE_CHARMAP_H">FT_CACHE_CHARMAP_H</a></td><td><a href="ft2-computations.html#FT_Matrix_Invert">FT_Matrix_Invert</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_kern</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CACHE_H">FT_CACHE_H</a></td><td><a href="ft2-computations.html#FT_Matrix_Multiply">FT_Matrix_Multiply</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_lcar</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CACHE_IMAGE_H">FT_CACHE_IMAGE_H</a></td><td><a href="ft2-system_interface.html#FT_Memory">FT_Memory</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_MATH</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CACHE_SMALL_BITMAPS_H">FT_CACHE_SMALL_BITMAPS_H</a></td><td><a href="ft2-system_interface.html#FT_MemoryRec">FT_MemoryRec</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_MS</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_CeilFix">FT_CeilFix</a></td><td><a href="ft2-multiple_masters.html#FT_MM_Axis">FT_MM_Axis</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_mort</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CFF_DRIVER_H">FT_CFF_DRIVER_H</a></td><td><a href="ft2-multiple_masters.html#FT_MM_Var">FT_MM_Var</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_morx</a></td></tr>
-<tr><td><a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_ADOBE</a></td><td><a href="ft2-header_file_macros.html#FT_MODULE_ERRORS_H">FT_MODULE_ERRORS_H</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_OT</a></td></tr>
-<tr><td><a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_FREETYPE</a></td><td><a href="ft2-header_file_macros.html#FT_MODULE_H">FT_MODULE_H</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_OTXXX</a></td></tr>
-<tr><td><a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_XXX</a></td><td><a href="ft2-base_interface.html#FT_Module">FT_Module</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_opbd</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Char">FT_Char</a></td><td><a href="ft2-module_management.html#FT_Module_Class">FT_Module_Class</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_prop</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_CharMap">FT_CharMap</a></td><td><a href="ft2-module_management.html#FT_Module_Constructor">FT_Module_Constructor</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_trak</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_CharMapRec">FT_CharMapRec</a></td><td><a href="ft2-module_management.html#FT_Module_Destructor">FT_Module_Destructor</a></td><td><a href="ft2-multiple_masters.html#FT_Var_Axis">FT_Var_Axis</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CID_H">FT_CID_H</a></td><td><a href="ft2-module_management.html#FT_Module_Requester">FT_Module_Requester</a></td><td><a href="ft2-multiple_masters.html#FT_Var_Named_Style">FT_Var_Named_Style</a></td></tr>
-<tr><td><a href="ft2-gx_validation.html#FT_ClassicKern_Free">FT_ClassicKern_Free</a></td><td><a href="ft2-header_file_macros.html#FT_MULTIPLE_MASTERS_H">FT_MULTIPLE_MASTERS_H</a></td><td><a href="ft2-basic_types.html#FT_Vector">FT_Vector</a></td></tr>
-<tr><td><a href="ft2-gx_validation.html#FT_ClassicKern_Validate">FT_ClassicKern_Validate</a></td><td><a href="ft2-computations.html#FT_MulDiv">FT_MulDiv</a></td><td><a href="ft2-computations.html#FT_Vector_From_Polar">FT_Vector_From_Polar</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CONFIG_CONFIG_H">FT_CONFIG_CONFIG_H</a></td><td><a href="ft2-computations.html#FT_MulFix">FT_MulFix</a></td><td><a href="ft2-computations.html#FT_Vector_Length">FT_Vector_Length</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CONFIG_MODULES_H">FT_CONFIG_MODULES_H</a></td><td><a href="ft2-multiple_masters.html#FT_Multi_Master">FT_Multi_Master</a></td><td><a href="ft2-computations.html#FT_Vector_Polarize">FT_Vector_Polarize</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CONFIG_OPTIONS_H">FT_CONFIG_OPTIONS_H</a></td><td><a href="ft2-base_interface.html#FT_New_Face">FT_New_Face</a></td><td><a href="ft2-computations.html#FT_Vector_Rotate">FT_Vector_Rotate</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_CONFIG_STANDARD_LIBRARY_H">FT_CONFIG_STANDARD_LIBRARY_H</a></td><td><a href="ft2-mac_specific.html#FT_New_Face_From_FOND">FT_New_Face_From_FOND</a></td><td><a href="ft2-computations.html#FT_Vector_Transform">FT_Vector_Transform</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_Cos">FT_Cos</a></td><td><a href="ft2-mac_specific.html#FT_New_Face_From_FSRef">FT_New_Face_From_FSRef</a></td><td><a href="ft2-computations.html#FT_Vector_Unit">FT_Vector_Unit</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Data">FT_Data</a></td><td><a href="ft2-mac_specific.html#FT_New_Face_From_FSSpec">FT_New_Face_From_FSSpec</a></td><td><a href="ft2-header_file_macros.html#FT_WINFONTS_H">FT_WINFONTS_H</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_DivFix">FT_DivFix</a></td><td><a href="ft2-module_management.html#FT_New_Library">FT_New_Library</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_Header">FT_WinFNT_Header</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Done_Face">FT_Done_Face</a></td><td><a href="ft2-base_interface.html#FT_New_Memory_Face">FT_New_Memory_Face</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_HeaderRec">FT_WinFNT_HeaderRec</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Done_FreeType">FT_Done_FreeType</a></td><td><a href="ft2-sizes_management.html#FT_New_Size">FT_New_Size</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1250</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Done_Glyph">FT_Done_Glyph</a></td><td><a href="ft2-basic_types.html#FT_Offset">FT_Offset</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1251</a></td></tr>
-<tr><td><a href="ft2-module_management.html#FT_Done_Library">FT_Done_Library</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_DRIVER</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1252</a></td></tr>
-<tr><td><a href="ft2-sizes_management.html#FT_Done_Size">FT_Done_Size</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_MEMORY</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1253</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Driver">FT_Driver</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_PARAMS</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1254</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_ENC_TAG">FT_ENC_TAG</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_PATHNAME</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1255</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_ADOBE_CUSTOM</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_STREAM</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1256</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_ADOBE_EXPERT</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_XXX</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1257</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_ADOBE_LATIN_1</a></td><td><a href="ft2-header_file_macros.html#FT_OPENTYPE_VALIDATE_H">FT_OPENTYPE_VALIDATE_H</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1258</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_ADOBE_STANDARD</a></td><td><a href="ft2-base_interface.html#FT_Open_Args">FT_Open_Args</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1361</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_APPLE_ROMAN</a></td><td><a href="ft2-base_interface.html#FT_Open_Face">FT_Open_Face</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP874</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_BIG5</a></td><td><a href="ft2-ot_validation.html#FT_OpenType_Free">FT_OpenType_Free</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP932</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_GB2312</a></td><td><a href="ft2-ot_validation.html#FT_OpenType_Validate">FT_OpenType_Validate</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP936</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_JOHAB</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_FILL_LEFT</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP949</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_BIG5</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_FILL_RIGHT</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP950</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_GB2312</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_NONE</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_DEFAULT</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_JOHAB</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_POSTSCRIPT</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_MAC</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_SJIS</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_TRUETYPE</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_OEM</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_SYMBOL</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_Orientation</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_SYMBOL</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_WANSUNG</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_EVEN_ODD_FILL</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_XXX</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_NONE</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_FLAGS</a></td><td><a href="ft2-header_file_macros.html#FT_XFREE86_H">FT_XFREE86_H</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_OLD_LATIN_2</a></td><td><a href="ft2-header_file_macros.html#FT_OUTLINE_H">FT_OUTLINE_H</a></td><td><a href="ft2-cache_subsystem.html#FTC_CMapCache">FTC_CMapCache</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_SJIS</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_HIGH_PRECISION</a></td><td><a href="ft2-cache_subsystem.html#FTC_CMapCache_Lookup">FTC_CMapCache_Lookup</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_UNICODE</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_IGNORE_DROPOUTS</a></td><td><a href="ft2-cache_subsystem.html#FTC_CMapCache_New">FTC_CMapCache_New</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_WANSUNG</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_INCLUDE_STUBS</a></td><td><a href="ft2-cache_subsystem.html#FTC_Face_Requester">FTC_Face_Requester</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_Encoding</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_NONE</a></td><td><a href="ft2-cache_subsystem.html#FTC_FaceID">FTC_FaceID</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_ERRORS_H">FT_ERRORS_H</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_OWNER</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageCache">FTC_ImageCache</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Error">FT_Error</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_REVERSE_FILL</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageCache_Lookup">FTC_ImageCache_Lookup</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_F26Dot6">FT_F26Dot6</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_SINGLE_PASS</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageCache_LookupScaler">FTC_ImageCache_LookupScaler</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_F2Dot14">FT_F2Dot14</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_SMART_DROPOUTS</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageCache_New">FTC_ImageCache_New</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_CID_KEYED</a></td><td><a href="ft2-outline_processing.html#FT_Outline">FT_Outline</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageType">FTC_ImageType</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_EXTERNAL_STREAM</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Check">FT_Outline_Check</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageTypeRec">FTC_ImageTypeRec</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_FAST_GLYPHS</a></td><td><a href="ft2-outline_processing.html#FT_Outline_ConicToFunc">FT_Outline_ConicToFunc</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager">FTC_Manager</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_FIXED_SIZES</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Copy">FT_Outline_Copy</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_Done">FTC_Manager_Done</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_FIXED_WIDTH</a></td><td><a href="ft2-outline_processing.html#FT_Outline_CubicToFunc">FT_Outline_CubicToFunc</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_LookupFace">FTC_Manager_LookupFace</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_GLYPH_NAMES</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Decompose">FT_Outline_Decompose</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_LookupSize">FTC_Manager_LookupSize</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_HINTER</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Done">FT_Outline_Done</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_New">FTC_Manager_New</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_HORIZONTAL</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Embolden">FT_Outline_Embolden</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_RemoveFaceID">FTC_Manager_RemoveFaceID</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_KERNING</a></td><td><a href="ft2-outline_processing.html#FT_Outline_EmboldenXY">FT_Outline_EmboldenXY</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_Reset">FTC_Manager_Reset</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_MULTIPLE_MASTERS</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Funcs">FT_Outline_Funcs</a></td><td><a href="ft2-cache_subsystem.html#FTC_Node">FTC_Node</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_SCALABLE</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Get_BBox">FT_Outline_Get_BBox</a></td><td><a href="ft2-cache_subsystem.html#FTC_Node_Unref">FTC_Node_Unref</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_SFNT</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Get_Bitmap">FT_Outline_Get_Bitmap</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBit">FTC_SBit</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_TRICKY</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Get_CBox">FT_Outline_Get_CBox</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitCache">FTC_SBitCache</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_VERTICAL</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Get_Orientation">FT_Outline_Get_Orientation</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitCache_Lookup">FTC_SBitCache_Lookup</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_XXX</a></td><td><a href="ft2-glyph_stroker.html#FT_Outline_GetInsideBorder">FT_Outline_GetInsideBorder</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitCache_LookupScaler">FTC_SBitCache_LookupScaler</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Face">FT_Face</a></td><td><a href="ft2-glyph_stroker.html#FT_Outline_GetOutsideBorder">FT_Outline_GetOutsideBorder</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitCache_New">FTC_SBitCache_New</a></td></tr>
-<tr><td><a href="ft2-version.html#FT_Face_CheckTrueTypePatents">FT_Face_CheckTrueTypePatents</a></td><td><a href="ft2-outline_processing.html#FT_Outline_LineToFunc">FT_Outline_LineToFunc</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitRec">FTC_SBitRec</a></td></tr>
-<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetCharsOfVariant">FT_Face_GetCharsOfVariant</a></td><td><a href="ft2-outline_processing.html#FT_Outline_MoveToFunc">FT_Outline_MoveToFunc</a></td><td><a href="ft2-cache_subsystem.html#FTC_Scaler">FTC_Scaler</a></td></tr>
-<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetCharVariantIndex">FT_Face_GetCharVariantIndex</a></td><td><a href="ft2-outline_processing.html#FT_Outline_New">FT_Outline_New</a></td><td><a href="ft2-cache_subsystem.html#FTC_ScalerRec">FTC_ScalerRec</a></td></tr>
-<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetCharVariantIsDefault">FT_Face_GetCharVariantIsDefault</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Render">FT_Outline_Render</a></td><td><a href="ft2-auto_hinter.html#fallback-script">fallback-script</a></td></tr>
-<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetVariantSelectors">FT_Face_GetVariantSelectors</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Reverse">FT_Outline_Reverse</a></td><td><a href="ft2-base_interface.html#ft_encoding_xxx">ft_encoding_xxx</a></td></tr>
-<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetVariantsOfChar">FT_Face_GetVariantsOfChar</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Transform">FT_Outline_Transform</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_gridfit</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Face_Internal">FT_Face_Internal</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Translate">FT_Outline_Translate</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_pixels</a></td></tr>
-<tr><td><a href="ft2-version.html#FT_Face_SetUnpatentedHinting">FT_Face_SetUnpatentedHinting</a></td><td><a href="ft2-glyph_management.html#FT_OutlineGlyph">FT_OutlineGlyph</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_subpixels</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FaceRec">FT_FaceRec</a></td><td><a href="ft2-glyph_management.html#FT_OutlineGlyphRec">FT_OutlineGlyphRec</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_truncate</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Fixed">FT_Fixed</a></td><td><a href="ft2-sfnt_names.html#FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY">FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_unscaled</a></td></tr>
-<tr><td><a href="ft2-computations.html#FT_FloorFix">FT_FloorFix</a></td><td><a href="ft2-sfnt_names.html#FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY">FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_xxx</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_FREETYPE_H">FT_FREETYPE_H</a></td><td><a href="ft2-incremental.html#FT_PARAM_TAG_INCREMENTAL">FT_PARAM_TAG_INCREMENTAL</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_bitmap</a></td></tr>
-<tr><td><a href="ft2-system_interface.html#FT_Free_Func">FT_Free_Func</a></td><td><a href="ft2-truetype_tables.html#FT_PARAM_TAG_UNPATENTED_HINTING">FT_PARAM_TAG_UNPATENTED_HINTING</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_composite</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_BITMAP_EMBEDDING_ONLY</a></td><td><a href="ft2-basic_types.html#FT_Palette_Mode">FT_Palette_Mode</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_none</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_EDITABLE_EMBEDDING</a></td><td><a href="ft2-base_interface.html#FT_Parameter">FT_Parameter</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_outline</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_INSTALLABLE_EMBEDDING</a></td><td><a href="ft2-header_file_macros.html#FT_PFR_H">FT_PFR_H</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_plotter</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_NO_SUBSETTING</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_BGRA</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_xxx</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_GRAY</a></td><td><a href="ft2-base_interface.html#ft_kerning_default">ft_kerning_default</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_GRAY2</a></td><td><a href="ft2-base_interface.html#ft_kerning_unfitted">ft_kerning_unfitted</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_XXX</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_GRAY4</a></td><td><a href="ft2-base_interface.html#ft_kerning_unscaled">ft_kerning_unscaled</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_FWord">FT_FWord</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_LCD</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_driver</a></td></tr>
-<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_DO_GRAY</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_LCD_V</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_memory</a></td></tr>
-<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_DO_GRIDFIT</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_MONO</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_params</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_GASP_H">FT_GASP_H</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_NONE</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_pathname</a></td></tr>
-<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_NO_TABLE</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_Pixel_Mode</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_stream</a></td></tr>
-<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_SYMMETRIC_GRIDFIT</a></td><td><a href="ft2-basic_types.html#FT_Pointer">FT_Pointer</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_even_odd_fill</a></td></tr>
-<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_SYMMETRIC_SMOOTHING</a></td><td><a href="ft2-basic_types.html#FT_Pos">FT_Pos</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_flags</a></td></tr>
-<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_XXX</a></td><td><a href="ft2-auto_hinter.html#FT_Prop_GlyphToScriptMap">FT_Prop_GlyphToScriptMap</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_high_precision</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Generic">FT_Generic</a></td><td><a href="ft2-auto_hinter.html#FT_Prop_IncreaseXHeight">FT_Prop_IncreaseXHeight</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_ignore_dropouts</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Generic_Finalizer">FT_Generic_Finalizer</a></td><td><a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_none</a></td></tr>
-<tr><td><a href="ft2-quick_advance.html#FT_Get_Advance">FT_Get_Advance</a></td><td><a href="ft2-module_management.html#FT_Property_Set">FT_Property_Set</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_owner</a></td></tr>
-<tr><td><a href="ft2-quick_advance.html#FT_Get_Advances">FT_Get_Advances</a></td><td><a href="ft2-bdf_fonts.html#FT_PropertyType">FT_PropertyType</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_reverse_fill</a></td></tr>
-<tr><td><a href="ft2-bdf_fonts.html#FT_Get_BDF_Charset_ID">FT_Get_BDF_Charset_ID</a></td><td><a href="ft2-basic_types.html#FT_PtrDist">FT_PtrDist</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_single_pass</a></td></tr>
-<tr><td><a href="ft2-bdf_fonts.html#FT_Get_BDF_Property">FT_Get_BDF_Property</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_AA</a></td><td><a href="ft2-basic_types.html#FT_Palette_Mode">ft_palette_mode_rgb</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_Char_Index">FT_Get_Char_Index</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_CLIP</a></td><td><a href="ft2-basic_types.html#FT_Palette_Mode">ft_palette_mode_rgba</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_Charmap_Index">FT_Get_Charmap_Index</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_DEFAULT</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_grays</a></td></tr>
-<tr><td><a href="ft2-cid_fonts.html#FT_Get_CID_From_Glyph_Index">FT_Get_CID_From_Glyph_Index</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_DIRECT</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_mono</a></td></tr>
-<tr><td><a href="ft2-cid_fonts.html#FT_Get_CID_Is_Internally_CID_Keyed">FT_Get_CID_Is_Internally_CID_Keyed</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_XXX</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_none</a></td></tr>
-<tr><td><a href="ft2-cid_fonts.html#FT_Get_CID_Registry_Ordering_Supplement">FT_Get_CID_Registry_Ordering_Supplement</a></td><td><a href="ft2-raster.html#FT_Raster">FT_Raster</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_pal2</a></td></tr>
-<tr><td><a href="ft2-truetype_tables.html#FT_Get_CMap_Format">FT_Get_CMap_Format</a></td><td><a href="ft2-raster.html#FT_Raster_BitSet_Func">FT_Raster_BitSet_Func</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_pal4</a></td></tr>
-<tr><td><a href="ft2-truetype_tables.html#FT_Get_CMap_Language_ID">FT_Get_CMap_Language_ID</a></td><td><a href="ft2-raster.html#FT_Raster_BitTest_Func">FT_Raster_BitTest_Func</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_xxx</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_First_Char">FT_Get_First_Char</a></td><td><a href="ft2-raster.html#FT_Raster_DoneFunc">FT_Raster_DoneFunc</a></td><td><a href="ft2-base_interface.html#ft_render_mode_xxx">ft_render_mode_mono</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_FSType_Flags">FT_Get_FSType_Flags</a></td><td><a href="ft2-raster.html#FT_Raster_Funcs">FT_Raster_Funcs</a></td><td><a href="ft2-base_interface.html#ft_render_mode_xxx">ft_render_mode_normal</a></td></tr>
-<tr><td><a href="ft2-gasp_table.html#FT_Get_Gasp">FT_Get_Gasp</a></td><td><a href="ft2-raster.html#FT_Raster_NewFunc">FT_Raster_NewFunc</a></td><td><a href="ft2-base_interface.html#ft_render_mode_xxx">ft_render_mode_xxx</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Get_Glyph">FT_Get_Glyph</a></td><td><a href="ft2-raster.html#FT_Raster_Params">FT_Raster_Params</a></td><td><a href="ft2-auto_hinter.html#glyph-to-script-map">glyph-to-script-map</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_Glyph_Name">FT_Get_Glyph_Name</a></td><td><a href="ft2-raster.html#FT_Raster_RenderFunc">FT_Raster_RenderFunc</a></td><td><a href="ft2-cff_driver.html#hinting-engine">hinting-engine</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_Kerning">FT_Get_Kerning</a></td><td><a href="ft2-raster.html#FT_Raster_ResetFunc">FT_Raster_ResetFunc</a></td><td><a href="ft2-auto_hinter.html#increase-x-height">increase-x-height</a></td></tr>
-<tr><td><a href="ft2-multiple_masters.html#FT_Get_MM_Var">FT_Get_MM_Var</a></td><td><a href="ft2-raster.html#FT_Raster_SetModeFunc">FT_Raster_SetModeFunc</a></td><td><a href="ft2-tt_driver.html#interpreter-version">interpreter-version</a></td></tr>
-<tr><td><a href="ft2-module_management.html#FT_Get_Module">FT_Get_Module</a></td><td><a href="ft2-header_file_macros.html#FT_RENDER_H">FT_RENDER_H</a></td><td><a href="ft2-cff_driver.html#no-stem-darkening">no-stem-darkening</a></td></tr>
-<tr><td><a href="ft2-multiple_masters.html#FT_Get_Multi_Master">FT_Get_Multi_Master</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_LCD</a></td><td><a href="ft2-type1_tables.html#PS_Dict_Keys">PS_Dict_Keys</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_Name_Index">FT_Get_Name_Index</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_LCD_V</a></td><td><a href="ft2-type1_tables.html#PS_FontInfo">PS_FontInfo</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_Next_Char">FT_Get_Next_Char</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_LIGHT</a></td><td><a href="ft2-type1_tables.html#PS_FontInfoRec">PS_FontInfoRec</a></td></tr>
-<tr><td><a href="ft2-pfr_fonts.html#FT_Get_PFR_Advance">FT_Get_PFR_Advance</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_MONO</a></td><td><a href="ft2-type1_tables.html#PS_Private">PS_Private</a></td></tr>
-<tr><td><a href="ft2-pfr_fonts.html#FT_Get_PFR_Kerning">FT_Get_PFR_Kerning</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_NORMAL</a></td><td><a href="ft2-type1_tables.html#PS_PrivateRec">PS_PrivateRec</a></td></tr>
-<tr><td><a href="ft2-pfr_fonts.html#FT_Get_PFR_Metrics">FT_Get_PFR_Metrics</a></td><td><a href="ft2-system_interface.html#FT_Realloc_Func">FT_Realloc_Func</a></td><td><a href="ft2-type1_tables.html#T1_Blend_Flags">T1_Blend_Flags</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_Postscript_Name">FT_Get_Postscript_Name</a></td><td><a href="ft2-base_interface.html#FT_Reference_Face">FT_Reference_Face</a></td><td><a href="ft2-type1_tables.html#T1_EncodingType">T1_EncodingType</a></td></tr>
-<tr><td><a href="ft2-type1_tables.html#FT_Get_PS_Font_Info">FT_Get_PS_Font_Info</a></td><td><a href="ft2-module_management.html#FT_Reference_Library">FT_Reference_Library</a></td><td><a href="ft2-type1_tables.html#T1_FontInfo">T1_FontInfo</a></td></tr>
-<tr><td><a href="ft2-type1_tables.html#FT_Get_PS_Font_Private">FT_Get_PS_Font_Private</a></td><td><a href="ft2-module_management.html#FT_Remove_Module">FT_Remove_Module</a></td><td><a href="ft2-type1_tables.html#T1_Private">T1_Private</a></td></tr>
-<tr><td><a href="ft2-type1_tables.html#FT_Get_PS_Font_Value">FT_Get_PS_Font_Value</a></td><td><a href="ft2-base_interface.html#FT_Render_Glyph">FT_Render_Glyph</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_CUSTOM</a></td></tr>
-<tr><td><a href="ft2-module_management.html#FT_Get_Renderer">FT_Get_Renderer</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_Render_Mode</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_EXPERT</a></td></tr>
-<tr><td><a href="ft2-sfnt_names.html#FT_Get_Sfnt_Name">FT_Get_Sfnt_Name</a></td><td><a href="ft2-base_interface.html#FT_Renderer">FT_Renderer</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_LATIN_1</a></td></tr>
-<tr><td><a href="ft2-sfnt_names.html#FT_Get_Sfnt_Name_Count">FT_Get_Sfnt_Name_Count</a></td><td><a href="ft2-module_management.html#FT_Renderer_Class">FT_Renderer_Class</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_STANDARD</a></td></tr>
-<tr><td><a href="ft2-truetype_tables.html#FT_Get_Sfnt_Table">FT_Get_Sfnt_Table</a></td><td><a href="ft2-base_interface.html#FT_Request_Size">FT_Request_Size</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_XXX</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_SubGlyph_Info">FT_Get_SubGlyph_Info</a></td><td><a href="ft2-computations.html#FT_RoundFix">FT_RoundFix</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_DEFAULT</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Get_Track_Kerning">FT_Get_Track_Kerning</a></td><td><a href="ft2-base_interface.html#FT_Select_Charmap">FT_Select_Charmap</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_ISO_10646</a></td></tr>
-<tr><td><a href="ft2-truetype_engine.html#FT_Get_TrueType_Engine_Type">FT_Get_TrueType_Engine_Type</a></td><td><a href="ft2-base_interface.html#FT_Select_Size">FT_Select_Size</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_UNICODE_1_1</a></td></tr>
-<tr><td><a href="ft2-winfnt_fonts.html#FT_Get_WinFNT_Header">FT_Get_WinFNT_Header</a></td><td><a href="ft2-base_interface.html#FT_Set_Char_Size">FT_Set_Char_Size</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_UNICODE_2_0</a></td></tr>
-<tr><td><a href="ft2-font_formats.html#FT_Get_X11_Font_Format">FT_Get_X11_Font_Format</a></td><td><a href="ft2-base_interface.html#FT_Set_Charmap">FT_Set_Charmap</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_UNICODE_32</a></td></tr>
-<tr><td><a href="ft2-mac_specific.html#FT_GetFile_From_Mac_ATS_Name">FT_GetFile_From_Mac_ATS_Name</a></td><td><a href="ft2-module_management.html#FT_Set_Debug_Hook">FT_Set_Debug_Hook</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_VARIANT_SELECTOR</a></td></tr>
-<tr><td><a href="ft2-mac_specific.html#FT_GetFile_From_Mac_Name">FT_GetFile_From_Mac_Name</a></td><td><a href="ft2-multiple_masters.html#FT_Set_MM_Blend_Coordinates">FT_Set_MM_Blend_Coordinates</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_XXX</a></td></tr>
-<tr><td><a href="ft2-mac_specific.html#FT_GetFilePath_From_Mac_ATS_Name">FT_GetFilePath_From_Mac_ATS_Name</a></td><td><a href="ft2-multiple_masters.html#FT_Set_MM_Design_Coordinates">FT_Set_MM_Design_Coordinates</a></td><td><a href="ft2-truetype_tables.html#TT_Header">TT_Header</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_GRIDFIT</a></td><td><a href="ft2-base_interface.html#FT_Set_Pixel_Sizes">FT_Set_Pixel_Sizes</a></td><td><a href="ft2-truetype_tables.html#TT_HoriHeader">TT_HoriHeader</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_PIXELS</a></td><td><a href="ft2-module_management.html#FT_Set_Renderer">FT_Set_Renderer</a></td><td><a href="ft2-tt_driver.html#TT_INTERPRETER_VERSION_XXX">TT_INTERPRETER_VERSION_35</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_SUBPIXELS</a></td><td><a href="ft2-base_interface.html#FT_Set_Transform">FT_Set_Transform</a></td><td><a href="ft2-tt_driver.html#TT_INTERPRETER_VERSION_XXX">TT_INTERPRETER_VERSION_38</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_TRUNCATE</a></td><td><a href="ft2-multiple_masters.html#FT_Set_Var_Blend_Coordinates">FT_Set_Var_Blend_Coordinates</a></td><td><a href="ft2-tt_driver.html#TT_INTERPRETER_VERSION_XXX">TT_INTERPRETER_VERSION_XXX</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_UNSCALED</a></td><td><a href="ft2-multiple_masters.html#FT_Set_Var_Design_Coordinates">FT_Set_Var_Design_Coordinates</a></td><td><a href="ft2-truetype_tables.html#TT_ISO_ID_XXX">TT_ISO_ID_10646</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_BITMAP</a></td><td><a href="ft2-header_file_macros.html#FT_SFNT_NAMES_H">FT_SFNT_NAMES_H</a></td><td><a href="ft2-truetype_tables.html#TT_ISO_ID_XXX">TT_ISO_ID_7BIT_ASCII</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_COMPOSITE</a></td><td><a href="ft2-truetype_tables.html#FT_Sfnt_Table_Info">FT_Sfnt_Table_Info</a></td><td><a href="ft2-truetype_tables.html#TT_ISO_ID_XXX">TT_ISO_ID_8859_1</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_NONE</a></td><td><a href="ft2-truetype_tables.html#FT_Sfnt_Tag">FT_Sfnt_Tag</a></td><td><a href="ft2-truetype_tables.html#TT_ISO_ID_XXX">TT_ISO_ID_XXX</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_OUTLINE</a></td><td><a href="ft2-sfnt_names.html#FT_SfntName">FT_SfntName</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ARABIC</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_PLOTTER</a></td><td><a href="ft2-basic_types.html#FT_Short">FT_Short</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ARMENIAN</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_GLYPH_H">FT_GLYPH_H</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_BBOX</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_BENGALI</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph">FT_Glyph</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_CELL</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_BURMESE</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_Glyph_BBox_Mode</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_NOMINAL</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_DEVANAGARI</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_Copy">FT_Glyph_Copy</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_REAL_DIM</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GEEZ</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_Glyph_Format</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_SCALES</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GEORGIAN</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_Get_CBox">FT_Glyph_Get_CBox</a></td><td><a href="ft2-header_file_macros.html#FT_SIZES_H">FT_SIZES_H</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GREEK</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Glyph_Metrics">FT_Glyph_Metrics</a></td><td><a href="ft2-computations.html#FT_Sin">FT_Sin</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GUJARATI</a></td></tr>
-<tr><td><a href="ft2-glyph_stroker.html#FT_Glyph_Stroke">FT_Glyph_Stroke</a></td><td><a href="ft2-base_interface.html#FT_Size">FT_Size</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GURMUKHI</a></td></tr>
-<tr><td><a href="ft2-glyph_stroker.html#FT_Glyph_StrokeBorder">FT_Glyph_StrokeBorder</a></td><td><a href="ft2-base_interface.html#FT_Size_Internal">FT_Size_Internal</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_HEBREW</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_To_Bitmap">FT_Glyph_To_Bitmap</a></td><td><a href="ft2-base_interface.html#FT_Size_Metrics">FT_Size_Metrics</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_JAPANESE</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_Glyph_Transform">FT_Glyph_Transform</a></td><td><a href="ft2-base_interface.html#FT_Size_Request">FT_Size_Request</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_KANNADA</a></td></tr>
-<tr><td><a href="ft2-glyph_management.html#FT_GlyphRec">FT_GlyphRec</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_Size_Request_Type</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_KHMER</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_GlyphSlot">FT_GlyphSlot</a></td><td><a href="ft2-base_interface.html#FT_Size_RequestRec">FT_Size_RequestRec</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_KOREAN</a></td></tr>
-<tr><td><a href="ft2-bitmap_handling.html#FT_GlyphSlot_Own_Bitmap">FT_GlyphSlot_Own_Bitmap</a></td><td><a href="ft2-base_interface.html#FT_SizeRec">FT_SizeRec</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_LAOTIAN</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_GlyphSlotRec">FT_GlyphSlotRec</a></td><td><a href="ft2-base_interface.html#FT_Slot_Internal">FT_Slot_Internal</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_MALAYALAM</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_GX_VALIDATE_H">FT_GX_VALIDATE_H</a></td><td><a href="ft2-raster.html#FT_Span">FT_Span</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_MALDIVIAN</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_GZIP_H">FT_GZIP_H</a></td><td><a href="ft2-raster.html#FT_SpanFunc">FT_SpanFunc</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_MONGOLIAN</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_HAS_FAST_GLYPHS">FT_HAS_FAST_GLYPHS</a></td><td><a href="ft2-glyph_stroker.html#FT_StrokerBorder">FT_STROKER_BORDER_LEFT</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ORIYA</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_HAS_FIXED_SIZES">FT_HAS_FIXED_SIZES</a></td><td><a href="ft2-glyph_stroker.html#FT_StrokerBorder">FT_STROKER_BORDER_RIGHT</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ROMAN</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_HAS_GLYPH_NAMES">FT_HAS_GLYPH_NAMES</a></td><td><a href="ft2-header_file_macros.html#FT_STROKER_H">FT_STROKER_H</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_RSYMBOL</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_HAS_HORIZONTAL">FT_HAS_HORIZONTAL</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineCap">FT_STROKER_LINECAP_BUTT</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_RUSSIAN</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_HAS_KERNING">FT_HAS_KERNING</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineCap">FT_STROKER_LINECAP_ROUND</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_SIMPLIFIED_CHINESE</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_HAS_MULTIPLE_MASTERS">FT_HAS_MULTIPLE_MASTERS</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineCap">FT_STROKER_LINECAP_SQUARE</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_SINDHI</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_HAS_VERTICAL">FT_HAS_VERTICAL</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_BEVEL</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_SINHALESE</a></td></tr>
-<tr><td><a href="ft2-type1_tables.html#FT_Has_PS_Glyph_Names">FT_Has_PS_Glyph_Names</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_MITER</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_SLAVIC</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_IMAGE_H">FT_IMAGE_H</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_MITER_FIXED</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_TAMIL</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_IMAGE_TAG">FT_IMAGE_TAG</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_MITER_VARIABLE</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_TELUGU</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_INCREMENTAL_H">FT_INCREMENTAL_H</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_ROUND</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_THAI</a></td></tr>
-<tr><td><a href="ft2-incremental.html#FT_Incremental">FT_Incremental</a></td><td><a href="ft2-base_interface.html#FT_STYLE_FLAG_XXX">FT_STYLE_FLAG_BOLD</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_TIBETAN</a></td></tr>
-<tr><td><a href="ft2-incremental.html#FT_Incremental_FreeGlyphDataFunc">FT_Incremental_FreeGlyphDataFunc</a></td><td><a href="ft2-base_interface.html#FT_STYLE_FLAG_XXX">FT_STYLE_FLAG_ITALIC</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_TRADITIONAL_CHINESE</a></td></tr>
-<tr><td><a href="ft2-incremental.html#FT_Incremental_FuncsRec">FT_Incremental_FuncsRec</a></td><td><a href="ft2-base_interface.html#FT_STYLE_FLAG_XXX">FT_STYLE_FLAG_XXX</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_UNINTERP</a></td></tr>
-<tr><td><a href="ft2-incremental.html#FT_Incremental_GetGlyphDataFunc">FT_Incremental_GetGlyphDataFunc</a></td><td><a href="ft2-system_interface.html#FT_Stream">FT_Stream</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_VIETNAMESE</a></td></tr>
-<tr><td><a href="ft2-incremental.html#FT_Incremental_GetGlyphMetricsFunc">FT_Incremental_GetGlyphMetricsFunc</a></td><td><a href="ft2-system_interface.html#FT_Stream_CloseFunc">FT_Stream_CloseFunc</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_XXX</a></td></tr>
-<tr><td><a href="ft2-incremental.html#FT_Incremental_Interface">FT_Incremental_Interface</a></td><td><a href="ft2-system_interface.html#FT_Stream_IoFunc">FT_Stream_IoFunc</a></td><td><a href="ft2-truetype_tables.html#TT_MaxProfile">TT_MaxProfile</a></td></tr>
-<tr><td><a href="ft2-incremental.html#FT_Incremental_InterfaceRec">FT_Incremental_InterfaceRec</a></td><td><a href="ft2-bzip2.html#FT_Stream_OpenBzip2">FT_Stream_OpenBzip2</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_BIG_5</a></td></tr>
-<tr><td><a href="ft2-incremental.html#FT_Incremental_Metrics">FT_Incremental_Metrics</a></td><td><a href="ft2-gzip.html#FT_Stream_OpenGzip">FT_Stream_OpenGzip</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_GB2312</a></td></tr>
-<tr><td><a href="ft2-incremental.html#FT_Incremental_MetricsRec">FT_Incremental_MetricsRec</a></td><td><a href="ft2-lzw.html#FT_Stream_OpenLZW">FT_Stream_OpenLZW</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_JOHAB</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Init_FreeType">FT_Init_FreeType</a></td><td><a href="ft2-system_interface.html#FT_StreamDesc">FT_StreamDesc</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_SJIS</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Int">FT_Int</a></td><td><a href="ft2-system_interface.html#FT_StreamRec">FT_StreamRec</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_SYMBOL_CS</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Int16">FT_Int16</a></td><td><a href="ft2-basic_types.html#FT_String">FT_String</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_UCS_4</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Int32">FT_Int32</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker">FT_Stroker</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_UNICODE_CS</a></td></tr>
-<tr><td><a href="ft2-basic_types.html#FT_Int64">FT_Int64</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_BeginSubPath">FT_Stroker_BeginSubPath</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_WANSUNG</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_IS_CID_KEYED">FT_IS_CID_KEYED</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_ConicTo">FT_Stroker_ConicTo</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_XXX</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_IS_FIXED_WIDTH">FT_IS_FIXED_WIDTH</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_CubicTo">FT_Stroker_CubicTo</a></td><td><a href="ft2-truetype_tables.html#TT_OS2">TT_OS2</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_IS_SCALABLE">FT_IS_SCALABLE</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_Done">FT_Stroker_Done</a></td><td><a href="ft2-truetype_tables.html#TT_PCLT">TT_PCLT</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_IS_SFNT">FT_IS_SFNT</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_EndSubPath">FT_Stroker_EndSubPath</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_ADOBE</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_IS_TRICKY">FT_IS_TRICKY</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_Export">FT_Stroker_Export</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_APPLE_UNICODE</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Kerning_Mode">FT_KERNING_DEFAULT</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_ExportBorder">FT_Stroker_ExportBorder</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_CUSTOM</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Kerning_Mode">FT_KERNING_UNFITTED</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_GetBorderCounts">FT_Stroker_GetBorderCounts</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_ISO</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Kerning_Mode">FT_KERNING_UNSCALED</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_GetCounts">FT_Stroker_GetCounts</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_MACINTOSH</a></td></tr>
-<tr><td><a href="ft2-base_interface.html#FT_Kerning_Mode">FT_Kerning_Mode</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineCap">FT_Stroker_LineCap</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_MICROSOFT</a></td></tr>
-<tr><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LCD_FILTER_DEFAULT</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_Stroker_LineJoin</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_XXX</a></td></tr>
-<tr><td><a href="ft2-header_file_macros.html#FT_LCD_FILTER_H">FT_LCD_FILTER_H</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineTo">FT_Stroker_LineTo</a></td><td><a href="ft2-truetype_tables.html#TT_Postscript">TT_Postscript</a></td></tr>
-<tr><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LCD_FILTER_LEGACY</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_New">FT_Stroker_New</a></td><td><a href="ft2-truetype_tables.html#TT_VertHeader">TT_VertHeader</a></td></tr>
+<tr><td><a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_ATOM</a></td><td><a href="ft2-header_file_macros.html#FT_LCD_FILTER_H">FT_LCD_FILTER_H</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_ParseOutline">FT_Stroker_ParseOutline</a></td></tr>
+<tr><td><a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_CARDINAL</a></td><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LCD_FILTER_LEGACY</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_Rewind">FT_Stroker_Rewind</a></td></tr>
+<tr><td><a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_INTEGER</a></td><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LCD_FILTER_LIGHT</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_Set">FT_Stroker_Set</a></td></tr>
+<tr><td><a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_NONE</a></td><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LCD_FILTER_NONE</a></td><td><a href="ft2-glyph_stroker.html#FT_StrokerBorder">FT_StrokerBorder</a></td></tr>
+<tr><td><a href="ft2-bdf_fonts.html#BDF_Property">BDF_Property</a></td><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LcdFilter</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_2X2</a></td></tr>
+<tr><td><a href="ft2-bdf_fonts.html#BDF_PropertyRec">BDF_PropertyRec</a></td><td><a href="ft2-header_file_macros.html#FT_LIST_H">FT_LIST_H</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS</a></td></tr>
+<tr><td><a href="ft2-type1_tables.html#CID_FaceDict">CID_FaceDict</a></td><td><a href="ft2-base_interface.html#FT_Library">FT_Library</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES</a></td></tr>
+<tr><td><a href="ft2-type1_tables.html#CID_FaceDictRec">CID_FaceDictRec</a></td><td><a href="ft2-lcd_filtering.html#FT_Library_SetLcdFilter">FT_Library_SetLcdFilter</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID</a></td></tr>
+<tr><td><a href="ft2-type1_tables.html#CID_FaceInfo">CID_FaceInfo</a></td><td><a href="ft2-lcd_filtering.html#FT_Library_SetLcdFilterWeights">FT_Library_SetLcdFilterWeights</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_SCALE</a></td></tr>
+<tr><td><a href="ft2-type1_tables.html#CID_FaceInfoRec">CID_FaceInfoRec</a></td><td><a href="ft2-version.html#FT_Library_Version">FT_Library_Version</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_USE_MY_METRICS</a></td></tr>
+<tr><td><a href="ft2-type1_tables.html#CID_Info">CID_Info</a></td><td><a href="ft2-list_processing.html#FT_List">FT_List</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_XXX</a></td></tr>
+<tr><td><a href="ft2-cff_driver.html#darkening-parameters">darkening-parameters</a></td><td><a href="ft2-list_processing.html#FT_List_Add">FT_List_Add</a></td><td><a href="ft2-base_interface.html#FT_SUBGLYPH_FLAG_XXX">FT_SUBGLYPH_FLAG_XY_SCALE</a></td></tr>
+<tr><td><a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MAJOR</a></td><td><a href="ft2-list_processing.html#FT_List_Destructor">FT_List_Destructor</a></td><td><a href="ft2-base_interface.html#FT_SubGlyph">FT_SubGlyph</a></td></tr>
+<tr><td><a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MINOR</a></td><td><a href="ft2-list_processing.html#FT_List_Finalize">FT_List_Finalize</a></td><td><a href="ft2-header_file_macros.html#FT_SYNTHESIS_H">FT_SYNTHESIS_H</a></td></tr>
+<tr><td><a href="ft2-version.html#FREETYPE_XXX">FREETYPE_PATCH</a></td><td><a href="ft2-list_processing.html#FT_List_Find">FT_List_Find</a></td><td><a href="ft2-header_file_macros.html#FT_SYSTEM_H">FT_SYSTEM_H</a></td></tr>
+<tr><td><a href="ft2-version.html#FREETYPE_XXX">FREETYPE_XXX</a></td><td><a href="ft2-list_processing.html#FT_List_Insert">FT_List_Insert</a></td><td><a href="ft2-basic_types.html#FT_Tag">FT_Tag</a></td></tr>
+<tr><td><a href="ft2-sizes_management.html#FT_Activate_Size">FT_Activate_Size</a></td><td><a href="ft2-list_processing.html#FT_List_Iterate">FT_List_Iterate</a></td><td><a href="ft2-computations.html#FT_Tan">FT_Tan</a></td></tr>
+<tr><td><a href="ft2-quick_advance.html#FT_ADVANCE_FLAG_FAST_ONLY">FT_ADVANCE_FLAG_FAST_ONLY</a></td><td><a href="ft2-list_processing.html#FT_List_Iterator">FT_List_Iterator</a></td><td><a href="ft2-header_file_macros.html#FT_TRIGONOMETRY_H">FT_TRIGONOMETRY_H</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_ADVANCES_H">FT_ADVANCES_H</a></td><td><a href="ft2-list_processing.html#FT_List_Remove">FT_List_Remove</a></td><td><a href="ft2-header_file_macros.html#FT_TRUETYPE_DRIVER_H">FT_TRUETYPE_DRIVER_H</a></td></tr>
+<tr><td><a href="ft2-module_management.html#FT_Add_Default_Modules">FT_Add_Default_Modules</a></td><td><a href="ft2-list_processing.html#FT_List_Up">FT_List_Up</a></td><td><a href="ft2-truetype_engine.html#FT_TrueTypeEngineType">FT_TRUETYPE_ENGINE_TYPE_NONE</a></td></tr>
+<tr><td><a href="ft2-module_management.html#FT_Add_Module">FT_Add_Module</a></td><td><a href="ft2-list_processing.html#FT_ListNode">FT_ListNode</a></td><td><a href="ft2-truetype_engine.html#FT_TrueTypeEngineType">FT_TRUETYPE_ENGINE_TYPE_PATENTED</a></td></tr>
+<tr><td><a href="ft2-system_interface.html#FT_Alloc_Func">FT_Alloc_Func</a></td><td><a href="ft2-list_processing.html#FT_ListNodeRec">FT_ListNodeRec</a></td><td><a href="ft2-truetype_engine.html#FT_TrueTypeEngineType">FT_TRUETYPE_ENGINE_TYPE_UNPATENTED</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_ANGLE_2PI">FT_ANGLE_2PI</a></td><td><a href="ft2-list_processing.html#FT_ListRec">FT_ListRec</a></td><td><a href="ft2-header_file_macros.html#FT_TRUETYPE_IDS_H">FT_TRUETYPE_IDS_H</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_ANGLE_PI">FT_ANGLE_PI</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_COLOR</a></td><td><a href="ft2-header_file_macros.html#FT_TRUETYPE_TABLES_H">FT_TRUETYPE_TABLES_H</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_ANGLE_PI2">FT_ANGLE_PI2</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_CROP_BITMAP</a></td><td><a href="ft2-header_file_macros.html#FT_TRUETYPE_TAGS_H">FT_TRUETYPE_TAGS_H</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_ANGLE_PI4">FT_ANGLE_PI4</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_DEFAULT</a></td><td><a href="ft2-truetype_engine.html#FT_TrueTypeEngineType">FT_TrueTypeEngineType</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_Angle">FT_Angle</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_FORCE_AUTOHINT</a></td><td><a href="ft2-gx_validation.html#FT_TrueTypeGX_Free">FT_TrueTypeGX_Free</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_Angle_Diff">FT_Angle_Diff</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH</a></td><td><a href="ft2-gx_validation.html#FT_TrueTypeGX_Validate">FT_TrueTypeGX_Validate</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_Atan2">FT_Atan2</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_TRANSFORM</a></td><td><a href="ft2-header_file_macros.html#FT_TYPE1_TABLES_H">FT_TYPE1_TABLES_H</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Attach_File">FT_Attach_File</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_LINEAR_DESIGN</a></td><td><a href="ft2-header_file_macros.html#FT_TYPES_H">FT_TYPES_H</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Attach_Stream">FT_Attach_Stream</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_MONOCHROME</a></td><td><a href="ft2-basic_types.html#FT_UFWord">FT_UFWord</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_AUTOHINTER_H">FT_AUTOHINTER_H</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_AUTOHINT</a></td><td><a href="ft2-basic_types.html#FT_UInt">FT_UInt</a></td></tr>
+<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_CJK</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_BITMAP</a></td><td><a href="ft2-basic_types.html#FT_UInt16">FT_UInt16</a></td></tr>
+<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_INDIC</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_HINTING</a></td><td><a href="ft2-basic_types.html#FT_UInt32">FT_UInt32</a></td></tr>
+<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_LATIN</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_RECURSE</a></td><td><a href="ft2-basic_types.html#FT_UInt64">FT_UInt64</a></td></tr>
+<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_NONE</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a></td><td><a href="ft2-basic_types.html#FT_ULong">FT_ULong</a></td></tr>
+<tr><td><a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_XXX</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_PEDANTIC</a></td><td><a href="ft2-header_file_macros.html#FT_UNPATENTED_HINTING_H">FT_UNPATENTED_HINTING_H</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_BBOX_H">FT_BBOX_H</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_RENDER</a></td><td><a href="ft2-basic_types.html#FT_UnitVector">FT_UnitVector</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_BBox">FT_BBox</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_LCD</a></td><td><a href="ft2-basic_types.html#FT_UShort">FT_UShort</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_BDF_H">FT_BDF_H</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_LCD_V</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_APPLE</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_BITMAP_H">FT_BITMAP_H</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_LIGHT</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_BASE</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Bitmap">FT_Bitmap</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_MODE">FT_LOAD_TARGET_MODE</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_bsln</a></td></tr>
+<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_Convert">FT_Bitmap_Convert</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_MONO</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_CKERN</a></td></tr>
+<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_Copy">FT_Bitmap_Copy</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_NORMAL</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_CKERNXXX</a></td></tr>
+<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_Done">FT_Bitmap_Done</a></td><td><a href="ft2-base_interface.html#FT_LOAD_TARGET_XXX">FT_LOAD_TARGET_XXX</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_feat</a></td></tr>
+<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_Embolden">FT_Bitmap_Embolden</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_VERTICAL_LAYOUT</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_GDEF</a></td></tr>
+<tr><td><a href="ft2-bitmap_handling.html#FT_Bitmap_New">FT_Bitmap_New</a></td><td><a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_XXX</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_GPOS</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Bitmap_Size">FT_Bitmap_Size</a></td><td><a href="ft2-base_interface.html#FT_Load_Char">FT_Load_Char</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_GSUB</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_BitmapGlyph">FT_BitmapGlyph</a></td><td><a href="ft2-base_interface.html#FT_Load_Glyph">FT_Load_Glyph</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_GX</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_BitmapGlyphRec">FT_BitmapGlyphRec</a></td><td><a href="ft2-truetype_tables.html#FT_Load_Sfnt_Table">FT_Load_Sfnt_Table</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GX_LENGTH">FT_VALIDATE_GX_LENGTH</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Bool">FT_Bool</a></td><td><a href="ft2-basic_types.html#FT_Long">FT_Long</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_GXXXX</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Byte">FT_Byte</a></td><td><a href="ft2-header_file_macros.html#FT_LZW_H">FT_LZW_H</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_JSTF</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Bytes">FT_Bytes</a></td><td><a href="ft2-header_file_macros.html#FT_MAC_H">FT_MAC_H</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_just</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_BZIP2_H">FT_BZIP2_H</a></td><td><a href="ft2-basic_types.html#FT_MAKE_TAG">FT_MAKE_TAG</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_kern</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CACHE_CHARMAP_H">FT_CACHE_CHARMAP_H</a></td><td><a href="ft2-basic_types.html#FT_Matrix">FT_Matrix</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_lcar</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CACHE_H">FT_CACHE_H</a></td><td><a href="ft2-computations.html#FT_Matrix_Invert">FT_Matrix_Invert</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_MATH</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CACHE_IMAGE_H">FT_CACHE_IMAGE_H</a></td><td><a href="ft2-computations.html#FT_Matrix_Multiply">FT_Matrix_Multiply</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_CKERNXXX">FT_VALIDATE_MS</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CACHE_SMALL_BITMAPS_H">FT_CACHE_SMALL_BITMAPS_H</a></td><td><a href="ft2-system_interface.html#FT_Memory">FT_Memory</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_mort</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_CeilFix">FT_CeilFix</a></td><td><a href="ft2-system_interface.html#FT_MemoryRec">FT_MemoryRec</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_morx</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CFF_DRIVER_H">FT_CFF_DRIVER_H</a></td><td><a href="ft2-multiple_masters.html#FT_MM_Axis">FT_MM_Axis</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_OT</a></td></tr>
+<tr><td><a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_ADOBE</a></td><td><a href="ft2-multiple_masters.html#FT_MM_Var">FT_MM_Var</a></td><td><a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_OTXXX</a></td></tr>
+<tr><td><a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_FREETYPE</a></td><td><a href="ft2-header_file_macros.html#FT_MODULE_ERRORS_H">FT_MODULE_ERRORS_H</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_opbd</a></td></tr>
+<tr><td><a href="ft2-cff_driver.html#FT_CFF_HINTING_XXX">FT_CFF_HINTING_XXX</a></td><td><a href="ft2-header_file_macros.html#FT_MODULE_H">FT_MODULE_H</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_prop</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Char">FT_Char</a></td><td><a href="ft2-base_interface.html#FT_Module">FT_Module</a></td><td><a href="ft2-gx_validation.html#FT_VALIDATE_GXXXX">FT_VALIDATE_trak</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_CharMap">FT_CharMap</a></td><td><a href="ft2-module_management.html#FT_Module_Class">FT_Module_Class</a></td><td><a href="ft2-multiple_masters.html#FT_Var_Axis">FT_Var_Axis</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_CharMapRec">FT_CharMapRec</a></td><td><a href="ft2-module_management.html#FT_Module_Constructor">FT_Module_Constructor</a></td><td><a href="ft2-multiple_masters.html#FT_Var_Named_Style">FT_Var_Named_Style</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CID_H">FT_CID_H</a></td><td><a href="ft2-module_management.html#FT_Module_Destructor">FT_Module_Destructor</a></td><td><a href="ft2-basic_types.html#FT_Vector">FT_Vector</a></td></tr>
+<tr><td><a href="ft2-gx_validation.html#FT_ClassicKern_Free">FT_ClassicKern_Free</a></td><td><a href="ft2-module_management.html#FT_Module_Requester">FT_Module_Requester</a></td><td><a href="ft2-computations.html#FT_Vector_From_Polar">FT_Vector_From_Polar</a></td></tr>
+<tr><td><a href="ft2-gx_validation.html#FT_ClassicKern_Validate">FT_ClassicKern_Validate</a></td><td><a href="ft2-header_file_macros.html#FT_MULTIPLE_MASTERS_H">FT_MULTIPLE_MASTERS_H</a></td><td><a href="ft2-computations.html#FT_Vector_Length">FT_Vector_Length</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CONFIG_CONFIG_H">FT_CONFIG_CONFIG_H</a></td><td><a href="ft2-computations.html#FT_MulDiv">FT_MulDiv</a></td><td><a href="ft2-computations.html#FT_Vector_Polarize">FT_Vector_Polarize</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CONFIG_MODULES_H">FT_CONFIG_MODULES_H</a></td><td><a href="ft2-computations.html#FT_MulFix">FT_MulFix</a></td><td><a href="ft2-computations.html#FT_Vector_Rotate">FT_Vector_Rotate</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CONFIG_OPTIONS_H">FT_CONFIG_OPTIONS_H</a></td><td><a href="ft2-multiple_masters.html#FT_Multi_Master">FT_Multi_Master</a></td><td><a href="ft2-computations.html#FT_Vector_Transform">FT_Vector_Transform</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_CONFIG_STANDARD_LIBRARY_H">FT_CONFIG_STANDARD_LIBRARY_H</a></td><td><a href="ft2-base_interface.html#FT_New_Face">FT_New_Face</a></td><td><a href="ft2-computations.html#FT_Vector_Unit">FT_Vector_Unit</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_Cos">FT_Cos</a></td><td><a href="ft2-mac_specific.html#FT_New_Face_From_FOND">FT_New_Face_From_FOND</a></td><td><a href="ft2-header_file_macros.html#FT_WINFONTS_H">FT_WINFONTS_H</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Data">FT_Data</a></td><td><a href="ft2-mac_specific.html#FT_New_Face_From_FSRef">FT_New_Face_From_FSRef</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_Header">FT_WinFNT_Header</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_DivFix">FT_DivFix</a></td><td><a href="ft2-mac_specific.html#FT_New_Face_From_FSSpec">FT_New_Face_From_FSSpec</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_HeaderRec">FT_WinFNT_HeaderRec</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Done_Face">FT_Done_Face</a></td><td><a href="ft2-module_management.html#FT_New_Library">FT_New_Library</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1250</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Done_FreeType">FT_Done_FreeType</a></td><td><a href="ft2-base_interface.html#FT_New_Memory_Face">FT_New_Memory_Face</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1251</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Done_Glyph">FT_Done_Glyph</a></td><td><a href="ft2-sizes_management.html#FT_New_Size">FT_New_Size</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1252</a></td></tr>
+<tr><td><a href="ft2-module_management.html#FT_Done_Library">FT_Done_Library</a></td><td><a href="ft2-basic_types.html#FT_Offset">FT_Offset</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1253</a></td></tr>
+<tr><td><a href="ft2-sizes_management.html#FT_Done_Size">FT_Done_Size</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_DRIVER</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1254</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Driver">FT_Driver</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_MEMORY</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1255</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_ENC_TAG">FT_ENC_TAG</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_PARAMS</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1256</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_ADOBE_CUSTOM</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_PATHNAME</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1257</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_ADOBE_EXPERT</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_STREAM</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1258</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_ADOBE_LATIN_1</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">FT_OPEN_XXX</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP1361</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_ADOBE_STANDARD</a></td><td><a href="ft2-header_file_macros.html#FT_OPENTYPE_VALIDATE_H">FT_OPENTYPE_VALIDATE_H</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP874</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_APPLE_ROMAN</a></td><td><a href="ft2-base_interface.html#FT_Open_Args">FT_Open_Args</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP932</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_BIG5</a></td><td><a href="ft2-base_interface.html#FT_Open_Face">FT_Open_Face</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP936</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_GB2312</a></td><td><a href="ft2-ot_validation.html#FT_OpenType_Free">FT_OpenType_Free</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP949</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_JOHAB</a></td><td><a href="ft2-ot_validation.html#FT_OpenType_Validate">FT_OpenType_Validate</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_CP950</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_BIG5</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_FILL_LEFT</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_DEFAULT</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_GB2312</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_FILL_RIGHT</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_MAC</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_JOHAB</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_NONE</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_OEM</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_SJIS</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_POSTSCRIPT</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_SYMBOL</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_SYMBOL</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_TRUETYPE</a></td><td><a href="ft2-winfnt_fonts.html#FT_WinFNT_ID_XXX">FT_WinFNT_ID_XXX</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_MS_WANSUNG</a></td><td><a href="ft2-outline_processing.html#FT_Orientation">FT_Orientation</a></td><td><a href="ft2-header_file_macros.html#FT_XFREE86_H">FT_XFREE86_H</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_NONE</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_EVEN_ODD_FILL</a></td><td><a href="ft2-cache_subsystem.html#FTC_CMapCache">FTC_CMapCache</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_OLD_LATIN_2</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_FLAGS</a></td><td><a href="ft2-cache_subsystem.html#FTC_CMapCache_Lookup">FTC_CMapCache_Lookup</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_SJIS</a></td><td><a href="ft2-header_file_macros.html#FT_OUTLINE_H">FT_OUTLINE_H</a></td><td><a href="ft2-cache_subsystem.html#FTC_CMapCache_New">FTC_CMapCache_New</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_UNICODE</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_HIGH_PRECISION</a></td><td><a href="ft2-cache_subsystem.html#FTC_Face_Requester">FTC_Face_Requester</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_ENCODING_WANSUNG</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_IGNORE_DROPOUTS</a></td><td><a href="ft2-cache_subsystem.html#FTC_FaceID">FTC_FaceID</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Encoding">FT_Encoding</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_INCLUDE_STUBS</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageCache">FTC_ImageCache</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_ERRORS_H">FT_ERRORS_H</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_NONE</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageCache_Lookup">FTC_ImageCache_Lookup</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Error">FT_Error</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_OWNER</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageCache_LookupScaler">FTC_ImageCache_LookupScaler</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_F26Dot6">FT_F26Dot6</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_REVERSE_FILL</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageCache_New">FTC_ImageCache_New</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_F2Dot14">FT_F2Dot14</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_SINGLE_PASS</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageType">FTC_ImageType</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_CID_KEYED</a></td><td><a href="ft2-outline_processing.html#FT_OUTLINE_FLAGS">FT_OUTLINE_SMART_DROPOUTS</a></td><td><a href="ft2-cache_subsystem.html#FTC_ImageTypeRec">FTC_ImageTypeRec</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_COLOR</a></td><td><a href="ft2-outline_processing.html#FT_Outline">FT_Outline</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager">FTC_Manager</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_EXTERNAL_STREAM</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Check">FT_Outline_Check</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_Done">FTC_Manager_Done</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_FAST_GLYPHS</a></td><td><a href="ft2-outline_processing.html#FT_Outline_ConicToFunc">FT_Outline_ConicToFunc</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_LookupFace">FTC_Manager_LookupFace</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_FIXED_SIZES</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Copy">FT_Outline_Copy</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_LookupSize">FTC_Manager_LookupSize</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_FIXED_WIDTH</a></td><td><a href="ft2-outline_processing.html#FT_Outline_CubicToFunc">FT_Outline_CubicToFunc</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_New">FTC_Manager_New</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_GLYPH_NAMES</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Decompose">FT_Outline_Decompose</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_RemoveFaceID">FTC_Manager_RemoveFaceID</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_HINTER</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Done">FT_Outline_Done</a></td><td><a href="ft2-cache_subsystem.html#FTC_Manager_Reset">FTC_Manager_Reset</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_HORIZONTAL</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Embolden">FT_Outline_Embolden</a></td><td><a href="ft2-cache_subsystem.html#FTC_Node">FTC_Node</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_KERNING</a></td><td><a href="ft2-outline_processing.html#FT_Outline_EmboldenXY">FT_Outline_EmboldenXY</a></td><td><a href="ft2-cache_subsystem.html#FTC_Node_Unref">FTC_Node_Unref</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_MULTIPLE_MASTERS</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Funcs">FT_Outline_Funcs</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBit">FTC_SBit</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_SCALABLE</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Get_BBox">FT_Outline_Get_BBox</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitCache">FTC_SBitCache</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_SFNT</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Get_Bitmap">FT_Outline_Get_Bitmap</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitCache_Lookup">FTC_SBitCache_Lookup</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_TRICKY</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Get_CBox">FT_Outline_Get_CBox</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitCache_LookupScaler">FTC_SBitCache_LookupScaler</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_VERTICAL</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Get_Orientation">FT_Outline_Get_Orientation</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitCache_New">FTC_SBitCache_New</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FACE_FLAG_XXX">FT_FACE_FLAG_XXX</a></td><td><a href="ft2-glyph_stroker.html#FT_Outline_GetInsideBorder">FT_Outline_GetInsideBorder</a></td><td><a href="ft2-cache_subsystem.html#FTC_SBitRec">FTC_SBitRec</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Face">FT_Face</a></td><td><a href="ft2-glyph_stroker.html#FT_Outline_GetOutsideBorder">FT_Outline_GetOutsideBorder</a></td><td><a href="ft2-cache_subsystem.html#FTC_Scaler">FTC_Scaler</a></td></tr>
+<tr><td><a href="ft2-version.html#FT_Face_CheckTrueTypePatents">FT_Face_CheckTrueTypePatents</a></td><td><a href="ft2-outline_processing.html#FT_Outline_LineToFunc">FT_Outline_LineToFunc</a></td><td><a href="ft2-cache_subsystem.html#FTC_ScalerRec">FTC_ScalerRec</a></td></tr>
+<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetCharsOfVariant">FT_Face_GetCharsOfVariant</a></td><td><a href="ft2-outline_processing.html#FT_Outline_MoveToFunc">FT_Outline_MoveToFunc</a></td><td><a href="ft2-auto_hinter.html#fallback-script">fallback-script</a></td></tr>
+<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetCharVariantIndex">FT_Face_GetCharVariantIndex</a></td><td><a href="ft2-outline_processing.html#FT_Outline_New">FT_Outline_New</a></td><td><a href="ft2-base_interface.html#ft_encoding_xxx">ft_encoding_xxx</a></td></tr>
+<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetCharVariantIsDefault">FT_Face_GetCharVariantIsDefault</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Render">FT_Outline_Render</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_gridfit</a></td></tr>
+<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetVariantSelectors">FT_Face_GetVariantSelectors</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Reverse">FT_Outline_Reverse</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_pixels</a></td></tr>
+<tr><td><a href="ft2-glyph_variants.html#FT_Face_GetVariantsOfChar">FT_Face_GetVariantsOfChar</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Transform">FT_Outline_Transform</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_subpixels</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Face_Internal">FT_Face_Internal</a></td><td><a href="ft2-outline_processing.html#FT_Outline_Translate">FT_Outline_Translate</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_truncate</a></td></tr>
+<tr><td><a href="ft2-version.html#FT_Face_SetUnpatentedHinting">FT_Face_SetUnpatentedHinting</a></td><td><a href="ft2-glyph_management.html#FT_OutlineGlyph">FT_OutlineGlyph</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_unscaled</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FaceRec">FT_FaceRec</a></td><td><a href="ft2-glyph_management.html#FT_OutlineGlyphRec">FT_OutlineGlyphRec</a></td><td><a href="ft2-glyph_management.html#ft_glyph_bbox_xxx">ft_glyph_bbox_xxx</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Fixed">FT_Fixed</a></td><td><a href="ft2-sfnt_names.html#FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY">FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_bitmap</a></td></tr>
+<tr><td><a href="ft2-computations.html#FT_FloorFix">FT_FloorFix</a></td><td><a href="ft2-sfnt_names.html#FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY">FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_composite</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_FREETYPE_H">FT_FREETYPE_H</a></td><td><a href="ft2-incremental.html#FT_PARAM_TAG_INCREMENTAL">FT_PARAM_TAG_INCREMENTAL</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_none</a></td></tr>
+<tr><td><a href="ft2-system_interface.html#FT_Free_Func">FT_Free_Func</a></td><td><a href="ft2-truetype_tables.html#FT_PARAM_TAG_UNPATENTED_HINTING">FT_PARAM_TAG_UNPATENTED_HINTING</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_outline</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_BITMAP_EMBEDDING_ONLY</a></td><td><a href="ft2-basic_types.html#FT_Palette_Mode">FT_Palette_Mode</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_plotter</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_EDITABLE_EMBEDDING</a></td><td><a href="ft2-base_interface.html#FT_Parameter">FT_Parameter</a></td><td><a href="ft2-basic_types.html#ft_glyph_format_xxx">ft_glyph_format_xxx</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_INSTALLABLE_EMBEDDING</a></td><td><a href="ft2-header_file_macros.html#FT_PFR_H">FT_PFR_H</a></td><td><a href="ft2-base_interface.html#ft_kerning_default">ft_kerning_default</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_NO_SUBSETTING</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_BGRA</a></td><td><a href="ft2-base_interface.html#ft_kerning_unfitted">ft_kerning_unfitted</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_GRAY</a></td><td><a href="ft2-base_interface.html#ft_kerning_unscaled">ft_kerning_unscaled</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_GRAY2</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_driver</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_FSTYPE_XXX">FT_FSTYPE_XXX</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_GRAY4</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_memory</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_FWord">FT_FWord</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_LCD</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_params</a></td></tr>
+<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_DO_GRAY</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_LCD_V</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_pathname</a></td></tr>
+<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_DO_GRIDFIT</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_MONO</a></td><td><a href="ft2-base_interface.html#FT_OPEN_XXX">ft_open_stream</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_GASP_H">FT_GASP_H</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_PIXEL_MODE_NONE</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_even_odd_fill</a></td></tr>
+<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_NO_TABLE</a></td><td><a href="ft2-basic_types.html#FT_Pixel_Mode">FT_Pixel_Mode</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_flags</a></td></tr>
+<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_SYMMETRIC_GRIDFIT</a></td><td><a href="ft2-basic_types.html#FT_Pointer">FT_Pointer</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_high_precision</a></td></tr>
+<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_SYMMETRIC_SMOOTHING</a></td><td><a href="ft2-basic_types.html#FT_Pos">FT_Pos</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_ignore_dropouts</a></td></tr>
+<tr><td><a href="ft2-gasp_table.html#FT_GASP_XXX">FT_GASP_XXX</a></td><td><a href="ft2-auto_hinter.html#FT_Prop_GlyphToScriptMap">FT_Prop_GlyphToScriptMap</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_none</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Generic">FT_Generic</a></td><td><a href="ft2-auto_hinter.html#FT_Prop_IncreaseXHeight">FT_Prop_IncreaseXHeight</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_owner</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Generic_Finalizer">FT_Generic_Finalizer</a></td><td><a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_reverse_fill</a></td></tr>
+<tr><td><a href="ft2-quick_advance.html#FT_Get_Advance">FT_Get_Advance</a></td><td><a href="ft2-module_management.html#FT_Property_Set">FT_Property_Set</a></td><td><a href="ft2-outline_processing.html#ft_outline_flags">ft_outline_single_pass</a></td></tr>
+<tr><td><a href="ft2-quick_advance.html#FT_Get_Advances">FT_Get_Advances</a></td><td><a href="ft2-bdf_fonts.html#FT_PropertyType">FT_PropertyType</a></td><td><a href="ft2-basic_types.html#FT_Palette_Mode">ft_palette_mode_rgb</a></td></tr>
+<tr><td><a href="ft2-bdf_fonts.html#FT_Get_BDF_Charset_ID">FT_Get_BDF_Charset_ID</a></td><td><a href="ft2-basic_types.html#FT_PtrDist">FT_PtrDist</a></td><td><a href="ft2-basic_types.html#FT_Palette_Mode">ft_palette_mode_rgba</a></td></tr>
+<tr><td><a href="ft2-bdf_fonts.html#FT_Get_BDF_Property">FT_Get_BDF_Property</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_AA</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_grays</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_Char_Index">FT_Get_Char_Index</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_CLIP</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_mono</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_Charmap_Index">FT_Get_Charmap_Index</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_DEFAULT</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_none</a></td></tr>
+<tr><td><a href="ft2-cid_fonts.html#FT_Get_CID_From_Glyph_Index">FT_Get_CID_From_Glyph_Index</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_DIRECT</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_pal2</a></td></tr>
+<tr><td><a href="ft2-cid_fonts.html#FT_Get_CID_Is_Internally_CID_Keyed">FT_Get_CID_Is_Internally_CID_Keyed</a></td><td><a href="ft2-raster.html#FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_XXX</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_pal4</a></td></tr>
+<tr><td><a href="ft2-cid_fonts.html#FT_Get_CID_Registry_Ordering_Supplement">FT_Get_CID_Registry_Ordering_Supplement</a></td><td><a href="ft2-raster.html#FT_Raster">FT_Raster</a></td><td><a href="ft2-basic_types.html#ft_pixel_mode_xxx">ft_pixel_mode_xxx</a></td></tr>
+<tr><td><a href="ft2-truetype_tables.html#FT_Get_CMap_Format">FT_Get_CMap_Format</a></td><td><a href="ft2-raster.html#FT_Raster_BitSet_Func">FT_Raster_BitSet_Func</a></td><td><a href="ft2-base_interface.html#ft_render_mode_xxx">ft_render_mode_mono</a></td></tr>
+<tr><td><a href="ft2-truetype_tables.html#FT_Get_CMap_Language_ID">FT_Get_CMap_Language_ID</a></td><td><a href="ft2-raster.html#FT_Raster_BitTest_Func">FT_Raster_BitTest_Func</a></td><td><a href="ft2-base_interface.html#ft_render_mode_xxx">ft_render_mode_normal</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_First_Char">FT_Get_First_Char</a></td><td><a href="ft2-raster.html#FT_Raster_DoneFunc">FT_Raster_DoneFunc</a></td><td><a href="ft2-base_interface.html#ft_render_mode_xxx">ft_render_mode_xxx</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_FSType_Flags">FT_Get_FSType_Flags</a></td><td><a href="ft2-raster.html#FT_Raster_Funcs">FT_Raster_Funcs</a></td><td><a href="ft2-auto_hinter.html#glyph-to-script-map">glyph-to-script-map</a></td></tr>
+<tr><td><a href="ft2-gasp_table.html#FT_Get_Gasp">FT_Get_Gasp</a></td><td><a href="ft2-raster.html#FT_Raster_NewFunc">FT_Raster_NewFunc</a></td><td><a href="ft2-cff_driver.html#hinting-engine">hinting-engine</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Get_Glyph">FT_Get_Glyph</a></td><td><a href="ft2-raster.html#FT_Raster_Params">FT_Raster_Params</a></td><td><a href="ft2-auto_hinter.html#increase-x-height">increase-x-height</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_Glyph_Name">FT_Get_Glyph_Name</a></td><td><a href="ft2-raster.html#FT_Raster_RenderFunc">FT_Raster_RenderFunc</a></td><td><a href="ft2-tt_driver.html#interpreter-version">interpreter-version</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_Kerning">FT_Get_Kerning</a></td><td><a href="ft2-raster.html#FT_Raster_ResetFunc">FT_Raster_ResetFunc</a></td><td><a href="ft2-cff_driver.html#no-stem-darkening">no-stem-darkening</a></td></tr>
+<tr><td><a href="ft2-multiple_masters.html#FT_Get_MM_Var">FT_Get_MM_Var</a></td><td><a href="ft2-raster.html#FT_Raster_SetModeFunc">FT_Raster_SetModeFunc</a></td><td><a href="ft2-type1_tables.html#PS_Dict_Keys">PS_Dict_Keys</a></td></tr>
+<tr><td><a href="ft2-module_management.html#FT_Get_Module">FT_Get_Module</a></td><td><a href="ft2-header_file_macros.html#FT_RENDER_H">FT_RENDER_H</a></td><td><a href="ft2-type1_tables.html#PS_FontInfo">PS_FontInfo</a></td></tr>
+<tr><td><a href="ft2-multiple_masters.html#FT_Get_Multi_Master">FT_Get_Multi_Master</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_LCD</a></td><td><a href="ft2-type1_tables.html#PS_FontInfoRec">PS_FontInfoRec</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_Name_Index">FT_Get_Name_Index</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_LCD_V</a></td><td><a href="ft2-type1_tables.html#PS_Private">PS_Private</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_Next_Char">FT_Get_Next_Char</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_LIGHT</a></td><td><a href="ft2-type1_tables.html#PS_PrivateRec">PS_PrivateRec</a></td></tr>
+<tr><td><a href="ft2-pfr_fonts.html#FT_Get_PFR_Advance">FT_Get_PFR_Advance</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_MONO</a></td><td><a href="ft2-type1_tables.html#T1_Blend_Flags">T1_Blend_Flags</a></td></tr>
+<tr><td><a href="ft2-pfr_fonts.html#FT_Get_PFR_Kerning">FT_Get_PFR_Kerning</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_RENDER_MODE_NORMAL</a></td><td><a href="ft2-type1_tables.html#T1_EncodingType">T1_EncodingType</a></td></tr>
+<tr><td><a href="ft2-pfr_fonts.html#FT_Get_PFR_Metrics">FT_Get_PFR_Metrics</a></td><td><a href="ft2-system_interface.html#FT_Realloc_Func">FT_Realloc_Func</a></td><td><a href="ft2-type1_tables.html#T1_FontInfo">T1_FontInfo</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_Postscript_Name">FT_Get_Postscript_Name</a></td><td><a href="ft2-base_interface.html#FT_Reference_Face">FT_Reference_Face</a></td><td><a href="ft2-type1_tables.html#T1_Private">T1_Private</a></td></tr>
+<tr><td><a href="ft2-type1_tables.html#FT_Get_PS_Font_Info">FT_Get_PS_Font_Info</a></td><td><a href="ft2-module_management.html#FT_Reference_Library">FT_Reference_Library</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_CUSTOM</a></td></tr>
+<tr><td><a href="ft2-type1_tables.html#FT_Get_PS_Font_Private">FT_Get_PS_Font_Private</a></td><td><a href="ft2-module_management.html#FT_Remove_Module">FT_Remove_Module</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_EXPERT</a></td></tr>
+<tr><td><a href="ft2-type1_tables.html#FT_Get_PS_Font_Value">FT_Get_PS_Font_Value</a></td><td><a href="ft2-base_interface.html#FT_Render_Glyph">FT_Render_Glyph</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_LATIN_1</a></td></tr>
+<tr><td><a href="ft2-module_management.html#FT_Get_Renderer">FT_Get_Renderer</a></td><td><a href="ft2-base_interface.html#FT_Render_Mode">FT_Render_Mode</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_STANDARD</a></td></tr>
+<tr><td><a href="ft2-sfnt_names.html#FT_Get_Sfnt_Name">FT_Get_Sfnt_Name</a></td><td><a href="ft2-base_interface.html#FT_Renderer">FT_Renderer</a></td><td><a href="ft2-truetype_tables.html#TT_ADOBE_ID_XXX">TT_ADOBE_ID_XXX</a></td></tr>
+<tr><td><a href="ft2-sfnt_names.html#FT_Get_Sfnt_Name_Count">FT_Get_Sfnt_Name_Count</a></td><td><a href="ft2-module_management.html#FT_Renderer_Class">FT_Renderer_Class</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_DEFAULT</a></td></tr>
+<tr><td><a href="ft2-truetype_tables.html#FT_Get_Sfnt_Table">FT_Get_Sfnt_Table</a></td><td><a href="ft2-base_interface.html#FT_Request_Size">FT_Request_Size</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_ISO_10646</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_SubGlyph_Info">FT_Get_SubGlyph_Info</a></td><td><a href="ft2-computations.html#FT_RoundFix">FT_RoundFix</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_UNICODE_1_1</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Get_Track_Kerning">FT_Get_Track_Kerning</a></td><td><a href="ft2-base_interface.html#FT_Select_Charmap">FT_Select_Charmap</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_UNICODE_2_0</a></td></tr>
+<tr><td><a href="ft2-truetype_engine.html#FT_Get_TrueType_Engine_Type">FT_Get_TrueType_Engine_Type</a></td><td><a href="ft2-base_interface.html#FT_Select_Size">FT_Select_Size</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_UNICODE_32</a></td></tr>
+<tr><td><a href="ft2-winfnt_fonts.html#FT_Get_WinFNT_Header">FT_Get_WinFNT_Header</a></td><td><a href="ft2-base_interface.html#FT_Set_Char_Size">FT_Set_Char_Size</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_VARIANT_SELECTOR</a></td></tr>
+<tr><td><a href="ft2-font_formats.html#FT_Get_X11_Font_Format">FT_Get_X11_Font_Format</a></td><td><a href="ft2-base_interface.html#FT_Set_Charmap">FT_Set_Charmap</a></td><td><a href="ft2-truetype_tables.html#TT_APPLE_ID_XXX">TT_APPLE_ID_XXX</a></td></tr>
+<tr><td><a href="ft2-mac_specific.html#FT_GetFile_From_Mac_ATS_Name">FT_GetFile_From_Mac_ATS_Name</a></td><td><a href="ft2-module_management.html#FT_Set_Debug_Hook">FT_Set_Debug_Hook</a></td><td><a href="ft2-truetype_tables.html#TT_Header">TT_Header</a></td></tr>
+<tr><td><a href="ft2-mac_specific.html#FT_GetFile_From_Mac_Name">FT_GetFile_From_Mac_Name</a></td><td><a href="ft2-multiple_masters.html#FT_Set_MM_Blend_Coordinates">FT_Set_MM_Blend_Coordinates</a></td><td><a href="ft2-truetype_tables.html#TT_HoriHeader">TT_HoriHeader</a></td></tr>
+<tr><td><a href="ft2-mac_specific.html#FT_GetFilePath_From_Mac_ATS_Name">FT_GetFilePath_From_Mac_ATS_Name</a></td><td><a href="ft2-multiple_masters.html#FT_Set_MM_Design_Coordinates">FT_Set_MM_Design_Coordinates</a></td><td><a href="ft2-tt_driver.html#TT_INTERPRETER_VERSION_XXX">TT_INTERPRETER_VERSION_35</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_GRIDFIT</a></td><td><a href="ft2-base_interface.html#FT_Set_Pixel_Sizes">FT_Set_Pixel_Sizes</a></td><td><a href="ft2-tt_driver.html#TT_INTERPRETER_VERSION_XXX">TT_INTERPRETER_VERSION_38</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_PIXELS</a></td><td><a href="ft2-module_management.html#FT_Set_Renderer">FT_Set_Renderer</a></td><td><a href="ft2-tt_driver.html#TT_INTERPRETER_VERSION_XXX">TT_INTERPRETER_VERSION_XXX</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_SUBPIXELS</a></td><td><a href="ft2-base_interface.html#FT_Set_Transform">FT_Set_Transform</a></td><td><a href="ft2-truetype_tables.html#TT_ISO_ID_XXX">TT_ISO_ID_10646</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_TRUNCATE</a></td><td><a href="ft2-multiple_masters.html#FT_Set_Var_Blend_Coordinates">FT_Set_Var_Blend_Coordinates</a></td><td><a href="ft2-truetype_tables.html#TT_ISO_ID_XXX">TT_ISO_ID_7BIT_ASCII</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_GLYPH_BBOX_UNSCALED</a></td><td><a href="ft2-multiple_masters.html#FT_Set_Var_Design_Coordinates">FT_Set_Var_Design_Coordinates</a></td><td><a href="ft2-truetype_tables.html#TT_ISO_ID_XXX">TT_ISO_ID_8859_1</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_BITMAP</a></td><td><a href="ft2-header_file_macros.html#FT_SFNT_NAMES_H">FT_SFNT_NAMES_H</a></td><td><a href="ft2-truetype_tables.html#TT_ISO_ID_XXX">TT_ISO_ID_XXX</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_COMPOSITE</a></td><td><a href="ft2-truetype_tables.html#FT_Sfnt_Table_Info">FT_Sfnt_Table_Info</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ARABIC</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_NONE</a></td><td><a href="ft2-truetype_tables.html#FT_Sfnt_Tag">FT_Sfnt_Tag</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ARMENIAN</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_OUTLINE</a></td><td><a href="ft2-sfnt_names.html#FT_SfntName">FT_SfntName</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_BENGALI</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_GLYPH_FORMAT_PLOTTER</a></td><td><a href="ft2-basic_types.html#FT_Short">FT_Short</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_BURMESE</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_GLYPH_H">FT_GLYPH_H</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_BBOX</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_DEVANAGARI</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph">FT_Glyph</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_CELL</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GEEZ</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_BBox_Mode">FT_Glyph_BBox_Mode</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_NOMINAL</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GEORGIAN</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_Copy">FT_Glyph_Copy</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_REAL_DIM</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GREEK</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Glyph_Format">FT_Glyph_Format</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_SIZE_REQUEST_TYPE_SCALES</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GUJARATI</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_Get_CBox">FT_Glyph_Get_CBox</a></td><td><a href="ft2-header_file_macros.html#FT_SIZES_H">FT_SIZES_H</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_GURMUKHI</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Glyph_Metrics">FT_Glyph_Metrics</a></td><td><a href="ft2-computations.html#FT_Sin">FT_Sin</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_HEBREW</a></td></tr>
+<tr><td><a href="ft2-glyph_stroker.html#FT_Glyph_Stroke">FT_Glyph_Stroke</a></td><td><a href="ft2-base_interface.html#FT_Size">FT_Size</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_JAPANESE</a></td></tr>
+<tr><td><a href="ft2-glyph_stroker.html#FT_Glyph_StrokeBorder">FT_Glyph_StrokeBorder</a></td><td><a href="ft2-base_interface.html#FT_Size_Internal">FT_Size_Internal</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_KANNADA</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_To_Bitmap">FT_Glyph_To_Bitmap</a></td><td><a href="ft2-base_interface.html#FT_Size_Metrics">FT_Size_Metrics</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_KHMER</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_Glyph_Transform">FT_Glyph_Transform</a></td><td><a href="ft2-base_interface.html#FT_Size_Request">FT_Size_Request</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_KOREAN</a></td></tr>
+<tr><td><a href="ft2-glyph_management.html#FT_GlyphRec">FT_GlyphRec</a></td><td><a href="ft2-base_interface.html#FT_Size_Request_Type">FT_Size_Request_Type</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_LAOTIAN</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_GlyphSlot">FT_GlyphSlot</a></td><td><a href="ft2-base_interface.html#FT_Size_RequestRec">FT_Size_RequestRec</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_MALAYALAM</a></td></tr>
+<tr><td><a href="ft2-bitmap_handling.html#FT_GlyphSlot_Own_Bitmap">FT_GlyphSlot_Own_Bitmap</a></td><td><a href="ft2-base_interface.html#FT_SizeRec">FT_SizeRec</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_MALDIVIAN</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_GlyphSlotRec">FT_GlyphSlotRec</a></td><td><a href="ft2-base_interface.html#FT_Slot_Internal">FT_Slot_Internal</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_MONGOLIAN</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_GX_VALIDATE_H">FT_GX_VALIDATE_H</a></td><td><a href="ft2-raster.html#FT_Span">FT_Span</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ORIYA</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_GZIP_H">FT_GZIP_H</a></td><td><a href="ft2-raster.html#FT_SpanFunc">FT_SpanFunc</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_ROMAN</a></td></tr>
+<tr><td><a href="ft2-gzip.html#FT_Gzip_Uncompress">FT_Gzip_Uncompress</a></td><td><a href="ft2-glyph_stroker.html#FT_StrokerBorder">FT_STROKER_BORDER_LEFT</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_RSYMBOL</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_HAS_COLOR">FT_HAS_COLOR</a></td><td><a href="ft2-glyph_stroker.html#FT_StrokerBorder">FT_STROKER_BORDER_RIGHT</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_RUSSIAN</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_HAS_FAST_GLYPHS">FT_HAS_FAST_GLYPHS</a></td><td><a href="ft2-header_file_macros.html#FT_STROKER_H">FT_STROKER_H</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_SIMPLIFIED_CHINESE</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_HAS_FIXED_SIZES">FT_HAS_FIXED_SIZES</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineCap">FT_STROKER_LINECAP_BUTT</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_SINDHI</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_HAS_GLYPH_NAMES">FT_HAS_GLYPH_NAMES</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineCap">FT_STROKER_LINECAP_ROUND</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_SINHALESE</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_HAS_HORIZONTAL">FT_HAS_HORIZONTAL</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineCap">FT_STROKER_LINECAP_SQUARE</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_SLAVIC</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_HAS_KERNING">FT_HAS_KERNING</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_BEVEL</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_TAMIL</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_HAS_MULTIPLE_MASTERS">FT_HAS_MULTIPLE_MASTERS</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_MITER</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_TELUGU</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_HAS_VERTICAL">FT_HAS_VERTICAL</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_MITER_FIXED</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_THAI</a></td></tr>
+<tr><td><a href="ft2-type1_tables.html#FT_Has_PS_Glyph_Names">FT_Has_PS_Glyph_Names</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_MITER_VARIABLE</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_TIBETAN</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_IMAGE_H">FT_IMAGE_H</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_STROKER_LINEJOIN_ROUND</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_TRADITIONAL_CHINESE</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_IMAGE_TAG">FT_IMAGE_TAG</a></td><td><a href="ft2-base_interface.html#FT_STYLE_FLAG_XXX">FT_STYLE_FLAG_BOLD</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_UNINTERP</a></td></tr>
+<tr><td><a href="ft2-header_file_macros.html#FT_INCREMENTAL_H">FT_INCREMENTAL_H</a></td><td><a href="ft2-base_interface.html#FT_STYLE_FLAG_XXX">FT_STYLE_FLAG_ITALIC</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_VIETNAMESE</a></td></tr>
+<tr><td><a href="ft2-incremental.html#FT_Incremental">FT_Incremental</a></td><td><a href="ft2-base_interface.html#FT_STYLE_FLAG_XXX">FT_STYLE_FLAG_XXX</a></td><td><a href="ft2-truetype_tables.html#TT_MAC_ID_XXX">TT_MAC_ID_XXX</a></td></tr>
+<tr><td><a href="ft2-incremental.html#FT_Incremental_FreeGlyphDataFunc">FT_Incremental_FreeGlyphDataFunc</a></td><td><a href="ft2-system_interface.html#FT_Stream">FT_Stream</a></td><td><a href="ft2-truetype_tables.html#TT_MaxProfile">TT_MaxProfile</a></td></tr>
+<tr><td><a href="ft2-incremental.html#FT_Incremental_FuncsRec">FT_Incremental_FuncsRec</a></td><td><a href="ft2-system_interface.html#FT_Stream_CloseFunc">FT_Stream_CloseFunc</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_BIG_5</a></td></tr>
+<tr><td><a href="ft2-incremental.html#FT_Incremental_GetGlyphDataFunc">FT_Incremental_GetGlyphDataFunc</a></td><td><a href="ft2-system_interface.html#FT_Stream_IoFunc">FT_Stream_IoFunc</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_GB2312</a></td></tr>
+<tr><td><a href="ft2-incremental.html#FT_Incremental_GetGlyphMetricsFunc">FT_Incremental_GetGlyphMetricsFunc</a></td><td><a href="ft2-bzip2.html#FT_Stream_OpenBzip2">FT_Stream_OpenBzip2</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_JOHAB</a></td></tr>
+<tr><td><a href="ft2-incremental.html#FT_Incremental_Interface">FT_Incremental_Interface</a></td><td><a href="ft2-gzip.html#FT_Stream_OpenGzip">FT_Stream_OpenGzip</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_SJIS</a></td></tr>
+<tr><td><a href="ft2-incremental.html#FT_Incremental_InterfaceRec">FT_Incremental_InterfaceRec</a></td><td><a href="ft2-lzw.html#FT_Stream_OpenLZW">FT_Stream_OpenLZW</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_SYMBOL_CS</a></td></tr>
+<tr><td><a href="ft2-incremental.html#FT_Incremental_Metrics">FT_Incremental_Metrics</a></td><td><a href="ft2-system_interface.html#FT_StreamDesc">FT_StreamDesc</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_UCS_4</a></td></tr>
+<tr><td><a href="ft2-incremental.html#FT_Incremental_MetricsRec">FT_Incremental_MetricsRec</a></td><td><a href="ft2-system_interface.html#FT_StreamRec">FT_StreamRec</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_UNICODE_CS</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Init_FreeType">FT_Init_FreeType</a></td><td><a href="ft2-basic_types.html#FT_String">FT_String</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_WANSUNG</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Int">FT_Int</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker">FT_Stroker</a></td><td><a href="ft2-truetype_tables.html#TT_MS_ID_XXX">TT_MS_ID_XXX</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Int16">FT_Int16</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_BeginSubPath">FT_Stroker_BeginSubPath</a></td><td><a href="ft2-truetype_tables.html#TT_OS2">TT_OS2</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Int32">FT_Int32</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_ConicTo">FT_Stroker_ConicTo</a></td><td><a href="ft2-truetype_tables.html#TT_PCLT">TT_PCLT</a></td></tr>
+<tr><td><a href="ft2-basic_types.html#FT_Int64">FT_Int64</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_CubicTo">FT_Stroker_CubicTo</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_ADOBE</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_IS_CID_KEYED">FT_IS_CID_KEYED</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_Done">FT_Stroker_Done</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_APPLE_UNICODE</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_IS_FIXED_WIDTH">FT_IS_FIXED_WIDTH</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_EndSubPath">FT_Stroker_EndSubPath</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_CUSTOM</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_IS_SCALABLE">FT_IS_SCALABLE</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_Export">FT_Stroker_Export</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_ISO</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_IS_SFNT">FT_IS_SFNT</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_ExportBorder">FT_Stroker_ExportBorder</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_MACINTOSH</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_IS_TRICKY">FT_IS_TRICKY</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_GetBorderCounts">FT_Stroker_GetBorderCounts</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_MICROSOFT</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Kerning_Mode">FT_KERNING_DEFAULT</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_GetCounts">FT_Stroker_GetCounts</a></td><td><a href="ft2-truetype_tables.html#TT_PLATFORM_XXX">TT_PLATFORM_XXX</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Kerning_Mode">FT_KERNING_UNFITTED</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineCap">FT_Stroker_LineCap</a></td><td><a href="ft2-truetype_tables.html#TT_Postscript">TT_Postscript</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Kerning_Mode">FT_KERNING_UNSCALED</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineJoin">FT_Stroker_LineJoin</a></td><td><a href="ft2-truetype_tables.html#TT_VertHeader">TT_VertHeader</a></td></tr>
+<tr><td><a href="ft2-base_interface.html#FT_Kerning_Mode">FT_Kerning_Mode</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_LineTo">FT_Stroker_LineTo</a></td><td></td></tr>
+<tr><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LCD_FILTER_DEFAULT</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_New">FT_Stroker_New</a></td><td></td></tr>
 </table>
 <hr>
 <table><tr><td width="100%"></td>
 <td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
 
-<center><font size=-2>generated on Wed Jun 19 23:29:20 2013</font></center></body>
+<center><font size=-2>generated on Mon Nov 25 00:29:36 2013</font></center></body>
 </html>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-lcd_filtering.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-lcd_filtering.html
index da50ff5f5b0..a3b30690999 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-lcd_filtering.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-lcd_filtering.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 LCD Filtering
@@ -47,7 +47,7 @@ LCD Filtering
 </table><br><br>
 
 <table align=center width="87%"><tr><td>
-<p>The <a href="ft2-lcd_filtering.html#FT_Library_SetLcdFilter">FT_Library_SetLcdFilter</a> API can be used to specify a low-pass filter which is then applied to LCD-optimized bitmaps generated through <a href="ft2-base_interface.html#FT_Render_Glyph">FT_Render_Glyph</a>. This is useful to reduce color fringes which would occur with unfiltered rendering.</p>
+<p>The <a href="ft2-lcd_filtering.html#FT_Library_SetLcdFilter">FT_Library_SetLcdFilter</a> API can be used to specify a low-pass filter, which is then applied to LCD-optimized bitmaps generated through <a href="ft2-base_interface.html#FT_Render_Glyph">FT_Render_Glyph</a>. This is useful to reduce color fringes that would occur with unfiltered rendering.</p>
 <p>Note that no filter is active by default, and that this function is <b>not</b> implemented in default builds of the library. You need to #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING in your &lsquo;ftoption.h&rsquo; file in order to activate it.</p>
 <p>FreeType generates alpha coverage maps, which are linear by nature. For instance, the value 0x80 in bitmap representation means that (within numerical precision) 0x80/0xff fraction of that pixel is covered by the glyph's outline. The blending function for placing text over a background is</p>
 <pre class="colored">
@@ -67,7 +67,7 @@ LCD Filtering
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_LcdFilter">FT_LcdFilter</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LCD_FILTER_H (freetype/ftlcdfil.h).
+Defined in FT_LCD_FILTER_H (ftlcdfil.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -116,7 +116,7 @@ Defined in FT_LCD_FILTER_H (freetype/ftlcdfil.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Library_SetLcdFilter">FT_Library_SetLcdFilter</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LCD_FILTER_H (freetype/ftlcdfil.h).
+Defined in FT_LCD_FILTER_H (ftlcdfil.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -163,7 +163,7 @@ Defined in FT_LCD_FILTER_H (freetype/ftlcdfil.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Library_SetLcdFilterWeights">FT_Library_SetLcdFilterWeights</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LCD_FILTER_H (freetype/ftlcdfil.h).
+Defined in FT_LCD_FILTER_H (ftlcdfil.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-list_processing.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-list_processing.html
index 674a8e29454..3572295abc8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-list_processing.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-list_processing.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 List Processing
@@ -55,7 +55,7 @@ List Processing
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List">FT_List</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -74,7 +74,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ListNode">FT_ListNode</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -93,7 +93,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ListRec">FT_ListRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -128,7 +128,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ListNodeRec">FT_ListNodeRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPES_H (freetype/fttypes.h).
+Defined in FT_TYPES_H (fttypes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -167,7 +167,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List_Find">FT_List_Find</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LIST_H (freetype/ftlist.h).
+Defined in FT_LIST_H (ftlist.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -202,7 +202,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List_Add">FT_List_Add</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LIST_H (freetype/ftlist.h).
+Defined in FT_LIST_H (ftlist.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -234,7 +234,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List_Insert">FT_List_Insert</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LIST_H (freetype/ftlist.h).
+Defined in FT_LIST_H (ftlist.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -266,7 +266,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List_Remove">FT_List_Remove</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LIST_H (freetype/ftlist.h).
+Defined in FT_LIST_H (ftlist.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -303,7 +303,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List_Up">FT_List_Up</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LIST_H (freetype/ftlist.h).
+Defined in FT_LIST_H (ftlist.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -335,7 +335,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List_Iterator">FT_List_Iterator</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LIST_H (freetype/ftlist.h).
+Defined in FT_LIST_H (ftlist.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -345,7 +345,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>An FT_List iterator function which is called during a list parse by <a href="ft2-list_processing.html#FT_List_Iterate">FT_List_Iterate</a>.</p>
+<p>An FT_List iterator function that is called during a list parse by <a href="ft2-list_processing.html#FT_List_Iterate">FT_List_Iterate</a>.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -367,7 +367,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List_Iterate">FT_List_Iterate</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LIST_H (freetype/ftlist.h).
+Defined in FT_LIST_H (ftlist.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -390,7 +390,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <p>An iterator function, called on each node of the list.</p>
 </td></tr>
 <tr valign=top><td><b>user</b></td><td>
-<p>A user-supplied field which is passed as the second argument to the iterator.</p>
+<p>A user-supplied field that is passed as the second argument to the iterator.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -406,7 +406,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List_Destructor">FT_List_Destructor</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LIST_H (freetype/ftlist.h).
+Defined in FT_LIST_H (ftlist.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -417,7 +417,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>An <a href="ft2-list_processing.html#FT_List">FT_List</a> iterator function which is called during a list finalization by <a href="ft2-list_processing.html#FT_List_Finalize">FT_List_Finalize</a> to destroy all elements in a given list.</p>
+<p>An <a href="ft2-list_processing.html#FT_List">FT_List</a> iterator function that is called during a list finalization by <a href="ft2-list_processing.html#FT_List_Finalize">FT_List_Finalize</a> to destroy all elements in a given list.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -442,7 +442,7 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_List_Finalize">FT_List_Finalize</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LIST_H (freetype/ftlist.h).
+Defined in FT_LIST_H (ftlist.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -466,10 +466,10 @@ Defined in FT_LIST_H (freetype/ftlist.h).
 <p>A list destructor that will be applied to each element of the list.</p>
 </td></tr>
 <tr valign=top><td><b>memory</b></td><td>
-<p>The current memory object which handles deallocation.</p>
+<p>The current memory object that handles deallocation.</p>
 </td></tr>
 <tr valign=top><td><b>user</b></td><td>
-<p>A user-supplied field which is passed as the last argument to the destructor.</p>
+<p>A user-supplied field that is passed as the last argument to the destructor.</p>
 </td></tr>
 </table>
 </td></tr></table>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-lzw.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-lzw.html
index 09434482ee8..30d7c0960c7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-lzw.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-lzw.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 LZW Streams
@@ -51,7 +51,7 @@ LZW Streams
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stream_OpenLZW">FT_Stream_OpenLZW</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_LZW_H (freetype/ftlzw.h).
+Defined in FT_LZW_H (ftlzw.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-mac_specific.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-mac_specific.html
index 72ef43027b1..4b456199fb0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-mac_specific.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-mac_specific.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Mac Specific Interface
@@ -53,7 +53,7 @@ Mac Specific Interface
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_New_Face_From_FOND">FT_New_Face_From_FOND</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MAC_H (freetype/ftmac.h).
+Defined in FT_MAC_H (ftmac.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -114,7 +114,7 @@ Defined in FT_MAC_H (freetype/ftmac.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_GetFile_From_Mac_Name">FT_GetFile_From_Mac_Name</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MAC_H (freetype/ftmac.h).
+Defined in FT_MAC_H (ftmac.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -159,7 +159,7 @@ Defined in FT_MAC_H (freetype/ftmac.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_GetFile_From_Mac_ATS_Name">FT_GetFile_From_Mac_ATS_Name</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MAC_H (freetype/ftmac.h).
+Defined in FT_MAC_H (ftmac.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -204,7 +204,7 @@ Defined in FT_MAC_H (freetype/ftmac.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_GetFilePath_From_Mac_ATS_Name">FT_GetFilePath_From_Mac_ATS_Name</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MAC_H (freetype/ftmac.h).
+Defined in FT_MAC_H (ftmac.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -217,7 +217,7 @@ Defined in FT_MAC_H (freetype/ftmac.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Return a pathname of the disk file and face index for given font name which is handled by ATS framework.</p>
+<p>Return a pathname of the disk file and face index for given font name that is handled by ATS framework.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -253,7 +253,7 @@ Defined in FT_MAC_H (freetype/ftmac.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_New_Face_From_FSSpec">FT_New_Face_From_FSSpec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MAC_H (freetype/ftmac.h).
+Defined in FT_MAC_H (ftmac.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -310,7 +310,7 @@ Defined in FT_MAC_H (freetype/ftmac.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_New_Face_From_FSRef">FT_New_Face_From_FSRef</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MAC_H (freetype/ftmac.h).
+Defined in FT_MAC_H (ftmac.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-module_management.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-module_management.html
index cd53efb256e..f83846bf902 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-module_management.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-module_management.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Module Management
@@ -78,7 +78,7 @@ Module Management
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Module_Constructor">FT_Module_Constructor</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -106,7 +106,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Module_Destructor">FT_Module_Destructor</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -134,7 +134,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Module_Requester">FT_Module_Requester</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -166,7 +166,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Module_Class">FT_Module_Class</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -228,7 +228,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Add_Module">FT_Add_Module</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -271,7 +271,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Module">FT_Get_Module</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -309,7 +309,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Remove_Module">FT_Remove_Module</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -352,7 +352,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Property_Set">FT_Property_Set</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -380,7 +380,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <p>Note that only a few modules have properties.</p>
 </td></tr>
 <tr valign=top><td><b>value</b></td><td>
-<p>A generic pointer to a variable or structure which gives the new value of the property. The exact definition of &lsquo;value&rsquo; is dependent on the property; see the &lsquo;Synopsis&rsquo; subsection of the module's documentation.</p>
+<p>A generic pointer to a variable or structure that gives the new value of the property. The exact definition of &lsquo;value&rsquo; is dependent on the property; see the &lsquo;Synopsis&rsquo; subsection of the module's documentation.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -412,7 +412,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Property_Get">FT_Property_Get</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -444,7 +444,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <p></p>
 <table cellpadding=3 border=0>
 <tr valign=top><td><b>value</b></td><td>
-<p>A generic pointer to a variable or structure which gives the value of the property. The exact definition of &lsquo;value&rsquo; is dependent on the property; see the &lsquo;Synopsis&rsquo; subsection of the module's documentation.</p>
+<p>A generic pointer to a variable or structure that gives the value of the property. The exact definition of &lsquo;value&rsquo; is dependent on the property; see the &lsquo;Synopsis&rsquo; subsection of the module's documentation.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -481,7 +481,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Reference_Library">FT_Reference_Library</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -491,7 +491,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 </pre></table><br>
 <table align=center width="87%"><tr><td>
 <p>A counter gets initialized to&nbsp;1 at the time an <a href="ft2-base_interface.html#FT_Library">FT_Library</a> structure is created. This function increments the counter. <a href="ft2-module_management.html#FT_Done_Library">FT_Done_Library</a> then only destroys a library if the counter is&nbsp;1, otherwise it simply decrements the counter.</p>
-<p>This function helps in managing life-cycles of structures which reference <a href="ft2-base_interface.html#FT_Library">FT_Library</a> objects.</p>
+<p>This function helps in managing life-cycles of structures that reference <a href="ft2-base_interface.html#FT_Library">FT_Library</a> objects.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -516,7 +516,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_New_Library">FT_New_Library</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -561,7 +561,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Done_Library">FT_Done_Library</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -595,7 +595,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_Debug_Hook">FT_Set_Debug_Hook</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -640,7 +640,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Add_Default_Modules">FT_Add_Default_Modules</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -668,7 +668,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Renderer_Class">FT_Renderer_Class</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_RENDER_H (freetype/ftrender.h).
+Defined in FT_RENDER_H (ftrender.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -726,7 +726,7 @@ Defined in FT_RENDER_H (freetype/ftrender.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Renderer">FT_Get_Renderer</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_RENDER_H (freetype/ftrender.h).
+Defined in FT_RENDER_H (ftrender.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -765,7 +765,7 @@ Defined in FT_RENDER_H (freetype/ftrender.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_Renderer">FT_Set_Renderer</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_RENDER_H (freetype/ftrender.h).
+Defined in FT_RENDER_H (ftrender.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-multiple_masters.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-multiple_masters.html
index 3197a44851b..c9c8b2f0a11 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-multiple_masters.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-multiple_masters.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Multiple Masters
@@ -57,7 +57,7 @@ Multiple Masters
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_MM_Axis">FT_MM_Axis</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -97,7 +97,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Multi_Master">FT_Multi_Master</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -137,7 +137,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Var_Axis">FT_Var_Axis</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -190,7 +190,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Var_Named_Style">FT_Var_Named_Style</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -226,7 +226,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_MM_Var">FT_MM_Var</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -255,7 +255,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <p>The number of designs; should be normally 2^num_axis for MM fonts. Not meaningful for GX (where every glyph could have a different number of designs).</p>
 </td></tr>
 <tr valign=top><td><b>num_namedstyles</b></td><td>
-<p>The number of named styles; only meaningful for GX which allows certain design coordinates to have a string ID (in the &lsquo;name&rsquo; table) associated with them. The font can tell the user that, for example, Weight=1.5 is &lsquo;Bold&rsquo;.</p>
+<p>The number of named styles; only meaningful for GX that allows certain design coordinates to have a string ID (in the &lsquo;name&rsquo; table) associated with them. The font can tell the user that, for example, Weight=1.5 is &lsquo;Bold&rsquo;.</p>
 </td></tr>
 <tr valign=top><td><b>axis</b></td><td>
 <p>A table of axis descriptors. GX fonts contain slightly more data than MM.</p>
@@ -274,7 +274,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Multi_Master">FT_Get_Multi_Master</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -315,7 +315,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_MM_Var">FT_Get_MM_Var</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -339,7 +339,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <p></p>
 <table cellpadding=3 border=0>
 <tr valign=top><td><b>amaster</b></td><td>
-<p>The Multiple Masters/GX var descriptor. Allocates a data structure, which the user must free (a single call to FT_FREE will do it).</p>
+<p>The Multiple Masters/GX var descriptor. Allocates a data structure, which the user must free.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -355,7 +355,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_MM_Design_Coordinates">FT_Set_MM_Design_Coordinates</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -400,7 +400,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_Var_Design_Coordinates">FT_Set_Var_Design_Coordinates</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -444,7 +444,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_MM_Blend_Coordinates">FT_Set_MM_Blend_Coordinates</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -488,7 +488,7 @@ Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Set_Var_Blend_Coordinates">FT_Set_Var_Blend_Coordinates</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h).
+Defined in FT_MULTIPLE_MASTERS_H (ftmm.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-ot_validation.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-ot_validation.html
index 9feef848aaa..4f1ecc072d0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-ot_validation.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-ot_validation.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 OpenType Validation
@@ -51,7 +51,7 @@ OpenType Validation
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_VALIDATE_OTXXX">FT_VALIDATE_OTXXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h).
+Defined in FT_OPENTYPE_VALIDATE_H (ftotval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -108,7 +108,7 @@ Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_OpenType_Validate">FT_OpenType_Validate</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h).
+Defined in FT_OPENTYPE_VALIDATE_H (ftotval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -123,7 +123,7 @@ Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Validate various OpenType tables to assure that all offsets and indices are valid. The idea is that a higher-level library which actually does the text layout can access those tables without error checking (which can be quite time consuming).</p>
+<p>Validate various OpenType tables to assure that all offsets and indices are valid. The idea is that a higher-level library that actually does the text layout can access those tables without error checking (which can be quite time consuming).</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -132,7 +132,7 @@ Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h).
 <p>A handle to the input face.</p>
 </td></tr>
 <tr valign=top><td><b>validation_flags</b></td><td>
-<p>A bit field which specifies the tables to be validated. See <a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_OTXXX</a> for possible values.</p>
+<p>A bit field that specifies the tables to be validated. See <a href="ft2-ot_validation.html#FT_VALIDATE_OTXXX">FT_VALIDATE_OTXXX</a> for possible values.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -172,7 +172,7 @@ Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_OpenType_Free">FT_OpenType_Free</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h).
+Defined in FT_OPENTYPE_VALIDATE_H (ftotval.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-outline_processing.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-outline_processing.html
index 966570056b7..ca3306dd91b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-outline_processing.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-outline_processing.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Outline Processing
@@ -62,7 +62,7 @@ Outline Processing
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline">FT_Outline</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -127,7 +127,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_OUTLINE_FLAGS">FT_OUTLINE_FLAGS</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -198,7 +198,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_New">FT_Outline_New</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -256,7 +256,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Done">FT_Outline_Done</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -300,7 +300,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Copy">FT_Outline_Copy</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -340,7 +340,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Translate">FT_Outline_Translate</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -381,7 +381,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Transform">FT_Outline_Transform</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -421,7 +421,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Embolden">FT_Outline_Embolden</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -472,7 +472,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_EmboldenXY">FT_Outline_EmboldenXY</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -494,7 +494,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Reverse">FT_Outline_Reverse</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -526,7 +526,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Check">FT_Outline_Check</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -557,7 +557,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Get_BBox">FT_Outline_Get_BBox</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_BBOX_H (freetype/ftbbox.h).
+Defined in FT_BBOX_H (ftbbox.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -567,7 +567,7 @@ Defined in FT_BBOX_H (freetype/ftbbox.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Compute the exact bounding box of an outline. This is slower than computing the control box. However, it uses an advanced algorithm which returns <i>very</i> quickly when the two boxes coincide. Otherwise, the outline Bézier arcs are traversed to extract their extrema.</p>
+<p>Compute the exact bounding box of an outline. This is slower than computing the control box. However, it uses an advanced algorithm that returns <i>very</i> quickly when the two boxes coincide. Otherwise, the outline Bézier arcs are traversed to extract their extrema.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -589,7 +589,7 @@ Defined in FT_BBOX_H (freetype/ftbbox.h).
 <p>FreeType error code. 0&nbsp;means success.</p>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>If the font is tricky and the glyph has been loaded with <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a>, the resulting BBox is meaningless. To get reasonable values for the BBox it is necessary to load the glyph at a large ppem value (so that the hinting instructions can properly shift and scale the subglyphs), then extracting the BBox which can be eventually converted back to font units.</p>
+<p>If the font is tricky and the glyph has been loaded with <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a>, the resulting BBox is meaningless. To get reasonable values for the BBox it is necessary to load the glyph at a large ppem value (so that the hinting instructions can properly shift and scale the subglyphs), then extracting the BBox, which can be eventually converted back to font units.</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -600,7 +600,7 @@ Defined in FT_BBOX_H (freetype/ftbbox.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="ft_outline_flags">ft_outline_flags</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -655,7 +655,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_MoveToFunc">FT_Outline_MoveToFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -677,7 +677,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <p>A pointer to the target point of the &lsquo;move to&rsquo;.</p>
 </td></tr>
 <tr valign=top><td><b>user</b></td><td>
-<p>A typeless pointer which is passed from the caller of the decomposition function.</p>
+<p>A typeless pointer, which is passed from the caller of the decomposition function.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -693,7 +693,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_LineToFunc">FT_Outline_LineToFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -715,7 +715,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <p>A pointer to the target point of the &lsquo;line to&rsquo;.</p>
 </td></tr>
 <tr valign=top><td><b>user</b></td><td>
-<p>A typeless pointer which is passed from the caller of the decomposition function.</p>
+<p>A typeless pointer, which is passed from the caller of the decomposition function.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -731,7 +731,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_ConicToFunc">FT_Outline_ConicToFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -757,7 +757,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <p>A pointer to the target end point of the conic arc.</p>
 </td></tr>
 <tr valign=top><td><b>user</b></td><td>
-<p>A typeless pointer which is passed from the caller of the decomposition function.</p>
+<p>A typeless pointer, which is passed from the caller of the decomposition function.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -773,7 +773,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_CubicToFunc">FT_Outline_CubicToFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -803,7 +803,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <p>A pointer to the target end point.</p>
 </td></tr>
 <tr valign=top><td><b>user</b></td><td>
-<p>A typeless pointer which is passed from the caller of the decomposition function.</p>
+<p>A typeless pointer, which is passed from the caller of the decomposition function.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -819,7 +819,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Funcs">FT_Outline_Funcs</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -879,7 +879,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Decompose">FT_Outline_Decompose</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -907,13 +907,16 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <p></p>
 <table cellpadding=3 border=0>
 <tr valign=top><td><b>user</b></td><td>
-<p>A typeless pointer which is passed to each emitter during the decomposition. It can be used to store the state during the decomposition.</p>
+<p>A typeless pointer that is passed to each emitter during the decomposition. It can be used to store the state during the decomposition.</p>
 </td></tr>
 </table>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>return</b></em></td></tr><tr><td>
 <p>FreeType error code. 0&nbsp;means success.</p>
 </td></tr></table>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
+<p>A contour that contains a single point only is represented by a &lsquo;move to&rsquo; operation followed by &lsquo;line to&rsquo; to the same point. In most cases, it is best to filter this out before using the outline for stroking purposes (otherwise it would result in a visible dot when round caps are used).</p>
+</td></tr></table>
 </td></tr></table>
 <hr width="75%">
 <table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
@@ -923,7 +926,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Get_CBox">FT_Outline_Get_CBox</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -933,8 +936,8 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Return an outline's &lsquo;control box&rsquo;. The control box encloses all the outline's points, including Bézier control points. Though it coincides with the exact bounding box for most glyphs, it can be slightly larger in some situations (like when rotating an outline which contains Bézier outside arcs).</p>
-<p>Computing the control box is very fast, while getting the bounding box can take much more time as it needs to walk over all segments and arcs in the outline. To get the latter, you can use the &lsquo;ftbbox&rsquo; component which is dedicated to this single task.</p>
+<p>Return an outline's &lsquo;control box&rsquo;. The control box encloses all the outline's points, including Bézier control points. Though it coincides with the exact bounding box for most glyphs, it can be slightly larger in some situations (like when rotating an outline that contains Bézier outside arcs).</p>
+<p>Computing the control box is very fast, while getting the bounding box can take much more time as it needs to walk over all segments and arcs in the outline. To get the latter, you can use the &lsquo;ftbbox&rsquo; component, which is dedicated to this single task.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -964,7 +967,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Get_Bitmap">FT_Outline_Get_Bitmap</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1013,7 +1016,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Render">FT_Outline_Render</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1062,7 +1065,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Orientation">FT_Orientation</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1114,7 +1117,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Outline_Get_Orientation">FT_Outline_Get_Orientation</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_OUTLINE_H (freetype/ftoutln.h).
+Defined in FT_OUTLINE_H (ftoutln.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1123,7 +1126,7 @@ Defined in FT_OUTLINE_H (freetype/ftoutln.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>This function analyzes a glyph outline and tries to compute its fill orientation (see <a href="ft2-outline_processing.html#FT_Orientation">FT_Orientation</a>). This is done by computing the direction of each global horizontal and/or vertical extrema within the outline.</p>
+<p>This function analyzes a glyph outline and tries to compute its fill orientation (see <a href="ft2-outline_processing.html#FT_Orientation">FT_Orientation</a>). This is done by integrating the total area covered by the outline. The positive integral corresponds to the clockwise orientation and <a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_POSTSCRIPT</a> is returned. The negative integral corresponds to the counter-clockwise orientation and <a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_TRUETYPE</a> is returned.</p>
 <p>Note that this will return <a href="ft2-outline_processing.html#FT_Orientation">FT_ORIENTATION_TRUETYPE</a> for empty outlines.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-pfr_fonts.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-pfr_fonts.html
index d000b04c704..86e42bf49f3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-pfr_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-pfr_fonts.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 PFR Fonts
@@ -51,7 +51,7 @@ PFR Fonts
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_PFR_Metrics">FT_Get_PFR_Metrics</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_PFR_H (freetype/ftpfr.h).
+Defined in FT_PFR_H (ftpfr.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -106,7 +106,7 @@ Defined in FT_PFR_H (freetype/ftpfr.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_PFR_Kerning">FT_Get_PFR_Kerning</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_PFR_H (freetype/ftpfr.h).
+Defined in FT_PFR_H (ftpfr.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -158,7 +158,7 @@ Defined in FT_PFR_H (freetype/ftpfr.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_PFR_Advance">FT_Get_PFR_Advance</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_PFR_H (freetype/ftpfr.h).
+Defined in FT_PFR_H (ftpfr.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-quick_advance.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-quick_advance.html
index 1615aa4acc9..a1ebdf7f7c9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-quick_advance.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-quick_advance.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Quick retrieval of advance values
@@ -52,7 +52,7 @@ Quick retrieval of advance values
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_ADVANCE_FLAG_FAST_ONLY">FT_ADVANCE_FLAG_FAST_ONLY</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_ADVANCES_H (freetype/ftadvanc.h).
+Defined in FT_ADVANCES_H (ftadvanc.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -62,8 +62,8 @@ Defined in FT_ADVANCES_H (freetype/ftadvanc.h).
 <table align=center width="87%"><tr><td>
 <p>A bit-flag to be OR-ed with the &lsquo;flags&rsquo; parameter of the <a href="ft2-quick_advance.html#FT_Get_Advance">FT_Get_Advance</a> and <a href="ft2-quick_advance.html#FT_Get_Advances">FT_Get_Advances</a> functions.</p>
 <p>If set, it indicates that you want these functions to fail if the corresponding hinting mode or font driver doesn't allow for very quick advance computation.</p>
-<p>Typically, glyphs which are either unscaled, unhinted, bitmapped, or light-hinted can have their advance width computed very quickly.</p>
-<p>Normal and bytecode hinted modes, which require loading, scaling, and hinting of the glyph outline, are extremely slow by comparison.</p>
+<p>Typically, glyphs that are either unscaled, unhinted, bitmapped, or light-hinted can have their advance width computed very quickly.</p>
+<p>Normal and bytecode hinted modes that require loading, scaling, and hinting of the glyph outline, are extremely slow by comparison.</p>
 </td></tr></table><br>
 </td></tr></table>
 <hr width="75%">
@@ -74,7 +74,7 @@ Defined in FT_ADVANCES_H (freetype/ftadvanc.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Advance">FT_Get_Advance</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_ADVANCES_H (freetype/ftadvanc.h).
+Defined in FT_ADVANCES_H (ftadvanc.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -127,7 +127,7 @@ Defined in FT_ADVANCES_H (freetype/ftadvanc.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Advances">FT_Get_Advances</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_ADVANCES_H (freetype/ftadvanc.h).
+Defined in FT_ADVANCES_H (ftadvanc.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-raster.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-raster.html
index be8241e4cae..d16280fc4fb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-raster.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-raster.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Scanline Converter
@@ -55,7 +55,7 @@ Scanline Converter
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster">FT_Raster</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -74,7 +74,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Span">FT_Span</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -105,7 +105,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 </table>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>This structure is used by the span drawing callback type named <a href="ft2-raster.html#FT_SpanFunc">FT_SpanFunc</a> which takes the y&nbsp;coordinate of the span as a a parameter.</p>
+<p>This structure is used by the span drawing callback type named <a href="ft2-raster.html#FT_SpanFunc">FT_SpanFunc</a> that takes the y&nbsp;coordinate of the span as a parameter.</p>
 <p>The coverage value is always between 0 and 255. If you want less gray values, the callback function has to reduce them.</p>
 </td></tr></table>
 </td></tr></table>
@@ -117,7 +117,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_SpanFunc">FT_SpanFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -165,7 +165,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster_BitTest_Func">FT_Raster_BitTest_Func</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -205,7 +205,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster_BitSet_Func">FT_Raster_BitSet_Func</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -245,7 +245,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_RASTER_FLAG_XXX">FT_RASTER_FLAG_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -292,7 +292,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster_Params">FT_Raster_Params</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -360,7 +360,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster_NewFunc">FT_Raster_NewFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -405,7 +405,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster_DoneFunc">FT_Raster_DoneFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -435,7 +435,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster_ResetFunc">FT_Raster_ResetFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -477,7 +477,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster_SetModeFunc">FT_Raster_SetModeFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -515,7 +515,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster_RenderFunc">FT_Raster_RenderFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -546,7 +546,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>The exact format of the source image depends on the raster's glyph format defined in its <a href="ft2-raster.html#FT_Raster_Funcs">FT_Raster_Funcs</a> structure. It can be an <a href="ft2-outline_processing.html#FT_Outline">FT_Outline</a> or anything else in order to support a large array of glyph formats.</p>
 <p>Note also that the render function can fail and return a &lsquo;FT_Err_Unimplemented_Feature&rsquo; error code if the raster used does not support direct composition.</p>
-<p>XXX: For now, the standard raster doesn't support direct composition but this should change for the final release (see the files &lsquo;demos/src/ftgrays.c&rsquo; and &lsquo;demos/src/ftgrays2.c&rsquo; for examples of distinct implementations which support direct composition).</p>
+<p>XXX: For now, the standard raster doesn't support direct composition but this should change for the final release (see the files &lsquo;demos/src/ftgrays.c&rsquo; and &lsquo;demos/src/ftgrays2.c&rsquo; for examples of distinct implementations that support direct composition).</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -557,7 +557,7 @@ Defined in FT_IMAGE_H (freetype/ftimage.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Raster_Funcs">FT_Raster_Funcs</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_IMAGE_H (freetype/ftimage.h).
+Defined in FT_IMAGE_H (ftimage.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-sfnt_names.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-sfnt_names.html
index dbf23dba4dc..2823381e84d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-sfnt_names.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-sfnt_names.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 SFNT Names
@@ -57,7 +57,7 @@ SFNT Names
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_SfntName">FT_SfntName</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
+Defined in FT_SFNT_NAMES_H (ftsnames.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -114,7 +114,7 @@ Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Sfnt_Name_Count">FT_Get_Sfnt_Name_Count</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
+Defined in FT_SFNT_NAMES_H (ftsnames.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -145,7 +145,7 @@ Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Sfnt_Name">FT_Get_Sfnt_Name</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
+Defined in FT_SFNT_NAMES_H (ftsnames.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -193,7 +193,7 @@ Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY">FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
+Defined in FT_SFNT_NAMES_H (ftsnames.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -201,7 +201,7 @@ Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>A constant used as the tag of <a href="ft2-base_interface.html#FT_Parameter">FT_Parameter</a> structures to make FT_Open_Face() ignore preferred family subfamily names in &lsquo;name&rsquo; table since OpenType version 1.4. For backwards compatibility with legacy systems which has 4-face-per-family restriction.</p>
+<p>A constant used as the tag of <a href="ft2-base_interface.html#FT_Parameter">FT_Parameter</a> structures to make FT_Open_Face() ignore preferred family subfamily names in &lsquo;name&rsquo; table since OpenType version 1.4. For backwards compatibility with legacy systems that have a 4-face-per-family restriction.</p>
 </td></tr></table><br>
 </td></tr></table>
 <hr width="75%">
@@ -212,7 +212,7 @@ Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY">FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
+Defined in FT_SFNT_NAMES_H (ftsnames.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -220,7 +220,7 @@ Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>A constant used as the tag of <a href="ft2-base_interface.html#FT_Parameter">FT_Parameter</a> structures to make FT_Open_Face() ignore preferred subfamily names in &lsquo;name&rsquo; table since OpenType version 1.4. For backwards compatibility with legacy systems which has 4-face-per-family restriction.</p>
+<p>A constant used as the tag of <a href="ft2-base_interface.html#FT_Parameter">FT_Parameter</a> structures to make FT_Open_Face() ignore preferred subfamily names in &lsquo;name&rsquo; table since OpenType version 1.4. For backwards compatibility with legacy systems that have a 4-face-per-family restriction.</p>
 </td></tr></table><br>
 </td></tr></table>
 <hr width="75%">
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-sizes_management.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-sizes_management.html
index 60fdbe76cff..ecb6b11537b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-sizes_management.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-sizes_management.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Size Management
@@ -54,7 +54,7 @@ Size Management
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_New_Size">FT_New_Size</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SIZES_H (freetype/ftsizes.h).
+Defined in FT_SIZES_H (ftsizes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -97,7 +97,7 @@ Defined in FT_SIZES_H (freetype/ftsizes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Done_Size">FT_Done_Size</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SIZES_H (freetype/ftsizes.h).
+Defined in FT_SIZES_H (ftsizes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -128,7 +128,7 @@ Defined in FT_SIZES_H (freetype/ftsizes.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Activate_Size">FT_Activate_Size</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SIZES_H (freetype/ftsizes.h).
+Defined in FT_SIZES_H (ftsizes.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -137,7 +137,7 @@ Defined in FT_SIZES_H (freetype/ftsizes.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Even though it is possible to create several size objects for a given face (see <a href="ft2-sizes_management.html#FT_New_Size">FT_New_Size</a> for details), functions like <a href="ft2-base_interface.html#FT_Load_Glyph">FT_Load_Glyph</a> or <a href="ft2-base_interface.html#FT_Load_Char">FT_Load_Char</a> only use the one which has been activated last to determine the &lsquo;current character pixel size&rsquo;.</p>
+<p>Even though it is possible to create several size objects for a given face (see <a href="ft2-sizes_management.html#FT_New_Size">FT_New_Size</a> for details), functions like <a href="ft2-base_interface.html#FT_Load_Glyph">FT_Load_Glyph</a> or <a href="ft2-base_interface.html#FT_Load_Char">FT_Load_Char</a> only use the one that has been activated last to determine the &lsquo;current character pixel size&rsquo;.</p>
 <p>This function can be used to &lsquo;activate&rsquo; a previously created size object.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-system_interface.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-system_interface.html
index b6a1e1329f1..66d044a3bb4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-system_interface.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-system_interface.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 System Interface
@@ -54,7 +54,7 @@ System Interface
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Memory">FT_Memory</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -73,7 +73,7 @@ Defined in FT_SYSTEM_H (freetype/ftsystem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Alloc_Func">FT_Alloc_Func</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -108,7 +108,7 @@ Defined in FT_SYSTEM_H (freetype/ftsystem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Free_Func">FT_Free_Func</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -140,7 +140,7 @@ Defined in FT_SYSTEM_H (freetype/ftsystem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Realloc_Func">FT_Realloc_Func</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -186,7 +186,7 @@ Defined in FT_SYSTEM_H (freetype/ftsystem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_MemoryRec">FT_MemoryRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -228,7 +228,7 @@ Defined in FT_SYSTEM_H (freetype/ftsystem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stream">FT_Stream</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -247,7 +247,7 @@ Defined in FT_SYSTEM_H (freetype/ftsystem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_StreamDesc">FT_StreamDesc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -271,7 +271,7 @@ Defined in FT_SYSTEM_H (freetype/ftsystem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stream_IoFunc">FT_Stream_IoFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -317,7 +317,7 @@ Defined in FT_SYSTEM_H (freetype/ftsystem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Stream_CloseFunc">FT_Stream_CloseFunc</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -345,7 +345,7 @@ Defined in FT_SYSTEM_H (freetype/ftsystem.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_StreamRec">FT_StreamRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_SYSTEM_H (freetype/ftsystem.h).
+Defined in FT_SYSTEM_H (ftsystem.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-toc.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-toc.html
index 461b3789385..19f4867e8c3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-toc.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-toc.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -34,7 +34,7 @@
 
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>Table of Contents</h1></center>
 <br><table align=center width="75%"><tr><td><h2>General Remarks</h2><ul class="empty"><li>
@@ -231,5 +231,5 @@
 <td width="100%"></td>
 </tr></table>
 
-<center><font size=-2>generated on Wed Jun 19 23:29:20 2013</font></center></body>
+<center><font size=-2>generated on Mon Nov 25 00:29:36 2013</font></center></body>
 </html>
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-truetype_engine.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-truetype_engine.html
index 315b216f50c..1875d8f796a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-truetype_engine.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-truetype_engine.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 The TrueType Engine
@@ -51,7 +51,7 @@ The TrueType Engine
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_TrueTypeEngineType">FT_TrueTypeEngineType</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -77,7 +77,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <tr valign=top><td colspan=0><b>FT_TRUETYPE_ENGINE_TYPE_UNPATENTED</b></td></tr>
 <tr valign=top><td></td><td>
 <p>The library implements a bytecode interpreter that doesn't support the patented operations of the TrueType virtual machine.</p>
-<p>Its main use is to load certain Asian fonts which position and scale glyph components with bytecode instructions. It produces bad output for most other fonts.</p>
+<p>Its main use is to load certain Asian fonts that position and scale glyph components with bytecode instructions. It produces bad output for most other fonts.</p>
 </td></tr>
 <tr valign=top><td colspan=0><b>FT_TRUETYPE_ENGINE_TYPE_PATENTED</b></td></tr>
 <tr valign=top><td></td><td>
@@ -97,7 +97,7 @@ Defined in FT_MODULE_H (freetype/ftmodapi.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_TrueType_Engine_Type">FT_Get_TrueType_Engine_Type</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_MODULE_H (freetype/ftmodapi.h).
+Defined in FT_MODULE_H (ftmodapi.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-truetype_tables.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-truetype_tables.html
index 479b3a0c9a5..d3933e75e36 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-truetype_tables.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-truetype_tables.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 TrueType Tables
@@ -60,7 +60,7 @@ TrueType Tables
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_PLATFORM_XXX">TT_PLATFORM_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
+Defined in FT_TRUETYPE_IDS_H (ttnameid.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -108,7 +108,7 @@ Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_APPLE_ID_XXX">TT_APPLE_ID_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
+Defined in FT_TRUETYPE_IDS_H (ttnameid.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -158,7 +158,7 @@ Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_MAC_ID_XXX">TT_MAC_ID_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
+Defined in FT_TRUETYPE_IDS_H (ttnameid.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -319,7 +319,7 @@ Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_ISO_ID_XXX">TT_ISO_ID_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
+Defined in FT_TRUETYPE_IDS_H (ttnameid.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -355,7 +355,7 @@ Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_MS_ID_XXX">TT_MS_ID_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
+Defined in FT_TRUETYPE_IDS_H (ttnameid.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -410,7 +410,7 @@ Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_ADOBE_ID_XXX">TT_ADOBE_ID_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
+Defined in FT_TRUETYPE_IDS_H (ttnameid.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -449,7 +449,7 @@ Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_Header">TT_Header</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -494,7 +494,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_HoriHeader">TT_HoriHeader</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -587,7 +587,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 </table>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should be identical except for the names of their fields which are different.</p>
+<p>IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should be identical except for the names of their fields, which are different.</p>
 <p>This ensures that a single function in the &lsquo;ttload&rsquo; module is able to read both the horizontal and vertical headers.</p>
 </td></tr></table>
 </td></tr></table>
@@ -599,7 +599,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_VertHeader">TT_VertHeader</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -696,7 +696,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 </table>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
-<p>IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should be identical except for the names of their fields which are different.</p>
+<p>IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should be identical except for the names of their fields, which are different.</p>
 <p>This ensures that a single function in the &lsquo;ttload&rsquo; module is able to read both the horizontal and vertical headers.</p>
 </td></tr></table>
 </td></tr></table>
@@ -708,7 +708,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_OS2">TT_OS2</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -749,12 +749,12 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
     <a href="ft2-basic_types.html#FT_UShort">FT_UShort</a>  usWinAscent;
     <a href="ft2-basic_types.html#FT_UShort">FT_UShort</a>  usWinDescent;
 
-    /* only version 1 tables: */
+    /* only version 1 and higher: */
 
     <a href="ft2-basic_types.html#FT_ULong">FT_ULong</a>   ulCodePageRange1;       /* Bits 0-31   */
     <a href="ft2-basic_types.html#FT_ULong">FT_ULong</a>   ulCodePageRange2;       /* Bits 32-63  */
 
-    /* only version 2 tables: */
+    /* only version 2 and higher: */
 
     <a href="ft2-basic_types.html#FT_Short">FT_Short</a>   sxHeight;
     <a href="ft2-basic_types.html#FT_Short">FT_Short</a>   sCapHeight;
@@ -762,12 +762,17 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
     <a href="ft2-basic_types.html#FT_UShort">FT_UShort</a>  usBreakChar;
     <a href="ft2-basic_types.html#FT_UShort">FT_UShort</a>  usMaxContext;
 
+    /* only version 5 and higher: */
+
+    <a href="ft2-basic_types.html#FT_UShort">FT_UShort</a>  usLowerOpticalPointSize;       /* in twips (1/20th points) */
+    <a href="ft2-basic_types.html#FT_UShort">FT_UShort</a>  usUpperOpticalPointSize;       /* in twips (1/20th points) */
+
   } <b>TT_OS2</b>;
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>A structure used to model a TrueType OS/2 table. This is the long table version. All fields comply to the TrueType specification.</p>
-<p>Note that we now support old Mac fonts which do not include an OS/2 table. In this case, the &lsquo;version&rsquo; field is always set to 0xFFFF.</p>
+<p>A structure used to model a TrueType OS/2 table. All fields comply to the OpenType specification.</p>
+<p>Note that we now support old Mac fonts that do not include an OS/2 table. In this case, the &lsquo;version&rsquo; field is always set to 0xFFFF.</p>
 </td></tr></table><br>
 </td></tr></table>
 <hr width="75%">
@@ -778,7 +783,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_Postscript">TT_Postscript</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -812,7 +817,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_PCLT">TT_PCLT</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -849,7 +854,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_MaxProfile">TT_MaxProfile</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -875,7 +880,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>The maximum profile is a table containing many max values which can be used to pre-allocate arrays. This ensures that no memory allocation occurs during a glyph load.</p>
+<p>The maximum profile is a table containing many max values, which can be used to pre-allocate arrays. This ensures that no memory allocation occurs during a glyph load.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>fields</b></em></td></tr><tr><td>
 <p></p>
@@ -939,7 +944,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Sfnt_Tag">FT_Sfnt_Tag</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -970,7 +975,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_Sfnt_Table">FT_Get_Sfnt_Table</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1018,7 +1023,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Load_Sfnt_Table">FT_Load_Sfnt_Table</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1083,6 +1088,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
   error = FT_Load_Sfnt_Table( face, tag, 0, buffer, &amp;length );
   if ( error ) { ... could not load table ... }
 </pre>
+<p>Note that structures like <a href="ft2-truetype_tables.html#TT_Header">TT_Header</a> or <a href="ft2-truetype_tables.html#TT_OS2">TT_OS2</a> can't be used with this function; they are limited to <a href="ft2-truetype_tables.html#FT_Get_Sfnt_Table">FT_Get_Sfnt_Table</a>. Reason is that those structures depend on the processor architecture, with varying size (e.g. 32bit vs. 64bit) or order (big endian vs. little endian).</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -1093,7 +1099,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Sfnt_Table_Info">FT_Sfnt_Table_Info</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1149,7 +1155,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_CMap_Language_ID">FT_Get_CMap_Language_ID</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1158,7 +1164,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>Return TrueType/sfnt specific cmap language ID. Definitions of language ID values are in &lsquo;freetype/ttnameid.h&rsquo;.</p>
+<p>Return TrueType/sfnt specific cmap language ID. Definitions of language ID values are in &lsquo;ttnameid.h&rsquo;.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>input</b></em></td></tr><tr><td>
 <p></p>
@@ -1181,7 +1187,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_CMap_Format">FT_Get_CMap_Format</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
+Defined in FT_TRUETYPE_TABLES_H (tttables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -1212,7 +1218,7 @@ Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_PARAM_TAG_UNPATENTED_HINTING">FT_PARAM_TAG_UNPATENTED_HINTING</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_UNPATENTED_HINTING_H (freetype/ttunpat.h).
+Defined in FT_UNPATENTED_HINTING_H (ttunpat.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-tt_driver.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-tt_driver.html
index 0bf393df295..f66cfd0e2a1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-tt_driver.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-tt_driver.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 The TrueType driver
@@ -52,9 +52,9 @@ The TrueType driver
 <table align=center width="75%"><tr><td>
 <h4><a name="interpreter-version">interpreter-version</a></h4>
 <table align=center width="87%"><tr><td>
-<p>Currently, two versions are available which represent the bytecode interpreter with and without subpixel hinting support, respectively. The default is subpixel support if TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined, and no subpixel support otherwise (since it isn't available then).</p>
+<p>Currently, two versions are available, representing the bytecode interpreter with and without subpixel hinting support, respectively. The default is subpixel support if TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined, and no subpixel support otherwise (since it isn't available then).</p>
 <p>If subpixel hinting is on, many TrueType bytecode instructions behave differently compared to B/W or grayscale rendering. The main idea is to render at a much increased horizontal resolution, then sampling down the created output to subpixel precision. However, many older fonts are not suited to this and must be specially taken care of by applying (hardcoded) font-specific tweaks.</p>
-<p>Details on subpixel hinting and some of the necessary tweaks can be found in Greg Hitchcock's whitepaper at &lsquo;http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx&rsquo;.</p>
+<p>Details on subpixel hinting and some of the necessary tweaks can be found in Greg Hitchcock's whitepaper at &lsquo;<a href="http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx">http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx</a>&rsquo;.</p>
 <p>The following example code demonstrates how to activate subpixel hinting (omitting the error handling).</p>
 <pre class="colored">
   FT_Library  library;
@@ -81,7 +81,7 @@ The TrueType driver
 <table align=center width="75%"><tr><td>
 <h4><a name="TT_INTERPRETER_VERSION_XXX">TT_INTERPRETER_VERSION_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TRUETYPE_DRIVER_H (freetype/ftttdrv.h).
+Defined in FT_TRUETYPE_DRIVER_H (ftttdrv.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-type1_tables.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-type1_tables.html
index 63b6dee1a23..1903210da64 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-type1_tables.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-type1_tables.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Type 1 Tables
@@ -56,7 +56,7 @@ Type 1 Tables
 <table align=center width="75%"><tr><td>
 <h4><a name="PS_FontInfoRec">PS_FontInfoRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -87,7 +87,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="PS_FontInfo">PS_FontInfo</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -106,7 +106,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="T1_FontInfo">T1_FontInfo</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -125,7 +125,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="PS_PrivateRec">PS_PrivateRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -182,7 +182,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="PS_Private">PS_Private</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -201,7 +201,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="T1_Private">T1_Private</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -220,7 +220,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="T1_Blend_Flags">T1_Blend_Flags</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -262,7 +262,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="CID_FaceDictRec">CID_FaceDictRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -299,7 +299,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="CID_FaceDict">CID_FaceDict</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -318,7 +318,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="CID_FaceInfoRec">CID_FaceInfoRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -364,7 +364,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="CID_FaceInfo">CID_FaceInfo</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -383,7 +383,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="CID_Info">CID_Info</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -402,7 +402,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Has_PS_Glyph_Names">FT_Has_PS_Glyph_Names</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -434,7 +434,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_PS_Font_Info">FT_Get_PS_Font_Info</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -478,7 +478,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_PS_Font_Private">FT_Get_PS_Font_Private</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -522,7 +522,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="T1_EncodingType">T1_EncodingType</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -549,7 +549,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="PS_Dict_Keys">PS_Dict_Keys</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -624,7 +624,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_PS_Font_Value">FT_Get_PS_Font_Value</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
+Defined in FT_TYPE1_TABLES_H (t1tables.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-user_allocation.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-user_allocation.html
index fb0cf5efc25..69589a52f43 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-user_allocation.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-user_allocation.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 User allocation
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-version.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-version.html
index ea580ade7a3..b698ac5cb54 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-version.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-version.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 FreeType Version
@@ -52,13 +52,13 @@ FreeType Version
 <table align=center width="75%"><tr><td>
 <h4><a name="FREETYPE_XXX">FREETYPE_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
 #define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MAJOR</a>  2
 #define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MINOR</a>  5
-#define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_PATCH</a>  0
+#define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_PATCH</a>  1
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -90,7 +90,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Library_Version">FT_Library_Version</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -139,7 +139,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Face_CheckTrueTypePatents">FT_Face_CheckTrueTypePatents</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -177,7 +177,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Face_SetUnpatentedHinting">FT_Face_SetUnpatentedHinting</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_FREETYPE_H (freetype/freetype.h).
+Defined in FT_FREETYPE_H (freetype.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-winfnt_fonts.html b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-winfnt_fonts.html
index 1d314ffe5a0..e8b5e5fe133 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/reference/ft2-winfnt_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/reference/ft2-winfnt_fonts.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.0 API Reference</title>
+<title>FreeType-2.5.1 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.5.0 API Reference</h1></center>
+<center><h1>FreeType-2.5.1 API Reference</h1></center>
 
 <center><h1>
 Window FNT Files
@@ -52,7 +52,7 @@ Window FNT Files
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_WinFNT_ID_XXX">FT_WinFNT_ID_XXX</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_WINFONTS_H (freetype/ftwinfnt.h).
+Defined in FT_WINFONTS_H (ftwinfnt.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -78,7 +78,7 @@ Defined in FT_WINFONTS_H (freetype/ftwinfnt.h).
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
-<p>A list of valid values for the &lsquo;charset&rsquo; byte in <a href="ft2-winfnt_fonts.html#FT_WinFNT_HeaderRec">FT_WinFNT_HeaderRec</a>. Exact mapping tables for the various cpXXXX encodings (except for cp1361) can be found at ftp://ftp.unicode.org in the MAPPINGS/VENDORS/MICSFT/WINDOWS subdirectory. cp1361 is roughly a superset of MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.</p>
+<p>A list of valid values for the &lsquo;charset&rsquo; byte in <a href="ft2-winfnt_fonts.html#FT_WinFNT_HeaderRec">FT_WinFNT_HeaderRec</a>. Exact mapping tables for the various cpXXXX encodings (except for cp1361) can be found at <a href="ftp://ftp.unicode.org/public">ftp://ftp.unicode.org/public</a> in the MAPPINGS/VENDORS/MICSFT/WINDOWS subdirectory. cp1361 is roughly a superset of MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>values</b></em></td></tr><tr><td>
 <p></p>
@@ -98,7 +98,7 @@ Defined in FT_WINFONTS_H (freetype/ftwinfnt.h).
 <p>The &lsquo;CreateFont&rsquo; documentation says: The FT_WinFNT_ID_OEM value specifies a character set that is operating-system dependent.</p>
 <p>The &lsquo;IFIMETRICS&rsquo; documentation from the &lsquo;Windows Driver Development Kit&rsquo; says: This font supports an OEM-specific character set. The OEM character set is system dependent.</p>
 <p>In general OEM, as opposed to ANSI (i.e., cp1252), denotes the second default codepage that most international versions of Windows have. It is one of the OEM codepages from</p>
-<p>http://www.microsoft.com/globaldev/reference/cphome.mspx,</p>
+<p><a href="http://www.microsoft.com/globaldev/reference/cphome.mspx">http://www.microsoft.com/globaldev/reference/cphome.mspx</a>,</p>
 <p>and is used for the &lsquo;DOS boxes&rsquo;, to support legacy applications. A German Windows version for example usually uses ANSI codepage 1252 and OEM codepage 850.</p>
 </td></tr>
 <tr valign=top><td><b>FT_WinFNT_ID_CP874</b></td><td>
@@ -157,7 +157,7 @@ Defined in FT_WINFONTS_H (freetype/ftwinfnt.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_WinFNT_HeaderRec">FT_WinFNT_HeaderRec</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_WINFONTS_H (freetype/ftwinfnt.h).
+Defined in FT_WINFONTS_H (ftwinfnt.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -215,7 +215,7 @@ Defined in FT_WINFONTS_H (freetype/ftwinfnt.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_WinFNT_Header">FT_WinFNT_Header</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_WINFONTS_H (freetype/ftwinfnt.h).
+Defined in FT_WINFONTS_H (ftwinfnt.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
@@ -234,7 +234,7 @@ Defined in FT_WINFONTS_H (freetype/ftwinfnt.h).
 <table align=center width="75%"><tr><td>
 <h4><a name="FT_Get_WinFNT_Header">FT_Get_WinFNT_Header</a></h4>
 <table align=center width="87%"><tr><td>
-Defined in FT_WINFONTS_H (freetype/ftwinfnt.h).
+Defined in FT_WINFONTS_H (ftwinfnt.h).
 </td></tr></table><br>
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/release b/Build/source/libs/freetype2/freetype-2.5.1/docs/release
index 65ce078e881..cf1f643d616 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/docs/release
+++ b/Build/source/libs/freetype2/freetype-2.5.1/docs/release
@@ -1,7 +1,7 @@
 How to prepare a new release
 ----------------------------
 
-. include/freetype/freetype.h:  Update FREETYPE_MAJOR, FREETYPE_MINOR,
+. include/freetype.h:  Update FREETYPE_MAJOR, FREETYPE_MINOR,
   and FREETYPE_PATCH.
 
 . Update version numbers in all files where necessary (for example, do
@@ -49,8 +49,6 @@ How to prepare a new release
 
     git push --tags
 
-  TODO: Tag the home page CVS on savannah.nongnu.org.
-
 . Check with
 
     git clean -ndx
@@ -63,9 +61,9 @@ How to prepare a new release
 
 . Create     the     doc    bundles    (freetype-doc-<version>.tar.gz,
   freetype-doc-<version>.tar.bz2,    ftdoc<version>.zip).    This   is
-  everything below
+  everything in
 
-    freetype.freedesktop.org:/srv/freetype.freedesktop.org/www/freetype2/docs/
+    <freetype-web git repository>/freetype2/docs
 
   except the `reference' subdirectory.   Do *not* use option `-l' from
   zip!
@@ -77,7 +75,7 @@ How to prepare a new release
 
     #!/bin/sh
 
-    VERSION=2.4.8
+    VERSION=2.5.1
     SAVANNAH_USER=wl
     SOURCEFORGE_USER=wlemb
 
@@ -161,7 +159,7 @@ How to prepare a new release
 
     #!/bin/sh
 
-    VERSION=2.4.8
+    VERSION=2.5.1
     SOURCEFORGE_USER=wlemb
 
     #####################################################################
@@ -171,39 +169,26 @@ How to prepare a new release
 
     # EOF
 
-. On   SourceForge,   tag   the   just   uploaded   `ftXXXX.zip'   and
+. On   SourceForge,   tag   the    just   uploaded   `ftXXX.zip'   and
   `freetype-XXX.tar.bz2'  files as the  default files to  download for
   `Windows' and `Others', respectively.
 
 . Copy the reference files (generated by `make dist') to
 
-    freetype.freedesktop.org:/srv/freetype.freedesktop.org/www/freetype2/docs/reference
-
-  and
-
-    shell.sf.net:/home/groups/f/fr/freetype/htdocs/freetype2/docs/reference
-
-  TODO: Create  FreeType  home  page  CVS  on savannah.nongnu.org  and
-        update it accordingly.
-
-        Write script to automatically do this.
-
-        Mirror FreeType's savannah home page everywhere.
-
-. Update
-
-    freetype.freedesktop.org:/srv/freetype.freedesktop.org/www/index2.html
+    <freetype-web git repository>/freetype2/docs/reference
 
-  and copy it to
+. Update the `freetype-web' repository.  `git push' then automatically
+  triggers an update  of the public web pages  within ten minutes, due
+  to a cron script (on wl@freedesktop.org) that rsyncs with
 
-    shell.sf.net:/home/groups/f/fr/freetype/htdocs/index2.html
+    freedesktop.org://srv/freetype.freedesktop.org/www
 
 . Announce new release on freetype-announce@nongnu.org and to relevant
   newsgroups.
 
 ----------------------------------------------------------------------
 
-Copyright 2003, 2005-2007, 2009, 2011-2012 by
+Copyright 2003, 2005-2007, 2009, 2011-2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftconfig.h b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftconfig.h
index 5dce30ef3ed..0770e787883 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftconfig.h
@@ -27,11 +27,11 @@
   /* Note however that if some specific modifications are needed, we       */
   /* advise you to place a modified copy in your build directory.          */
   /*                                                                       */
-  /* The build directory is usually `freetype/builds/<system>', and        */
-  /* contains system-specific files that are always included first when    */
-  /* building the library.                                                 */
+  /* The build directory is usually `builds/<system>', and contains        */
+  /* system-specific files that are always included first when building    */
+  /* the library.                                                          */
   /*                                                                       */
-  /* This ANSI version should stay in `include/freetype/config'.           */
+  /* This ANSI version should stay in `include/config/'.                   */
   /*                                                                       */
   /*************************************************************************/
 
@@ -53,7 +53,7 @@ FT_BEGIN_HEADER
   /* These macros can be toggled to suit a specific system.  The current   */
   /* ones are defaults used to compile FreeType in an ANSI C environment   */
   /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `freetype/builds/<system>' directory, and edit it to port the engine. */
+  /* `builds/<system>' directory, and edit it to port the engine.          */
   /*                                                                       */
   /*************************************************************************/
 
@@ -338,6 +338,7 @@ FT_BEGIN_HEADER
   /* These must be defined `static __inline__' with GCC.             */
 
 #if defined( __CC_ARM ) || defined( __ARMCC__ )  /* RVCT */
+
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
 
   /* documentation is in freetype.h */
@@ -367,8 +368,10 @@ FT_BEGIN_HEADER
 
 #ifdef __GNUC__
 
-#if defined( __arm__ ) && !defined( __thumb__ )    && \
+#if defined( __arm__ )                                 && \
+    ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \
     !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
+
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
 
   /* documentation is in freetype.h */
@@ -383,7 +386,11 @@ FT_BEGIN_HEADER
     __asm__ __volatile__ (
       "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
       "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
+#ifdef __clang__
+      "add.w  %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+#else
       "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+#endif
       "adds   %1, %1, %0\n\t"           /* %1 += %0 */
       "adc    %2, %2, #0\n\t"           /* %2 += carry */
       "mov    %0, %1, lsr #16\n\t"      /* %0  = %1 >> 16 */
@@ -394,9 +401,13 @@ FT_BEGIN_HEADER
     return a;
   }
 
-#endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */
+#endif /* __arm__                      && */
+       /* ( __thumb2__ || !__thumb__ ) && */
+       /* !( __CC_ARM || __ARMCC__ )      */
+
 
 #if defined( __i386__ )
+
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
 
   /* documentation is in freetype.h */
@@ -465,6 +476,66 @@ FT_BEGIN_HEADER
 
 #endif /* _MSC_VER */
 
+
+#if defined( __GNUC__ ) && defined( __x86_64__ )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_x86_64
+
+  static __inline__ FT_Int32
+  FT_MulFix_x86_64( FT_Int32  a,
+                    FT_Int32  b )
+  {
+    /* Temporarily disable the warning that C90 doesn't support */
+    /* `long long'.                                             */
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+
+#if 1
+    /* Technically not an assembly fragment, but GCC does a really good */
+    /* job at inlining it and generating good machine code for it.      */
+    long long  ret, tmp;
+
+
+    ret  = (long long)a * b;
+    tmp  = ret >> 63;
+    ret += 0x8000 + tmp;
+
+    return (FT_Int32)( ret >> 16 );
+#else
+
+    /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine  */
+    /* code from the lines below.  The main issue is that `wide_a' is not  */
+    /* properly initialized by sign-extending `a'.  Instead, the generated */
+    /* machine code assumes that the register that contains `a' on input   */
+    /* can be used directly as a 64-bit value, which is wrong most of the  */
+    /* time.                                                               */
+    long long  wide_a = (long long)a;
+    long long  wide_b = (long long)b;
+    long long  result;
+
+
+    __asm__ __volatile__ (
+      "imul %2, %1\n"
+      "mov %1, %0\n"
+      "sar $63, %0\n"
+      "lea 0x8000(%1, %0), %0\n"
+      "sar $16, %0\n"
+      : "=&r"(result), "=&r"(wide_a)
+      : "r"(wide_b)
+      : "cc" );
+
+    return (FT_Int32)result;
+#endif
+
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic pop
+#endif
+  }
+
+#endif /* __GNUC__ && __x86_64__ */
+
 #endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
 
 
@@ -492,6 +563,9 @@ FT_BEGIN_HEADER
 
 #endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
 
+#define FT_LOCAL_ARRAY( x )      extern const  x
+#define FT_LOCAL_ARRAY_DEF( x )  const  x
+
 
 #ifndef FT_BASE
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftheader.h b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftheader.h
index 8371a31611b..b6236299210 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftheader.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftheader.h
@@ -107,7 +107,7 @@
    *
    */
 #ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H  <freetype/config/ftconfig.h>
+#define FT_CONFIG_CONFIG_H  <config/ftconfig.h>
 #endif
 
 
@@ -122,7 +122,7 @@
    *
    */
 #ifndef FT_CONFIG_STANDARD_LIBRARY_H
-#define FT_CONFIG_STANDARD_LIBRARY_H  <freetype/config/ftstdlib.h>
+#define FT_CONFIG_STANDARD_LIBRARY_H  <config/ftstdlib.h>
 #endif
 
 
@@ -137,7 +137,7 @@
    *
    */
 #ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H  <freetype/config/ftoption.h>
+#define FT_CONFIG_OPTIONS_H  <config/ftoption.h>
 #endif
 
 
@@ -153,7 +153,7 @@
    *
    */
 #ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H  <freetype/config/ftmodule.h>
+#define FT_CONFIG_MODULES_H  <config/ftmodule.h>
 #endif
 
   /* */
@@ -170,7 +170,7 @@
    *   base FreeType~2 API.
    *
    */
-#define FT_FREETYPE_H  <freetype/freetype.h>
+#define FT_FREETYPE_H  <freetype.h>
 
 
   /*************************************************************************
@@ -185,7 +185,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_ERRORS_H  <freetype/fterrors.h>
+#define FT_ERRORS_H  <fterrors.h>
 
 
   /*************************************************************************
@@ -198,7 +198,7 @@
    *   list of FreeType~2 module error offsets (and messages).
    *
    */
-#define FT_MODULE_ERRORS_H  <freetype/ftmoderr.h>
+#define FT_MODULE_ERRORS_H  <ftmoderr.h>
 
 
   /*************************************************************************
@@ -214,7 +214,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_SYSTEM_H  <freetype/ftsystem.h>
+#define FT_SYSTEM_H  <ftsystem.h>
 
 
   /*************************************************************************
@@ -230,7 +230,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_IMAGE_H  <freetype/ftimage.h>
+#define FT_IMAGE_H  <ftimage.h>
 
 
   /*************************************************************************
@@ -245,7 +245,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_TYPES_H  <freetype/fttypes.h>
+#define FT_TYPES_H  <fttypes.h>
 
 
   /*************************************************************************
@@ -260,7 +260,7 @@
    *   (Most applications will never need to include this file.)
    *
    */
-#define FT_LIST_H  <freetype/ftlist.h>
+#define FT_LIST_H  <ftlist.h>
 
 
   /*************************************************************************
@@ -273,7 +273,7 @@
    *   scalable outline management API of FreeType~2.
    *
    */
-#define FT_OUTLINE_H  <freetype/ftoutln.h>
+#define FT_OUTLINE_H  <ftoutln.h>
 
 
   /*************************************************************************
@@ -286,7 +286,7 @@
    *   API which manages multiple @FT_Size objects per face.
    *
    */
-#define FT_SIZES_H  <freetype/ftsizes.h>
+#define FT_SIZES_H  <ftsizes.h>
 
 
   /*************************************************************************
@@ -299,7 +299,7 @@
    *   module management API of FreeType~2.
    *
    */
-#define FT_MODULE_H  <freetype/ftmodapi.h>
+#define FT_MODULE_H  <ftmodapi.h>
 
 
   /*************************************************************************
@@ -312,7 +312,7 @@
    *   renderer module management API of FreeType~2.
    *
    */
-#define FT_RENDER_H  <freetype/ftrender.h>
+#define FT_RENDER_H  <ftrender.h>
 
 
   /*************************************************************************
@@ -325,7 +325,7 @@
    *   structures and macros related to the auto-hinting module.
    *
    */
-#define FT_AUTOHINTER_H  <freetype/ftautoh.h>
+#define FT_AUTOHINTER_H  <ftautoh.h>
 
 
   /*************************************************************************
@@ -338,7 +338,7 @@
    *   structures and macros related to the CFF driver module.
    *
    */
-#define FT_CFF_DRIVER_H  <freetype/ftcffdrv.h>
+#define FT_CFF_DRIVER_H  <ftcffdrv.h>
 
 
   /*************************************************************************
@@ -351,7 +351,7 @@
    *   structures and macros related to the TrueType driver module.
    *
    */
-#define FT_TRUETYPE_DRIVER_H  <freetype/ftttdrv.h>
+#define FT_TRUETYPE_DRIVER_H  <ftttdrv.h>
 
 
   /*************************************************************************
@@ -364,7 +364,7 @@
    *   types and API specific to the Type~1 format.
    *
    */
-#define FT_TYPE1_TABLES_H  <freetype/t1tables.h>
+#define FT_TYPE1_TABLES_H  <t1tables.h>
 
 
   /*************************************************************************
@@ -379,7 +379,7 @@
    *   definitions, taken from the TrueType and OpenType specifications.
    *
    */
-#define FT_TRUETYPE_IDS_H  <freetype/ttnameid.h>
+#define FT_TRUETYPE_IDS_H  <ttnameid.h>
 
 
   /*************************************************************************
@@ -392,7 +392,7 @@
    *   types and API specific to the TrueType (as well as OpenType) format.
    *
    */
-#define FT_TRUETYPE_TABLES_H  <freetype/tttables.h>
+#define FT_TRUETYPE_TABLES_H  <tttables.h>
 
 
   /*************************************************************************
@@ -406,7 +406,7 @@
    *   SFNT-based font formats (i.e., TrueType and OpenType).
    *
    */
-#define FT_TRUETYPE_TAGS_H  <freetype/tttags.h>
+#define FT_TRUETYPE_TAGS_H  <tttags.h>
 
 
   /*************************************************************************
@@ -420,7 +420,7 @@
    *   face.
    *
    */
-#define FT_BDF_H  <freetype/ftbdf.h>
+#define FT_BDF_H  <ftbdf.h>
 
 
   /*************************************************************************
@@ -434,7 +434,7 @@
    *   face.
    *
    */
-#define FT_CID_H  <freetype/ftcid.h>
+#define FT_CID_H  <ftcid.h>
 
 
   /*************************************************************************
@@ -447,7 +447,7 @@
    *   definitions of an API which supports gzip-compressed files.
    *
    */
-#define FT_GZIP_H  <freetype/ftgzip.h>
+#define FT_GZIP_H  <ftgzip.h>
 
 
   /*************************************************************************
@@ -460,7 +460,7 @@
    *   definitions of an API which supports LZW-compressed files.
    *
    */
-#define FT_LZW_H  <freetype/ftlzw.h>
+#define FT_LZW_H  <ftlzw.h>
 
 
   /*************************************************************************
@@ -473,7 +473,7 @@
    *   definitions of an API which supports bzip2-compressed files.
    *
    */
-#define FT_BZIP2_H  <freetype/ftbzip2.h>
+#define FT_BZIP2_H  <ftbzip2.h>
 
 
   /*************************************************************************
@@ -486,7 +486,7 @@
    *   definitions of an API which supports Windows FNT files.
    *
    */
-#define FT_WINFONTS_H   <freetype/ftwinfnt.h>
+#define FT_WINFONTS_H   <ftwinfnt.h>
 
 
   /*************************************************************************
@@ -499,7 +499,7 @@
    *   API of the optional glyph management component.
    *
    */
-#define FT_GLYPH_H  <freetype/ftglyph.h>
+#define FT_GLYPH_H  <ftglyph.h>
 
 
   /*************************************************************************
@@ -512,7 +512,7 @@
    *   API of the optional bitmap conversion component.
    *
    */
-#define FT_BITMAP_H  <freetype/ftbitmap.h>
+#define FT_BITMAP_H  <ftbitmap.h>
 
 
   /*************************************************************************
@@ -525,7 +525,7 @@
    *   API of the optional exact bounding box computation routines.
    *
    */
-#define FT_BBOX_H  <freetype/ftbbox.h>
+#define FT_BBOX_H  <ftbbox.h>
 
 
   /*************************************************************************
@@ -538,7 +538,7 @@
    *   API of the optional FreeType~2 cache sub-system.
    *
    */
-#define FT_CACHE_H  <freetype/ftcache.h>
+#define FT_CACHE_H  <ftcache.h>
 
 
   /*************************************************************************
@@ -612,7 +612,7 @@
    *   compiled on the Mac (note that the base API still works though).
    *
    */
-#define FT_MAC_H  <freetype/ftmac.h>
+#define FT_MAC_H  <ftmac.h>
 
 
   /*************************************************************************
@@ -625,7 +625,7 @@
    *   optional multiple-masters management API of FreeType~2.
    *
    */
-#define FT_MULTIPLE_MASTERS_H  <freetype/ftmm.h>
+#define FT_MULTIPLE_MASTERS_H  <ftmm.h>
 
 
   /*************************************************************************
@@ -639,7 +639,7 @@
    *   SFNT-based font formats (i.e., TrueType and OpenType).
    *
    */
-#define FT_SFNT_NAMES_H  <freetype/ftsnames.h>
+#define FT_SFNT_NAMES_H  <ftsnames.h>
 
 
   /*************************************************************************
@@ -653,7 +653,7 @@
    *   GPOS, GSUB, JSTF).
    *
    */
-#define FT_OPENTYPE_VALIDATE_H  <freetype/ftotval.h>
+#define FT_OPENTYPE_VALIDATE_H  <ftotval.h>
 
 
   /*************************************************************************
@@ -667,7 +667,7 @@
    *   mort, morx, bsln, just, kern, opbd, trak, prop).
    *
    */
-#define FT_GX_VALIDATE_H  <freetype/ftgxval.h>
+#define FT_GX_VALIDATE_H  <ftgxval.h>
 
 
   /*************************************************************************
@@ -680,7 +680,7 @@
    *   FreeType~2 API which accesses PFR-specific data.
    *
    */
-#define FT_PFR_H  <freetype/ftpfr.h>
+#define FT_PFR_H  <ftpfr.h>
 
 
   /*************************************************************************
@@ -692,7 +692,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which provides functions to stroke outline paths.
    */
-#define FT_STROKER_H  <freetype/ftstroke.h>
+#define FT_STROKER_H  <ftstroke.h>
 
 
   /*************************************************************************
@@ -704,7 +704,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs artificial obliquing and emboldening.
    */
-#define FT_SYNTHESIS_H  <freetype/ftsynth.h>
+#define FT_SYNTHESIS_H  <ftsynth.h>
 
 
   /*************************************************************************
@@ -717,7 +717,7 @@
    *   FreeType~2 API which provides functions specific to the XFree86 and
    *   X.Org X11 servers.
    */
-#define FT_XFREE86_H  <freetype/ftxf86.h>
+#define FT_XFREE86_H  <ftxf86.h>
 
 
   /*************************************************************************
@@ -730,7 +730,7 @@
    *   FreeType~2 API which performs trigonometric computations (e.g.,
    *   cosines and arc tangents).
    */
-#define FT_TRIGONOMETRY_H  <freetype/fttrigon.h>
+#define FT_TRIGONOMETRY_H  <fttrigon.h>
 
 
   /*************************************************************************
@@ -742,7 +742,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs color filtering for subpixel rendering.
    */
-#define FT_LCD_FILTER_H  <freetype/ftlcdfil.h>
+#define FT_LCD_FILTER_H  <ftlcdfil.h>
 
 
   /*************************************************************************
@@ -754,7 +754,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs color filtering for subpixel rendering.
    */
-#define FT_UNPATENTED_HINTING_H  <freetype/ttunpat.h>
+#define FT_UNPATENTED_HINTING_H  <ttunpat.h>
 
 
   /*************************************************************************
@@ -766,7 +766,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs color filtering for subpixel rendering.
    */
-#define FT_INCREMENTAL_H  <freetype/ftincrem.h>
+#define FT_INCREMENTAL_H  <ftincrem.h>
 
 
   /*************************************************************************
@@ -778,7 +778,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which returns entries from the TrueType GASP table.
    */
-#define FT_GASP_H  <freetype/ftgasp.h>
+#define FT_GASP_H  <ftgasp.h>
 
 
   /*************************************************************************
@@ -790,38 +790,38 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which returns individual and ranged glyph advances.
    */
-#define FT_ADVANCES_H  <freetype/ftadvanc.h>
+#define FT_ADVANCES_H  <ftadvanc.h>
 
 
   /* */
 
-#define FT_ERROR_DEFINITIONS_H  <freetype/fterrdef.h>
+#define FT_ERROR_DEFINITIONS_H  <fterrdef.h>
 
 
   /* The internals of the cache sub-system are no longer exposed.  We */
   /* default to FT_CACHE_H at the moment just in case, but we know of */
   /* no rogue client that uses them.                                  */
   /*                                                                  */
-#define FT_CACHE_MANAGER_H           <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MRU_H      <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MANAGER_H  <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_CACHE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_GLYPH_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_IMAGE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_SBITS_H    <freetype/ftcache.h>
+#define FT_CACHE_MANAGER_H           <ftcache.h>
+#define FT_CACHE_INTERNAL_MRU_H      <ftcache.h>
+#define FT_CACHE_INTERNAL_MANAGER_H  <ftcache.h>
+#define FT_CACHE_INTERNAL_CACHE_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_GLYPH_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_IMAGE_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_SBITS_H    <ftcache.h>
 
 
-#define FT_INCREMENTAL_H          <freetype/ftincrem.h>
+#define FT_INCREMENTAL_H          <ftincrem.h>
 
-#define FT_TRUETYPE_UNPATENTED_H  <freetype/ttunpat.h>
+#define FT_TRUETYPE_UNPATENTED_H  <ttunpat.h>
 
 
   /*
-   * Include internal headers definitions from <freetype/internal/...>
+   * Include internal headers definitions from <internal/...>
    * only when building the library.
    */
 #ifdef FT2_BUILD_LIBRARY
-#define  FT_INTERNAL_INTERNAL_H  <freetype/internal/internal.h>
+#define  FT_INTERNAL_INTERNAL_H  <internal/internal.h>
 #include FT_INTERNAL_INTERNAL_H
 #endif /* FT2_BUILD_LIBRARY */
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftmodule.h b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftmodule.h
index 76d271a74b9..76d271a74b9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftoption.h b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftoption.h
index 0883c69e420..fe2ba15b48c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftoption.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftoption.h
@@ -38,9 +38,9 @@ FT_BEGIN_HEADER
   /*    library from a single source directory.                            */
   /*                                                                       */
   /*  - You can put a copy of this file in your build directory, more      */
-  /*    precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD'   */
-  /*    is the name of a directory that is included _before_ the FreeType  */
-  /*    include path during compilation.                                   */
+  /*    precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the     */
+  /*    name of a directory that is included _before_ the FreeType include */
+  /*    path during compilation.                                           */
   /*                                                                       */
   /*    The default FreeType Makefiles and Jamfiles use the build          */
   /*    directory `builds/<system>' by default, but you can easily change  */
@@ -51,7 +51,7 @@ FT_BEGIN_HEADER
   /*    locate this file during the build.  For example,                   */
   /*                                                                       */
   /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <freetype/config/ftheader.h>                            */
+  /*      #include <config/ftheader.h>                                     */
   /*                                                                       */
   /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
   /*    definitions.                                                       */
@@ -59,7 +59,7 @@ FT_BEGIN_HEADER
   /*    Note also that you can similarly pre-define the macro              */
   /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
   /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <freetype/config/ftmodule.h>.                */
+  /*    default, this file is <config/ftmodule.h>.                         */
   /*                                                                       */
   /*  We highly recommend using the third method whenever possible.        */
   /*                                                                       */
@@ -528,7 +528,7 @@ FT_BEGIN_HEADER
   /* does not contain any glyph name though.                               */
   /*                                                                       */
   /* Accessing SFNT names is done through the functions declared in        */
-  /* `freetype/ftsnames.h'.                                                */
+  /* `ftsnames.h'.                                                         */
   /*                                                                       */
 #define TT_CONFIG_OPTION_SFNT_NAMES
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftstdlib.h b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftstdlib.h
index b940efc4273..b940efc4273 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/config/ftstdlib.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/config/ftstdlib.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/freetype.h b/Build/source/libs/freetype2/freetype-2.5.1/include/freetype.h
index fe46d229787..76fbda2db1c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/freetype.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/freetype.h
@@ -98,7 +98,10 @@ FT_BEGIN_HEADER
   /*    FT_FACE_FLAG_FIXED_WIDTH                                           */
   /*    FT_FACE_FLAG_HORIZONTAL                                            */
   /*    FT_FACE_FLAG_VERTICAL                                              */
+  /*    FT_FACE_FLAG_COLOR                                                 */
   /*    FT_FACE_FLAG_SFNT                                                  */
+  /*    FT_FACE_FLAG_CID_KEYED                                             */
+  /*    FT_FACE_FLAG_TRICKY                                                */
   /*    FT_FACE_FLAG_KERNING                                               */
   /*    FT_FACE_FLAG_MULTIPLE_MASTERS                                      */
   /*    FT_FACE_FLAG_GLYPH_NAMES                                           */
@@ -417,7 +420,8 @@ FT_BEGIN_HEADER
   /* <Note>                                                                */
   /*    Each @FT_Face has an _active_ @FT_Size object that is used by      */
   /*    functions like @FT_Load_Glyph to determine the scaling             */
-  /*    transformation which is used to load and hint glyphs and metrics.  */
+  /*    transformation that in turn is used to load and hint glyphs and    */
+  /*    metrics.                                                           */
   /*                                                                       */
   /*    You can use @FT_Set_Char_Size, @FT_Set_Pixel_Sizes,                */
   /*    @FT_Request_Size or even @FT_Select_Size to change the content     */
@@ -552,11 +556,12 @@ FT_BEGIN_HEADER
   /*    FT_ENCODING_MS_SYMBOL ::                                           */
   /*      Corresponds to the Microsoft Symbol encoding, used to encode     */
   /*      mathematical symbols in the 32..255 character code range.  For   */
-  /*      more information, see `http://www.ceviz.net/symbol.htm'.         */
+  /*      more information, see                                            */
+  /*      `http://www.kostis.net/charsets/symbol.htm'.                     */
   /*                                                                       */
   /*    FT_ENCODING_SJIS ::                                                */
   /*      Corresponds to Japanese SJIS encoding.  More info at             */
-  /*      at `http://langsupport.japanreference.com/encoding.shtml'.       */
+  /*      at `http://en.wikipedia.org/wiki/Shift_JIS'.                     */
   /*      See note on multi-byte encodings below.                          */
   /*                                                                       */
   /*    FT_ENCODING_GB2312 ::                                              */
@@ -570,7 +575,7 @@ FT_BEGIN_HEADER
   /*    FT_ENCODING_WANSUNG ::                                             */
   /*      Corresponds to the Korean encoding system known as Wansung.      */
   /*      For more information see                                         */
-  /*      `http://www.microsoft.com/typography/unicode/949.txt'.           */
+  /*      `http://msdn.microsoft.com/en-US/goglobal/cc305154'.             */
   /*                                                                       */
   /*    FT_ENCODING_JOHAB ::                                               */
   /*      The Korean standard character set (KS~C 5601-1992), which        */
@@ -645,10 +650,10 @@ FT_BEGIN_HEADER
   /*    FT_ENCODING_APPLE_ROMAN).                                          */
   /*                                                                       */
   /*    If `platform_id' is @TT_PLATFORM_MACINTOSH, use the function       */
-  /*    @FT_Get_CMap_Language_ID  to query the Mac language ID which may   */
+  /*    @FT_Get_CMap_Language_ID to query the Mac language ID that may     */
   /*    be needed to be able to distinguish Apple encoding variants.  See  */
   /*                                                                       */
-  /*      http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/README.TXT  */
+  /*      http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/Readme.txt  */
   /*                                                                       */
   /*    to get an idea how to do that.  Basically, if the language ID      */
   /*    is~0, don't use it, otherwise subtract 1 from the language ID.     */
@@ -808,7 +813,7 @@ FT_BEGIN_HEADER
   /*                           highest CID used in the font.               */
   /*                                                                       */
   /*    family_name         :: The face's family name.  This is an ASCII   */
-  /*                           string, usually in English, which describes */
+  /*                           string, usually in English, that describes  */
   /*                           the typeface's family (like `Times New      */
   /*                           Roman', `Bodoni', `Garamond', etc).  This   */
   /*                           is a least common denominator used to list  */
@@ -820,7 +825,7 @@ FT_BEGIN_HEADER
   /*                           PDF file).                                  */
   /*                                                                       */
   /*    style_name          :: The face's style name.  This is an ASCII    */
-  /*                           string, usually in English, which describes */
+  /*                           string, usually in English, that describes  */
   /*                           the typeface's style (like `Italic',        */
   /*                           `Bold', `Condensed', etc).  Not all font    */
   /*                           formats provide a style name, so this field */
@@ -1054,7 +1059,7 @@ FT_BEGIN_HEADER
   /*      exist make FT_Load_Glyph return successfully; in all other cases */
   /*      you get an `FT_Err_Invalid_Argument' error.                      */
   /*                                                                       */
-  /*      Note that CID-keyed fonts which are in an SFNT wrapper don't     */
+  /*      Note that CID-keyed fonts that are in an SFNT wrapper don't      */
   /*      have this flag set since the glyphs are accessed in the normal   */
   /*      way (using contiguous indices); the `CID-ness' isn't visible to  */
   /*      the application.                                                 */
@@ -1062,7 +1067,7 @@ FT_BEGIN_HEADER
   /*    FT_FACE_FLAG_TRICKY ::                                             */
   /*      Set if the font is `tricky', this is, it always needs the        */
   /*      font format's native hinting engine to get a reasonable result.  */
-  /*      A typical example is the Chinese font `mingli.ttf' which uses    */
+  /*      A typical example is the Chinese font `mingli.ttf' that uses     */
   /*      TrueType bytecode instructions to move and scale all of its      */
   /*      subglyphs.                                                       */
   /*                                                                       */
@@ -1075,6 +1080,10 @@ FT_BEGIN_HEADER
   /*      Currently, there are about a dozen TrueType fonts in the list of */
   /*      tricky fonts; they are hard-coded in file `ttobjs.c'.            */
   /*                                                                       */
+  /*    FT_FACE_FLAG_COLOR ::                                              */
+  /*      Set if the font has color glyph tables.  To access color glyphs  */
+  /*      use @FT_LOAD_COLOR.                                              */
+  /*                                                                       */
 #define FT_FACE_FLAG_SCALABLE          ( 1L <<  0 )
 #define FT_FACE_FLAG_FIXED_SIZES       ( 1L <<  1 )
 #define FT_FACE_FLAG_FIXED_WIDTH       ( 1L <<  2 )
@@ -1089,6 +1098,7 @@ FT_BEGIN_HEADER
 #define FT_FACE_FLAG_HINTER            ( 1L << 11 )
 #define FT_FACE_FLAG_CID_KEYED         ( 1L << 12 )
 #define FT_FACE_FLAG_TRICKY            ( 1L << 13 )
+#define FT_FACE_FLAG_COLOR             ( 1L << 14 )
 
 
   /*************************************************************************
@@ -1273,6 +1283,20 @@ FT_BEGIN_HEADER
           ( face->face_flags & FT_FACE_FLAG_TRICKY )
 
 
+  /*************************************************************************
+   *
+   * @macro:
+   *   FT_HAS_COLOR( face )
+   *
+   * @description:
+   *   A macro that returns true whenever a face object contains
+   *   tables for color glyphs.
+   *
+   */
+#define FT_HAS_COLOR( face ) \
+          ( face->face_flags & FT_FACE_FLAG_COLOR )
+
+
   /*************************************************************************/
   /*                                                                       */
   /* <Const>                                                               */
@@ -1394,9 +1418,9 @@ FT_BEGIN_HEADER
   /* <Fields>                                                              */
   /*    face    :: Handle to the parent face object.                       */
   /*                                                                       */
-  /*    generic :: A typeless pointer, which is unused by the FreeType     */
-  /*               library or any of its drivers.  It can be used by       */
-  /*               client applications to link their own data to each size */
+  /*    generic :: A typeless pointer, unused by the FreeType library or   */
+  /*               any of its drivers.  It can be used by client           */
+  /*               applications to link their own data to each size        */
   /*               object.                                                 */
   /*                                                                       */
   /*    metrics :: Metrics for this size object.  This field is read-only. */
@@ -1464,10 +1488,10 @@ FT_BEGIN_HEADER
   /*                         listed through a direct, single-linked list   */
   /*                         using its `next' field.                       */
   /*                                                                       */
-  /*    generic           :: A typeless pointer which is unused by the     */
-  /*                         FreeType library or any of its drivers.  It   */
-  /*                         can be used by client applications to link    */
-  /*                         their own data to each glyph slot object.     */
+  /*    generic           :: A typeless pointer unused by the FreeType     */
+  /*                         library or any of its drivers.  It can be     */
+  /*                         used by client applications to link their own */
+  /*                         data to each glyph slot object.               */
   /*                                                                       */
   /*    metrics           :: The metrics of the last loaded glyph in the   */
   /*                         slot.  The returned values depend on the last */
@@ -1494,8 +1518,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    advance           :: This shorthand is, depending on               */
   /*                         @FT_LOAD_IGNORE_TRANSFORM, the transformed    */
-  /*                         advance width for the glyph (in 26.6          */
-  /*                         fractional pixel format).  As specified with  */
+  /*                         (hinted) advance width for the glyph, in 26.6 */
+  /*                         fractional pixel format.  As specified with   */
   /*                         @FT_LOAD_VERTICAL_LAYOUT, it uses either the  */
   /*                         `horiAdvance' or the `vertAdvance' value of   */
   /*                         `metrics' field.                              */
@@ -1584,7 +1608,7 @@ FT_BEGIN_HEADER
   /*    `slot->format' is also changed to @FT_GLYPH_FORMAT_BITMAP.         */
   /*                                                                       */
   /* <Note>                                                                */
-  /*    Here a small pseudo code fragment which shows how to use           */
+  /*    Here a small pseudo code fragment that shows how to use            */
   /*    `lsb_delta' and `rsb_delta':                                       */
   /*                                                                       */
   /*    {                                                                  */
@@ -1813,7 +1837,7 @@ FT_BEGIN_HEADER
   /*                   opening a new face.                                 */
   /*                                                                       */
   /* <Note>                                                                */
-  /*    The stream type is determined by the contents of `flags' which     */
+  /*    The stream type is determined by the contents of `flags' that      */
   /*    are tested in the following order by @FT_Open_Face:                */
   /*                                                                       */
   /*    If the `FT_OPEN_MEMORY' bit is set, assume that this is a          */
@@ -1894,7 +1918,7 @@ FT_BEGIN_HEADER
   /*    FT_New_Memory_Face                                                 */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    This function calls @FT_Open_Face to open a font which has been    */
+  /*    This function calls @FT_Open_Face to open a font that has been     */
   /*    loaded into memory.                                                */
   /*                                                                       */
   /* <InOut>                                                               */
@@ -1940,7 +1964,7 @@ FT_BEGIN_HEADER
   /*    library    :: A handle to the library resource.                    */
   /*                                                                       */
   /* <Input>                                                               */
-  /*    args       :: A pointer to an `FT_Open_Args' structure which must  */
+  /*    args       :: A pointer to an `FT_Open_Args' structure that must   */
   /*                  be filled by the caller.                             */
   /*                                                                       */
   /*    face_index :: The index of the face within the font.  The first    */
@@ -1956,7 +1980,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Note>                                                                */
   /*    Unlike FreeType 1.x, this function automatically creates a glyph   */
-  /*    slot for the face object which can be accessed directly through    */
+  /*    slot for the face object that can be accessed directly through     */
   /*    `face->glyph'.                                                     */
   /*                                                                       */
   /*    FT_Open_Face can be used to quickly check whether the font         */
@@ -1965,7 +1989,7 @@ FT_BEGIN_HEADER
   /*    if the font format is recognized, or non-zero otherwise;           */
   /*    the function returns a more or less empty face handle in `*aface'  */
   /*    (if `aface' isn't NULL).  The only useful field in this special    */
-  /*    case is `face->num_faces' which gives the number of faces within   */
+  /*    case is `face->num_faces' that gives the number of faces within    */
   /*    the font file.  After examination, the returned @FT_Face structure */
   /*    should be deallocated with a call to @FT_Done_Face.                */
   /*                                                                       */
@@ -2023,7 +2047,7 @@ FT_BEGIN_HEADER
   /*    face       :: The target face object.                              */
   /*                                                                       */
   /* <Input>                                                               */
-  /*    parameters :: A pointer to @FT_Open_Args which must be filled by   */
+  /*    parameters :: A pointer to @FT_Open_Args that must be filled by    */
   /*                  the caller.                                          */
   /*                                                                       */
   /* <Return>                                                              */
@@ -2054,7 +2078,7 @@ FT_BEGIN_HEADER
   /*    then only destroys a face if the counter is~1, otherwise it simply */
   /*    decrements the counter.                                            */
   /*                                                                       */
-  /*    This function helps in managing life-cycles of structures which    */
+  /*    This function helps in managing life-cycles of structures that     */
   /*    reference @FT_Face objects.                                        */
   /*                                                                       */
   /* <Input>                                                               */
@@ -2361,7 +2385,7 @@ FT_BEGIN_HEADER
   /*    the details.                                                       */
   /*                                                                       */
   /*    For subsetted CID-keyed fonts, `FT_Err_Invalid_Argument' is        */
-  /*    returned for invalid CID values (this is, for CID values which     */
+  /*    returned for invalid CID values (this is, for CID values that      */
   /*    don't have a corresponding glyph in the font).  See the discussion */
   /*    of the @FT_FACE_FLAG_CID_KEYED flag for more details.              */
   /*                                                                       */
@@ -2635,7 +2659,7 @@ FT_BEGIN_HEADER
    *   `load_flags'.  They can't be ORed.
    *
    *   If @FT_LOAD_RENDER is also set, the glyph is rendered in the
-   *   corresponding mode (i.e., the mode which matches the used algorithm
+   *   corresponding mode (i.e., the mode that matches the used algorithm
    *   best).  An exeption is FT_LOAD_TARGET_MONO since it implies
    *   @FT_LOAD_MONOCHROME.
    *
@@ -3003,7 +3027,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    This function is not compiled within the library if the config     */
   /*    macro `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is defined in              */
-  /*    `include/freetype/config/ftoptions.h'.                             */
+  /*    `ftoptions.h'.                                                     */
   /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Get_Glyph_Name( FT_Face     face,
@@ -3059,8 +3083,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    Because many fonts contain more than a single cmap for Unicode     */
   /*    encoding, this function has some special code to select the one    */
-  /*    which covers Unicode best (`best' in the sense that a UCS-4 cmap   */
-  /*    is preferred to a UCS-2 cmap).  It is thus preferable to           */
+  /*    that covers Unicode best (`best' in the sense that a UCS-4 cmap is */
+  /*    preferred to a UCS-2 cmap).  It is thus preferable to              */
   /*    @FT_Set_Charmap in this case.                                      */
   /*                                                                       */
   FT_EXPORT( FT_Error )
@@ -3414,7 +3438,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Note>                                                                */
   /*    Use this function rather than directly reading the `fs_type' field */
-  /*    in the @PS_FontInfoRec structure which is only guaranteed to       */
+  /*    in the @PS_FontInfoRec structure, which is only guaranteed to      */
   /*    return the correct results for Type~1 fonts.                       */
   /*                                                                       */
   /* <Since>                                                               */
@@ -3594,7 +3618,7 @@ FT_BEGIN_HEADER
   /*      The character codepoint in Unicode.                              */
   /*                                                                       */
   /* <Return>                                                              */
-  /*    A pointer to an array of variant selector code points which are    */
+  /*    A pointer to an array of variant selector code points that are     */
   /*    active for the given character, or NULL if the corresponding list  */
   /*    is empty.                                                          */
   /*                                                                       */
@@ -3628,7 +3652,7 @@ FT_BEGIN_HEADER
   /*      The variant selector code point in Unicode.                      */
   /*                                                                       */
   /* <Return>                                                              */
-  /*    A list of all the code points which are specified by this selector */
+  /*    A list of all the code points that are specified by this selector  */
   /*    (both default and non-default codes are returned) or NULL if there */
   /*    is no valid cmap or the variant selector is invalid.               */
   /*                                                                       */
@@ -3901,7 +3925,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  5
-#define FREETYPE_PATCH  0
+#define FREETYPE_PATCH  1
 
 
   /*************************************************************************/
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/ft2build.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ft2build.h
index 923d887df6f..6f8eb7f3731 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/ft2build.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ft2build.h
@@ -3,9 +3,8 @@
 /*  ft2build.h                                                             */
 /*                                                                         */
 /*    FreeType 2 build and setup macros.                                   */
-/*    (Generic version)                                                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2006 by                                           */
+/*  Copyright 1996-2001, 2006, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -19,21 +18,25 @@
 
   /*************************************************************************/
   /*                                                                       */
-  /* This file corresponds to the default `ft2build.h' file for            */
-  /* FreeType 2.  It uses the `freetype' include root.                     */
+  /* This is the `entry point' for FreeType header file inclusions.  It is */
+  /* the only header file which should be included directly; all other     */
+  /* FreeType header files should be accessed with macro names (after      */
+  /* including `ft2build.h').                                              */
   /*                                                                       */
-  /* Note that specific platforms might use a different configuration.     */
-  /* See builds/unix/ft2unix.h for an example.                             */
+  /* A typical example is                                                  */
+  /*                                                                       */
+  /*   #include <ft2build.h>                                               */
+  /*   #include FT_FREETYPE_H                                              */
   /*                                                                       */
   /*************************************************************************/
 
 
-#ifndef __FT2_BUILD_GENERIC_H__
-#define __FT2_BUILD_GENERIC_H__
+#ifndef __FT2BUILD_H__
+#define __FT2BUILD_H__
 
-#include <freetype/config/ftheader.h>
+#include <config/ftheader.h>
 
-#endif /* __FT2_BUILD_GENERIC_H__ */
+#endif /* __FT2BUILD_H__ */
 
 
 /* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftadvanc.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftadvanc.h
index 012b74b8122..8f7e2fce5ed 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftadvanc.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftadvanc.h
@@ -64,11 +64,11 @@ FT_BEGIN_HEADER
   /*    corresponding hinting mode or font driver doesn't allow for very   */
   /*    quick advance computation.                                         */
   /*                                                                       */
-  /*    Typically, glyphs which are either unscaled, unhinted, bitmapped,  */
+  /*    Typically, glyphs that are either unscaled, unhinted, bitmapped,   */
   /*    or light-hinted can have their advance width computed very         */
   /*    quickly.                                                           */
   /*                                                                       */
-  /*    Normal and bytecode hinted modes, which require loading, scaling,  */
+  /*    Normal and bytecode hinted modes that require loading, scaling,    */
   /*    and hinting of the glyph outline, are extremely slow by            */
   /*    comparison.                                                        */
   /*                                                                       */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftautoh.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftautoh.h
index 5e1153a1c1d..bf97b3f2404 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftautoh.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftautoh.h
@@ -79,7 +79,7 @@ FT_BEGIN_HEADER
    *   sense, see the @FT_AUTOHINTER_SCRIPT_XXX values) is stored as an
    *   array with `num_glyphs' elements, as found in the font's @FT_Face
    *   structure.  The `glyph-to-script-map' property returns a pointer to
-   *   this array which can be modified as needed.  Note that the
+   *   this array, which can be modified as needed.  Note that the
    *   modification should happen before the first glyph gets processed by
    *   the auto-hinter so that the global analysis of the font shapes
    *   actually uses the modified mapping.
@@ -282,7 +282,7 @@ FT_BEGIN_HEADER
    *   This property can be used with @FT_Property_Get also.
    *
    *   It's important to use the right timing for changing this value: The
-   *   creation of the glyph-to-script map which eventually uses the
+   *   creation of the glyph-to-script map that eventually uses the
    *   fallback script value gets triggered either by setting or reading a
    *   face-specific property like @glyph-to-script-map, or by auto-hinting
    *   any glyph from that face.  In particular, if you have already created
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftbbox.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftbbox.h
index 976691956f2..8938841a622 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftbbox.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftbbox.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType exact bbox computation (specification).                     */
 /*                                                                         */
-/*  Copyright 1996-2001, 2003, 2007, 2011 by                               */
+/*  Copyright 1996-2001, 2003, 2007, 2011, 2013 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -60,7 +60,7 @@ FT_BEGIN_HEADER
   /* <Description>                                                         */
   /*    Compute the exact bounding box of an outline.  This is slower      */
   /*    than computing the control box.  However, it uses an advanced      */
-  /*    algorithm which returns _very_ quickly when the two boxes          */
+  /*    algorithm that returns _very_ quickly when the two boxes           */
   /*    coincide.  Otherwise, the outline Bézier arcs are traversed to     */
   /*    extract their extrema.                                             */
   /*                                                                       */
@@ -78,7 +78,7 @@ FT_BEGIN_HEADER
   /*    @FT_LOAD_NO_SCALE, the resulting BBox is meaningless.  To get      */
   /*    reasonable values for the BBox it is necessary to load the glyph   */
   /*    at a large ppem value (so that the hinting instructions can        */
-  /*    properly shift and scale the subglyphs), then extracting the BBox  */
+  /*    properly shift and scale the subglyphs), then extracting the BBox, */
   /*    which can be eventually converted back to font units.              */
   /*                                                                       */
   FT_EXPORT( FT_Error )
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftbdf.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftbdf.h
index 4f8baf84017..4f8baf84017 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftbdf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftbdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftbitmap.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftbitmap.h
index 7dbf5ba3fe6..7dbf5ba3fe6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftbitmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftbitmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftbzip2.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftbzip2.h
index 1bf81b15e89..1bf81b15e89 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftbzip2.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftbzip2.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftcache.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftcache.h
index 4ec9587cf6f..a5d7100a3fb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftcache.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftcache.h
@@ -156,7 +156,7 @@ FT_BEGIN_HEADER
    * @note:
    *   Never use NULL as a valid @FTC_FaceID.
    *
-   *   Face IDs are passed by the client to the cache manager, which calls,
+   *   Face IDs are passed by the client to the cache manager that calls,
    *   when needed, the @FTC_Face_Requester to translate them into new
    *   @FT_Face objects.
    *
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/include/ftcffdrv.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftcffdrv.h
new file mode 100644
index 00000000000..e4d039d0214
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftcffdrv.h
@@ -0,0 +1,254 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftcffdrv.h                                                             */
+/*                                                                         */
+/*    FreeType API for controlling the CFF driver (specification only).    */
+/*                                                                         */
+/*  Copyright 2013 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 __FTCFFDRV_H__
+#define __FTCFFDRV_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+  /**************************************************************************
+   *
+   * @section:
+   *   cff_driver
+   *
+   * @title:
+   *   The CFF driver
+   *
+   * @abstract:
+   *   Controlling the CFF driver module.
+   *
+   * @description:
+   *   While FreeType's CFF driver doesn't expose API functions by itself,
+   *   it is possible to control its behaviour with @FT_Property_Set and
+   *   @FT_Property_Get.  The list below gives the available properties
+   *   together with the necessary macros and structures.
+   *
+   *   The CFF driver's module name is `cff'.
+   *
+   *   *Hinting* *and* *antialiasing* *principles* *of* *the* *new* *engine*
+   *
+   *   The rasterizer is positioning horizontal features (e.g., ascender
+   *   height & x-height, or crossbars) on the pixel grid and minimizing the
+   *   amount of antialiasing applied to them, while placing vertical
+   *   features (vertical stems) on the pixel grid without hinting, thus
+   *   representing the stem position and weight accurately.  Sometimes the
+   *   vertical stems may be only partially black.  In this context,
+   *   `antialiasing' means that stems are not positioned exactly on pixel
+   *   borders, causing a fuzzy appearance.
+   *
+   *   There are two principles behind this approach.
+   *
+   *   1) No hinting in the horizontal direction: Unlike `superhinted'
+   *   TrueType, which changes glyph widths to accommodate regular
+   *   inter-glyph spacing, Adobe's approach is `faithful to the design' in
+   *   representing both the glyph width and the inter-glyph spacing
+   *   designed for the font.  This makes the screen display as close as it
+   *   can be to the result one would get with infinite resolution, while
+   *   preserving what is considered the key characteristics of each glyph.
+   *   Note that the distances between unhinted and grid-fitted positions at
+   *   small sizes are comparable to kerning values and thus would be
+   *   noticeable (and distracting) while reading if hinting were applied.
+   *
+   *   One of the reasons to not hint horizontally is antialiasing for LCD
+   *   screens: The pixel geometry of modern displays supplies three
+   *   vertical sub-pixels as the eye moves horizontally across each visible
+   *   pixel.  On devices where we can be certain this characteristic is
+   *   present a rasterizer can take advantage of the sub-pixels to add
+   *   increments of weight.  In Western writing systems this turns out to
+   *   be the more critical direction anyway; the weights and spacing of
+   *   vertical stems (see above) are central to Armenian, Cyrillic, Greek,
+   *   and Latin type designs.  Even when the rasterizer uses greyscale
+   *   antialiasing instead of color (a necessary compromise when one
+   *   doesn't know the screen characteristics), the unhinted vertical
+   *   features preserve the design's weight and spacing much better than
+   *   aliased type would.
+   *
+   *   2) Aligment in the vertical direction: Weights and spacing along the
+   *   y~axis are less critical; what is much more important is the visual
+   *   alignment of related features (like cap-height and x-height).  The
+   *   sense of alignment for these is enhanced by the sharpness of grid-fit
+   *   edges, while the cruder vertical resolution (full pixels instead of
+   *   1/3 pixels) is less of a problem.
+   *
+   *   On the technical side, horizontal alignment zones for ascender,
+   *   x-height, and other important height values (traditionally called
+   *   `blue zones') as defined in the font are positioned independently,
+   *   each being rounded to the nearest pixel edge, taking care of
+   *   overshoot suppression at small sizes, stem darkening, and scaling.
+   *
+   *   Hstems (this is, hint values defined in the font to help align
+   *   horizontal features) that fall within a blue zone are said to be
+   *   `captured' and are aligned to that zone.  Uncaptured stems are moved
+   *   in one of four ways, top edge up or down, bottom edge up or down.
+   *   Unless there are conflicting hstems, the smallest movement is taken
+   *   to minimize distortion.
+   */
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   hinting-engine
+   *
+   * @description:
+   *   Thanks to Adobe, which contributed a new hinting (and parsing)
+   *   engine, an application can select between `freetype' and `adobe' if
+   *   compiled with CFF_CONFIG_OPTION_OLD_ENGINE.  If this configuration
+   *   macro isn't defined, `hinting-engine' does nothing.
+   *
+   *   The default engine is `freetype' if CFF_CONFIG_OPTION_OLD_ENGINE is
+   *   defined, and `adobe' otherwise.
+   *
+   *   The following example code demonstrates how to select Adobe's hinting
+   *   engine (omitting the error handling).
+   *
+   *   {
+   *     FT_Library  library;
+   *     FT_UInt     hinting_engine = FT_CFF_HINTING_ADOBE;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "cff",
+   *                               "hinting-engine", &hinting_engine );
+   *   }
+   *
+   * @note:
+   *   This property can be used with @FT_Property_Get also.
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @enum:
+   *   FT_CFF_HINTING_XXX
+   *
+   * @description:
+   *   A list of constants used for the @hinting-engine property to select
+   *   the hinting engine for CFF fonts.
+   *
+   * @values:
+   *   FT_CFF_HINTING_FREETYPE ::
+   *     Use the old FreeType hinting engine.
+   *
+   *   FT_CFF_HINTING_ADOBE ::
+   *     Use the hinting engine contributed by Adobe.
+   *
+   */
+#define FT_CFF_HINTING_FREETYPE  0
+#define FT_CFF_HINTING_ADOBE     1
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   no-stem-darkening
+   *
+   * @description:
+   *   By default, the Adobe CFF engine darkens stems at smaller sizes,
+   *   regardless of hinting, to enhance contrast.  This feature requires
+   *   a rendering system with proper gamma correction.  Setting this
+   *   property, stem darkening gets switched off.
+   *
+   *   Note that stem darkening is never applied if @FT_LOAD_NO_SCALE is set.
+   *
+   *   {
+   *     FT_Library  library;
+   *     FT_Bool     no_stem_darkening = TRUE;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "cff",
+   *                               "no-stem-darkening", &no_stem_darkening );
+   *   }
+   *
+   * @note:
+   *   This property can be used with @FT_Property_Get also.
+   *
+   */
+
+
+  /**************************************************************************
+   *
+   * @property:
+   *   darkening-parameters
+   *
+   * @description:
+   *   By default, the Adobe CFF engine darkens stems as follows (if the
+   *   `no-stem-darkening' property isn't set):
+   *
+   *   {
+   *     stem width <= 0.5px:   darkening amount = 0.4px
+   *     stem width  = 1px:     darkening amount = 0.275px
+   *     stem width  = 1.667px: darkening amount = 0.275px
+   *     stem width >= 2.333px: darkening amount = 0px
+   *   }
+   *
+   *   and piecewise linear in-between.  Using the `darkening-parameters'
+   *   property, these four control points can be changed, as the following
+   *   example demonstrates.
+   *
+   *   {
+   *     FT_Library  library;
+   *     FT_Int      darken_params[8] = {  500, 300,   // x1, y1
+   *                                      1000, 200,   // x2, y2
+   *                                      1500, 100,   // x3, y3
+   *                                      2000,   0 }; // x4, y4
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "cff",
+   *                               "darkening-parameters", darken_params );
+   *   }
+   *
+   *   The x~values give the stem width, and the y~values the darkening
+   *   amount.  The unit is 1000th of pixels.  All coordinate values must be
+   *   positive; the x~values must be monotonically increasing; the
+   *   y~values must be monotonically decreasing and smaller than or
+   *   equal to 500 (corresponding to half a pixel); the slope of each
+   *   linear piece must be shallower than -1 (e.g., -.4).
+   *
+   * @note:
+   *   This property can be used with @FT_Property_Get also.
+   *
+   */
+
+
+ /* */
+
+FT_END_HEADER
+
+
+#endif /* __FTCFFDRV_H__ */
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftchapters.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftchapters.h
index c55670d1d23..4b1059a8592 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftchapters.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftchapters.h
@@ -1,7 +1,7 @@
 /***************************************************************************/
 /*                                                                         */
 /* This file defines the structure of the FreeType reference.              */
-/* It is used by the python script which generates the HTML files.         */
+/* It is used by the python script that generates the HTML files.          */
 /*                                                                         */
 /***************************************************************************/
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftcid.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftcid.h
index 203a30caf85..203a30caf85 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftcid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftcid.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/fterrdef.h b/Build/source/libs/freetype2/freetype-2.5.1/include/fterrdef.h
index 76c7b9e36fc..76c7b9e36fc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/fterrdef.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/fterrdef.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/fterrors.h b/Build/source/libs/freetype2/freetype-2.5.1/include/fterrors.h
index 0fa3e4dce19..0fa3e4dce19 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/fterrors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/fterrors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftgasp.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftgasp.h
index 453d4fa42c9..453d4fa42c9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftgasp.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftgasp.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftglyph.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftglyph.h
index 31dc33187d7..2d30ed9de7b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftglyph.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftglyph.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType convenience functions to handle glyphs (specification).     */
 /*                                                                         */
-/*  Copyright 1996-2003, 2006, 2008, 2009, 2011 by                         */
+/*  Copyright 1996-2003, 2006, 2008, 2009, 2011, 2013 by                   */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -358,17 +358,17 @@ FT_BEGIN_HEADER
   /*    outline's points, including Bézier control points.  Though it      */
   /*    coincides with the exact bounding box for most glyphs, it can be   */
   /*    slightly larger in some situations (like when rotating an outline  */
-  /*    which contains Bézier outside arcs).                               */
+  /*    that contains Bézier outside arcs).                                */
   /*                                                                       */
   /*    Computing the control box is very fast, while getting the bounding */
   /*    box can take much more time as it needs to walk over all segments  */
   /*    and arcs in the outline.  To get the latter, you can use the       */
-  /*    `ftbbox' component which is dedicated to this single task.         */
+  /*    `ftbbox' component, which is dedicated to this single task.        */
   /*                                                                       */
   /* <Input>                                                               */
   /*    glyph :: A handle to the source glyph object.                      */
   /*                                                                       */
-  /*    mode  :: The mode which indicates how to interpret the returned    */
+  /*    mode  :: The mode that indicates how to interpret the returned     */
   /*             bounding box values.                                      */
   /*                                                                       */
   /* <Output>                                                              */
@@ -388,7 +388,7 @@ FT_BEGIN_HEADER
   /*    @FT_LOAD_NO_SCALE, the resulting CBox is meaningless.  To get      */
   /*    reasonable values for the CBox it is necessary to load the glyph   */
   /*    at a large ppem value (so that the hinting instructions can        */
-  /*    properly shift and scale the subglyphs), then extracting the CBox  */
+  /*    properly shift and scale the subglyphs), then extracting the CBox, */
   /*    which can be eventually converted back to font units.              */
   /*                                                                       */
   /*    Note that the maximum coordinates are exclusive, which means that  */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftgxval.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftgxval.h
index 497015c1011..6d38e327aa1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftgxval.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftgxval.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType API for validating TrueTypeGX/AAT tables (specification).   */
 /*                                                                         */
-/*  Copyright 2004, 2005, 2006 by                                          */
+/*  Copyright 2004-2006, 2013 by                                           */
 /*  Masatake YAMATO, Redhat K.K,                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
@@ -180,7 +180,7 @@ FT_BEGIN_HEADER
   *
   * @description:
   *    Validate various TrueTypeGX tables to assure that all offsets and
-  *    indices are valid.  The idea is that a higher-level library which
+  *    indices are valid.  The idea is that a higher-level library that
   *    actually does the text layout can access those tables without
   *    error checking (which can be quite time consuming).
   *
@@ -189,7 +189,7 @@ FT_BEGIN_HEADER
   *       A handle to the input face.
   *
   *    validation_flags ::
-  *       A bit field which specifies the tables to be validated.  See
+  *       A bit field that specifies the tables to be validated.  See
   *       @FT_VALIDATE_GXXXX for possible values.
   *
   *    table_length ::
@@ -286,7 +286,7 @@ FT_BEGIN_HEADER
   *
   * @description:
   *    Validate classic (16-bit format) kern table to assure that the offsets
-  *    and indices are valid.  The idea is that a higher-level library which
+  *    and indices are valid.  The idea is that a higher-level library that
   *    actually does the text layout can access those tables without error
   *    checking (which can be quite time consuming).
   *
@@ -299,7 +299,7 @@ FT_BEGIN_HEADER
   *       A handle to the input face.
   *
   *    validation_flags ::
-  *       A bit field which specifies the dialect to be validated.  See
+  *       A bit field that specifies the dialect to be validated.  See
   *       @FT_VALIDATE_CKERNXXX for possible values.
   *
   * @output:
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftgzip.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftgzip.h
index acbc4f0327b..78e726999ac 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftgzip.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftgzip.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Gzip-compressed stream support.                                      */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2006 by                                    */
+/*  Copyright 2002-2004, 2006, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -91,6 +91,53 @@ FT_BEGIN_HEADER
   FT_Stream_OpenGzip( FT_Stream  stream,
                       FT_Stream  source );
 
+
+ /************************************************************************
+  *
+  * @function:
+  *   FT_Gzip_Uncompress
+  *
+  * @description:
+  *   Decompress a zipped input buffer into an output buffer.  This function
+  *   is modeled after zlib's `uncompress' function.
+  *
+  * @input:
+  *   memory ::
+  *     A FreeType memory handle.
+  *
+  *   input ::
+  *     The input buffer.
+  *
+  *   input_len ::
+  *     The length of the input buffer.
+  *
+  * @output:
+  *   output::
+  *     The output buffer.
+  *
+  * @inout:
+  *   output_len ::
+  *     Before calling the function, this is the the total size of the
+  *     output buffer, which must be large enough to hold the entire
+  *     uncompressed data (so the size of the uncompressed data must be
+  *     known in advance).  After calling the function, `output_len' is the
+  *     size of the used data in `output'.
+  *
+  * @return:
+  *   FreeType error code.  0~means success.
+  *
+  * @note:
+  *   This function may return `FT_Err_Unimplemented_Feature' if your build
+  *   of FreeType was not compiled with zlib support.
+  */
+  FT_EXPORT( FT_Error )
+  FT_Gzip_Uncompress( FT_Memory       memory,
+                      FT_Byte*        output,
+                      FT_ULong*       output_len,
+                      const FT_Byte*  input,
+                      FT_ULong        input_len );
+
+
  /* */
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftimage.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftimage.h
index 3b826b1d32f..ea71a78efb6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftimage.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftimage.h
@@ -555,7 +555,7 @@ FT_BEGIN_HEADER
   /* <Input>                                                               */
   /*    to   :: A pointer to the target point of the `move to'.            */
   /*                                                                       */
-  /*    user :: A typeless pointer which is passed from the caller of the  */
+  /*    user :: A typeless pointer, which is passed from the caller of the */
   /*            decomposition function.                                    */
   /*                                                                       */
   /* <Return>                                                              */
@@ -582,7 +582,7 @@ FT_BEGIN_HEADER
   /* <Input>                                                               */
   /*    to   :: A pointer to the target point of the `line to'.            */
   /*                                                                       */
-  /*    user :: A typeless pointer which is passed from the caller of the  */
+  /*    user :: A typeless pointer, which is passed from the caller of the */
   /*            decomposition function.                                    */
   /*                                                                       */
   /* <Return>                                                              */
@@ -613,7 +613,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    to      :: A pointer to the target end point of the conic arc.     */
   /*                                                                       */
-  /*    user    :: A typeless pointer which is passed from the caller of   */
+  /*    user    :: A typeless pointer, which is passed from the caller of  */
   /*               the decomposition function.                             */
   /*                                                                       */
   /* <Return>                                                              */
@@ -645,7 +645,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    to       :: A pointer to the target end point.                     */
   /*                                                                       */
-  /*    user     :: A typeless pointer which is passed from the caller of  */
+  /*    user     :: A typeless pointer, which is passed from the caller of */
   /*                the decomposition function.                            */
   /*                                                                       */
   /* <Return>                                                              */
@@ -836,8 +836,8 @@ FT_BEGIN_HEADER
   /* a a bitmap.  This section contains the public API for rasters.        */
   /*                                                                       */
   /* Note that in FreeType 2, all rasters are now encapsulated within      */
-  /* specific modules called `renderers'.  See `freetype/ftrender.h' for   */
-  /* more details on renderers.                                            */
+  /* specific modules called `renderers'.  See `ftrender.h' for more       */
+  /* details on renderers.                                                 */
   /*                                                                       */
   /*************************************************************************/
 
@@ -891,8 +891,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Note>                                                                */
   /*    This structure is used by the span drawing callback type named     */
-  /*    @FT_SpanFunc which takes the y~coordinate of the span as a         */
-  /*    a parameter.                                                       */
+  /*    @FT_SpanFunc that takes the y~coordinate of the span as a          */
+  /*    parameter.                                                         */
   /*                                                                       */
   /*    The coverage value is always between 0 and 255.  If you want less  */
   /*    gray values, the callback function has to reduce them.             */
@@ -1265,7 +1265,7 @@ FT_BEGIN_HEADER
   /*    XXX: For now, the standard raster doesn't support direct           */
   /*         composition but this should change for the final release (see */
   /*         the files `demos/src/ftgrays.c' and `demos/src/ftgrays2.c'    */
-  /*         for examples of distinct implementations which support direct */
+  /*         for examples of distinct implementations that support direct  */
   /*         composition).                                                 */
   /*                                                                       */
   typedef int
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftincrem.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftincrem.h
index aaf689ff16c..aaf689ff16c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftincrem.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftincrem.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftlcdfil.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftlcdfil.h
index 8b253f118be..39206f01927 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftlcdfil.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftlcdfil.h
@@ -5,7 +5,7 @@
 /*    FreeType API for color filtering of subpixel bitmap glyphs           */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 2006, 2007, 2008, 2010 by                                    */
+/*  Copyright 2006-2008, 2010, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -45,9 +45,9 @@ FT_BEGIN_HEADER
    *
    * @description:
    *   The @FT_Library_SetLcdFilter API can be used to specify a low-pass
-   *   filter which is then applied to LCD-optimized bitmaps generated
+   *   filter, which is then applied to LCD-optimized bitmaps generated
    *   through @FT_Render_Glyph.  This is useful to reduce color fringes
-   *   which would occur with unfiltered rendering.
+   *   that would occur with unfiltered rendering.
    *
    *   Note that no filter is active by default, and that this function is
    *   *not* implemented in default builds of the library.  You need to
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftlist.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftlist.h
index bb6f7f119d3..241e21e555c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftlist.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftlist.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Generic list support for FreeType (specification).                   */
 /*                                                                         */
-/*  Copyright 1996-2001, 2003, 2007, 2010 by                               */
+/*  Copyright 1996-2001, 2003, 2007, 2010, 2013 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 @@ FT_BEGIN_HEADER
   /*    FT_List_Iterator                                                   */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    An FT_List iterator function which is called during a list parse   */
+  /*    An FT_List iterator function that is called during a list parse    */
   /*    by @FT_List_Iterate.                                               */
   /*                                                                       */
   /* <Input>                                                               */
@@ -200,7 +200,7 @@ FT_BEGIN_HEADER
   /* <Input>                                                               */
   /*    list     :: A handle to the list.                                  */
   /*    iterator :: An iterator function, called on each node of the list. */
-  /*    user     :: A user-supplied field which is passed as the second    */
+  /*    user     :: A user-supplied field that is passed as the second     */
   /*                argument to the iterator.                              */
   /*                                                                       */
   /* <Return>                                                              */
@@ -218,7 +218,7 @@ FT_BEGIN_HEADER
   /*    FT_List_Destructor                                                 */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    An @FT_List iterator function which is called during a list        */
+  /*    An @FT_List iterator function that is called during a list         */
   /*    finalization by @FT_List_Finalize to destroy all elements in a     */
   /*    given list.                                                        */
   /*                                                                       */
@@ -250,9 +250,9 @@ FT_BEGIN_HEADER
   /*    destroy :: A list destructor that will be applied to each element  */
   /*               of the list.                                            */
   /*                                                                       */
-  /*    memory  :: The current memory object which handles deallocation.   */
+  /*    memory  :: The current memory object that handles deallocation.    */
   /*                                                                       */
-  /*    user    :: A user-supplied field which is passed as the last       */
+  /*    user    :: A user-supplied field that is passed as the last        */
   /*               argument to the destructor.                             */
   /*                                                                       */
   /* <Note>                                                                */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftlzw.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftlzw.h
index 00d40169a75..00d40169a75 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftlzw.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftlzw.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftmac.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftmac.h
index ab5bab5170c..42874fe6fc1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftmac.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftmac.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Additional Mac-specific API.                                         */
 /*                                                                         */
-/*  Copyright 1996-2001, 2004, 2006, 2007 by                               */
+/*  Copyright 1996-2001, 2004, 2006, 2007, 2013 by                         */
 /*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -18,7 +18,7 @@
 
 /***************************************************************************/
 /*                                                                         */
-/* NOTE: Include this file after <freetype/freetype.h> and after any       */
+/* NOTE: Include this file after FT_FREETYPE_H and after any               */
 /*       Mac-specific headers (because this header uses Mac types such as  */
 /*       Handle, FSSpec, FSRef, etc.)                                      */
 /*                                                                         */
@@ -168,7 +168,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*    Return a pathname of the disk file and face index for given font   */
-  /*    name which is handled by ATS framework.                            */
+  /*    name that is handled by ATS framework.                             */
   /*                                                                       */
   /* <Input>                                                               */
   /*    fontName    :: Mac OS name of the font in ATS framework.           */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftmm.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftmm.h
index 3aefb9e4f25..837975a0b5c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftmm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftmm.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType Multiple Master font interface (specification).             */
 /*                                                                         */
-/*  Copyright 1996-2001, 2003, 2004, 2006, 2009 by                         */
+/*  Copyright 1996-2001, 2003, 2004, 2006, 2009, 2013 by                   */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -196,7 +196,7 @@ FT_BEGIN_HEADER
   /*                       number of designs).                             */
   /*                                                                       */
   /*    num_namedstyles :: The number of named styles; only meaningful for */
-  /*                       GX which allows certain design coordinates to   */
+  /*                       GX that allows certain design coordinates to    */
   /*                       have a string ID (in the `name' table)          */
   /*                       associated with them.  The font can tell the    */
   /*                       user that, for example, Weight=1.5 is `Bold'.   */
@@ -258,8 +258,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Output>                                                              */
   /*    amaster :: The Multiple Masters/GX var descriptor.                 */
-  /*               Allocates a data structure, which the user must free    */
-  /*               (a single call to FT_FREE will do it).                  */
+  /*               Allocates a data structure, which the user must free.   */
   /*                                                                       */
   /* <Return>                                                              */
   /*    FreeType error code.  0~means success.                             */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftmodapi.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftmodapi.h
index 8abffb558f1..22878f8c6d7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftmodapi.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftmodapi.h
@@ -298,7 +298,7 @@ FT_BEGIN_HEADER
    *       Note that only a few modules have properties.
    *
    *    value ::
-   *       A generic pointer to a variable or structure which gives the new
+   *       A generic pointer to a variable or structure that gives the new
    *       value of the property.  The exact definition of `value' is
    *       dependent on the property; see the `Synopsis' subsection of the
    *       module's documentation.
@@ -364,7 +364,7 @@ FT_BEGIN_HEADER
    *
    * @inout:
    *    value ::
-   *       A generic pointer to a variable or structure which gives the
+   *       A generic pointer to a variable or structure that gives the
    *       value of the property.  The exact definition of `value' is
    *       dependent on the property; see the `Synopsis' subsection of the
    *       module's documentation.
@@ -418,7 +418,7 @@ FT_BEGIN_HEADER
   /*    @FT_Done_Library then only destroys a library if the counter is~1, */
   /*    otherwise it simply decrements the counter.                        */
   /*                                                                       */
-  /*    This function helps in managing life-cycles of structures which    */
+  /*    This function helps in managing life-cycles of structures that     */
   /*    reference @FT_Library objects.                                     */
   /*                                                                       */
   /* <Input>                                                               */
@@ -584,7 +584,7 @@ FT_BEGIN_HEADER
    *       The library implements a bytecode interpreter that doesn't
    *       support the patented operations of the TrueType virtual machine.
    *
-   *       Its main use is to load certain Asian fonts which position and
+   *       Its main use is to load certain Asian fonts that position and
    *       scale glyph components with bytecode instructions.  It produces
    *       bad output for most other fonts.
    *
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftmoderr.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftmoderr.h
index 5a27db151a3..5a27db151a3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftmoderr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftmoderr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftotval.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftotval.h
index 027f2e88657..bb52dc4a0d2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftotval.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftotval.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType API for validating OpenType tables (specification).         */
 /*                                                                         */
-/*  Copyright 2004, 2005, 2006, 2007 by                                    */
+/*  Copyright 2004-2007, 2013 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -116,7 +116,7 @@ FT_BEGIN_HEADER
   *
   * @description:
   *    Validate various OpenType tables to assure that all offsets and
-  *    indices are valid.  The idea is that a higher-level library which
+  *    indices are valid.  The idea is that a higher-level library that
   *    actually does the text layout can access those tables without
   *    error checking (which can be quite time consuming).
   *
@@ -125,7 +125,7 @@ FT_BEGIN_HEADER
   *       A handle to the input face.
   *
   *    validation_flags ::
-  *       A bit field which specifies the tables to be validated.  See
+  *       A bit field that specifies the tables to be validated.  See
   *       @FT_VALIDATE_OTXXX for possible values.
   *
   * @output:
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftoutln.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftoutln.h
index fd69f282929..8c7c57d99eb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftoutln.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftoutln.h
@@ -5,7 +5,7 @@
 /*    Support for the FT_Outline type used to store glyph shapes of        */
 /*    most scalable font formats (specification).                          */
 /*                                                                         */
-/*  Copyright 1996-2003, 2005-2012 by                                      */
+/*  Copyright 1996-2003, 2005-2013 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -97,7 +97,7 @@ FT_BEGIN_HEADER
   /*                      operations.                                      */
   /*                                                                       */
   /* <InOut>                                                               */
-  /*    user           :: A typeless pointer which is passed to each       */
+  /*    user           :: A typeless pointer that is passed to each        */
   /*                      emitter during the decomposition.  It can be     */
   /*                      used to store the state during the               */
   /*                      decomposition.                                   */
@@ -105,6 +105,13 @@ FT_BEGIN_HEADER
   /* <Return>                                                              */
   /*    FreeType error code.  0~means success.                             */
   /*                                                                       */
+  /* <Note>                                                                */
+  /*    A contour that contains a single point only is represented by a    */
+  /*    `move to' operation followed by `line to' to the same point.  In   */
+  /*    most cases, it is best to filter this out before using the         */
+  /*    outline for stroking purposes (otherwise it would result in a      */
+  /*    visible dot when round caps are used).                             */
+  /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Outline_Decompose( FT_Outline*              outline,
                         const FT_Outline_Funcs*  func_interface,
@@ -217,12 +224,12 @@ FT_BEGIN_HEADER
   /*    the outline's points, including Bézier control points.  Though it  */
   /*    coincides with the exact bounding box for most glyphs, it can be   */
   /*    slightly larger in some situations (like when rotating an outline  */
-  /*    which contains Bézier outside arcs).                               */
+  /*    that contains Bézier outside arcs).                                */
   /*                                                                       */
   /*    Computing the control box is very fast, while getting the bounding */
   /*    box can take much more time as it needs to walk over all segments  */
   /*    and arcs in the outline.  To get the latter, you can use the       */
-  /*    `ftbbox' component which is dedicated to this single task.         */
+  /*    `ftbbox' component, which is dedicated to this single task.        */
   /*                                                                       */
   /* <Input>                                                               */
   /*    outline :: A pointer to the source outline descriptor.             */
@@ -525,9 +532,11 @@ FT_BEGIN_HEADER
   *
   * @description:
   *   This function analyzes a glyph outline and tries to compute its
-  *   fill orientation (see @FT_Orientation).  This is done by computing
-  *   the direction of each global horizontal and/or vertical extrema
-  *   within the outline.
+  *   fill orientation (see @FT_Orientation).  This is done by integrating 
+  *   the total area covered by the outline. The positive integral
+  *   corresponds to the clockwise orientation and @FT_ORIENTATION_POSTSCRIPT
+  *   is returned. The negative integral corresponds to the counter-clockwise
+  *   orientation and @FT_ORIENTATION_TRUETYPE is returned.
   *
   *   Note that this will return @FT_ORIENTATION_TRUETYPE for empty
   *   outlines.
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftpfr.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftpfr.h
index 0b7b7d427c9..0b7b7d427c9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftpfr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftpfr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftrender.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftrender.h
index dd0229b815e..dd0229b815e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftrender.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftrender.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftsizes.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftsizes.h
index 3e548cc39f3..41670457014 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftsizes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftsizes.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType size objects management (specification).                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2003, 2004, 2006, 2009 by                         */
+/*  Copyright 1996-2001, 2003, 2004, 2006, 2009, 2013 by                   */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -129,7 +129,7 @@ FT_BEGIN_HEADER
   /* <Description>                                                         */
   /*    Even though it is possible to create several size objects for a    */
   /*    given face (see @FT_New_Size for details), functions like          */
-  /*    @FT_Load_Glyph or @FT_Load_Char only use the one which has been    */
+  /*    @FT_Load_Glyph or @FT_Load_Char only use the one that has been     */
   /*    activated last to determine the `current character pixel size'.    */
   /*                                                                       */
   /*    This function can be used to `activate' a previously created size  */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftsnames.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftsnames.h
index 485e4e162e7..88af440356c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftsnames.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftsnames.h
@@ -7,7 +7,7 @@
 /*                                                                         */
 /*    This is _not_ used to retrieve glyph names!                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2006, 2009, 2010 by                   */
+/*  Copyright 1996-2003, 2006, 2009, 2010, 2013 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -169,7 +169,7 @@ FT_BEGIN_HEADER
    *   A constant used as the tag of @FT_Parameter structures to make
    *   FT_Open_Face() ignore preferred family subfamily names in `name'
    *   table since OpenType version 1.4.  For backwards compatibility with
-   *   legacy systems which has 4-face-per-family restriction.
+   *   legacy systems that have a 4-face-per-family restriction.
    *
    */
 #define FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 'f' )
@@ -184,7 +184,7 @@ FT_BEGIN_HEADER
    *   A constant used as the tag of @FT_Parameter structures to make
    *   FT_Open_Face() ignore preferred subfamily names in `name' table since
    *   OpenType version 1.4.  For backwards compatibility with legacy
-   *   systems which has 4-face-per-family restriction.
+   *   systems that have a 4-face-per-family restriction.
    *
    */
 #define FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 's' )
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftstroke.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftstroke.h
index a498e4a883b..a498e4a883b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftstroke.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftstroke.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftsynth.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftsynth.h
index 2074503cf60..839ab5e4002 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftsynth.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftsynth.h
@@ -5,7 +5,7 @@
 /*    FreeType synthesizing code for emboldening and slanting              */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 2000-2001, 2003, 2006, 2008, 2012 by                         */
+/*  Copyright 2000-2001, 2003, 2006, 2008, 2012, 2013 by                   */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -37,7 +37,7 @@
   /* Main reason for not lifting the functions in this module to a  */
   /* `standard' API is that the used parameters for emboldening and */
   /* slanting are not configurable.  Consider the functions as a    */
-  /* code resource which should be copied into the application and  */
+  /* code resource that should be copied into the application and   */
   /* adapted to the particular needs.                               */
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftsystem.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftsystem.h
index e07460c55d4..e07460c55d4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftsystem.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftsystem.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/fttrigon.h b/Build/source/libs/freetype2/freetype-2.5.1/include/fttrigon.h
index 65143cb8c85..65143cb8c85 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/fttrigon.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/fttrigon.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftttdrv.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftttdrv.h
index d5d3f1ccc18..8d9c16c1979 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftttdrv.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftttdrv.h
@@ -61,7 +61,7 @@ FT_BEGIN_HEADER
    *   interpreter-version
    *
    * @description:
-   *   Currently, two versions are available which represent the bytecode
+   *   Currently, two versions are available, representing the bytecode
    *   interpreter with and without subpixel hinting support,
    *   respectively.  The default is subpixel support if
    *   TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined, and no subpixel
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/fttypes.h b/Build/source/libs/freetype2/freetype-2.5.1/include/fttypes.h
index 027e59ce115..bd944a4935f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/fttypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/fttypes.h
@@ -418,7 +418,7 @@ FT_BEGIN_HEADER
   /*    details of usage.                                                  */
   /*                                                                       */
   /* <Input>                                                               */
-  /*    The address of the FreeType object which is under finalization.    */
+  /*    The address of the FreeType object that is under finalization.     */
   /*    Its client data is accessed through its `generic' field.           */
   /*                                                                       */
   typedef void  (*FT_Generic_Finalizer)(void*  object);
@@ -466,8 +466,8 @@ FT_BEGIN_HEADER
   /*    FT_MAKE_TAG                                                        */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    This macro converts four-letter tags which are used to label       */
-  /*    TrueType tables into an unsigned long to be used within FreeType.  */
+  /*    This macro converts four-letter tags that are used to label        */
+  /*    TrueType tables into an unsigned long, to be used within FreeType. */
   /*                                                                       */
   /* <Note>                                                                */
   /*    The produced values *must* be 32-bit integers.  Don't redefine     */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftwinfnt.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftwinfnt.h
index ea33353536e..0b673517914 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftwinfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftwinfnt.h
@@ -58,9 +58,10 @@ FT_BEGIN_HEADER
    * @description:
    *   A list of valid values for the `charset' byte in
    *   @FT_WinFNT_HeaderRec.  Exact mapping tables for the various cpXXXX
-   *   encodings (except for cp1361) can be found at ftp://ftp.unicode.org
-   *   in the MAPPINGS/VENDORS/MICSFT/WINDOWS subdirectory.  cp1361 is
-   *   roughly a superset of MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.
+   *   encodings (except for cp1361) can be found at
+   *   ftp://ftp.unicode.org/public in the MAPPINGS/VENDORS/MICSFT/WINDOWS
+   *   subdirectory.  cp1361 is roughly a superset of
+   *   MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.
    *
    * @values:
    *   FT_WinFNT_ID_DEFAULT ::
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftxf86.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ftxf86.h
index 8c68afdcc58..493cccdd0a5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ftxf86.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ftxf86.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Support functions for X11.                                           */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2006, 2007 by                              */
+/*  Copyright 2002-2004, 2006, 2007, 2013 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -62,7 +62,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*   Return a string describing the format of a given face, using values */
-  /*   which can be used as an X11 FONT_PROPERTY.  Possible values are     */
+  /*   that can be used as an X11 FONT_PROPERTY.  Possible values are      */
   /*   `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */
   /*   `PFR', and `Windows~FNT'.                                           */
   /*                                                                       */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/autohint.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/autohint.h
index 545de938c27..545de938c27 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/autohint.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/autohint.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftcalc.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftcalc.h
index faac3a38675..03bd68eb108 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftcalc.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftcalc.h
@@ -27,10 +27,12 @@
 FT_BEGIN_HEADER
 
 
+#if 0
+
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
-  /*    FT_FixedSqrt                                                       */
+  /*    FT_SqrtFixed                                                       */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Computes the square root of a 16.16 fixed-point value.             */
@@ -47,6 +49,8 @@ FT_BEGIN_HEADER
   FT_BASE( FT_Int32 )
   FT_SqrtFixed( FT_Int32  x );
 
+#endif /* 0 */
+
 
   /*************************************************************************/
   /*                                                                       */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftdebug.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftdebug.h
index 58a3916d7e5..58a3916d7e5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftdebug.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftdebug.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftdriver.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftdriver.h
index 940218e62d5..940218e62d5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftdriver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftdriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftgloadr.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftgloadr.h
index ce4dc6c9cc6..ce4dc6c9cc6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftgloadr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftgloadr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftmemory.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftmemory.h
index 3d51aeec69f..3d51aeec69f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftmemory.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftmemory.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftobjs.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftobjs.h
index 701c850eb70..701c850eb70 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftpic.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftpic.h
index 485ce7a24e7..485ce7a24e7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftrfork.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftrfork.h
index 6307f2d0c5a..6307f2d0c5a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftrfork.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftrfork.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftserv.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftserv.h
index cd5fbd0fac6..1203ec8121a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftserv.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftserv.h
@@ -734,24 +734,24 @@ FT_BEGIN_HEADER
    *  The header files containing the services.
    */
 
-#define FT_SERVICE_BDF_H                <freetype/internal/services/svbdf.h>
-#define FT_SERVICE_CID_H                <freetype/internal/services/svcid.h>
-#define FT_SERVICE_GLYPH_DICT_H         <freetype/internal/services/svgldict.h>
-#define FT_SERVICE_GX_VALIDATE_H        <freetype/internal/services/svgxval.h>
-#define FT_SERVICE_KERNING_H            <freetype/internal/services/svkern.h>
-#define FT_SERVICE_MULTIPLE_MASTERS_H   <freetype/internal/services/svmm.h>
-#define FT_SERVICE_OPENTYPE_VALIDATE_H  <freetype/internal/services/svotval.h>
-#define FT_SERVICE_PFR_H                <freetype/internal/services/svpfr.h>
-#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <freetype/internal/services/svpscmap.h>
-#define FT_SERVICE_POSTSCRIPT_INFO_H    <freetype/internal/services/svpsinfo.h>
-#define FT_SERVICE_POSTSCRIPT_NAME_H    <freetype/internal/services/svpostnm.h>
-#define FT_SERVICE_PROPERTIES_H         <freetype/internal/services/svprop.h>
-#define FT_SERVICE_SFNT_H               <freetype/internal/services/svsfnt.h>
-#define FT_SERVICE_TRUETYPE_ENGINE_H    <freetype/internal/services/svtteng.h>
-#define FT_SERVICE_TT_CMAP_H            <freetype/internal/services/svttcmap.h>
-#define FT_SERVICE_WINFNT_H             <freetype/internal/services/svwinfnt.h>
-#define FT_SERVICE_XFREE86_NAME_H       <freetype/internal/services/svxf86nm.h>
-#define FT_SERVICE_TRUETYPE_GLYF_H      <freetype/internal/services/svttglyf.h>
+#define FT_SERVICE_BDF_H                <internal/services/svbdf.h>
+#define FT_SERVICE_CID_H                <internal/services/svcid.h>
+#define FT_SERVICE_GLYPH_DICT_H         <internal/services/svgldict.h>
+#define FT_SERVICE_GX_VALIDATE_H        <internal/services/svgxval.h>
+#define FT_SERVICE_KERNING_H            <internal/services/svkern.h>
+#define FT_SERVICE_MULTIPLE_MASTERS_H   <internal/services/svmm.h>
+#define FT_SERVICE_OPENTYPE_VALIDATE_H  <internal/services/svotval.h>
+#define FT_SERVICE_PFR_H                <internal/services/svpfr.h>
+#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <internal/services/svpscmap.h>
+#define FT_SERVICE_POSTSCRIPT_INFO_H    <internal/services/svpsinfo.h>
+#define FT_SERVICE_POSTSCRIPT_NAME_H    <internal/services/svpostnm.h>
+#define FT_SERVICE_PROPERTIES_H         <internal/services/svprop.h>
+#define FT_SERVICE_SFNT_H               <internal/services/svsfnt.h>
+#define FT_SERVICE_TRUETYPE_ENGINE_H    <internal/services/svtteng.h>
+#define FT_SERVICE_TT_CMAP_H            <internal/services/svttcmap.h>
+#define FT_SERVICE_WINFNT_H             <internal/services/svwinfnt.h>
+#define FT_SERVICE_XFREE86_NAME_H       <internal/services/svxf86nm.h>
+#define FT_SERVICE_TRUETYPE_GLYF_H      <internal/services/svttglyf.h>
 
  /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftstream.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftstream.h
index 26618583209..26618583209 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftstream.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftstream.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/fttrace.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/fttrace.h
index a9d98b60aa5..a9d98b60aa5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/fttrace.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/fttrace.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftvalid.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftvalid.h
index 12ad03685ad..12ad03685ad 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/ftvalid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/ftvalid.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/internal.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/internal.h
index 262afcfa8ae..e0ddb06b708 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/internal.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/internal.h
@@ -24,28 +24,28 @@
   /*************************************************************************/
 
 
-#define FT_INTERNAL_OBJECTS_H             <freetype/internal/ftobjs.h>
-#define FT_INTERNAL_PIC_H                 <freetype/internal/ftpic.h>
-#define FT_INTERNAL_STREAM_H              <freetype/internal/ftstream.h>
-#define FT_INTERNAL_MEMORY_H              <freetype/internal/ftmemory.h>
-#define FT_INTERNAL_DEBUG_H               <freetype/internal/ftdebug.h>
-#define FT_INTERNAL_CALC_H                <freetype/internal/ftcalc.h>
-#define FT_INTERNAL_DRIVER_H              <freetype/internal/ftdriver.h>
-#define FT_INTERNAL_TRACE_H               <freetype/internal/fttrace.h>
-#define FT_INTERNAL_GLYPH_LOADER_H        <freetype/internal/ftgloadr.h>
-#define FT_INTERNAL_SFNT_H                <freetype/internal/sfnt.h>
-#define FT_INTERNAL_SERVICE_H             <freetype/internal/ftserv.h>
-#define FT_INTERNAL_RFORK_H               <freetype/internal/ftrfork.h>
-#define FT_INTERNAL_VALIDATE_H            <freetype/internal/ftvalid.h>
-
-#define FT_INTERNAL_TRUETYPE_TYPES_H      <freetype/internal/tttypes.h>
-#define FT_INTERNAL_TYPE1_TYPES_H         <freetype/internal/t1types.h>
-
-#define FT_INTERNAL_POSTSCRIPT_AUX_H      <freetype/internal/psaux.h>
-#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <freetype/internal/pshints.h>
-#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <freetype/internal/psglobal.h>
-
-#define FT_INTERNAL_AUTOHINT_H            <freetype/internal/autohint.h>
+#define FT_INTERNAL_OBJECTS_H             <internal/ftobjs.h>
+#define FT_INTERNAL_PIC_H                 <internal/ftpic.h>
+#define FT_INTERNAL_STREAM_H              <internal/ftstream.h>
+#define FT_INTERNAL_MEMORY_H              <internal/ftmemory.h>
+#define FT_INTERNAL_DEBUG_H               <internal/ftdebug.h>
+#define FT_INTERNAL_CALC_H                <internal/ftcalc.h>
+#define FT_INTERNAL_DRIVER_H              <internal/ftdriver.h>
+#define FT_INTERNAL_TRACE_H               <internal/fttrace.h>
+#define FT_INTERNAL_GLYPH_LOADER_H        <internal/ftgloadr.h>
+#define FT_INTERNAL_SFNT_H                <internal/sfnt.h>
+#define FT_INTERNAL_SERVICE_H             <internal/ftserv.h>
+#define FT_INTERNAL_RFORK_H               <internal/ftrfork.h>
+#define FT_INTERNAL_VALIDATE_H            <internal/ftvalid.h>
+
+#define FT_INTERNAL_TRUETYPE_TYPES_H      <internal/tttypes.h>
+#define FT_INTERNAL_TYPE1_TYPES_H         <internal/t1types.h>
+
+#define FT_INTERNAL_POSTSCRIPT_AUX_H      <internal/psaux.h>
+#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <internal/pshints.h>
+#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <internal/psglobal.h>
+
+#define FT_INTERNAL_AUTOHINT_H            <internal/autohint.h>
 
 
 #if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/psaux.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/psaux.h
index e903114f84f..e903114f84f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/psaux.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/psaux.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/pshints.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/pshints.h
index 3fb18dc2d59..3fb18dc2d59 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/pshints.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/pshints.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svbdf.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svbdf.h
index 0974752a797..0974752a797 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svbdf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svbdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svcid.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svcid.h
index 6be3f9374da..6be3f9374da 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svcid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svcid.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svgldict.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svgldict.h
index 1d125347253..1d125347253 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svgldict.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svgldict.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svgxval.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svgxval.h
index 2cdab506551..2cdab506551 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svgxval.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svgxval.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svkern.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svkern.h
index 1488adf493b..1488adf493b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svkern.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svkern.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svmm.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svmm.h
index b08a663d667..b08a663d667 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svmm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svmm.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svotval.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svotval.h
index 970bbd57593..970bbd57593 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svotval.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svotval.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svpfr.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svpfr.h
index 462786f9ce9..462786f9ce9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svpfr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svpfr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svpostnm.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svpostnm.h
index a76b4fe057a..a76b4fe057a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svpostnm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svpostnm.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svprop.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svprop.h
index 22da0bbc69d..22da0bbc69d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svprop.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svprop.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svpscmap.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svpscmap.h
index 030948ea64f..030948ea64f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svpscmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svpscmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svpsinfo.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svpsinfo.h
index 4bfb506711b..4bfb506711b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svpsinfo.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svpsinfo.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svsfnt.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svsfnt.h
index d3835aa1c2a..d3835aa1c2a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svsfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svsfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svttcmap.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svttcmap.h
index 83994aaf8ae..4370f4c2d82 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svttcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svttcmap.h
@@ -7,7 +7,7 @@
 /*  Copyright 2003 by                                                      */
 /*  Masatake YAMATO, Redhat K.K.                                           */
 /*                                                                         */
-/*  Copyright 2003, 2008, 2009, 2012 by                                    */
+/*  Copyright 2003, 2008, 2009, 2012, 2013 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -47,7 +47,7 @@ FT_BEGIN_HEADER
   /* <Fields>                                                              */
   /*    language ::                                                        */
   /*      The language ID used in Mac fonts.  Definitions of values are in */
-  /*      freetype/ttnameid.h.                                             */
+  /*      `ttnameid.h'.                                                    */
   /*                                                                       */
   /*    format ::                                                          */
   /*      The cmap format.  OpenType 1.5 defines the formats 0 (byte       */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svtteng.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svtteng.h
index 58e02a6f9dd..58e02a6f9dd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svtteng.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svtteng.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svttglyf.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svttglyf.h
index 369eb8421b7..369eb8421b7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svttglyf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svttglyf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svwinfnt.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svwinfnt.h
index 57f7765d92f..57f7765d92f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svwinfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svwinfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svxf86nm.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svxf86nm.h
index ca5d884a83c..ca5d884a83c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/services/svxf86nm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/services/svxf86nm.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/sfnt.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/sfnt.h
index 6b5e41f1adf..6b5e41f1adf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/sfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/sfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/t1types.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/t1types.h
index e20237c14dc..e20237c14dc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/t1types.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/t1types.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/tttypes.h b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/tttypes.h
index 1bbfe499c5b..f4da3f956b5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/internal/tttypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/internal/tttypes.h
@@ -140,6 +140,75 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* <Struct>                                                              */
+  /*    WOFF_HeaderRec                                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    WOFF file format header.                                           */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    See                                                                */
+  /*                                                                       */
+  /*      http://www.w3.org/TR/WOFF/#WOFFHeader                            */
+  /*                                                                       */
+  typedef struct  WOFF_HeaderRec_
+  {
+    FT_ULong   signature;
+    FT_ULong   flavor;
+    FT_ULong   length;
+    FT_UShort  num_tables;
+    FT_UShort  reserved;
+    FT_ULong   totalSfntSize;
+    FT_UShort  majorVersion;
+    FT_UShort  minorVersion;
+    FT_ULong   metaOffset;
+    FT_ULong   metaLength;
+    FT_ULong   metaOrigLength;
+    FT_ULong   privOffset;
+    FT_ULong   privLength;
+
+  } WOFF_HeaderRec, *WOFF_Header;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    WOFF_TableRec                                                      */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This structure describes a given table of a WOFF font.             */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    Tag        :: A four-bytes tag describing the table.               */
+  /*                                                                       */
+  /*    Offset     :: The offset of the table from the start of the WOFF   */
+  /*                  font in its resource.                                */
+  /*                                                                       */
+  /*    CompLength :: Compressed table length (in bytes).                  */
+  /*                                                                       */
+  /*    OrigLength :: Unompressed table length (in bytes).                 */
+  /*                                                                       */
+  /*    CheckSum   :: The table checksum.  This value can be ignored.      */
+  /*                                                                       */
+  /*    OrigOffset :: The uncompressed table file offset.  This value gets */
+  /*                  computed while constructing the (uncompressed) SFNT  */
+  /*                  header.  It is not contained in the WOFF file.       */
+  /*                                                                       */
+  typedef struct  WOFF_TableRec_
+  {
+    FT_ULong  Tag;           /* table ID                  */
+    FT_ULong  Offset;        /* table file offset         */
+    FT_ULong  CompLength;    /* compressed table length   */
+    FT_ULong  OrigLength;    /* uncompressed table length */
+    FT_ULong  CheckSum;      /* uncompressed checksum     */
+
+    FT_ULong  OrigOffset;    /* uncompressed table file offset */
+                             /* (not in the WOFF file)         */
+  } WOFF_TableRec, *WOFF_Table;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
   /*    TT_LongMetricsRec                                                  */
   /*                                                                       */
   /* <Description>                                                         */
@@ -353,16 +422,16 @@ FT_BEGIN_HEADER
   /*                                                                       */
   typedef struct  TT_SBit_MetricsRec_
   {
-    FT_Byte  height;
-    FT_Byte  width;
+    FT_UShort  height;
+    FT_UShort  width;
 
-    FT_Char  horiBearingX;
-    FT_Char  horiBearingY;
-    FT_Byte  horiAdvance;
+    FT_Short   horiBearingX;
+    FT_Short   horiBearingY;
+    FT_UShort  horiAdvance;
 
-    FT_Char  vertBearingX;
-    FT_Char  vertBearingY;
-    FT_Byte  vertAdvance;
+    FT_Short   vertBearingX;
+    FT_Short   vertBearingY;
+    FT_UShort  vertAdvance;
 
   } TT_SBit_MetricsRec, *TT_SBit_Metrics;
 
@@ -979,6 +1048,20 @@ FT_BEGIN_HEADER
   (*TT_Loader_EndGlyphFunc)( TT_Loader  loader );
 
 
+  typedef enum TT_SbitTableType_
+  {
+    TT_SBIT_TABLE_TYPE_NONE = 0,
+    TT_SBIT_TABLE_TYPE_EBLC, /* `EBLC' (Microsoft), */
+                             /* `bloc' (Apple)      */
+    TT_SBIT_TABLE_TYPE_CBLC, /* `CBLC' (Google)     */
+    TT_SBIT_TABLE_TYPE_SBIX, /* `sbix' (Apple)      */
+
+    /* do not remove */
+    TT_SBIT_TABLE_TYPE_MAX
+
+  } TT_SbitTableType;
+
+
   /*************************************************************************/
   /*                                                                       */
   /*                         TrueType Face Type                            */
@@ -1090,13 +1173,6 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    pclt                 :: The `pclt' SFNT table.                     */
   /*                                                                       */
-  /*    num_sbit_strikes     :: The number of sbit strikes, i.e., bitmap   */
-  /*                            sizes, embedded in this font.              */
-  /*                                                                       */
-  /*    sbit_strikes         :: An array of sbit strikes embedded in this  */
-  /*                            font.  This table is optional in a         */
-  /*                            TrueType/OpenType font.                    */
-  /*                                                                       */
   /*    num_sbit_scales      :: The number of sbit scales for this font.   */
   /*                                                                       */
   /*    sbit_scales          :: Array of sbit scales embedded in this      */
@@ -1302,6 +1378,7 @@ FT_BEGIN_HEADER
 
     FT_Byte*              sbit_table;
     FT_ULong              sbit_table_size;
+    TT_SbitTableType      sbit_table_type;
     FT_UInt               sbit_num_strikes;
 
     FT_Byte*              kern_table;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/t1tables.h b/Build/source/libs/freetype2/freetype-2.5.1/include/t1tables.h
index a14255e5f58..a14255e5f58 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/t1tables.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/t1tables.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ttnameid.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ttnameid.h
index 173f88c9507..9711d1d9475 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ttnameid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ttnameid.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType name ID definitions (specification only).                   */
 /*                                                                         */
-/*  Copyright 1996-2004, 2006-2008, 2012 by                                */
+/*  Copyright 1996-2004, 2006-2008, 2012, 2013 by                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -1208,7 +1208,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* Here some alias #defines in order to be clearer.                      */
   /*                                                                       */
-  /* These are not always #defined to stay within the 31~character limit   */
+  /* These are not always #defined to stay within the 31~character limit,  */
   /* which some compilers have.                                            */
   /*                                                                       */
   /* Credits go to Dave Hoo <dhoo@flash.net> for pointing out that modern  */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/tttables.h b/Build/source/libs/freetype2/freetype-2.5.1/include/tttables.h
index fe07117b0b4..bb49dc0dafd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/tttables.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/tttables.h
@@ -5,7 +5,7 @@
 /*    Basic SFNT/TrueType tables definitions and interface                 */
 /*    (specification only).                                                */
 /*                                                                         */
-/*  Copyright 1996-2005, 2008-2012 by                                      */
+/*  Copyright 1996-2005, 2008-2013 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -170,8 +170,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Note>                                                                */
   /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
-  /*               be identical except for the names of their fields which */
-  /*               are different.                                          */
+  /*               be identical except for the names of their fields,      */
+  /*               which are different.                                    */
   /*                                                                       */
   /*               This ensures that a single function in the `ttload'     */
   /*               module is able to read both the horizontal and vertical */
@@ -296,8 +296,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Note>                                                                */
   /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
-  /*               be identical except for the names of their fields which */
-  /*               are different.                                          */
+  /*               be identical except for the names of their fields,      */
+  /*               which are different.                                    */
   /*                                                                       */
   /*               This ensures that a single function in the `ttload'     */
   /*               module is able to read both the horizontal and vertical */
@@ -340,12 +340,11 @@ FT_BEGIN_HEADER
   /*    TT_OS2                                                             */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    A structure used to model a TrueType OS/2 table. This is the long  */
-  /*    table version.  All fields comply to the TrueType specification.   */
+  /*    A structure used to model a TrueType OS/2 table.  All fields       */
+  /*    comply to the OpenType specification.                              */
   /*                                                                       */
-  /*    Note that we now support old Mac fonts which do not include an     */
-  /*    OS/2 table.  In this case, the `version' field is always set to    */
-  /*    0xFFFF.                                                            */
+  /*    Note that we now support old Mac fonts that do not include an OS/2 */
+  /*    table.  In this case, the `version' field is always set to 0xFFFF. */
   /*                                                                       */
   typedef struct  TT_OS2_
   {
@@ -384,12 +383,12 @@ FT_BEGIN_HEADER
     FT_UShort  usWinAscent;
     FT_UShort  usWinDescent;
 
-    /* only version 1 tables: */
+    /* only version 1 and higher: */
 
     FT_ULong   ulCodePageRange1;       /* Bits 0-31   */
     FT_ULong   ulCodePageRange2;       /* Bits 32-63  */
 
-    /* only version 2 tables: */
+    /* only version 2 and higher: */
 
     FT_Short   sxHeight;
     FT_Short   sCapHeight;
@@ -397,6 +396,11 @@ FT_BEGIN_HEADER
     FT_UShort  usBreakChar;
     FT_UShort  usMaxContext;
 
+    /* only version 5 and higher: */
+
+    FT_UShort  usLowerOpticalPointSize;       /* in twips (1/20th points) */
+    FT_UShort  usUpperOpticalPointSize;       /* in twips (1/20th points) */
+
   } TT_OS2;
 
 
@@ -465,7 +469,7 @@ FT_BEGIN_HEADER
   /*    TT_MaxProfile                                                      */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    The maximum profile is a table containing many max values which    */
+  /*    The maximum profile is a table containing many max values, which   */
   /*    can be used to pre-allocate arrays.  This ensures that no memory   */
   /*    allocation occurs during a glyph load.                             */
   /*                                                                       */
@@ -672,6 +676,12 @@ FT_BEGIN_HEADER
   *       error = FT_Load_Sfnt_Table( face, tag, 0, buffer, &length );
   *       if ( error ) { ... could not load table ... }
   *     }
+  *
+  *   Note that structures like @TT_Header or @TT_OS2 can't be used with
+  *   this function; they are limited to @FT_Get_Sfnt_Table.  Reason is that
+  *   those structures depend on the processor architecture, with varying
+  *   size (e.g. 32bit vs. 64bit) or order (big endian vs. little endian).
+  *
   */
   FT_EXPORT( FT_Error )
   FT_Load_Sfnt_Table( FT_Face    face,
@@ -730,7 +740,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*    Return TrueType/sfnt specific cmap language ID.  Definitions of    */
-  /*    language ID values are in `freetype/ttnameid.h'.                   */
+  /*    language ID values are in `ttnameid.h'.                            */
   /*                                                                       */
   /* <Input>                                                               */
   /*    charmap ::                                                         */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/tttags.h b/Build/source/libs/freetype2/freetype-2.5.1/include/tttags.h
index be8c524edb8..d59aa19a338 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/tttags.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/tttags.h
@@ -88,6 +88,7 @@ FT_BEGIN_HEADER
 #define TTAG_post  FT_MAKE_TAG( 'p', 'o', 's', 't' )
 #define TTAG_prep  FT_MAKE_TAG( 'p', 'r', 'e', 'p' )
 #define TTAG_prop  FT_MAKE_TAG( 'p', 'r', 'o', 'p' )
+#define TTAG_sbix  FT_MAKE_TAG( 's', 'b', 'i', 'x' )
 #define TTAG_sfnt  FT_MAKE_TAG( 's', 'f', 'n', 't' )
 #define TTAG_SING  FT_MAKE_TAG( 'S', 'I', 'N', 'G' )
 #define TTAG_trak  FT_MAKE_TAG( 't', 'r', 'a', 'k' )
@@ -99,6 +100,7 @@ FT_BEGIN_HEADER
 #define TTAG_VDMX  FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
 #define TTAG_vhea  FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
 #define TTAG_vmtx  FT_MAKE_TAG( 'v', 'm', 't', 'x' )
+#define TTAG_wOFF  FT_MAKE_TAG( 'w', 'O', 'F', 'F' )
 
 
 FT_END_HEADER
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ttunpat.h b/Build/source/libs/freetype2/freetype-2.5.1/include/ttunpat.h
index a0162759b78..a0162759b78 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/include/freetype/ttunpat.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/include/ttunpat.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/modules.cfg b/Build/source/libs/freetype2/freetype-2.5.1/modules.cfg
index a85378ee7ce..4e5259445fb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/modules.cfg
+++ b/Build/source/libs/freetype2/freetype-2.5.1/modules.cfg
@@ -1,6 +1,6 @@
 # modules.cfg
 #
-# Copyright 2005-2007, 2009-2011 by
+# Copyright 2005-2007, 2009-2011, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -19,7 +19,7 @@
 # activate a module, remove the comment character.
 #
 # Note that many modules and components are further controlled with macros
-# in the file `include/freetype/config/ftoption.h'.
+# in the file `include/config/ftoption.h'.
 
 
 ####
@@ -85,7 +85,7 @@ HINTING_MODULES += autofit
 HINTING_MODULES += pshinter
 
 # The TrueType hinting engine doesn't have a module of its own but is
-# controlled in file include/freetype/config/ftoption.h
+# controlled in file include/config/ftoption.h
 # (TT_CONFIG_OPTION_BYTECODE_INTERPRETER and friends).
 
 
@@ -106,7 +106,7 @@ RASTER_MODULES += smooth
 
 # FreeType's cache sub-system (quite stable but still in beta -- this means
 # that its public API is subject to change if necessary).  See
-# include/freetype/ftcache.h.  Needs ftglyph.c.
+# include/ftcache.h.  Needs ftglyph.c.
 AUX_MODULES += cache
 
 # TrueType GX/AAT table validation.  Needs ftgxval.c below.
@@ -114,17 +114,17 @@ AUX_MODULES += cache
 
 # Support for streams compressed with gzip (files with suffix .gz).
 #
-# See include/freetype/ftgzip.h for the API.
+# See include/ftgzip.h for the API.
 AUX_MODULES += gzip
 
 # Support for streams compressed with LZW (files with suffix .Z).
 #
-# See include/freetype/ftlzw.h for the API.
+# See include/ftlzw.h for the API.
 AUX_MODULES += lzw
 
 # Support for streams compressed with bzip2 (files with suffix .bz2).
 #
-# See include/freetype/ftbzip2.h for the API.
+# See include/ftbzip2.h for the API.
 AUX_MODULES += bzip2
 
 # OpenType table validation.  Needs ftotval.c below.
@@ -149,95 +149,95 @@ AUX_MODULES += psnames
 
 # Exact bounding box calculation.
 #
-# See include/freetype/ftbbox.h for the API.
+# See include/ftbbox.h for the API.
 BASE_EXTENSIONS += ftbbox.c
 
 # Access BDF-specific strings.  Needs BDF font driver.
 #
-# See include/freetype/ftbdf.h for the API.
+# See include/ftbdf.h for the API.
 BASE_EXTENSIONS += ftbdf.c
 
 # Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into
 # 8bpp format, and for emboldening of bitmap glyphs.
 #
-# See include/freetype/ftbitmap.h for the API.
+# See include/ftbitmap.h for the API.
 BASE_EXTENSIONS += ftbitmap.c
 
 # Access CID font information.
 #
-# See include/freetype/ftcid.h for the API.
+# See include/ftcid.h for the API.
 BASE_EXTENSIONS += ftcid.c
 
 # Access FSType information.  Needs fttype1.c.
 #
-# See include/freetype/freetype.h for the API.
+# See include/freetype.h for the API.
 BASE_EXTENSIONS += ftfstype.c
 
 # Support for GASP table queries.
 #
-# See include/freetype/ftgasp.h for the API.
+# See include/ftgasp.h for the API.
 BASE_EXTENSIONS += ftgasp.c
 
 # Convenience functions to handle glyphs.  Needs ftbitmap.c.
 #
-# See include/freetype/ftglyph.h for the API.
+# See include/ftglyph.h for the API.
 BASE_EXTENSIONS += ftglyph.c
 
 # Interface for gxvalid module.
 #
-# See include/freetype/ftgxval.h for the API.
+# See include/ftgxval.h for the API.
 BASE_EXTENSIONS += ftgxval.c
 
 # Support for LCD color filtering of subpixel bitmaps.
 #
-# See include/freetype/ftlcdfil.h for the API.
+# See include/ftlcdfil.h for the API.
 BASE_EXTENSIONS += ftlcdfil.c
 
 # Multiple Master font interface.
 #
-# See include/freetype/ftmm.h for the API.
+# See include/ftmm.h for the API.
 BASE_EXTENSIONS += ftmm.c
 
 # Interface for otvalid module.
 #
-# See include/freetype/ftotval.h for the API.
+# See include/ftotval.h for the API.
 BASE_EXTENSIONS += ftotval.c
 
 # Support for FT_Face_CheckTrueTypePatents.
 #
-# See include/freetype/freetype.h for the API.
+# See include/freetype.h for the API.
 BASE_EXTENSIONS += ftpatent.c
 
 # Interface for accessing PFR-specific data.  Needs PFR font driver.
 #
-# See include/freetype/ftpfr.h for the API.
+# See include/ftpfr.h for the API.
 BASE_EXTENSIONS += ftpfr.c
 
 # Path stroker.  Needs ftglyph.c.
 #
-# See include/freetype/ftstroke.h for the API.
+# See include/ftstroke.h for the API.
 BASE_EXTENSIONS += ftstroke.c
 
 # Support for synthetic embolding and slanting of fonts.  Needs ftbitmap.c.
 #
-# See include/freetype/ftsynth.h for the API.
+# See include/ftsynth.h for the API.
 BASE_EXTENSIONS += ftsynth.c
 
 # Interface to access data specific to PostScript Type 1 and Type 2 (CFF)
 # fonts.
 #
-# See include/freetype/t1tables.h for the API.
+# See include/t1tables.h for the API.
 BASE_EXTENSIONS += fttype1.c
 
 # Interface for accessing data specific to Windows FNT files.  Needs winfnt
 # driver.
 #
-# See include/freetype/ftwinfnt.h for the API.
+# See include/ftwinfnt.h for the API.
 BASE_EXTENSIONS += ftwinfnt.c
 
 # Support functions for X11.
 #
-# See include/freetype/ftxf86.h for the API.
+# See include/ftxf86.h for the API.
 BASE_EXTENSIONS += ftxf86.c
 
 ####
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/objs/README b/Build/source/libs/freetype2/freetype-2.5.1/objs/README
index befb63e0492..befb63e0492 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/objs/README
+++ b/Build/source/libs/freetype2/freetype-2.5.1/objs/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/Jamfile
index 76ee0f46e6d..1cc06858c0f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/Jamfile
@@ -1,6 +1,6 @@
 # FreeType 2 src Jamfile
 #
-# Copyright 2001, 2002 by
+# Copyright 2001, 2002, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -11,7 +11,7 @@
 
 SubDir  FT2_TOP $(FT2_SRC_DIR) ;
 
-# The file <freetype/internal/internal.h> is used to define macros that are
+# The file <internal/internal.h> is used to define macros that are
 # later used in #include statements.  It needs to be parsed in order to
 # record these definitions.
 #
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/Jamfile
index 2714765b5b5..2714765b5b5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afangles.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afangles.c
index b44a5ba2c6c..b44a5ba2c6c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afangles.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afangles.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afangles.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afangles.h
index f33f9e108e3..f33f9e108e3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afangles.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afangles.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.c
new file mode 100644
index 00000000000..22ef6d5a87e
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.c
@@ -0,0 +1,166 @@
+/* This file has been generated by the Perl script `afblue.pl', */
+/* using data from file `afblue.dat'.                           */
+
+/***************************************************************************/
+/*                                                                         */
+/*  afblue.c                                                               */
+/*                                                                         */
+/*    Auto-fitter data for blue strings (body).                            */
+/*                                                                         */
+/*  Copyright 2013 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 "aftypes.h"
+
+
+  FT_LOCAL_ARRAY_DEF( char )
+  af_blue_strings[] =
+  {
+    /* */
+    'T', 'H', 'E', 'Z', 'O', 'C', 'Q', 'S',  /* THEZOCQS */
+    '\0',
+    'H', 'E', 'Z', 'L', 'O', 'C', 'U', 'S',  /* HEZLOCUS */
+    '\0',
+    'f', 'i', 'j', 'k', 'd', 'b', 'h',  /* fijkdbh */
+    '\0',
+    'x', 'z', 'r', 'o', 'e', 's', 'c',  /* xzroesc */
+    '\0',
+    'p', 'q', 'g', 'j', 'y',  /* pqgjy */
+    '\0',
+    '\xCE', '\x93', '\xCE', '\x92', '\xCE', '\x95', '\xCE', '\x96', '\xCE', '\x98', '\xCE', '\x9F', '\xCE', '\xA9',  /* ΓΒΕΖΘΟΩ */
+    '\0',
+    '\xCE', '\x92', '\xCE', '\x94', '\xCE', '\x96', '\xCE', '\x9E', '\xCE', '\x98', '\xCE', '\x9F',  /* ΒΔΖΞΘΟ */
+    '\0',
+    '\xCE', '\xB2', '\xCE', '\xB8', '\xCE', '\xB4', '\xCE', '\xB6', '\xCE', '\xBB', '\xCE', '\xBE',  /* βθδζλξ */
+    '\0',
+    '\xCE', '\xB1', '\xCE', '\xB5', '\xCE', '\xB9', '\xCE', '\xBF', '\xCF', '\x80', '\xCF', '\x83', '\xCF', '\x84', '\xCF', '\x89',  /* αειοπστω */
+    '\0',
+    '\xCE', '\xB2', '\xCE', '\xB3', '\xCE', '\xB7', '\xCE', '\xBC', '\xCF', '\x81', '\xCF', '\x86', '\xCF', '\x87', '\xCF', '\x88',  /* βγημ�φχψ */
+    '\0',
+    '\xD0', '\x91', '\xD0', '\x92', '\xD0', '\x95', '\xD0', '\x9F', '\xD0', '\x97', '\xD0', '\x9E', '\xD0', '\xA1', '\xD0', '\xAD',  /* БВЕПЗОСЭ */
+    '\0',
+    '\xD0', '\x91', '\xD0', '\x92', '\xD0', '\x95', '\xD0', '\xA8', '\xD0', '\x97', '\xD0', '\x9E', '\xD0', '\xA1', '\xD0', '\xAD',  /* БВЕШЗОСЭ */
+    '\0',
+    '\xD1', '\x85', '\xD0', '\xBF', '\xD0', '\xBD', '\xD1', '\x88', '\xD0', '\xB5', '\xD0', '\xB7', '\xD0', '\xBE', '\xD1', '\x81',  /* хпншезо� */
+    '\0',
+    '\xD1', '\x80', '\xD1', '\x83', '\xD1', '\x84',  /* руф */
+    '\0',
+    '\xD7', '\x91', '\xD7', '\x93', '\xD7', '\x94', '\xD7', '\x97', '\xD7', '\x9A', '\xD7', '\x9B', '\xD7', '\x9D', '\xD7', '\xA1',  /* בדהחךכ�ס */
+    '\0',
+    '\xD7', '\x91', '\xD7', '\x98', '\xD7', '\x9B', '\xD7', '\x9D', '\xD7', '\xA1', '\xD7', '\xA6',  /* בטכ�סצ */
+    '\0',
+    '\xD7', '\xA7', '\xD7', '\x9A', '\xD7', '\x9F', '\xD7', '\xA3', '\xD7', '\xA5',  /* קךןףץ */
+#ifdef AF_CONFIG_OPTION_CJK
+    '\0',
+    '\xE4', '\xBB', '\x96', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\x9C', '\xB0',  /* 他们你來們到和地 */
+    '\xE5', '\xAF', '\xB9', '\xE5', '\xB0', '\x8D', '\xE5', '\xB0', '\xB1', '\xE5', '\xB8', '\xAD', '\xE6', '\x88', '\x91', '\xE6', '\x97', '\xB6', '\xE6', '\x99', '\x82', '\xE6', '\x9C', '\x83',  /* 对�就席我时時會 */
+    '\xE6', '\x9D', '\xA5', '\xE7', '\x82', '\xBA', '\xE8', '\x83', '\xBD', '\xE8', '\x88', '\xB0', '\xE8', '\xAA', '\xAA', '\xE8', '\xAF', '\xB4', '\xE8', '\xBF', '\x99', '\xE9', '\x80', '\x99',  /* �為能舰說说这這 */
+    '\xE9', '\xBD', '\x8A',  /* 齊 */
+    '\0',
+    '\xE5', '\x86', '\x9B', '\xE5', '\x90', '\x8C', '\xE5', '\xB7', '\xB2', '\xE6', '\x84', '\xBF', '\xE6', '\x97', '\xA2', '\xE6', '\x98', '\x9F', '\xE6', '\x98', '\xAF', '\xE6', '\x99', '\xAF',  /* 军�已愿既星是景 */
+    '\xE6', '\xB0', '\x91', '\xE7', '\x85', '\xA7', '\xE7', '\x8E', '\xB0', '\xE7', '\x8F', '\xBE', '\xE7', '\x90', '\x86', '\xE7', '\x94', '\xA8', '\xE7', '\xBD', '\xAE', '\xE8', '\xA6', '\x81',  /* 民照现��用置� */
+    '\xE8', '\xBB', '\x8D', '\xE9', '\x82', '\xA3', '\xE9', '\x85', '\x8D', '\xE9', '\x87', '\x8C', '\xE9', '\x96', '\x8B', '\xE9', '\x9B', '\xB7', '\xE9', '\x9C', '\xB2', '\xE9', '\x9D', '\xA2',  /* �那�里開雷露� */
+    '\xE9', '\xA1', '\xBE',  /* 顾 */
+    '\0',
+    '\xE4', '\xB8', '\xAA', '\xE4', '\xB8', '\xBA', '\xE4', '\xBA', '\xBA', '\xE4', '\xBB', '\x96', '\xE4', '\xBB', '\xA5', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86',  /* 个为人他以们你來 */
+    '\xE5', '\x80', '\x8B', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\xA4', '\xA7', '\xE5', '\xAF', '\xB9', '\xE5', '\xB0', '\x8D', '\xE5', '\xB0', '\xB1',  /* 個們到和大对�就 */
+    '\xE6', '\x88', '\x91', '\xE6', '\x97', '\xB6', '\xE6', '\x99', '\x82', '\xE6', '\x9C', '\x89', '\xE6', '\x9D', '\xA5', '\xE7', '\x82', '\xBA', '\xE8', '\xA6', '\x81', '\xE8', '\xAA', '\xAA',  /* 我时時有�為�說 */
+    '\xE8', '\xAF', '\xB4',  /* 说 */
+    '\0',
+    '\xE4', '\xB8', '\xBB', '\xE4', '\xBA', '\x9B', '\xE5', '\x9B', '\xA0', '\xE5', '\xAE', '\x83', '\xE6', '\x83', '\xB3', '\xE6', '\x84', '\x8F', '\xE7', '\x90', '\x86', '\xE7', '\x94', '\x9F',  /* 主些因它想��生 */
+    '\xE7', '\x95', '\xB6', '\xE7', '\x9C', '\x8B', '\xE7', '\x9D', '\x80', '\xE7', '\xBD', '\xAE', '\xE8', '\x80', '\x85', '\xE8', '\x87', '\xAA', '\xE8', '\x91', '\x97', '\xE8', '\xA3', '\xA1',  /* 當看�置者自著裡 */
+    '\xE8', '\xBF', '\x87', '\xE8', '\xBF', '\x98', '\xE8', '\xBF', '\x9B', '\xE9', '\x80', '\xB2', '\xE9', '\x81', '\x8E', '\xE9', '\x81', '\x93', '\xE9', '\x82', '\x84', '\xE9', '\x87', '\x8C',  /* 过还进進��還里 */
+    '\xE9', '\x9D', '\xA2',  /* � */
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    '\0',
+    '\xE4', '\xBA', '\x9B', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\x9C', '\xB0',  /* 些们你來們到和地 */
+    '\xE5', '\xA5', '\xB9', '\xE5', '\xB0', '\x86', '\xE5', '\xB0', '\x87', '\xE5', '\xB0', '\xB1', '\xE5', '\xB9', '\xB4', '\xE5', '\xBE', '\x97', '\xE6', '\x83', '\x85', '\xE6', '\x9C', '\x80',  /* 她将將就年得情最 */
+    '\xE6', '\xA0', '\xB7', '\xE6', '\xA8', '\xA3', '\xE7', '\x90', '\x86', '\xE8', '\x83', '\xBD', '\xE8', '\xAA', '\xAA', '\xE8', '\xAF', '\xB4', '\xE8', '\xBF', '\x99', '\xE9', '\x80', '\x99',  /* 样樣�能說说这這 */
+    '\xE9', '\x80', '\x9A',  /* 通 */
+    '\0',
+    '\xE5', '\x8D', '\xB3', '\xE5', '\x90', '\x97', '\xE5', '\x90', '\xA7', '\xE5', '\x90', '\xAC', '\xE5', '\x91', '\xA2', '\xE5', '\x93', '\x81', '\xE5', '\x93', '\x8D', '\xE5', '\x97', '\x8E',  /* ����呢��嗎 */
+    '\xE5', '\xB8', '\x88', '\xE5', '\xB8', '\xAB', '\xE6', '\x94', '\xB6', '\xE6', '\x96', '\xAD', '\xE6', '\x96', '\xB7', '\xE6', '\x98', '\x8E', '\xE7', '\x9C', '\xBC', '\xE9', '\x96', '\x93',  /* 师師收断斷明眼間 */
+    '\xE9', '\x97', '\xB4', '\xE9', '\x99', '\x85', '\xE9', '\x99', '\x88', '\xE9', '\x99', '\x90', '\xE9', '\x99', '\xA4', '\xE9', '\x99', '\xB3', '\xE9', '\x9A', '\x8F', '\xE9', '\x9A', '\x9B',  /* 间际陈�除陳�際 */
+    '\xE9', '\x9A', '\xA8',  /* 隨 */
+    '\0',
+    '\xE4', '\xBA', '\x8B', '\xE5', '\x89', '\x8D', '\xE5', '\xAD', '\xB8', '\xE5', '\xB0', '\x86', '\xE5', '\xB0', '\x87', '\xE6', '\x83', '\x85', '\xE6', '\x83', '\xB3', '\xE6', '\x88', '\x96',  /* 事�學将將情想或 */
+    '\xE6', '\x94', '\xBF', '\xE6', '\x96', '\xAF', '\xE6', '\x96', '\xB0', '\xE6', '\xA0', '\xB7', '\xE6', '\xA8', '\xA3', '\xE6', '\xB0', '\x91', '\xE6', '\xB2', '\x92', '\xE6', '\xB2', '\xA1',  /* 政斯新样樣民沒没 */
+    '\xE7', '\x84', '\xB6', '\xE7', '\x89', '\xB9', '\xE7', '\x8E', '\xB0', '\xE7', '\x8F', '\xBE', '\xE7', '\x90', '\x83', '\xE7', '\xAC', '\xAC', '\xE7', '\xB6', '\x93', '\xE8', '\xB0', '\x81',  /* 然特现��第經� */
+    '\xE8', '\xB5', '\xB7',  /* èµ· */
+    '\0',
+    '\xE4', '\xBE', '\x8B', '\xE5', '\x88', '\xA5', '\xE5', '\x88', '\xAB', '\xE5', '\x88', '\xB6', '\xE5', '\x8A', '\xA8', '\xE5', '\x8B', '\x95', '\xE5', '\x90', '\x97', '\xE5', '\x97', '\x8E',  /* 例別别制动動�嗎 */
+    '\xE5', '\xA2', '\x9E', '\xE6', '\x8C', '\x87', '\xE6', '\x98', '\x8E', '\xE6', '\x9C', '\x9D', '\xE6', '\x9C', '\x9F', '\xE6', '\x9E', '\x84', '\xE7', '\x89', '\xA9', '\xE7', '\xA1', '\xAE',  /* 增指明�期构物确 */
+    '\xE7', '\xA7', '\x8D', '\xE8', '\xAA', '\xBF', '\xE8', '\xB0', '\x83', '\xE8', '\xB2', '\xBB', '\xE8', '\xB4', '\xB9', '\xE9', '\x82', '\xA3', '\xE9', '\x83', '\xBD', '\xE9', '\x96', '\x93',  /* �調调費费那都間 */
+    '\xE9', '\x97', '\xB4',  /* é—´ */
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+#endif /* AF_CONFIG_OPTION_CJK                */
+    '\0',
+
+  };
+
+
+  /* stringsets are specific to scripts */
+  FT_LOCAL_ARRAY_DEF( AF_Blue_StringRec )
+  af_blue_stringsets[] =
+  {
+    /* */
+    { AF_BLUE_STRING_LATIN_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM,  0                                 },
+    { AF_BLUE_STRING_LATIN_SMALL_F_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_LATIN_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                            AF_BLUE_PROPERTY_LATIN_X_HEIGHT   },
+    { AF_BLUE_STRING_LATIN_SMALL,           0                                 },
+    { AF_BLUE_STRING_LATIN_SMALL_DESCENDER, 0                                 },
+    { AF_BLUE_STRING_MAX,                   0                                 },
+    { AF_BLUE_STRING_GREEK_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM,  0                                 },
+    { AF_BLUE_STRING_GREEK_SMALL_BETA_TOP,  AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_GREEK_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                            AF_BLUE_PROPERTY_LATIN_X_HEIGHT   },
+    { AF_BLUE_STRING_GREEK_SMALL,           0                                 },
+    { AF_BLUE_STRING_GREEK_SMALL_DESCENDER, 0                                 },
+    { AF_BLUE_STRING_MAX,                   0                                 },
+    { AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        },
+    { AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM,  0                                 },
+    { AF_BLUE_STRING_CYRILLIC_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                               AF_BLUE_PROPERTY_LATIN_X_HEIGHT   },
+    { AF_BLUE_STRING_CYRILLIC_SMALL,           0                                 },
+    { AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER, 0                                 },
+    { AF_BLUE_STRING_MAX,                      0                                 },
+    { AF_BLUE_STRING_HEBREW_TOP,       AF_BLUE_PROPERTY_LATIN_TOP  |
+                                       AF_BLUE_PROPERTY_LATIN_LONG   },
+    { AF_BLUE_STRING_HEBREW_BOTTOM,    0                             },
+    { AF_BLUE_STRING_HEBREW_DESCENDER, 0                             },
+    { AF_BLUE_STRING_MAX,              0                             },
+#ifdef AF_CONFIG_OPTION_CJK
+    { AF_BLUE_STRING_CJK_TOP_FILL,      AF_BLUE_PROPERTY_CJK_TOP |
+                                        AF_BLUE_PROPERTY_CJK_FILL    },
+    { AF_BLUE_STRING_CJK_TOP_UNFILL,    AF_BLUE_PROPERTY_CJK_TOP     },
+    { AF_BLUE_STRING_CJK_BOTTOM_FILL,   AF_BLUE_PROPERTY_CJK_FILL    },
+    { AF_BLUE_STRING_CJK_BOTTOM_UNFILL, 0                            },
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    { AF_BLUE_STRING_CJK_LEFT_FILL,     AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_FILL    },
+    { AF_BLUE_STRING_CJK_LEFT_UNFILL,   AF_BLUE_PROPERTY_CJK_HORIZ   },
+    { AF_BLUE_STRING_CJK_RIGHT_FILL,    AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_RIGHT |
+                                        AF_BLUE_PROPERTY_CJK_FILL    },
+    { AF_BLUE_STRING_CJK_RIGHT_UNFILL,  AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_RIGHT   },
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+    { AF_BLUE_STRING_MAX,               0                            },
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+  };
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.cin b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.cin
new file mode 100644
index 00000000000..c693d89f701
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.cin
@@ -0,0 +1,39 @@
+/***************************************************************************/
+/*                                                                         */
+/*  afblue.c                                                               */
+/*                                                                         */
+/*    Auto-fitter data for blue strings (body).                            */
+/*                                                                         */
+/*  Copyright 2013 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 "aftypes.h"
+
+
+  FT_LOCAL_ARRAY_DEF( char )
+  af_blue_strings[] =
+  {
+    /* */
+@AF_BLUE_STRINGS_ARRAY@
+  };
+
+
+  /* stringsets are specific to scripts */
+  FT_LOCAL_ARRAY_DEF( AF_Blue_StringRec )
+  af_blue_stringsets[] =
+  {
+    /* */
+@AF_BLUE_STRINGSETS_ARRAY@
+  };
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.dat b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.dat
new file mode 100644
index 00000000000..d488f3faea6
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.dat
@@ -0,0 +1,218 @@
+//  afblue.dat
+//
+//    Auto-fitter data for blue strings.
+//
+//  Copyright 2013 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 contains data specific to blue zones.  It gets processed by
+// a script to simulate `jagged arrays', with enumeration values holding
+// offsets into the arrays.
+//
+// The format of the file is rather simple:  A section starts with three
+// labels separated by whitespace and followed by a colon (everything in a
+// single line); the first label gives the name of the enumeration template,
+// the second the name of the array template, and the third the name of the
+// `maximum' template, holding the size of the largest array element.  The
+// script then fills the corresponding templates (indicated by `@'
+// characters around the name).
+//
+// A section contains one or more data records.  Each data record consists
+// of two or more lines.  The first line holds the enumeration name, and the
+// remaining lines the corresponding array data.
+//
+// There are two possible representations for array data.
+//
+// - A string of characters in UTF-8 encoding enclosed in double quotes,
+//   using C syntax.  There can be only one string per line, thus the
+//   starting and ending double quote must be the first and last character
+//   in the line, respectively, ignoring whitespace before and after the
+//   string.  If there are multiple strings (in multiple lines), they are
+//   concatenated to a single string.  In the output, a string gets
+//   represented as a series of singles bytes, followed by a zero byte.  The
+//   enumeration values simply hold byte offsets to the start of the
+//   corresponding strings.
+//
+// - Data blocks enclosed in balanced braces, which get copied verbatim and
+//   which can span multiple lines.  The opening brace of a block must be
+//   the first character of a line (ignoring whitespace), and the closing
+//   brace the last (ignoring whitespace also).  The script appends a comma
+//   character after each block and counts the number of blocks to set the
+//   enumeration values.
+//
+// A section can contain either strings only or data blocks only.
+//
+// A comment line starts with `//'; it gets removed.  A preprocessor
+// directive line (using the standard syntax of `cpp') starts with `#' and
+// gets copied verbatim to both the enumeration and the array.  Whitespace
+// outside of a string is insignificant.
+//
+// Preprocessor directives are ignored while the script computes maximum
+// values; this essentially means that the maximum values can easily be too
+// large.  Given that the purpose of those values is to create local
+// fixed-size arrays at compile time for further processing of the blue zone
+// data, this isn't a problem.  Note the the final zero byte of a string is
+// not counted.  Note also that the count holds the number of UTF-8 encoded
+// characters, not bytes.
+
+
+AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN:
+
+  AF_BLUE_STRING_LATIN_CAPITAL_TOP
+    "THEZOCQS"
+  AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM
+    "HEZLOCUS"
+  AF_BLUE_STRING_LATIN_SMALL_F_TOP
+    "fijkdbh"
+  AF_BLUE_STRING_LATIN_SMALL
+    "xzroesc"
+  AF_BLUE_STRING_LATIN_SMALL_DESCENDER
+    "pqgjy"
+
+  AF_BLUE_STRING_GREEK_CAPITAL_TOP
+    "ΓΒΕΖΘΟΩ"
+  AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM
+    "ΒΔΖΞΘΟ"
+  AF_BLUE_STRING_GREEK_SMALL_BETA_TOP
+    "βθδζλξ"
+  AF_BLUE_STRING_GREEK_SMALL
+    "αειοπστω"
+  AF_BLUE_STRING_GREEK_SMALL_DESCENDER
+    "βγημ�φχψ"
+
+  AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP
+    "БВЕПЗОСЭ"
+  AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM
+    "БВЕШЗОСЭ"
+  AF_BLUE_STRING_CYRILLIC_SMALL
+    "хпншезо�"
+  AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER
+    "руф"
+
+  AF_BLUE_STRING_HEBREW_TOP
+    "בדהחךכ�ס"
+  AF_BLUE_STRING_HEBREW_BOTTOM
+    "בטכ�סצ"
+  AF_BLUE_STRING_HEBREW_DESCENDER
+    "קךןףץ"
+
+#ifdef AF_CONFIG_OPTION_CJK
+
+  AF_BLUE_STRING_CJK_TOP_FILL
+    "他们你來們到和地"
+    "对�就席我时時會"
+    "�為能舰說说这這"
+    "齊"
+  AF_BLUE_STRING_CJK_TOP_UNFILL
+    "军�已愿既星是景"
+    "民照现��用置�"
+    "�那�里開雷露�"
+    "顾"
+  AF_BLUE_STRING_CJK_BOTTOM_FILL
+    "个为人他以们你來"
+    "個們到和大对�就"
+    "我时時有�為�說"
+    "说"
+  AF_BLUE_STRING_CJK_BOTTOM_UNFILL
+    "主些因它想��生"
+    "當看�置者自著裡"
+    "过还进進��還里"
+    "�"
+
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+
+  AF_BLUE_STRING_CJK_LEFT_FILL
+    "些们你來們到和地"
+    "她将將就年得情最"
+    "样樣�能說说这這"
+    "通"
+  AF_BLUE_STRING_CJK_LEFT_UNFILL
+    "����呢��嗎"
+    "师師收断斷明眼間"
+    "间际陈�除陳�際"
+    "隨"
+  AF_BLUE_STRING_CJK_RIGHT_FILL
+    "事�學将將情想或"
+    "政斯新样樣民沒没"
+    "然特现��第經�"
+    "èµ·"
+  AF_BLUE_STRING_CJK_RIGHT_UNFILL
+    "例別别制动動�嗎"
+    "增指明�期构物确"
+    "�調调費费那都間"
+    "é—´"
+
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+
+AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN:
+
+  AF_BLUE_STRINGSET_LATN
+    { AF_BLUE_STRING_LATIN_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM,  0                                 }
+    { AF_BLUE_STRING_LATIN_SMALL_F_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_LATIN_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                            AF_BLUE_PROPERTY_LATIN_X_HEIGHT   }
+    { AF_BLUE_STRING_LATIN_SMALL,           0                                 }
+    { AF_BLUE_STRING_LATIN_SMALL_DESCENDER, 0                                 }
+    { AF_BLUE_STRING_MAX,                   0                                 }
+
+  AF_BLUE_STRINGSET_GREK
+    { AF_BLUE_STRING_GREEK_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM,  0                                 }
+    { AF_BLUE_STRING_GREEK_SMALL_BETA_TOP,  AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_GREEK_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                            AF_BLUE_PROPERTY_LATIN_X_HEIGHT   }
+    { AF_BLUE_STRING_GREEK_SMALL,           0                                 }
+    { AF_BLUE_STRING_GREEK_SMALL_DESCENDER, 0                                 }
+    { AF_BLUE_STRING_MAX,                   0                                 }
+
+  AF_BLUE_STRINGSET_CYRL
+    { AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM,  0                                 }
+    { AF_BLUE_STRING_CYRILLIC_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                               AF_BLUE_PROPERTY_LATIN_X_HEIGHT   }
+    { AF_BLUE_STRING_CYRILLIC_SMALL,           0                                 }
+    { AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER, 0                                 }
+    { AF_BLUE_STRING_MAX,                      0                                 }
+
+  AF_BLUE_STRINGSET_HEBR
+    { AF_BLUE_STRING_HEBREW_TOP,       AF_BLUE_PROPERTY_LATIN_TOP  |
+                                       AF_BLUE_PROPERTY_LATIN_LONG   }
+    { AF_BLUE_STRING_HEBREW_BOTTOM,    0                             }
+    { AF_BLUE_STRING_HEBREW_DESCENDER, 0                             }
+    { AF_BLUE_STRING_MAX,              0                             }
+
+#ifdef AF_CONFIG_OPTION_CJK
+
+  AF_BLUE_STRINGSET_HANI
+    { AF_BLUE_STRING_CJK_TOP_FILL,      AF_BLUE_PROPERTY_CJK_TOP |
+                                        AF_BLUE_PROPERTY_CJK_FILL    }
+    { AF_BLUE_STRING_CJK_TOP_UNFILL,    AF_BLUE_PROPERTY_CJK_TOP     }
+    { AF_BLUE_STRING_CJK_BOTTOM_FILL,   AF_BLUE_PROPERTY_CJK_FILL    }
+    { AF_BLUE_STRING_CJK_BOTTOM_UNFILL, 0                            }
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    { AF_BLUE_STRING_CJK_LEFT_FILL,     AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_FILL    }
+    { AF_BLUE_STRING_CJK_LEFT_UNFILL,   AF_BLUE_PROPERTY_CJK_HORIZ   }
+    { AF_BLUE_STRING_CJK_RIGHT_FILL,    AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_RIGHT |
+                                        AF_BLUE_PROPERTY_CJK_FILL    }
+    { AF_BLUE_STRING_CJK_RIGHT_UNFILL,  AF_BLUE_PROPERTY_CJK_HORIZ |
+                                        AF_BLUE_PROPERTY_CJK_RIGHT   }
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+    { AF_BLUE_STRING_MAX,               0                            }
+
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+
+// END
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.h
new file mode 100644
index 00000000000..86a36491faf
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.h
@@ -0,0 +1,199 @@
+/* This file has been generated by the Perl script `afblue.pl', */
+/* using data from file `afblue.dat'.                           */
+
+/***************************************************************************/
+/*                                                                         */
+/*  afblue.h                                                               */
+/*                                                                         */
+/*    Auto-fitter data for blue strings (specification).                   */
+/*                                                                         */
+/*  Copyright 2013 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 __AFBLUE_H__
+#define __AFBLUE_H__
+
+
+FT_BEGIN_HEADER
+
+
+  /* an auxiliary macro to decode a UTF-8 character -- since we only use */
+  /* hard-coded, self-converted data, no error checking is performed     */
+#define GET_UTF8_CHAR( ch, p )                    \
+          ch = (unsigned char)*p++;               \
+          if ( ch >= 0x80 )                       \
+          {                                       \
+            FT_UInt  len;                         \
+                                                  \
+                                                  \
+            if ( ch < 0xE0 )                      \
+            {                                     \
+              len = 1;                            \
+              ch &= 0x1F;                         \
+            }                                     \
+            else if ( ch < 0xF0 )                 \
+            {                                     \
+              len = 2;                            \
+              ch &= 0x0F;                         \
+            }                                     \
+            else                                  \
+            {                                     \
+              len = 3;                            \
+              ch &= 0x07;                         \
+            }                                     \
+                                                  \
+            for ( ; len > 0; len-- )              \
+              ch = ( ch << 6 ) | ( *p++ & 0x3F ); \
+          }
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                    B L U E   S T R I N G S                    *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* At the bottommost level, we define strings for finding blue zones. */
+
+
+#define AF_BLUE_STRING_MAX_LEN  25
+
+  /* The AF_Blue_String enumeration values are offsets into the */
+  /* `af_blue_strings' array.                                   */
+
+  typedef enum  AF_Blue_String_
+  {
+    AF_BLUE_STRING_LATIN_CAPITAL_TOP = 0,
+    AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 9,
+    AF_BLUE_STRING_LATIN_SMALL_F_TOP = 18,
+    AF_BLUE_STRING_LATIN_SMALL = 26,
+    AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 34,
+    AF_BLUE_STRING_GREEK_CAPITAL_TOP = 40,
+    AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 55,
+    AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 68,
+    AF_BLUE_STRING_GREEK_SMALL = 81,
+    AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 98,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 115,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 132,
+    AF_BLUE_STRING_CYRILLIC_SMALL = 149,
+    AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 166,
+    AF_BLUE_STRING_HEBREW_TOP = 173,
+    AF_BLUE_STRING_HEBREW_BOTTOM = 190,
+    AF_BLUE_STRING_HEBREW_DESCENDER = 203,
+    af_blue_1_1 = 213,
+#ifdef AF_CONFIG_OPTION_CJK
+    AF_BLUE_STRING_CJK_TOP_FILL = af_blue_1_1 + 1,
+    AF_BLUE_STRING_CJK_TOP_UNFILL = af_blue_1_1 + 77,
+    AF_BLUE_STRING_CJK_BOTTOM_FILL = af_blue_1_1 + 153,
+    AF_BLUE_STRING_CJK_BOTTOM_UNFILL = af_blue_1_1 + 229,
+    af_blue_1_1_1 = af_blue_1_1 + 304,
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    AF_BLUE_STRING_CJK_LEFT_FILL = af_blue_1_1_1 + 1,
+    AF_BLUE_STRING_CJK_LEFT_UNFILL = af_blue_1_1_1 + 77,
+    AF_BLUE_STRING_CJK_RIGHT_FILL = af_blue_1_1_1 + 153,
+    AF_BLUE_STRING_CJK_RIGHT_UNFILL = af_blue_1_1_1 + 229,
+    af_blue_1_2_1 = af_blue_1_1_1 + 304,
+#else
+    af_blue_1_2_1 = af_blue_1_1_1 + 0,
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+    af_blue_1_2 = af_blue_1_2_1 + 0,
+#else
+    af_blue_1_2 = af_blue_1_2_1 + 0,
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+
+    AF_BLUE_STRING_MAX   /* do not remove */
+
+  } AF_Blue_String;
+
+
+  FT_LOCAL_ARRAY( char )
+  af_blue_strings[];
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                 B L U E   S T R I N G S E T S                 *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* The next level is to group blue strings into script-specific sets. */
+
+
+  /* Properties are specific to a writing system.  We assume that a given  */
+  /* blue string can't be used in more than a single writing system, which */
+  /* is a safe bet.                                                        */
+#define AF_BLUE_PROPERTY_LATIN_TOP       ( 1 << 0 )
+#define AF_BLUE_PROPERTY_LATIN_X_HEIGHT  ( 1 << 1 )
+#define AF_BLUE_PROPERTY_LATIN_LONG      ( 1 << 2 )
+
+#define AF_BLUE_PROPERTY_CJK_HORIZ  ( 1 << 0 )
+#define AF_BLUE_PROPERTY_CJK_TOP    ( 1 << 1 )
+#define AF_BLUE_PROPERTY_CJK_FILL   ( 1 << 2 )
+#define AF_BLUE_PROPERTY_CJK_RIGHT  AF_BLUE_PROPERTY_CJK_TOP
+
+
+#define AF_BLUE_STRINGSET_MAX_LEN  9
+
+  /* The AF_Blue_Stringset enumeration values are offsets into the */
+  /* `af_blue_stringsets' array.                                   */
+
+  typedef enum  AF_Blue_Stringset_
+  {
+    AF_BLUE_STRINGSET_LATN = 0,
+    AF_BLUE_STRINGSET_GREK = 7,
+    AF_BLUE_STRINGSET_CYRL = 14,
+    AF_BLUE_STRINGSET_HEBR = 20,
+    af_blue_2_1 = 24,
+#ifdef AF_CONFIG_OPTION_CJK
+    AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0,
+    af_blue_2_1_1 = af_blue_2_1 + 4,
+#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
+    af_blue_2_2_1 = af_blue_2_1_1 + 4,
+#else
+    af_blue_2_2_1 = af_blue_2_1_1 + 0,
+#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
+    af_blue_2_2 = af_blue_2_2_1 + 1,
+#else
+    af_blue_2_2 = af_blue_2_2_1 + 0,
+#endif /* AF_CONFIG_OPTION_CJK                */
+
+
+    AF_BLUE_STRINGSET_MAX   /* do not remove */
+
+  } AF_Blue_Stringset;
+
+
+  typedef struct  AF_Blue_StringRec_
+  {
+    AF_Blue_String  string;
+    FT_UShort       properties;
+
+  } AF_Blue_StringRec;
+
+
+  FT_LOCAL_ARRAY( AF_Blue_StringRec )
+  af_blue_stringsets[];
+
+/* */
+
+FT_END_HEADER
+
+
+#endif /* __AFBLUE_H__ */
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.hin b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.hin
new file mode 100644
index 00000000000..00282c3bad9
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afblue.hin
@@ -0,0 +1,142 @@
+/***************************************************************************/
+/*                                                                         */
+/*  afblue.h                                                               */
+/*                                                                         */
+/*    Auto-fitter data for blue strings (specification).                   */
+/*                                                                         */
+/*  Copyright 2013 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 __AFBLUE_H__
+#define __AFBLUE_H__
+
+
+FT_BEGIN_HEADER
+
+
+  /* an auxiliary macro to decode a UTF-8 character -- since we only use */
+  /* hard-coded, self-converted data, no error checking is performed     */
+#define GET_UTF8_CHAR( ch, p )                    \
+          ch = (unsigned char)*p++;               \
+          if ( ch >= 0x80 )                       \
+          {                                       \
+            FT_UInt  len;                         \
+                                                  \
+                                                  \
+            if ( ch < 0xE0 )                      \
+            {                                     \
+              len = 1;                            \
+              ch &= 0x1F;                         \
+            }                                     \
+            else if ( ch < 0xF0 )                 \
+            {                                     \
+              len = 2;                            \
+              ch &= 0x0F;                         \
+            }                                     \
+            else                                  \
+            {                                     \
+              len = 3;                            \
+              ch &= 0x07;                         \
+            }                                     \
+                                                  \
+            for ( ; len > 0; len-- )              \
+              ch = ( ch << 6 ) | ( *p++ & 0x3F ); \
+          }
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                    B L U E   S T R I N G S                    *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* At the bottommost level, we define strings for finding blue zones. */
+
+
+#define AF_BLUE_STRING_MAX_LEN  @AF_BLUE_STRING_MAX_LEN@
+
+  /* The AF_Blue_String enumeration values are offsets into the */
+  /* `af_blue_strings' array.                                   */
+
+  typedef enum  AF_Blue_String_
+  {
+@AF_BLUE_STRING_ENUM@
+
+    AF_BLUE_STRING_MAX   /* do not remove */
+
+  } AF_Blue_String;
+
+
+  FT_LOCAL_ARRAY( char )
+  af_blue_strings[];
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                 B L U E   S T R I N G S E T S                 *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /* The next level is to group blue strings into script-specific sets. */
+
+
+  /* Properties are specific to a writing system.  We assume that a given  */
+  /* blue string can't be used in more than a single writing system, which */
+  /* is a safe bet.                                                        */
+#define AF_BLUE_PROPERTY_LATIN_TOP       ( 1 << 0 )
+#define AF_BLUE_PROPERTY_LATIN_X_HEIGHT  ( 1 << 1 )
+#define AF_BLUE_PROPERTY_LATIN_LONG      ( 1 << 2 )
+
+#define AF_BLUE_PROPERTY_CJK_HORIZ  ( 1 << 0 )
+#define AF_BLUE_PROPERTY_CJK_TOP    ( 1 << 1 )
+#define AF_BLUE_PROPERTY_CJK_FILL   ( 1 << 2 )
+#define AF_BLUE_PROPERTY_CJK_RIGHT  AF_BLUE_PROPERTY_CJK_TOP
+
+
+#define AF_BLUE_STRINGSET_MAX_LEN  @AF_BLUE_STRINGSET_MAX_LEN@
+
+  /* The AF_Blue_Stringset enumeration values are offsets into the */
+  /* `af_blue_stringsets' array.                                   */
+
+  typedef enum  AF_Blue_Stringset_
+  {
+@AF_BLUE_STRINGSET_ENUM@
+
+    AF_BLUE_STRINGSET_MAX   /* do not remove */
+
+  } AF_Blue_Stringset;
+
+
+  typedef struct  AF_Blue_StringRec_
+  {
+    AF_Blue_String  string;
+    FT_UShort       properties;
+
+  } AF_Blue_StringRec;
+
+
+  FT_LOCAL_ARRAY( AF_Blue_StringRec )
+  af_blue_stringsets[];
+
+/* */
+
+FT_END_HEADER
+
+
+#endif /* __AFBLUE_H__ */
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afcjk.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afcjk.c
index f69a528e3b7..7a6f835516c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afcjk.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afcjk.c
@@ -26,7 +26,7 @@
 #include FT_ADVANCES_H
 #include FT_INTERNAL_DEBUG_H
 
-#include "aftypes.h"
+#include "afglobal.h"
 #include "aflatin.h"
 
 
@@ -73,6 +73,12 @@
     AF_GlyphHintsRec  hints[1];
 
 
+    FT_TRACE5(( "\n"
+                "cjk standard widths computation (script `%s')\n"
+                "===============================================\n"
+                "\n",
+                af_script_names[metrics->root.script_class->script] ));
+
     af_glyph_hints_init( hints, face->memory );
 
     metrics->axis[AF_DIMENSION_HORZ].width_count = 0;
@@ -86,11 +92,15 @@
       AF_Scaler         scaler = &dummy->root.scaler;
 
 
-      glyph_index = FT_Get_Char_Index( face,
-                                       metrics->root.clazz->standard_char );
+      glyph_index = FT_Get_Char_Index(
+                      face,
+                      metrics->root.script_class->standard_char );
       if ( glyph_index == 0 )
         goto Exit;
 
+      FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n",
+                  metrics->root.script_class->standard_char, glyph_index ));
+
       error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
       if ( error || face->glyph->outline.n_points <= 0 )
         goto Exit;
@@ -122,11 +132,13 @@
         FT_UInt       num_widths = 0;
 
 
-        error = af_latin_hints_compute_segments( hints, (AF_Dimension)dim );
+        error = af_latin_hints_compute_segments( hints,
+                                                 (AF_Dimension)dim );
         if ( error )
           goto Exit;
 
-        af_latin_hints_link_segments( hints, (AF_Dimension)dim );
+        af_latin_hints_link_segments( hints,
+                                      (AF_Dimension)dim );
 
         seg   = axhints->segments;
         limit = seg + axhints->num_segments;
@@ -151,7 +163,7 @@
         }
 
         /* this also replaces multiple almost identical stem widths */
-        /* with a single one (the value 100 is heuristic) */
+        /* with a single one (the value 100 is heuristic)           */
         af_sort_and_quantize_widths( &num_widths, axis->widths,
                                      dummy->units_per_em / 100 );
         axis->width_count = num_widths;
@@ -171,263 +183,201 @@
         axis->edge_distance_threshold = stdw / 5;
         axis->standard_width          = stdw;
         axis->extra_light             = 0;
-      }
-    }
-
-    af_glyph_hints_done( hints );
-  }
-
-
-#define AF_CJK_MAX_TEST_CHARACTERS  32
 
+#ifdef FT_DEBUG_LEVEL_TRACE
+        {
+          FT_UInt  i;
 
-  /* Each blue zone has two types of fill and unfill, this is, */
-  /* filling the entire glyph square or not.                   */
 
-  enum
-  {
-    AF_CJK_BLUE_TYPE_FILL,
-    AF_CJK_BLUE_TYPE_UNFILL,
-    AF_CJK_BLUE_TYPE_MAX
-  };
+          FT_TRACE5(( "%s widths:\n",
+                      dim == AF_DIMENSION_VERT ? "horizontal"
+                                               : "vertical" ));
 
+          FT_TRACE5(( "  %d (standard)", axis->standard_width ));
+          for ( i = 1; i < axis->width_count; i++ )
+            FT_TRACE5(( " %d", axis->widths[i].org ));
 
-  /* Put some common and representative Han Ideographs characters here. */
-  static const FT_ULong af_cjk_hani_blue_chars[AF_CJK_BLUE_MAX]
-                                              [AF_CJK_BLUE_TYPE_MAX]
-                                              [AF_CJK_MAX_TEST_CHARACTERS] =
-  {
-    {
-      {
-        0x4ED6, 0x4EEC, 0x4F60, 0x4F86, 0x5011, 0x5230, 0x548C, 0x5730,
-        0x5BF9, 0x5C0D, 0x5C31, 0x5E2D, 0x6211, 0x65F6, 0x6642, 0x6703,
-        0x6765, 0x70BA, 0x80FD, 0x8230, 0x8AAA, 0x8BF4, 0x8FD9, 0x9019,
-        0x9F4A /* top fill */
-      },
-      {
-        0x519B, 0x540C, 0x5DF2, 0x613F, 0x65E2, 0x661F, 0x662F, 0x666F,
-        0x6C11, 0x7167, 0x73B0, 0x73FE, 0x7406, 0x7528, 0x7F6E, 0x8981,
-        0x8ECD, 0x90A3, 0x914D, 0x91CC, 0x958B, 0x96F7, 0x9732, 0x9762,
-        0x987E /* top unfill */
-      }
-    },
-    {
-      {
-        0x4E2A, 0x4E3A, 0x4EBA, 0x4ED6, 0x4EE5, 0x4EEC, 0x4F60, 0x4F86,
-        0x500B, 0x5011, 0x5230, 0x548C, 0x5927, 0x5BF9, 0x5C0D, 0x5C31,
-        0x6211, 0x65F6, 0x6642, 0x6709, 0x6765, 0x70BA, 0x8981, 0x8AAA,
-        0x8BF4 /* bottom fill */
-      },
-      {
-        0x4E3B, 0x4E9B, 0x56E0, 0x5B83, 0x60F3, 0x610F, 0x7406, 0x751F,
-        0x7576, 0x770B, 0x7740, 0x7F6E, 0x8005, 0x81EA, 0x8457, 0x88E1,
-        0x8FC7, 0x8FD8, 0x8FDB, 0x9032, 0x904E, 0x9053, 0x9084, 0x91CC,
-        0x9762 /* bottom unfill */
-      }
-    },
-#ifndef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT
-      { {0x0000}, {0x0000} },
-      { {0x0000}, {0x0000} }
-#else
-    {
-      {
-        0x4E9B, 0x4EEC, 0x4F60, 0x4F86, 0x5011, 0x5230, 0x548C, 0x5730,
-        0x5979, 0x5C06, 0x5C07, 0x5C31, 0x5E74, 0x5F97, 0x60C5, 0x6700,
-        0x6837, 0x6A23, 0x7406, 0x80FD, 0x8AAA, 0x8BF4, 0x8FD9, 0x9019,
-        0x901A /* left fill */
-      },
-      {
-        0x5373, 0x5417, 0x5427, 0x542C, 0x5462, 0x54C1, 0x54CD, 0x55CE,
-        0x5E08, 0x5E2B, 0x6536, 0x65AD, 0x65B7, 0x660E, 0x773C, 0x9593,
-        0x95F4, 0x9645, 0x9648, 0x9650, 0x9664, 0x9673, 0x968F, 0x969B,
-        0x96A8 /* left unfill */
-      }
-    },
-    {
-      {
-        0x4E8B, 0x524D, 0x5B78, 0x5C06, 0x5C07, 0x60C5, 0x60F3, 0x6216,
-        0x653F, 0x65AF, 0x65B0, 0x6837, 0x6A23, 0x6C11, 0x6C92, 0x6CA1,
-        0x7136, 0x7279, 0x73B0, 0x73FE, 0x7403, 0x7B2C, 0x7D93, 0x8C01,
-        0x8D77 /* right fill */
-      },
-      {
-        0x4F8B, 0x5225, 0x522B, 0x5236, 0x52A8, 0x52D5, 0x5417, 0x55CE,
-        0x589E, 0x6307, 0x660E, 0x671D, 0x671F, 0x6784, 0x7269, 0x786E,
-        0x79CD, 0x8ABF, 0x8C03, 0x8CBB, 0x8D39, 0x90A3, 0x90FD, 0x9593,
-        0x95F4 /* right unfill */
+          FT_TRACE5(( "\n" ));
+        }
+#endif
       }
     }
-#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
-  };
 
+    FT_TRACE5(( "\n" ));
+
+    af_glyph_hints_done( hints );
+  }
 
-  /* Calculate blue zones for all the CJK_BLUE_XXX's. */
+
+  /* Find all blue zones. */
 
   static void
-  af_cjk_metrics_init_blues( AF_CJKMetrics   metrics,
-                             FT_Face         face,
-                             const FT_ULong  blue_chars
-                                               [AF_CJK_BLUE_MAX]
-                                               [AF_CJK_BLUE_TYPE_MAX]
-                                               [AF_CJK_MAX_TEST_CHARACTERS] )
+  af_cjk_metrics_init_blues( AF_CJKMetrics  metrics,
+                             FT_Face        face )
   {
-    FT_Pos        fills[AF_CJK_MAX_TEST_CHARACTERS];
-    FT_Pos        flats[AF_CJK_MAX_TEST_CHARACTERS];
+    FT_Pos      fills[AF_BLUE_STRING_MAX_LEN];
+    FT_Pos      flats[AF_BLUE_STRING_MAX_LEN];
 
-    FT_Int        num_fills;
-    FT_Int        num_flats;
+    FT_Int      num_fills;
+    FT_Int      num_flats;
 
-    FT_Int        bb;
-    AF_CJKBlue    blue;
-    FT_Error      error;
-    AF_CJKAxis    axis;
-    FT_GlyphSlot  glyph = face->glyph;
+    AF_CJKBlue  blue;
+    FT_Error    error;
+    AF_CJKAxis  axis;
+    FT_Outline  outline;
+
+    AF_Blue_Stringset         bss = metrics->root.script_class->blue_stringset;
+    const AF_Blue_StringRec*  bs  = &af_blue_stringsets[bss];
 
 #ifdef FT_DEBUG_LEVEL_TRACE
-    FT_String*  cjk_blue_name[AF_CJK_BLUE_MAX] = {
-      (FT_String*)"top",
-      (FT_String*)"bottom",
-      (FT_String*)"left",
-      (FT_String*)"right"
+    FT_String*  cjk_blue_name[4] =
+    {
+      (FT_String*)"bottom",    /* --   , --  */
+      (FT_String*)"top",       /* --   , TOP */
+      (FT_String*)"left",      /* HORIZ, --  */
+      (FT_String*)"right"      /* HORIZ, TOP */
     };
-    FT_String*  cjk_blue_type_name[AF_CJK_BLUE_TYPE_MAX] = {
-      (FT_String*)"filled",
-      (FT_String*)"unfilled"
+
+    FT_String*  cjk_blue_type_name[2] =
+    {
+      (FT_String*)"unfilled",  /* --   */
+      (FT_String*)"filled"     /* FILL */
     };
 #endif
 
 
-    /* We compute the blues simply by loading each character from the */
-    /* `blue_chars[blues]' string, then computing its extreme points  */
-    /* (depending blue zone type etc.).                               */
+    /* we walk over the blue character strings as specified in the    */
+    /* script's entry in the `af_blue_stringset' array, computing its */
+    /* extremum points (depending on the string properties)           */
 
-    FT_TRACE5(( "cjk blue zones computation\n" ));
-    FT_TRACE5(( "------------------------------------------------\n" ));
+    FT_TRACE5(( "cjk blue zones computation\n"
+                "==========================\n"
+                "\n" ));
 
-    for ( bb = 0; bb < AF_CJK_BLUE_MAX; bb++ )
+    for ( ; bs->string != AF_BLUE_STRING_MAX; bs++ )
     {
-      FT_Int   fill_type;
-      FT_Pos*  blue_ref;
-      FT_Pos*  blue_shoot;
+      const char*  p = &af_blue_strings[bs->string];
+      FT_Pos*      blue_ref;
+      FT_Pos*      blue_shoot;
+
+
+      if ( AF_CJK_IS_HORIZ_BLUE( bs ) )
+        axis = &metrics->axis[AF_DIMENSION_HORZ];
+      else
+        axis = &metrics->axis[AF_DIMENSION_VERT];
 
+      FT_TRACE5(( "blue zone %d:\n", axis->blue_count ));
 
       num_fills = 0;
       num_flats = 0;
 
-      for ( fill_type = 0; fill_type < AF_CJK_BLUE_TYPE_MAX; fill_type++ )
+      FT_TRACE5(( "  cjk blue %s/%s\n",
+                  cjk_blue_name[AF_CJK_IS_HORIZ_BLUE( bs ) |
+                                AF_CJK_IS_TOP_BLUE( bs )   ],
+                  cjk_blue_type_name[!!AF_CJK_IS_FILLED_BLUE( bs )] ));
+
+      while ( *p )
       {
-        const FT_ULong*  p     = blue_chars[bb][fill_type];
-        const FT_ULong*  limit = p + AF_CJK_MAX_TEST_CHARACTERS;
-        FT_Bool          fill  = FT_BOOL(
-                                   fill_type == AF_CJK_BLUE_TYPE_FILL );
+        FT_ULong    ch;
+        FT_UInt     glyph_index;
+        FT_Pos      best_pos;       /* same as points.y or points.x, resp. */
+        FT_Int      best_point;
+        FT_Vector*  points;
 
 
-        FT_TRACE5(( "cjk blue %s/%s\n", cjk_blue_name[bb],
-                                        cjk_blue_type_name[fill_type] ));
+        GET_UTF8_CHAR( ch, p );
 
+        /* load the character in the face -- skip unknown or empty ones */
+        glyph_index = FT_Get_Char_Index( face, ch );
+        if ( glyph_index == 0 )
+        {
+          FT_TRACE5(( "  U+%04lX unavailable\n", ch ));
+          continue;
+        }
 
-        for ( ; p < limit && *p; p++ )
+        error   = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
+        outline = face->glyph->outline;
+        if ( error || outline.n_points <= 0 )
         {
-          FT_UInt     glyph_index;
-          FT_Pos      best_pos; /* same as points.y */
-          FT_Int      best_point;
-          FT_Vector*  points;
+          FT_TRACE5(( "  U+%04lX contains no outlines\n", ch ));
+          continue;
+        }
 
+        /* now compute min or max point indices and coordinates */
+        points     = outline.points;
+        best_point = -1;
+        best_pos   = 0;  /* make compiler happy */
 
-          FT_TRACE5(( "  U+%lX...", *p ));
+        {
+          FT_Int  nn;
+          FT_Int  first = 0;
+          FT_Int  last  = -1;
 
-          /* load the character in the face -- skip unknown or empty ones */
-          glyph_index = FT_Get_Char_Index( face, *p );
-          if ( glyph_index == 0 )
-          {
-            FT_TRACE5(( "unavailable\n" ));
-            continue;
-          }
 
-          error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
-          if ( error || glyph->outline.n_points <= 0 )
+          for ( nn = 0; nn < outline.n_contours; first = last + 1, nn++ )
           {
-            FT_TRACE5(( "no outline\n" ));
-            continue;
-          }
+            FT_Int  pp;
 
-          /* now compute min or max point indices and coordinates */
-          points     = glyph->outline.points;
-          best_point = -1;
-          best_pos   = 0;  /* make compiler happy */
 
-          {
-            FT_Int  nn;
-            FT_Int  first = 0;
-            FT_Int  last  = -1;
+            last = outline.contours[nn];
 
+            /* Avoid single-point contours since they are never rasterized. */
+            /* In some fonts, they correspond to mark attachment points     */
+            /* which are way outside of the glyph's real outline.           */
+            if ( last <= first )
+              continue;
 
-            for ( nn = 0;
-                  nn < glyph->outline.n_contours;
-                  first = last + 1, nn++ )
+            if ( AF_CJK_IS_HORIZ_BLUE( bs ) )
             {
-              FT_Int  pp;
-
-
-              last = glyph->outline.contours[nn];
-
-              /* Avoid single-point contours since they are never       */
-              /* rasterized.  In some fonts, they correspond to mark    */
-              /* attachment points which are way outside of the glyph's */
-              /* real outline.                                          */
-              if ( last <= first )
-                continue;
-
-              switch ( bb )
+              if ( AF_CJK_IS_RIGHT_BLUE( bs ) )
               {
-              case AF_CJK_BLUE_TOP:
                 for ( pp = first; pp <= last; pp++ )
-                  if ( best_point < 0 || points[pp].y > best_pos )
+                  if ( best_point < 0 || points[pp].x > best_pos )
                   {
                     best_point = pp;
-                    best_pos   = points[pp].y;
+                    best_pos   = points[pp].x;
                   }
-                break;
-
-              case AF_CJK_BLUE_BOTTOM:
+              }
+              else
+              {
                 for ( pp = first; pp <= last; pp++ )
-                  if ( best_point < 0 || points[pp].y < best_pos )
+                  if ( best_point < 0 || points[pp].x < best_pos )
                   {
                     best_point = pp;
-                    best_pos   = points[pp].y;
+                    best_pos   = points[pp].x;
                   }
-                break;
-
-              case AF_CJK_BLUE_LEFT:
+              }
+            }
+            else
+            {
+              if ( AF_CJK_IS_TOP_BLUE( bs ) )
+              {
                 for ( pp = first; pp <= last; pp++ )
-                  if ( best_point < 0 || points[pp].x < best_pos )
+                  if ( best_point < 0 || points[pp].y > best_pos )
                   {
                     best_point = pp;
-                    best_pos   = points[pp].x;
+                    best_pos   = points[pp].y;
                   }
-                break;
-
-              case AF_CJK_BLUE_RIGHT:
+              }
+              else
+              {
                 for ( pp = first; pp <= last; pp++ )
-                  if ( best_point < 0 || points[pp].x > best_pos )
+                  if ( best_point < 0 || points[pp].y < best_pos )
                   {
                     best_point = pp;
-                    best_pos   = points[pp].x;
+                    best_pos   = points[pp].y;
                   }
-                break;
-
-              default:
-                ;
               }
             }
-            FT_TRACE5(( "best_pos=%5ld\n", best_pos ));
           }
 
-          if ( fill )
-            fills[num_fills++] = best_pos;
-          else
-            flats[num_flats++] = best_pos;
+          FT_TRACE5(( "  U+%04lX: best_pos = %5ld\n", ch, best_pos ));
         }
+
+        if ( AF_CJK_IS_FILLED_BLUE( bs ) )
+          fills[num_fills++] = best_pos;
+        else
+          flats[num_flats++] = best_pos;
       }
 
       if ( num_flats == 0 && num_fills == 0 )
@@ -436,34 +386,30 @@
          *  we couldn't find a single glyph to compute this blue zone,
          *  we will simply ignore it then
          */
-        FT_TRACE5(( "empty\n" ));
+        FT_TRACE5(( "    empty\n" ));
         continue;
       }
 
       /* we have computed the contents of the `fill' and `flats' tables, */
-      /* now determine the reference position of the blue --             */
+      /* now determine the reference position of the blue zone --        */
       /* we simply take the median value after a simple sort             */
       af_sort_pos( num_flats, flats );
       af_sort_pos( num_fills, fills );
 
-      if ( AF_CJK_BLUE_TOP == bb || AF_CJK_BLUE_BOTTOM == bb )
-        axis = &metrics->axis[AF_DIMENSION_VERT];
-      else
-        axis = &metrics->axis[AF_DIMENSION_HORZ];
-
-      blue       = & axis->blues[axis->blue_count];
-      blue_ref   = & blue->ref.org;
-      blue_shoot = & blue->shoot.org;
+      blue       = &axis->blues[axis->blue_count];
+      blue_ref   = &blue->ref.org;
+      blue_shoot = &blue->shoot.org;
 
       axis->blue_count++;
+
       if ( num_flats == 0 )
       {
-        *blue_ref   = fills[num_fills / 2];
+        *blue_ref   =
         *blue_shoot = fills[num_fills / 2];
       }
       else if ( num_fills == 0 )
       {
-        *blue_ref   = flats[num_flats / 2];
+        *blue_ref   =
         *blue_shoot = flats[num_flats / 2];
       }
       else
@@ -481,26 +427,34 @@
         FT_Bool  under_ref = FT_BOOL( shoot < ref );
 
 
-        if ( ( AF_CJK_BLUE_TOP == bb   ||
-               AF_CJK_BLUE_RIGHT == bb ) ^ under_ref )
-          *blue_shoot = *blue_ref = ( shoot + ref ) / 2;
+        /* AF_CJK_IS_TOP_BLUE covers `right' and `top' */
+        if ( AF_CJK_IS_TOP_BLUE( bs ) ^ under_ref )
+        {
+          *blue_ref   =
+          *blue_shoot = ( shoot + ref ) / 2;
+
+          FT_TRACE5(( "  [overshoot smaller than reference,"
+                      " taking mean value]\n" ));
+        }
       }
 
       blue->flags = 0;
-      if ( AF_CJK_BLUE_TOP == bb )
-        blue->flags |= AF_CJK_BLUE_IS_TOP;
-      else if ( AF_CJK_BLUE_RIGHT == bb )
-        blue->flags |= AF_CJK_BLUE_IS_RIGHT;
+      if ( AF_CJK_IS_TOP_BLUE( bs ) )
+        blue->flags |= AF_CJK_BLUE_TOP;
 
-      FT_TRACE5(( "-- cjk %s bluezone ref = %ld shoot = %ld\n",
-                  cjk_blue_name[bb], *blue_ref, *blue_shoot ));
+      FT_TRACE5(( "    -> reference = %ld\n"
+                  "       overshoot = %ld\n",
+                  *blue_ref, *blue_shoot ));
     }
 
+    FT_TRACE5(( "\n" ));
+
     return;
   }
 
 
   /* Basically the Latin version with type AF_CJKMetrics for metrics. */
+
   FT_LOCAL_DEF( void )
   af_cjk_metrics_check_digits( AF_CJKMetrics  metrics,
                                FT_Face        face )
@@ -510,8 +464,7 @@
     FT_Fixed  advance, old_advance = 0;
 
 
-    /* check whether all ASCII digits have the same advance width; */
-    /* digit `0' is 0x30 in all supported charmaps                 */
+    /* digit `0' is 0x30 in all supported charmaps */
     for ( i = 0x30; i <= 0x39; i++ )
     {
       FT_UInt  glyph_index;
@@ -547,6 +500,8 @@
   }
 
 
+  /* Initialize global metrics. */
+
   FT_LOCAL_DEF( FT_Error )
   af_cjk_metrics_init( AF_CJKMetrics  metrics,
                        FT_Face        face )
@@ -556,21 +511,21 @@
 
     metrics->units_per_em = face->units_per_EM;
 
-    if ( FT_Select_Charmap( face, FT_ENCODING_UNICODE ) )
-      face->charmap = NULL;
-    else
+    if ( !FT_Select_Charmap( face, FT_ENCODING_UNICODE ) )
     {
       af_cjk_metrics_init_widths( metrics, face );
-      af_cjk_metrics_init_blues( metrics, face, af_cjk_hani_blue_chars );
+      af_cjk_metrics_init_blues( metrics, face );
       af_cjk_metrics_check_digits( metrics, face );
     }
 
     FT_Set_Charmap( face, oldmap );
-
     return FT_Err_Ok;
   }
 
 
+  /* Adjust scaling value, then scale and shift widths   */
+  /* and blue zones (if applicable) for given dimension. */
+
   static void
   af_cjk_metrics_scale_dim( AF_CJKMetrics  metrics,
                             AF_Scaler      scaler,
@@ -582,8 +537,6 @@
     FT_UInt     nn;
 
 
-    axis = &metrics->axis[dim];
-
     if ( dim == AF_DIMENSION_HORZ )
     {
       scale = scaler->x_scale;
@@ -595,6 +548,8 @@
       delta = scaler->y_delta;
     }
 
+    axis = &metrics->axis[dim];
+
     if ( axis->org_scale == scale && axis->org_delta == delta )
       return;
 
@@ -650,12 +605,13 @@
 
         blue->shoot.fit = blue->ref.fit - delta2;
 
-        FT_TRACE5(( ">> active cjk blue zone %c%d[%ld/%ld]: "
-                     "ref: cur=%.2f fit=%.2f shoot: cur=%.2f fit=%.2f\n",
-                       ( dim == AF_DIMENSION_HORZ ) ? 'H' : 'V',
-                       nn, blue->ref.org, blue->shoot.org,
-                       blue->ref.cur / 64.0, blue->ref.fit / 64.0,
-                       blue->shoot.cur / 64.0, blue->shoot.fit / 64.0 ));
+        FT_TRACE5(( ">> active cjk blue zone %c%d[%ld/%ld]:\n"
+                    "     ref:   cur=%.2f fit=%.2f\n"
+                    "     shoot: cur=%.2f fit=%.2f\n",
+                    ( dim == AF_DIMENSION_HORZ ) ? 'H' : 'V',
+                    nn, blue->ref.org, blue->shoot.org,
+                    blue->ref.cur / 64.0, blue->ref.fit / 64.0,
+                    blue->shoot.cur / 64.0, blue->shoot.fit / 64.0 ));
 
         blue->flags |= AF_CJK_BLUE_ACTIVE;
       }
@@ -663,10 +619,14 @@
   }
 
 
+  /* Scale global values in both directions. */
+
   FT_LOCAL_DEF( void )
   af_cjk_metrics_scale( AF_CJKMetrics  metrics,
                         AF_Scaler      scaler )
   {
+    /* we copy the whole structure since the x and y scaling values */
+    /* are not modified, contrary to e.g. the `latin' auto-hinter   */
     metrics->root.scaler = *scaler;
 
     af_cjk_metrics_scale_dim( metrics, scaler, AF_DIMENSION_HORZ );
@@ -682,6 +642,9 @@
   /*************************************************************************/
   /*************************************************************************/
 
+
+  /* Walk over all contours and compute its segments. */
+
   static FT_Error
   af_cjk_hints_compute_segments( AF_GlyphHints  hints,
                                  AF_Dimension   dim )
@@ -938,7 +901,7 @@
 
     for ( seg = segments; seg < segment_limit; seg++ )
     {
-      AF_Edge  found = 0;
+      AF_Edge  found = NULL;
       FT_Pos   best  = 0xFFFFU;
       FT_Int   ee;
 
@@ -1026,25 +989,26 @@
       }
     }
 
-    /*********************************************************************/
-    /*                                                                   */
-    /* Good, we now compute each edge's properties according to segments */
-    /* found on its position.  Basically, these are as follows.          */
-    /*                                                                   */
-    /*  - edge's main direction                                          */
-    /*  - stem edge, serif edge or both (which defaults to stem then)    */
-    /*  - 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 removing this loop and setting the `edge' field of each */
-    /* segment directly in the code above slows down execution speed for */
-    /* some reasons on platforms like the Sun.                           */
+    /******************************************************************/
+    /*                                                                */
+    /* Good, we now compute each edge's properties according to the   */
+    /* segments found on its position.  Basically, these are          */
+    /*                                                                */
+    /*  - the edge's main direction                                   */
+    /*  - stem edge, serif edge or both (which defaults to stem then) */
+    /*  - 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 removing this loop and setting the `edge' field of each
+     * segment directly in the code above slows down execution speed for
+     * some reasons on platforms like the Sun.
+     */
     {
       AF_Edge  edges      = axis->edges;
       AF_Edge  edge_limit = edges + axis->num_edges;
@@ -1153,6 +1117,8 @@
   }
 
 
+  /* Detect segments and edges for given dimension. */
+
   static FT_Error
   af_cjk_hints_detect_features( AF_GlyphHints  hints,
                                 AF_Dimension   dim )
@@ -1171,6 +1137,8 @@
   }
 
 
+  /* Compute all edges which lie within blue zones. */
+
   FT_LOCAL_DEF( void )
   af_cjk_hints_compute_blue_edges( AF_GlyphHints  hints,
                                    AF_CJKMetrics  metrics,
@@ -1218,10 +1186,8 @@
         /* zone, check for left edges                                      */
         /*                                                                 */
         /* of course, that's for TrueType                                  */
-        is_top_right_blue  =
-          FT_BOOL( ( ( blue->flags & AF_CJK_BLUE_IS_TOP )   != 0 ) ||
-                   ( ( blue->flags & AF_CJK_BLUE_IS_RIGHT ) != 0 ) );
-        is_major_dir = FT_BOOL( edge->dir == axis->major_dir );
+        is_top_right_blue = FT_BOOL( blue->flags & AF_CJK_BLUE_TOP );
+        is_major_dir      = FT_BOOL( edge->dir == axis->major_dir );
 
         /* if it is a top zone, the edge must be against the major    */
         /* direction; if it is a bottom zone, it must be in the major */
@@ -1258,6 +1224,8 @@
   }
 
 
+  /* Initalize hinting engine. */
+
   FT_LOCAL_DEF( FT_Error )
   af_cjk_hints_init( AF_GlyphHints  hints,
                      AF_CJKMetrics  metrics )
@@ -1316,7 +1284,7 @@
     hints->scaler_flags = scaler_flags;
     hints->other_flags  = other_flags;
 
-    return 0;
+    return FT_Err_Ok;
   }
 
 
@@ -1328,8 +1296,8 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* snap a given width in scaled coordinates to one of the */
-  /* current standard widths                                */
+  /* Snap a given width in scaled coordinates to one of the */
+  /* current standard widths.                               */
 
   static FT_Pos
   af_cjk_snap_width( AF_Width  widths,
@@ -1376,7 +1344,9 @@
   }
 
 
-  /* compute the snapped width of a given stem */
+  /* Compute the snapped width of a given stem.                          */
+  /* There is a lot of voodoo in this function; changing the hard-coded  */
+  /* parameters influence the whole hinting process.                     */
 
   static FT_Pos
   af_cjk_compute_stem_width( AF_GlyphHints  hints,
@@ -1385,8 +1355,8 @@
                              AF_Edge_Flags  base_flags,
                              AF_Edge_Flags  stem_flags )
   {
-    AF_CJKMetrics  metrics  = (AF_CJKMetrics) hints->metrics;
-    AF_CJKAxis     axis     = & metrics->axis[dim];
+    AF_CJKMetrics  metrics  = (AF_CJKMetrics)hints->metrics;
+    AF_CJKAxis     axis     = &metrics->axis[dim];
     FT_Pos         dist     = width;
     FT_Int         sign     = 0;
     FT_Bool        vertical = FT_BOOL( dim == AF_DIMENSION_VERT );
@@ -1497,7 +1467,7 @@
   }
 
 
-  /* align one stem edge relative to the previous stem edge */
+  /* Align one stem edge relative to the previous stem edge. */
 
   static void
   af_cjk_align_linked_edge( AF_GlyphHints  hints,
@@ -1517,6 +1487,9 @@
   }
 
 
+  /* Shift the coordinates of the `serif' edge by the same amount */
+  /* as the corresponding `base' edge has been moved already.     */
+
   static void
   af_cjk_align_serif_edge( AF_GlyphHints  hints,
                            AF_Edge        base,
@@ -1670,6 +1643,8 @@
   }
 
 
+  /* The main grid-fitting routine. */
+
   static void
   af_cjk_hint_edges( AF_GlyphHints  hints,
                      AF_Dimension   dim )
@@ -1685,10 +1660,16 @@
     FT_Bool       has_last_stem = FALSE;
     FT_Pos        last_stem_pos = 0;
 
+#ifdef FT_DEBUG_LEVEL_TRACE
+    FT_UInt       num_actions = 0;
+#endif
+
+
+    FT_TRACE5(( "cjk %s edge hinting (script `%s')\n",
+                dim == AF_DIMENSION_VERT ? "horizontal" : "vertical",
+                af_script_names[hints->metrics->script_class->script] ));
 
     /* we begin by aligning all stems relative to the blue zone */
-    FT_TRACE5(( "==== cjk hinting %s edges =====\n",
-          dim == AF_DIMENSION_HORZ ? "vertical" : "horizontal" ));
 
     if ( AF_HINTS_DO_BLUES( hints ) )
     {
@@ -1719,10 +1700,14 @@
         if ( !edge1 )
           continue;
 
-        FT_TRACE5(( "CJKBLUE: edge %d @%d (opos=%.2f) snapped to (%.2f), "
-                 "was (%.2f)\n",
-                 edge1-edges, edge1->fpos, edge1->opos / 64.0, blue->fit / 64.0,
-                 edge1->pos / 64.0 ));
+#ifdef FT_DEBUG_LEVEL_TRACE
+        FT_TRACE5(( "  CJKBLUE: edge %d @%d (opos=%.2f) snapped to %.2f,"
+                    " was %.2f\n",
+                    edge1 - edges, edge1->fpos, edge1->opos / 64.0,
+                    blue->fit / 64.0, edge1->pos / 64.0 ));
+
+        num_actions++;
+#endif
 
         edge1->pos    = blue->fit;
         edge1->flags |= AF_EDGE_DONE;
@@ -1731,6 +1716,10 @@
         {
           af_cjk_align_linked_edge( hints, dim, edge1, edge2 );
           edge2->flags |= AF_EDGE_DONE;
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+          num_actions++;
+#endif
         }
 
         if ( !anchor )
@@ -1772,6 +1761,7 @@
       }
 
       /* now align the stem */
+
       /* this should not happen, but it's better to be safe */
       if ( edge2->blue_edge )
       {
@@ -1779,6 +1769,11 @@
 
         af_cjk_align_linked_edge( hints, dim, edge2, edge );
         edge->flags |= AF_EDGE_DONE;
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+        num_actions++;
+#endif
+
         continue;
       }
 
@@ -1786,6 +1781,11 @@
       {
         af_cjk_align_linked_edge( hints, dim, edge2, edge );
         edge->flags |= AF_EDGE_DONE;
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+        num_actions++;
+#endif
+
         /* We rarely reaches here it seems;
          * usually the two edges belonging
          * to one stem are marked as DONE together
@@ -1953,7 +1953,7 @@
     }
 
     if ( !skipped )
-      return;
+      goto Exit;
 
     /*
      *  now hint the remaining edges (serifs and single) in order
@@ -1973,7 +1973,7 @@
     }
 
     if ( !skipped )
-      return;
+      goto Exit;
 
     for ( edge = edges; edge < edge_limit; edge++ )
     {
@@ -2011,6 +2011,16 @@
         }
       }
     }
+
+  Exit:
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+    if ( !num_actions )
+      FT_TRACE5(( "  (none)\n" ));
+    FT_TRACE5(( "\n" ));
+#endif
+
+    return;
   }
 
 
@@ -2104,6 +2114,8 @@
   }
 
 
+  /* Apply the complete hinting algorithm to a CJK glyph. */
+
   FT_LOCAL_DEF( FT_Error )
   af_cjk_hints_apply( AF_GlyphHints  hints,
                       FT_Outline*    outline,
@@ -2191,9 +2203,28 @@
   /*************************************************************************/
 
 
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_cjk_writing_system_class,
+
+    AF_WRITING_SYSTEM_CJK,
+
+    sizeof ( AF_CJKMetricsRec ),
+
+    (AF_Script_InitMetricsFunc) af_cjk_metrics_init,
+    (AF_Script_ScaleMetricsFunc)af_cjk_metrics_scale,
+    (AF_Script_DoneMetricsFunc) NULL,
+
+    (AF_Script_InitHintsFunc)   af_cjk_hints_init,
+    (AF_Script_ApplyHintsFunc)  af_cjk_hints_apply
+  )
+
+
   /* this corresponds to Unicode 6.0 */
 
-  static const AF_Script_UniRangeRec  af_cjk_uniranges[] =
+  /* XXX: this should probably fine tuned to differentiate better between */
+  /*      scripts...                                                      */
+
+  static const AF_Script_UniRangeRec  af_hani_uniranges[] =
   {
     AF_UNIRANGE_REC(  0x1100UL,  0x11FFUL ),  /* Hangul Jamo                             */
     AF_UNIRANGE_REC(  0x2E80UL,  0x2EFFUL ),  /* CJK Radicals Supplement                 */
@@ -2231,45 +2262,42 @@
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class,
-    AF_SCRIPT_CJK,
-    af_cjk_uniranges,
-    0x7530, /* ç”° */
+#else /* !AF_CONFIG_OPTION_CJK */
+
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_cjk_writing_system_class,
+
+    AF_WRITING_SYSTEM_CJK,
 
     sizeof ( AF_CJKMetricsRec ),
 
-    (AF_Script_InitMetricsFunc) af_cjk_metrics_init,
-    (AF_Script_ScaleMetricsFunc)af_cjk_metrics_scale,
+    (AF_Script_InitMetricsFunc) NULL,
+    (AF_Script_ScaleMetricsFunc)NULL,
     (AF_Script_DoneMetricsFunc) NULL,
 
-    (AF_Script_InitHintsFunc)   af_cjk_hints_init,
-    (AF_Script_ApplyHintsFunc)  af_cjk_hints_apply
+    (AF_Script_InitHintsFunc)   NULL,
+    (AF_Script_ApplyHintsFunc)  NULL
   )
 
-#else /* !AF_CONFIG_OPTION_CJK */
 
-  static const AF_Script_UniRangeRec  af_cjk_uniranges[] =
+  static const AF_Script_UniRangeRec  af_hani_uniranges[] =
   {
     AF_UNIRANGE_REC( 0UL, 0UL )
   };
 
+#endif /* !AF_CONFIG_OPTION_CJK */
 
-  AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class,
-    AF_SCRIPT_CJK,
-    af_cjk_uniranges,
-    0,
 
-    sizeof ( AF_CJKMetricsRec ),
+  AF_DEFINE_SCRIPT_CLASS(
+    af_hani_script_class,
 
-    (AF_Script_InitMetricsFunc) NULL,
-    (AF_Script_ScaleMetricsFunc)NULL,
-    (AF_Script_DoneMetricsFunc) NULL,
+    AF_SCRIPT_HANI,
+    AF_BLUE_STRINGSET_HANI,
+    AF_WRITING_SYSTEM_CJK,
 
-    (AF_Script_InitHintsFunc)   NULL,
-    (AF_Script_ApplyHintsFunc)  NULL
+    af_hani_uniranges,
+    0x7530 /* ç”° */
   )
 
-#endif /* !AF_CONFIG_OPTION_CJK */
-
 
 /* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afcjk.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afcjk.h
index ab816f20b1e..6f5bdc53d99 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afcjk.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afcjk.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for CJK script (specification).         */
 /*                                                                         */
-/*  Copyright 2006, 2007, 2011, 2012 by                                    */
+/*  Copyright 2006, 2007, 2011-2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -26,39 +26,48 @@
 FT_BEGIN_HEADER
 
 
-  /* the CJK-specific script class */
+  /* the CJK-specific writing system */
 
-  AF_DECLARE_SCRIPT_CLASS( af_cjk_script_class )
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_cjk_writing_system_class )
+
+
+  /* the CJK-specific script classes */
+
+  AF_DECLARE_SCRIPT_CLASS( af_hani_script_class )
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****              C J K   G L O B A L   M E T R I C S              *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
 
-  /* CJK (global) metrics management */
 
   /*
    *  CJK glyphs tend to fill the square.  So we have both vertical and
    *  horizontal blue zones.  But some glyphs have flat bounding strokes that
    *  leave some space between neighbour glyphs.
    */
-  enum
-  {
-    AF_CJK_BLUE_TOP,
-    AF_CJK_BLUE_BOTTOM,
-    AF_CJK_BLUE_LEFT,
-    AF_CJK_BLUE_RIGHT,
-
-    AF_CJK_BLUE_MAX
-  };
 
+#define AF_CJK_IS_TOP_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_CJK_TOP )
+#define AF_CJK_IS_HORIZ_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_CJK_HORIZ )
+#define AF_CJK_IS_FILLED_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_CJK_FILL )
+#define AF_CJK_IS_RIGHT_BLUE  AF_CJK_IS_TOP_BLUE
 
 #define AF_CJK_MAX_WIDTHS  16
-#define AF_CJK_MAX_BLUES   AF_CJK_BLUE_MAX
 
 
   enum
   {
-    AF_CJK_BLUE_ACTIVE     = 1 << 0,
-    AF_CJK_BLUE_IS_TOP     = 1 << 1,
-    AF_CJK_BLUE_IS_RIGHT   = 1 << 2,
-    AF_CJK_BLUE_ADJUSTMENT = 1 << 3,  /* used for scale adjustment */
-                                      /* optimization              */
+    AF_CJK_BLUE_ACTIVE     = 1 << 0,  /* set if zone height is <= 3/4px */
+    AF_CJK_BLUE_TOP        = 1 << 1,  /* result of AF_CJK_IS_TOP_BLUE   */
+    AF_CJK_BLUE_ADJUSTMENT = 1 << 2,  /* used for scale adjustment      */
+                                      /* optimization                   */
     AF_CJK_BLUE_FLAG_MAX
   };
 
@@ -77,16 +86,16 @@ FT_BEGIN_HEADER
     FT_Fixed       scale;
     FT_Pos         delta;
 
-    FT_UInt        width_count;
-    AF_WidthRec    widths[AF_CJK_MAX_WIDTHS];
-    FT_Pos         edge_distance_threshold;
-    FT_Pos         standard_width;
-    FT_Bool        extra_light;
+    FT_UInt        width_count;                   /* number of used widths */
+    AF_WidthRec    widths[AF_CJK_MAX_WIDTHS];     /* widths array          */
+    FT_Pos         edge_distance_threshold;     /* used for creating edges */
+    FT_Pos         standard_width;           /* the default stem thickness */
+    FT_Bool        extra_light;           /* is standard width very light? */
 
     /* used for horizontal metrics too for CJK */
     FT_Bool        control_overshoot;
     FT_UInt        blue_count;
-    AF_CJKBlueRec  blues[AF_CJK_BLUE_MAX];
+    AF_CJKBlueRec  blues[AF_BLUE_STRINGSET_MAX];
 
     FT_Fixed       org_scale;
     FT_Pos         org_delta;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afdummy.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afdummy.c
index 22944559da0..aaa034d9f92 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afdummy.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afdummy.c
@@ -26,8 +26,13 @@
   af_dummy_hints_init( AF_GlyphHints     hints,
                        AF_ScriptMetrics  metrics )
   {
-    af_glyph_hints_rescale( hints,
-                            metrics );
+    af_glyph_hints_rescale( hints, metrics );
+
+    hints->x_scale = metrics->scaler.x_scale;
+    hints->y_scale = metrics->scaler.y_scale;
+    hints->x_delta = metrics->scaler.x_delta;
+    hints->y_delta = metrics->scaler.y_delta;
+
     return FT_Err_Ok;
   }
 
@@ -36,17 +41,21 @@
   af_dummy_hints_apply( AF_GlyphHints  hints,
                         FT_Outline*    outline )
   {
-    FT_UNUSED( hints );
-    FT_UNUSED( outline );
+    FT_Error  error;
 
-    return FT_Err_Ok;
+
+    error = af_glyph_hints_reload( hints, outline );
+    if ( !error )
+      af_glyph_hints_save( hints, outline );
+
+    return error;
   }
 
 
-  AF_DEFINE_SCRIPT_CLASS( af_dummy_script_class,
-    AF_SCRIPT_DUMMY,
-    NULL,
-    0,
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_dummy_writing_system_class,
+
+    AF_WRITING_SYSTEM_DUMMY,
 
     sizeof ( AF_ScriptMetricsRec ),
 
@@ -59,4 +68,16 @@
   )
 
 
+  AF_DEFINE_SCRIPT_CLASS(
+    af_dflt_script_class,
+
+    AF_SCRIPT_DFLT,
+    (AF_Blue_Stringset)0,
+    AF_WRITING_SYSTEM_DUMMY,
+
+    NULL,
+    '\0'
+  )
+
+
 /* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afdummy.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afdummy.h
index 95d8f8cf190..bc34dddaf90 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afdummy.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afdummy.h
@@ -5,7 +5,7 @@
 /*    Auto-fitter dummy routines to be used if no hinting should be        */
 /*    performed (specification).                                           */
 /*                                                                         */
-/*  Copyright 2003-2005, 2011 by                                           */
+/*  Copyright 2003-2005, 2011, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -25,11 +25,13 @@
 
 FT_BEGIN_HEADER
 
- /*  A dummy script metrics class used when no hinting should
-  *  be performed.  This is the default for non-latin glyphs!
+ /*  A dummy writing system and script class used when no hinting should be
+  *  performed.
   */
 
-  AF_DECLARE_SCRIPT_CLASS( af_dummy_script_class )
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_dummy_writing_system_class )
+
+  AF_DECLARE_SCRIPT_CLASS( af_dflt_script_class )
 
 /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aferrors.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aferrors.h
index 50e1a22dd57..50e1a22dd57 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aferrors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aferrors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afglobal.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afglobal.c
index 3e41465756b..dc62bd7a1f5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afglobal.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afglobal.c
@@ -17,39 +17,64 @@
 
 
 #include "afglobal.h"
-#include "afdummy.h"
-#include "aflatin.h"
-#include "afcjk.h"
-#include "afindic.h"
-#include "afpic.h"
+
+  /* get writing system specific header files */
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )  /* empty */
+#include "afwrtsys.h"
 
 #include "aferrors.h"
+#include "afpic.h"
 
-#ifdef FT_OPTION_AUTOFIT2
-#include "aflatin2.h"
-#endif
 
 #ifndef FT_CONFIG_OPTION_PIC
 
-  /* when updating this table, don't forget to update          */
-  /* AF_SCRIPT_CLASSES_COUNT and autofit_module_class_pic_init */
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )               \
+          &af_ ## ws ## _writing_system_class,
 
-  /* populate this list when you add new scripts */
-  static AF_ScriptClass const  af_script_classes[] =
+  FT_LOCAL_ARRAY_DEF( AF_WritingSystemClass )
+  af_writing_system_classes[] =
   {
-    &af_dummy_script_class,
-#ifdef FT_OPTION_AUTOFIT2
-    &af_latin2_script_class,
-#endif
-    &af_latin_script_class,
-    &af_cjk_script_class,
-    &af_indic_script_class,
+
+#include "afwrtsys.h"
+
+    NULL  /* do not remove */
+  };
+
+
+#undef  SCRIPT
+#define SCRIPT( s, S, d )             \
+          &af_ ## s ## _script_class,
+
+  FT_LOCAL_ARRAY_DEF( AF_ScriptClass )
+  af_script_classes[] =
+  {
+
+#include "afscript.h"
+
     NULL  /* do not remove */
   };
 
 #endif /* !FT_CONFIG_OPTION_PIC */
 
 
+#ifdef FT_DEBUG_LEVEL_TRACE
+
+#undef  SCRIPT
+#define SCRIPT( s, S, d )  #s,
+
+  FT_LOCAL_ARRAY_DEF( char* )
+  af_script_names[] =
+  {
+
+#include "afscript.h"
+
+  };
+
+#endif /* FT_DEBUG_LEVEL_TRACE */
+
+
   /* Compute the script index of each glyph within a given face. */
 
   static FT_Error
@@ -82,18 +107,20 @@
     /* scan each script in a Unicode charmap */
     for ( ss = 0; AF_SCRIPT_CLASSES_GET[ss]; ss++ )
     {
-      AF_ScriptClass      clazz = AF_SCRIPT_CLASSES_GET[ss];
+      AF_ScriptClass      script_class = AF_SCRIPT_CLASSES_GET[ss];
       AF_Script_UniRange  range;
 
 
-      if ( clazz->script_uni_ranges == NULL )
+      if ( script_class->script_uni_ranges == NULL )
         continue;
 
       /*
        *  Scan all Unicode points in the range and set the corresponding
        *  glyph script index.
        */
-      for ( range = clazz->script_uni_ranges; range->first != 0; range++ )
+      for ( range = script_class->script_uni_ranges;
+            range->first != 0;
+            range++ )
       {
         FT_ULong  charcode = range->first;
         FT_UInt   gindex;
@@ -204,13 +231,14 @@
       {
         if ( globals->metrics[nn] )
         {
-          AF_ScriptClass  clazz = AF_SCRIPT_CLASSES_GET[nn];
+          AF_ScriptClass         script_class =
+            AF_SCRIPT_CLASSES_GET[nn];
+          AF_WritingSystemClass  writing_system_class =
+            AF_WRITING_SYSTEM_CLASSES_GET[script_class->writing_system];
 
 
-          FT_ASSERT( globals->metrics[nn]->clazz == clazz );
-
-          if ( clazz->script_metrics_done )
-            clazz->script_metrics_done( globals->metrics[nn] );
+          if ( writing_system_class->script_metrics_done )
+            writing_system_class->script_metrics_done( globals->metrics[nn] );
 
           FT_FREE( globals->metrics[nn] );
         }
@@ -232,12 +260,12 @@
                                AF_ScriptMetrics  *ametrics )
   {
     AF_ScriptMetrics  metrics = NULL;
-    FT_UInt           gidx;
-    AF_ScriptClass    clazz;
-    FT_UInt           script     = options & 15;
-    const FT_Offset   script_max = sizeof ( AF_SCRIPT_CLASSES_GET ) /
-                                     sizeof ( AF_SCRIPT_CLASSES_GET[0] );
-    FT_Error          error      = FT_Err_Ok;
+
+    AF_Script              script = (AF_Script)( options & 15 );
+    AF_WritingSystemClass  writing_system_class;
+    AF_ScriptClass         script_class;
+
+    FT_Error  error = FT_Err_Ok;
 
 
     if ( gindex >= (FT_ULong)globals->glyph_count )
@@ -246,41 +274,43 @@
       goto Exit;
     }
 
-    gidx = script;
-    if ( gidx == 0 || gidx + 1 >= script_max )
-      gidx = globals->glyph_scripts[gindex] & AF_SCRIPT_NONE;
+    /* if we have a forced script (via `options'), use it, */
+    /* otherwise look into `glyph_scripts' array           */
+    if ( script == AF_SCRIPT_DFLT || script + 1 >= AF_SCRIPT_MAX )
+      script = (AF_Script)( globals->glyph_scripts[gindex] & AF_SCRIPT_NONE );
 
-    clazz = AF_SCRIPT_CLASSES_GET[gidx];
-    if ( script == 0 )
-      script = clazz->script;
+    script_class         = AF_SCRIPT_CLASSES_GET[script];
+    writing_system_class = AF_WRITING_SYSTEM_CLASSES_GET
+                             [script_class->writing_system];
 
-    metrics = globals->metrics[clazz->script];
+    metrics = globals->metrics[script];
     if ( metrics == NULL )
     {
       /* create the global metrics object if necessary */
       FT_Memory  memory = globals->face->memory;
 
 
-      if ( FT_ALLOC( metrics, clazz->script_metrics_size ) )
+      if ( FT_ALLOC( metrics, writing_system_class->script_metrics_size ) )
         goto Exit;
 
-      metrics->clazz   = clazz;
-      metrics->globals = globals;
+      metrics->script_class = script_class;
+      metrics->globals      = globals;
 
-      if ( clazz->script_metrics_init )
+      if ( writing_system_class->script_metrics_init )
       {
-        error = clazz->script_metrics_init( metrics, globals->face );
+        error = writing_system_class->script_metrics_init( metrics,
+                                                           globals->face );
         if ( error )
         {
-          if ( clazz->script_metrics_done )
-            clazz->script_metrics_done( metrics );
+          if ( writing_system_class->script_metrics_done )
+            writing_system_class->script_metrics_done( metrics );
 
           FT_FREE( metrics );
           goto Exit;
         }
       }
 
-      globals->metrics[clazz->script] = metrics;
+      globals->metrics[script] = metrics;
     }
 
   Exit:
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afglobal.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afglobal.h
index 2e249008224..227eee752ad 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afglobal.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afglobal.h
@@ -5,7 +5,7 @@
 /*    Auto-fitter routines to compute global hinting values                */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 2003-2005, 2007, 2009, 2011-2012 by                          */
+/*  Copyright 2003-2005, 2007, 2009, 2011-2013 by                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -28,13 +28,28 @@
 FT_BEGIN_HEADER
 
 
+  FT_LOCAL_ARRAY( AF_WritingSystemClass )
+  af_writing_system_classes[];
+
+  FT_LOCAL_ARRAY( AF_ScriptClass )
+  af_script_classes[];
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+  FT_LOCAL_ARRAY( char* )
+  af_script_names[];
+#endif
+
   /*
    *  Default values and flags for both autofitter globals (found in
    *  AF_ModuleRec) and face globals (in AF_FaceGlobalsRec).
    */
 
   /* index of fallback script in `af_script_classes' */
-#define AF_SCRIPT_FALLBACK  2
+#ifdef AF_CONFIG_OPTION_CJK
+#define AF_SCRIPT_FALLBACK  AF_SCRIPT_HANI
+#else
+#define AF_SCRIPT_FALLBACK  AF_SCRIPT_DFLT
+#endif
   /* a bit mask indicating an uncovered glyph        */
 #define AF_SCRIPT_NONE      0x7F
   /* if this flag is set, we have an ASCII digit     */
@@ -55,8 +70,8 @@ FT_BEGIN_HEADER
 
 
   /*
-   *  Note that glyph_scripts[] is used to map each glyph into
-   *  an index into the `af_script_classes' array.
+   *  Note that glyph_scripts[] maps each glyph to an index into the
+   *  `af_script_classes' array.
    *
    */
   typedef struct  AF_FaceGlobalsRec_
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afhints.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afhints.c
index e8defaa88db..24184af349f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afhints.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afhints.c
@@ -740,6 +740,12 @@
         FT_Pos        in_y   = 0;
         AF_Direction  in_dir = AF_DIR_NONE;
 
+        FT_Pos  last_good_in_x = 0;
+        FT_Pos  last_good_in_y = 0;
+
+        FT_UInt  units_per_em = hints->metrics->scaler.face->units_per_EM;
+        FT_Int   near_limit   = 20 * units_per_em / 2048;
+
 
         for ( point = points; point < point_limit; point++ )
         {
@@ -749,15 +755,59 @@
 
           if ( point == first )
           {
-            prev   = first->prev;
-            in_x   = first->fx - prev->fx;
-            in_y   = first->fy - prev->fy;
+            prev = first->prev;
+
+            in_x = first->fx - prev->fx;
+            in_y = first->fy - prev->fy;
+
+            last_good_in_x = in_x;
+            last_good_in_y = in_y;
+
+            if ( FT_ABS( in_x ) + FT_ABS( in_y ) < near_limit )
+            {
+              /* search first non-near point to get a good `in_dir' value */
+
+              AF_Point  point_ = prev;
+
+
+              while ( point_ != first )
+              {
+                AF_Point  prev_ = point_->prev;
+
+                FT_Pos  in_x_ = point_->fx - prev_->fx;
+                FT_Pos  in_y_ = point_->fy - prev_->fy;
+
+
+                if ( FT_ABS( in_x_ ) + FT_ABS( in_y_ ) >= near_limit )
+                {
+                  last_good_in_x = in_x_;
+                  last_good_in_y = in_y_;
+
+                  break;
+                }
+
+                point_ = prev_;
+              }
+            }
+
             in_dir = af_direction_compute( in_x, in_y );
             first  = prev + 1;
           }
 
           point->in_dir = (FT_Char)in_dir;
 
+          /* check whether the current point is near to the previous one */
+          /* (value 20 in `near_limit' is heuristic; we use Taxicab      */
+          /* metrics for the test)                                       */
+
+          if ( FT_ABS( in_x ) + FT_ABS( in_y ) < near_limit )
+            point->flags |= AF_FLAG_NEAR;
+          else
+          {
+            last_good_in_x = in_x;
+            last_good_in_y = in_y;
+          }
+
           next  = point->next;
           out_x = next->fx - point->fx;
           out_y = next->fy - point->fy;
@@ -765,23 +815,43 @@
           in_dir         = af_direction_compute( out_x, out_y );
           point->out_dir = (FT_Char)in_dir;
 
-          /* check for weak points */
+          /* Check for weak points.  The remaining points not collected */
+          /* in edges are then implicitly classified as strong points.  */
 
           if ( point->flags & AF_FLAG_CONTROL )
           {
+            /* control points are always weak */
           Is_Weak_Point:
             point->flags |= AF_FLAG_WEAK_INTERPOLATION;
           }
           else if ( point->out_dir == point->in_dir )
           {
             if ( point->out_dir != AF_DIR_NONE )
+            {
+              /* current point lies on a horizontal or          */
+              /* vertical segment (but doesn't start or end it) */
               goto Is_Weak_Point;
+            }
 
-            if ( ft_corner_is_flat( in_x, in_y, out_x, out_y ) )
+            /* test whether `in' and `out' direction is approximately */
+            /* the same (and use the last good `in' vector in case    */
+            /* the current point is near to the previous one)         */
+            if ( ft_corner_is_flat(
+                   point->flags & AF_FLAG_NEAR ? last_good_in_x : in_x,
+                   point->flags & AF_FLAG_NEAR ? last_good_in_y : in_y,
+                   out_x,
+                   out_y ) )
+            {
+              /* current point lies on a straight, diagonal line */
+              /* (more or less)                                  */
               goto Is_Weak_Point;
+            }
           }
           else if ( point->in_dir == -point->out_dir )
+          {
+            /* current point forms a spike */
             goto Is_Weak_Point;
+          }
 
           in_x = out_x;
           in_y = out_y;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afhints.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afhints.h
index 776b3c844eb..ce5232545cc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afhints.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afhints.h
@@ -62,15 +62,19 @@ FT_BEGIN_HEADER
    *
    *  by David Turner and Werner Lemberg
    *
-   *   http://www.tug.org/TUGboat/Articles/tb24-3/lemberg.pdf
+   *    http://www.tug.org/TUGboat/Articles/tb24-3/lemberg.pdf
+   *
+   *  with appropriate updates.
    *
    *
    *  Segments
    *
    *    `af_{cjk,latin,...}_hints_compute_segments' are the functions to
-   *    find segments in an outline.  A segment is a series of consecutive
-   *    points that are approximately aligned along a coordinate axis.  The
-   *    analysis to do so is specific to a script.
+   *    find segments in an outline.
+   *
+   *    A segment is a series of consecutive points that are approximately
+   *    aligned along a coordinate axis.  The analysis to do so is specific
+   *    to a writing system.
    *
    *    A segment must have at least two points, except in the case of
    *    `fake' segments that are generated to hint metrics appropriately,
@@ -79,16 +83,17 @@ FT_BEGIN_HEADER
    *
    *  Edges
    *
+   *    `af_{cjk,latin,...}_hints_compute_edges' are the functions to find
+   *    edges.
+   *
    *    As soon as segments are defined, the auto-hinter groups them into
    *    edges.  An edge corresponds to a single position on the main
    *    dimension that collects one or more segments (allowing for a small
    *    threshold).
    *
-   *    The auto-hinter first tries to grid fit edges, then to align
-   *    segments on the edges unless it detects that they form a serif.
-   *
-   *    `af_{cjk,latin,...}_hints_compute_edges' are the functions to find
-   *    edges; they are specific to a script.
+   *    As an example, the `latin' writing system first tries to grid-fit
+   *    edges, then to align segments on the edges unless it detects that
+   *    they form a serif.
    *
    *
    *                      A          H
@@ -107,6 +112,8 @@ FT_BEGIN_HEADER
    *
    *  Stems
    *
+   *    Stems are detected by `af_{cjk,latin,...}_hint_edges'.
+   *
    *    Segments need to be `linked' to other ones in order to detect stems.
    *    A stem is made of two segments that face each other in opposite
    *    directions and that are sufficiently close to each other.  Using
@@ -127,17 +134,21 @@ FT_BEGIN_HEADER
    *    The best candidate is stored in field `link' in structure
    *    `AF_Segment'.
    *
-   *    Stems are detected by `af_{cjk,latin,...}_hint_edges'.
-   *
    *    In the above ASCII drawing, the best candidate for both AB and CD is
    *    GH, while the best candidate for GH is AB.  Similarly, the best
    *    candidate for EF and GH is AB, while the best candidate for AB is
    *    GH.
    *
+   *    The detection and handling of stems is dependent on the writing
+   *    system.
+   *
    *
    *  Serifs
    *
-   *    On the opposite, a serif has
+   *    Serifs are detected by `af_{cjk,latin,...}_hint_edges'.
+   *
+   *    In comparison to a stem, a serif (as handled by the auto-hinter
+   *    module which takes care of the `latin' writing system) has
    *
    *      best segment_1 = segment_2 && best segment_2 != segment_1
    *
@@ -147,8 +158,6 @@ FT_BEGIN_HEADER
    *    The best candidate is stored in field `serif' in structure
    *    `AF_Segment' (and `link' is set to NULL).
    *
-   *    Serifs are detected by `af_{cjk,latin,...}_hint_edges'.
-   *
    *
    *  Touched points
    *
@@ -178,7 +187,8 @@ FT_BEGIN_HEADER
    *      differ greatly)
    *
    *    - inflection points (i.e., where the `in' and `out' angles are the
-   *      same, but the curvature changes sign)
+   *      same, but the curvature changes sign) [currently, such points
+   *      aren't handled in the auto-hinter]
    *
    *    `af_glyph_hints_align_strong_points' is the function which takes
    *    care of such situations; it is equivalent to the TrueType `IP'
@@ -226,7 +236,10 @@ FT_BEGIN_HEADER
     AF_FLAG_WEAK_INTERPOLATION = 1 << 8,
 
     /* all inflection points in the outline have this flag set */
-    AF_FLAG_INFLECTION = 1 << 9
+    AF_FLAG_INFLECTION = 1 << 9,
+
+    /* the current point is very near to another one */
+    AF_FLAG_NEAR = 1 << 10
 
   } AF_Flags;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afindic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afindic.c
index 8c249725988..ef8299f89df 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afindic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afindic.c
@@ -97,26 +97,10 @@
   /*************************************************************************/
 
 
-  static const AF_Script_UniRangeRec  af_indic_uniranges[] =
-  {
-#if 0
-    AF_UNIRANGE_REC( 0x0100UL, 0xFFFFUL ),  /* why this? */
-#endif
-    AF_UNIRANGE_REC( 0x0900UL, 0x0DFFUL),    /* Indic Range */
-    AF_UNIRANGE_REC( 0x0F00UL, 0x0FFFUL),    /* Tibetan */
-    AF_UNIRANGE_REC( 0x1900UL, 0x194FUL),    /* Limbu */
-    AF_UNIRANGE_REC( 0x1B80UL, 0x1BBFUL),    /* Sundanese */
-    AF_UNIRANGE_REC( 0x1C80UL, 0x1CDFUL),    /* Meetei Mayak */
-    AF_UNIRANGE_REC( 0xA800UL, 0xA82FUL),    /* Syloti Nagri */
-    AF_UNIRANGE_REC( 0x11800UL, 0x118DFUL),  /* Sharada */
-    AF_UNIRANGE_REC(      0UL,      0UL)
-  };
-
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_indic_writing_system_class,
 
-  AF_DEFINE_SCRIPT_CLASS( af_indic_script_class,
-    AF_SCRIPT_INDIC,
-    af_indic_uniranges,
-    'o', /* XXX */
+    AF_WRITING_SYSTEM_INDIC,
 
     sizeof ( AF_CJKMetricsRec ),
 
@@ -128,18 +112,28 @@
     (AF_Script_ApplyHintsFunc)  af_indic_hints_apply
   )
 
-#else /* !AF_CONFIG_OPTION_INDIC */
+  /* XXX: this should probably fine tuned to differentiate better between */
+  /*      scripts...                                                      */
 
-  static const AF_Script_UniRangeRec  af_indic_uniranges[] =
+  static const AF_Script_UniRangeRec  af_deva_uniranges[] =
   {
-    { 0, 0 }
+    AF_UNIRANGE_REC(  0x0900UL,  0x0DFFUL ),  /* Indic Range  */
+    AF_UNIRANGE_REC(  0x0F00UL,  0x0FFFUL ),  /* Tibetan      */
+    AF_UNIRANGE_REC(  0x1900UL,  0x194FUL ),  /* Limbu        */
+    AF_UNIRANGE_REC(  0x1B80UL,  0x1BBFUL ),  /* Sundanese    */
+    AF_UNIRANGE_REC(  0x1C80UL,  0x1CDFUL ),  /* Meetei Mayak */
+    AF_UNIRANGE_REC(  0xA800UL,  0xA82FUL ),  /* Syloti Nagri */
+    AF_UNIRANGE_REC( 0x11800UL, 0x118DFUL ),  /* Sharada      */
+    AF_UNIRANGE_REC(       0UL,       0UL )
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS( af_indic_script_class,
-    AF_SCRIPT_INDIC,
-    af_indic_uniranges,
-    0,
+#else /* !AF_CONFIG_OPTION_INDIC */
+
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_indic_writing_system_class,
+
+    AF_WRITING_SYSTEM_INDIC,
 
     sizeof ( AF_CJKMetricsRec ),
 
@@ -151,7 +145,25 @@
     (AF_Script_ApplyHintsFunc)  NULL
   )
 
+
+  static const AF_Script_UniRangeRec  af_deva_uniranges[] =
+  {
+    AF_UNIRANGE_REC( 0UL, 0UL )
+  };
+
 #endif /* !AF_CONFIG_OPTION_INDIC */
 
 
+  AF_DEFINE_SCRIPT_CLASS(
+    af_deva_script_class,
+
+    AF_SCRIPT_DEVA,
+    (AF_Blue_Stringset)0, /* XXX */
+    AF_WRITING_SYSTEM_INDIC,
+
+    af_deva_uniranges,
+    'o' /* XXX */
+  )
+
+
 /* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afindic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afindic.h
index c252cf20da6..db38e9674f4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afindic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afindic.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for Indic scripts (specification).      */
 /*                                                                         */
-/*  Copyright 2007, 2012 by                                                */
+/*  Copyright 2007, 2012, 2013 by                                          */
 /*  Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.    */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -25,9 +25,14 @@
 FT_BEGIN_HEADER
 
 
-  /* the Indic-specific script class */
+  /* the `indic' writing system */
 
-  AF_DECLARE_SCRIPT_CLASS( af_indic_script_class )
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_indic_writing_system_class )
+
+
+  /* the indic-specific script classes */
+
+  AF_DECLARE_SCRIPT_CLASS( af_deva_script_class )
 
 
 /* */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aflatin.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aflatin.c
index ef0157a13ee..15a241e523a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aflatin.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aflatin.c
@@ -60,8 +60,11 @@
     AF_GlyphHintsRec  hints[1];
 
 
-    FT_TRACE5(( "standard widths computation\n"
-                "===========================\n\n" ));
+    FT_TRACE5(( "\n"
+                "latin standard widths computation (script `%s')\n"
+                "=================================================\n"
+                "\n",
+                af_script_names[metrics->root.script_class->script] ));
 
     af_glyph_hints_init( hints, face->memory );
 
@@ -76,13 +79,14 @@
       AF_Scaler           scaler = &dummy->root.scaler;
 
 
-      glyph_index = FT_Get_Char_Index( face,
-                                       metrics->root.clazz->standard_char );
+      glyph_index = FT_Get_Char_Index(
+                      face,
+                      metrics->root.script_class->standard_char );
       if ( glyph_index == 0 )
         goto Exit;
 
-      FT_TRACE5(( "standard character: 0x%X (glyph index %d)\n",
-                  metrics->root.clazz->standard_char, glyph_index ));
+      FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n",
+                  metrics->root.script_class->standard_char, glyph_index ));
 
       error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
       if ( error || face->glyph->outline.n_points <= 0 )
@@ -146,22 +150,21 @@
         }
 
         /* this also replaces multiple almost identical stem widths */
-        /* with a single one (the value 100 is heuristic) */
+        /* with a single one (the value 100 is heuristic)           */
         af_sort_and_quantize_widths( &num_widths, axis->widths,
                                      dummy->units_per_em / 100 );
         axis->width_count = num_widths;
       }
 
-  Exit:
+    Exit:
       for ( dim = 0; dim < AF_DIMENSION_MAX; dim++ )
       {
         AF_LatinAxis  axis = &metrics->axis[dim];
         FT_Pos        stdw;
 
 
-        stdw = ( axis->width_count > 0 )
-                 ? axis->widths[0].org
-                 : AF_LATIN_CONSTANT( metrics, 50 );
+        stdw = ( axis->width_count > 0 ) ? axis->widths[0].org
+                                         : AF_LATIN_CONSTANT( metrics, 50 );
 
         /* let's try 20% of the smallest width */
         axis->edge_distance_threshold = stdw / 5;
@@ -193,22 +196,6 @@
   }
 
 
-
-#define AF_LATIN_MAX_TEST_CHARACTERS  12
-
-
-  static const char af_latin_blue_chars[AF_LATIN_MAX_BLUES]
-                                       [AF_LATIN_MAX_TEST_CHARACTERS + 1] =
-  {
-    "THEZOCQS",
-    "HEZLOCUS",
-    "fijkdbh",
-    "xzroesc",
-    "xzroesc",
-    "pqgjy"
-  };
-
-
   /* Find all blue zones.  Flat segments give the reference points, */
   /* round segments the overshoot positions.                        */
 
@@ -216,39 +203,80 @@
   af_latin_metrics_init_blues( AF_LatinMetrics  metrics,
                                FT_Face          face )
   {
-    FT_Pos        flats [AF_LATIN_MAX_TEST_CHARACTERS];
-    FT_Pos        rounds[AF_LATIN_MAX_TEST_CHARACTERS];
+    FT_Pos        flats [AF_BLUE_STRING_MAX_LEN];
+    FT_Pos        rounds[AF_BLUE_STRING_MAX_LEN];
+
     FT_Int        num_flats;
     FT_Int        num_rounds;
-    FT_Int        bb;
+
     AF_LatinBlue  blue;
     FT_Error      error;
-    AF_LatinAxis  axis  = &metrics->axis[AF_DIMENSION_VERT];
+    AF_LatinAxis  axis = &metrics->axis[AF_DIMENSION_VERT];
     FT_Outline    outline;
 
+    AF_Blue_Stringset         bss = metrics->root.script_class->blue_stringset;
+    const AF_Blue_StringRec*  bs  = &af_blue_stringsets[bss];
+
 
-    /* we compute the blues simply by loading each character from the    */
-    /* `af_latin_blue_chars[blues]' string, then finding its top-most or */
-    /* bottom-most points (depending on `AF_IS_TOP_BLUE')                */
+    /* we walk over the blue character strings as specified in the  */
+    /* script's entry in the `af_blue_stringset' array              */
 
-    FT_TRACE5(( "blue zones computation\n"
-                "======================\n\n" ));
+    FT_TRACE5(( "latin blue zones computation\n"
+                "============================\n"
+                "\n" ));
 
-    for ( bb = 0; bb < AF_LATIN_BLUE_MAX; bb++ )
+    for ( ; bs->string != AF_BLUE_STRING_MAX; bs++ )
     {
-      const char*  p     = af_latin_blue_chars[bb];
-      const char*  limit = p + AF_LATIN_MAX_TEST_CHARACTERS;
+      const char*  p = &af_blue_strings[bs->string];
       FT_Pos*      blue_ref;
       FT_Pos*      blue_shoot;
 
 
-      FT_TRACE5(( "blue zone %d:\n", bb ));
+#ifdef FT_DEBUG_LEVEL_TRACE
+      {
+        FT_Bool  have_flag = 0;
+
+
+        FT_TRACE5(( "blue zone %d", axis->blue_count ));
+
+        if ( bs->properties )
+        {
+          FT_TRACE5(( " (" ));
+
+          if ( AF_LATIN_IS_TOP_BLUE( bs ) )
+          {
+            FT_TRACE5(( "top" ));
+            have_flag = 1;
+          }
+
+          if ( AF_LATIN_IS_X_HEIGHT_BLUE( bs ) )
+          {
+            if ( have_flag )
+              FT_TRACE5(( ", " ));
+            FT_TRACE5(( "small top" ));
+            have_flag = 1;
+          }
+
+          if ( AF_LATIN_IS_LONG_BLUE( bs ) )
+          {
+            if ( have_flag )
+              FT_TRACE5(( ", " ));
+            FT_TRACE5(( "long" ));
+          }
+
+          FT_TRACE5(( ")" ));
+        }
+
+        FT_TRACE5(( ":\n" ));
+      }
+#endif /* FT_DEBUG_LEVEL_TRACE */
 
       num_flats  = 0;
       num_rounds = 0;
 
-      for ( ; p < limit && *p; p++ )
+      while ( *p )
       {
+        FT_ULong    ch;
         FT_UInt     glyph_index;
         FT_Pos      best_y;                            /* same as points.y */
         FT_Int      best_point, best_contour_first, best_contour_last;
@@ -256,15 +284,23 @@
         FT_Bool     round = 0;
 
 
+        GET_UTF8_CHAR( ch, p );
+
         /* load the character in the face -- skip unknown or empty ones */
-        glyph_index = FT_Get_Char_Index( face, (FT_UInt)*p );
+        glyph_index = FT_Get_Char_Index( face, ch );
         if ( glyph_index == 0 )
+        {
+          FT_TRACE5(( "  U+%04lX unavailable\n", ch ));
           continue;
+        }
 
         error   = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
         outline = face->glyph->outline;
         if ( error || outline.n_points <= 0 )
+        {
+          FT_TRACE5(( "  U+%04lX contains no outlines\n", ch ));
           continue;
+        }
 
         /* now compute min or max point indices and coordinates */
         points             = outline.points;
@@ -289,11 +325,11 @@
 
             /* Avoid single-point contours since they are never rasterized. */
             /* In some fonts, they correspond to mark attachment points     */
-            /* which are way outside of the glyph's real outline.           */
+            /* that are way outside of the glyph's real outline.            */
             if ( last <= first )
               continue;
 
-            if ( AF_LATIN_IS_TOP_BLUE( bb ) )
+            if ( AF_LATIN_IS_TOP_BLUE( bs ) )
             {
               for ( pp = first; pp <= last; pp++ )
                 if ( best_point < 0 || points[pp].y > best_y )
@@ -318,7 +354,6 @@
               best_contour_last  = last;
             }
           }
-          FT_TRACE5(( "  %c  %ld", *p, best_y ));
         }
 
         /* now check whether the point belongs to a straight or round   */
@@ -328,10 +363,14 @@
         {
           FT_Pos  best_x = points[best_point].x;
           FT_Int  prev, next;
+          FT_Int  best_segment_first, best_segment_last;
           FT_Int  best_on_point_first, best_on_point_last;
           FT_Pos  dist;
 
 
+          best_segment_first = best_point;
+          best_segment_last  = best_point;
+
           if ( FT_CURVE_TAG( outline.tags[best_point] ) == FT_CURVE_TAG_ON )
           {
             best_on_point_first = best_point;
@@ -343,8 +382,9 @@
             best_on_point_last  = -1;
           }
 
-          /* look for the previous and next points that are not on the */
-          /* same Y coordinate, then threshold the `closeness'...      */
+          /* look for the previous and next points on the contour  */
+          /* that are not on the same Y coordinate, then threshold */
+          /* the `closeness'...                                    */
           prev = best_point;
           next = prev;
 
@@ -362,6 +402,8 @@
               if ( FT_ABS( points[prev].x - best_x ) <= 20 * dist )
                 break;
 
+            best_segment_first = prev;
+
             if ( FT_CURVE_TAG( outline.tags[prev] ) == FT_CURVE_TAG_ON )
             {
               best_on_point_first = prev;
@@ -383,6 +425,8 @@
               if ( FT_ABS( points[next].x - best_x ) <= 20 * dist )
                 break;
 
+            best_segment_last = next;
+
             if ( FT_CURVE_TAG( outline.tags[next] ) == FT_CURVE_TAG_ON )
             {
               best_on_point_last = next;
@@ -392,8 +436,186 @@
 
           } while ( next != best_point );
 
-          /* now set the `round' flag depending on the segment's kind */
-          /* (value 8 is heuristic)                                   */
+          if ( AF_LATIN_IS_LONG_BLUE( bs ) )
+          {
+            /* If this flag is set, we have an additional constraint to  */
+            /* get the blue zone distance: Find a segment of the topmost */
+            /* (or bottommost) contour that is longer than a heuristic   */
+            /* threshold.  This ensures that small bumps in the outline  */
+            /* are ignored (for example, the `vertical serifs' found in  */
+            /* many Hebrew glyph designs).                               */
+
+            /* If this segment is long enough, we are done.  Otherwise,  */
+            /* search the segment next to the extremum that is long      */
+            /* enough, has the same direction, and a not too large       */
+            /* vertical distance from the extremum.  Note that the       */
+            /* algorithm doesn't check whether the found segment is      */
+            /* actually the one (vertically) nearest to the extremum.    */
+
+            /* heuristic threshold value */
+            FT_Pos  length_threshold = metrics->units_per_em / 25;
+
+
+            dist = FT_ABS( points[best_segment_last].x -
+                             points[best_segment_first].x );
+
+            if ( dist < length_threshold                       &&
+                 best_segment_last - best_segment_first + 2 <=
+                   best_contour_last - best_contour_first      )
+            {
+              /* heuristic threshold value */
+              FT_Pos  height_threshold = metrics->units_per_em / 4;
+
+              FT_Int   first;
+              FT_Int   last;
+              FT_Bool  hit;
+
+              FT_Bool  left2right;
+
+
+              /* compute direction */
+              prev = best_point;
+
+              do
+              {
+                if ( prev > best_contour_first )
+                  prev--;
+                else
+                  prev = best_contour_last;
+
+                if ( points[prev].x != best_x )
+                  break;
+
+              } while ( prev != best_point );
+
+              /* skip glyph for the degenerate case */
+              if ( prev == best_point )
+                continue;
+
+              left2right = FT_BOOL( points[prev].x < points[best_point].x );
+
+              first = best_segment_last;
+              last  = first;
+              hit   = 0;
+
+              do
+              {
+                FT_Bool  l2r;
+                FT_Pos   d;
+                FT_Int   p_first, p_last;
+
+
+                if ( !hit )
+                {
+                  /* no hit; adjust first point */
+                  first = last;
+
+                  /* also adjust first and last on point */
+                  if ( FT_CURVE_TAG( outline.tags[first] ) ==
+                         FT_CURVE_TAG_ON )
+                  {
+                    p_first = first;
+                    p_last  = first;
+                  }
+                  else
+                  {
+                    p_first = -1;
+                    p_last  = -1;
+                  }
+
+                  hit = 1;
+                }
+
+                if ( last < best_contour_last )
+                  last++;
+                else
+                  last = best_contour_first;
+
+                if ( FT_ABS( best_y - points[first].y ) > height_threshold )
+                {
+                  /* vertical distance too large */
+                  hit = 0;
+                  continue;
+                }
+
+                /* same test as above */
+                dist = FT_ABS( points[last].y - points[first].y );
+                if ( dist > 5 )
+                  if ( FT_ABS( points[last].x - points[first].x ) <=
+                         20 * dist )
+                  {
+                    hit = 0;
+                    continue;
+                  }
+
+                if ( FT_CURVE_TAG( outline.tags[last] ) == FT_CURVE_TAG_ON )
+                {
+                  p_last = last;
+                  if ( p_first < 0 )
+                    p_first = last;
+                }
+
+                l2r = FT_BOOL( points[first].x < points[last].x );
+                d   = FT_ABS( points[last].x - points[first].x );
+
+                if ( l2r == left2right     &&
+                     d >= length_threshold )
+                {
+                  /* all constraints are met; update segment after finding */
+                  /* its end                                               */
+                  do
+                  {
+                    if ( last < best_contour_last )
+                      last++;
+                    else
+                      last = best_contour_first;
+
+                    d = FT_ABS( points[last].y - points[first].y );
+                    if ( d > 5 )
+                      if ( FT_ABS( points[next].x - points[first].x ) <=
+                             20 * dist )
+                      {
+                        last--;
+                        break;
+                      }
+
+                    p_last = last;
+
+                    if ( FT_CURVE_TAG( outline.tags[last] ) ==
+                           FT_CURVE_TAG_ON )
+                    {
+                      p_last = last;
+                      if ( p_first < 0 )
+                        p_first = last;
+                    }
+
+                  } while ( last != best_segment_first );
+
+                  best_y = points[first].y;
+
+                  best_segment_first = first;
+                  best_segment_last  = last;
+
+                  best_on_point_first = p_first;
+                  best_on_point_last  = p_last;
+
+                  break;
+                }
+
+              } while ( last != best_segment_first );
+            }
+          }
+
+          FT_TRACE5(( "  U+%04lX: best_y = %5ld", ch, best_y ));
+
+          /* now set the `round' flag depending on the segment's kind: */
+          /*                                                           */
+          /* - if the horizontal distance between the first and last   */
+          /*   `on' point is larger than upem/8 (value 8 is heuristic) */
+          /*   we have a flat segment                                  */
+          /* - if either the first or the last point of the segment is */
+          /*   an `off' point, the segment is round, otherwise it is   */
+          /*   flat                                                    */
           if ( best_on_point_first >= 0                               &&
                best_on_point_last >= 0                                &&
                (FT_UInt)( FT_ABS( points[best_on_point_last].x -
@@ -402,8 +624,10 @@
             round = 0;
           else
             round = FT_BOOL(
-              FT_CURVE_TAG( outline.tags[prev] ) != FT_CURVE_TAG_ON ||
-              FT_CURVE_TAG( outline.tags[next] ) != FT_CURVE_TAG_ON );
+                      FT_CURVE_TAG( outline.tags[best_segment_first] ) !=
+                        FT_CURVE_TAG_ON                                   ||
+                      FT_CURVE_TAG( outline.tags[best_segment_last]  ) !=
+                        FT_CURVE_TAG_ON                                   );
 
           FT_TRACE5(( " (%s)\n", round ? "round" : "flat" ));
         }
@@ -448,7 +672,7 @@
       }
       else
       {
-        *blue_ref   = flats[num_flats / 2];
+        *blue_ref   = flats [num_flats  / 2];
         *blue_shoot = rounds[num_rounds / 2];
       }
 
@@ -462,7 +686,7 @@
         FT_Bool  over_ref = FT_BOOL( shoot > ref );
 
 
-        if ( AF_LATIN_IS_TOP_BLUE( bb ) ^ over_ref )
+        if ( AF_LATIN_IS_TOP_BLUE( bs ) ^ over_ref )
         {
           *blue_ref   =
           *blue_shoot = ( shoot + ref ) / 2;
@@ -473,7 +697,7 @@
       }
 
       blue->flags = 0;
-      if ( AF_LATIN_IS_TOP_BLUE( bb ) )
+      if ( AF_LATIN_IS_TOP_BLUE( bs ) )
         blue->flags |= AF_LATIN_BLUE_TOP;
 
       /*
@@ -481,7 +705,7 @@
        * in order to optimize the pixel grid alignment of the top of small
        * letters.
        */
-      if ( bb == AF_LATIN_BLUE_SMALL_TOP )
+      if ( AF_LATIN_IS_X_HEIGHT_BLUE( bs ) )
         blue->flags |= AF_LATIN_BLUE_ADJUSTMENT;
 
       FT_TRACE5(( "    -> reference = %ld\n"
@@ -650,7 +874,20 @@
           else
 #endif
           if ( dim == AF_DIMENSION_VERT )
+          {
             scale = FT_MulDiv( scale, fitted, scaled );
+
+            FT_TRACE5((
+              "af_latin_metrics_scale_dim:"
+              " x height alignment (script `%s'):\n"
+              "                           "
+              " vertical scaling changed from %.4f to %.4f (by %d%%)\n"
+              "\n",
+              af_script_names[metrics->root.script_class->script],
+              axis->org_scale / 65536.0,
+              scale / 65536.0,
+              ( fitted - scaled ) * 100 / scaled ));
+          }
         }
       }
     }
@@ -669,6 +906,10 @@
       metrics->root.scaler.y_delta = delta;
     }
 
+    FT_TRACE5(( "%s widths (script `%s')\n",
+                dim == AF_DIMENSION_HORZ ? "horizontal" : "vertical",
+                af_script_names[metrics->root.script_class->script] ));
+
     /* scale the widths */
     for ( nn = 0; nn < axis->width_count; nn++ )
     {
@@ -677,15 +918,31 @@
 
       width->cur = FT_MulFix( width->org, scale );
       width->fit = width->cur;
+
+      FT_TRACE5(( "  %d scaled to %.2f\n",
+                  width->org,
+                  width->cur / 64.0 ));
     }
 
+    FT_TRACE5(( "\n" ));
+
     /* an extra-light axis corresponds to a standard width that is */
     /* smaller than 5/8 pixels                                     */
     axis->extra_light =
       (FT_Bool)( FT_MulFix( axis->standard_width, scale ) < 32 + 8 );
 
+#ifdef FT_DEBUG_LEVEL_TRACE
+    if ( axis->extra_light )
+      FT_TRACE5(( "`%s' script is extra light (at current resolution)\n"
+                  "\n",
+                  af_script_names[metrics->root.script_class->script] ));
+#endif
+
     if ( dim == AF_DIMENSION_VERT )
     {
+      FT_TRACE5(( "blue zones (script `%s')\n",
+                  af_script_names[metrics->root.script_class->script] ));
+
       /* scale the blue zones */
       for ( nn = 0; nn < axis->blue_count; nn++ )
       {
@@ -757,6 +1014,19 @@
 #endif
 
           blue->flags |= AF_LATIN_BLUE_ACTIVE;
+
+          FT_TRACE5(( "  reference %d: %d scaled to %.2f%s\n"
+                      "  overshoot %d: %d scaled to %.2f%s\n",
+                      nn,
+                      blue->ref.org,
+                      blue->ref.fit / 64.0,
+                      blue->flags & AF_LATIN_BLUE_ACTIVE ? ""
+                                                         : " (inactive)",
+                      nn,
+                      blue->shoot.org,
+                      blue->shoot.fit / 64.0,
+                      blue->flags & AF_LATIN_BLUE_ACTIVE ? ""
+                                                         : " (inactive)" ));
         }
       }
     }
@@ -1654,8 +1924,8 @@
                                AF_Edge_Flags  base_flags,
                                AF_Edge_Flags  stem_flags )
   {
-    AF_LatinMetrics  metrics  = (AF_LatinMetrics) hints->metrics;
-    AF_LatinAxis     axis     = & metrics->axis[dim];
+    AF_LatinMetrics  metrics  = (AF_LatinMetrics)hints->metrics;
+    AF_LatinAxis     axis     = &metrics->axis[dim];
     FT_Pos           dist     = width;
     FT_Int           sign     = 0;
     FT_Int           vertical = ( dim == AF_DIMENSION_VERT );
@@ -1878,8 +2148,9 @@
 #endif
 
 
-    FT_TRACE5(( "%s edge hinting\n",
-                dim == AF_DIMENSION_VERT ? "horizontal" : "vertical" ));
+    FT_TRACE5(( "latin %s edge hinting (script `%s')\n",
+                dim == AF_DIMENSION_VERT ? "horizontal" : "vertical",
+                af_script_names[hints->metrics->script_class->script] ));
 
     /* we begin by aligning all stems relative to the blue zone */
     /* if needed -- that's only for horizontal edges            */
@@ -2414,6 +2685,7 @@
         af_glyph_hints_align_weak_points( hints, (AF_Dimension)dim );
       }
     }
+
     af_glyph_hints_save( hints, outline );
 
   Exit:
@@ -2430,10 +2702,26 @@
   /*************************************************************************/
 
 
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_latin_writing_system_class,
+
+    AF_WRITING_SYSTEM_LATIN,
+
+    sizeof ( AF_LatinMetricsRec ),
+
+    (AF_Script_InitMetricsFunc) af_latin_metrics_init,
+    (AF_Script_ScaleMetricsFunc)af_latin_metrics_scale,
+    (AF_Script_DoneMetricsFunc) NULL,
+
+    (AF_Script_InitHintsFunc)   af_latin_hints_init,
+    (AF_Script_ApplyHintsFunc)  af_latin_hints_apply
+  )
+
+
   /* XXX: this should probably fine tuned to differentiate better between */
   /*      scripts...                                                      */
 
-  static const AF_Script_UniRangeRec  af_latin_uniranges[] =
+  static const AF_Script_UniRangeRec  af_latn_uniranges[] =
   {
     AF_UNIRANGE_REC(  0x0020UL,  0x007FUL ),  /* Basic Latin (no control chars) */
     AF_UNIRANGE_REC(  0x00A0UL,  0x00FFUL ),  /* Latin-1 Supplement (no control chars) */
@@ -2442,23 +2730,17 @@
     AF_UNIRANGE_REC(  0x0250UL,  0x02AFUL ),  /* IPA Extensions */
     AF_UNIRANGE_REC(  0x02B0UL,  0x02FFUL ),  /* Spacing Modifier Letters */
     AF_UNIRANGE_REC(  0x0300UL,  0x036FUL ),  /* Combining Diacritical Marks */
-    AF_UNIRANGE_REC(  0x0370UL,  0x03FFUL ),  /* Greek and Coptic */
-    AF_UNIRANGE_REC(  0x0400UL,  0x04FFUL ),  /* Cyrillic */
-    AF_UNIRANGE_REC(  0x0500UL,  0x052FUL ),  /* Cyrillic Supplement */
     AF_UNIRANGE_REC(  0x1D00UL,  0x1D7FUL ),  /* Phonetic Extensions */
     AF_UNIRANGE_REC(  0x1D80UL,  0x1DBFUL ),  /* Phonetic Extensions Supplement */
     AF_UNIRANGE_REC(  0x1DC0UL,  0x1DFFUL ),  /* Combining Diacritical Marks Supplement */
     AF_UNIRANGE_REC(  0x1E00UL,  0x1EFFUL ),  /* Latin Extended Additional */
-    AF_UNIRANGE_REC(  0x1F00UL,  0x1FFFUL ),  /* Greek Extended */
     AF_UNIRANGE_REC(  0x2000UL,  0x206FUL ),  /* General Punctuation */
     AF_UNIRANGE_REC(  0x2070UL,  0x209FUL ),  /* Superscripts and Subscripts */
     AF_UNIRANGE_REC(  0x20A0UL,  0x20CFUL ),  /* Currency Symbols */
     AF_UNIRANGE_REC(  0x2150UL,  0x218FUL ),  /* Number Forms */
     AF_UNIRANGE_REC(  0x2460UL,  0x24FFUL ),  /* Enclosed Alphanumerics */
     AF_UNIRANGE_REC(  0x2C60UL,  0x2C7FUL ),  /* Latin Extended-C */
-    AF_UNIRANGE_REC(  0x2DE0UL,  0x2DFFUL ),  /* Cyrillic Extended-A */
     AF_UNIRANGE_REC(  0x2E00UL,  0x2E7FUL ),  /* Supplemental Punctuation */
-    AF_UNIRANGE_REC(  0xA640UL,  0xA69FUL ),  /* Cyrillic Extended-B */
     AF_UNIRANGE_REC(  0xA720UL,  0xA7FFUL ),  /* Latin Extended-D */
     AF_UNIRANGE_REC(  0xFB00UL,  0xFB06UL ),  /* Alphab. Present. Forms (Latin Ligs) */
     AF_UNIRANGE_REC( 0x1D400UL, 0x1D7FFUL ),  /* Mathematical Alphanumeric Symbols */
@@ -2466,20 +2748,72 @@
     AF_UNIRANGE_REC(       0UL,       0UL )
   };
 
+  static const AF_Script_UniRangeRec  af_grek_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0x0370UL,  0x03FFUL ),  /* Greek and Coptic */
+    AF_UNIRANGE_REC(  0x1F00UL,  0x1FFFUL ),  /* Greek Extended */
+    AF_UNIRANGE_REC(       0UL,       0UL )
+  };
 
-  AF_DEFINE_SCRIPT_CLASS( af_latin_script_class,
-    AF_SCRIPT_LATIN,
-    af_latin_uniranges,
-    'o',
+  static const AF_Script_UniRangeRec  af_cyrl_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0x0400UL,  0x04FFUL ),  /* Cyrillic */
+    AF_UNIRANGE_REC(  0x0500UL,  0x052FUL ),  /* Cyrillic Supplement */
+    AF_UNIRANGE_REC(  0x2DE0UL,  0x2DFFUL ),  /* Cyrillic Extended-A */
+    AF_UNIRANGE_REC(  0xA640UL,  0xA69FUL ),  /* Cyrillic Extended-B */
+    AF_UNIRANGE_REC(       0UL,       0UL )
+  };
 
-    sizeof ( AF_LatinMetricsRec ),
+  static const AF_Script_UniRangeRec  af_hebr_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0x0590UL,  0x05FFUL ),  /* Hebrew */
+    AF_UNIRANGE_REC(  0xFB1DUL,  0xFB4FUL ),  /* Alphab. Present. Forms (Hebrew) */
+    AF_UNIRANGE_REC(       0UL,       0UL )
+  };
 
-    (AF_Script_InitMetricsFunc) af_latin_metrics_init,
-    (AF_Script_ScaleMetricsFunc)af_latin_metrics_scale,
-    (AF_Script_DoneMetricsFunc) NULL,
 
-    (AF_Script_InitHintsFunc)   af_latin_hints_init,
-    (AF_Script_ApplyHintsFunc)  af_latin_hints_apply
+  AF_DEFINE_SCRIPT_CLASS(
+    af_latn_script_class,
+
+    AF_SCRIPT_LATN,
+    AF_BLUE_STRINGSET_LATN,
+    AF_WRITING_SYSTEM_LATIN,
+
+    af_latn_uniranges,
+    'o'
+  )
+
+  AF_DEFINE_SCRIPT_CLASS(
+    af_grek_script_class,
+
+    AF_SCRIPT_GREK,
+    AF_BLUE_STRINGSET_GREK,
+    AF_WRITING_SYSTEM_LATIN,
+
+    af_grek_uniranges,
+    0x3BF /* ο */
+  )
+
+  AF_DEFINE_SCRIPT_CLASS(
+    af_cyrl_script_class,
+
+    AF_SCRIPT_CYRL,
+    AF_BLUE_STRINGSET_CYRL,
+    AF_WRITING_SYSTEM_LATIN,
+
+    af_cyrl_uniranges,
+    0x43E /* о */
+  )
+
+  AF_DEFINE_SCRIPT_CLASS(
+    af_hebr_script_class,
+
+    AF_SCRIPT_HEBR,
+    AF_BLUE_STRINGSET_HEBR,
+    AF_WRITING_SYSTEM_LATIN,
+
+    af_hebr_uniranges,
+    0x5DD /* � */
   )
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aflatin.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aflatin.h
index d9170b3dcc6..c06cbd9a6af 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aflatin.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aflatin.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for latin script (specification).       */
 /*                                                                         */
-/*  Copyright 2003-2007, 2009, 2011-2012 by                                */
+/*  Copyright 2003-2007, 2009, 2011-2013 by                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -24,10 +24,20 @@
 
 FT_BEGIN_HEADER
 
+  /* the `latin' writing system */
 
-  /* the latin-specific script class */
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_latin_writing_system_class )
 
-  AF_DECLARE_SCRIPT_CLASS( af_latin_script_class )
+
+  /* the latin-specific script classes */
+
+  AF_DECLARE_SCRIPT_CLASS( af_cyrl_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_grek_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_latn_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_hebr_script_class )
+#if 0
+  AF_DECLARE_SCRIPT_CLASS( af_armn_script_class )
+#endif
 
 
   /* constants are given with units_per_em == 2048 in mind */
@@ -51,27 +61,14 @@ FT_BEGIN_HEADER
    */
 
 
-  /* Latin (global) metrics management */
-
-  enum
-  {
-    AF_LATIN_BLUE_CAPITAL_TOP,
-    AF_LATIN_BLUE_CAPITAL_BOTTOM,
-    AF_LATIN_BLUE_SMALL_F_TOP,
-    AF_LATIN_BLUE_SMALL_TOP,
-    AF_LATIN_BLUE_SMALL_BOTTOM,
-    AF_LATIN_BLUE_SMALL_MINOR,
-
-    AF_LATIN_BLUE_MAX
-  };
-
-
-#define AF_LATIN_IS_TOP_BLUE( b )  ( (b) == AF_LATIN_BLUE_CAPITAL_TOP || \
-                                     (b) == AF_LATIN_BLUE_SMALL_F_TOP || \
-                                     (b) == AF_LATIN_BLUE_SMALL_TOP   )
+#define AF_LATIN_IS_TOP_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_LATIN_TOP )
+#define AF_LATIN_IS_X_HEIGHT_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_LATIN_X_HEIGHT )
+#define AF_LATIN_IS_LONG_BLUE( b ) \
+          ( (b)->properties & AF_BLUE_PROPERTY_LATIN_LONG )
 
 #define AF_LATIN_MAX_WIDTHS  16
-#define AF_LATIN_MAX_BLUES   AF_LATIN_BLUE_MAX
 
 
   enum
@@ -106,7 +103,7 @@ FT_BEGIN_HEADER
 
     /* ignored for horizontal metrics */
     FT_UInt          blue_count;
-    AF_LatinBlueRec  blues[AF_LATIN_BLUE_MAX];
+    AF_LatinBlueRec  blues[AF_BLUE_STRINGSET_MAX];
 
     FT_Fixed         org_scale;
     FT_Pos           org_delta;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aflatin2.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aflatin2.c
index b1e9658d5d7..a6d564a28f5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aflatin2.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aflatin2.c
@@ -76,8 +76,9 @@
       AF_Scaler            scaler = &dummy->root.scaler;
 
 
-      glyph_index = FT_Get_Char_Index( face,
-                                       metrics->root.clazz->standard_char );
+      glyph_index = FT_Get_Char_Index(
+                      face,
+                      metrics->root.script_class->standard_char );
       if ( glyph_index == 0 )
         goto Exit;
 
@@ -409,11 +410,11 @@
         blue->flags |= AF_LATIN_BLUE_TOP;
 
       /*
-       * The following flags is used later to adjust the y and x scales
+       * The following flag is used later to adjust the y and x scales
        * in order to optimize the pixel grid alignment of the top of small
        * letters.
        */
-      if ( bb == AF_LATIN_BLUE_SMALL_TOP )
+      if ( AF_LATIN_IS_X_HEIGHT_BLUE( bb ) )
         blue->flags |= AF_LATIN_BLUE_ADJUSTMENT;
 
       FT_TRACE5(( "    -> reference = %ld\n"
@@ -2379,18 +2380,10 @@
   /*************************************************************************/
 
 
-  static const AF_Script_UniRangeRec  af_latin2_uniranges[] =
-  {
-    AF_UNIRANGE_REC( 32UL,  127UL ),    /* TODO: Add new Unicode ranges here! */
-    AF_UNIRANGE_REC( 160UL, 255UL ),
-    AF_UNIRANGE_REC( 0UL,   0UL )
-  };
+  AF_DEFINE_WRITING_SYSTEM_CLASS(
+    af_latin2_writing_system_class,
 
-
-  AF_DEFINE_SCRIPT_CLASS( af_latin2_script_class,
-    AF_SCRIPT_LATIN2,
-    af_latin2_uniranges,
-    'o',
+    AF_WRITING_SYSTEM_LATIN2,
 
     sizeof ( AF_LatinMetricsRec ),
 
@@ -2403,4 +2396,53 @@
   )
 
 
+  /* XXX: this should probably fine tuned to differentiate better between */
+  /*      scripts...                                                      */
+
+  static const AF_Script_UniRangeRec  af_ltn2_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0x0020UL,  0x007FUL ),  /* Basic Latin (no control chars) */
+    AF_UNIRANGE_REC(  0x00A0UL,  0x00FFUL ),  /* Latin-1 Supplement (no control chars) */
+    AF_UNIRANGE_REC(  0x0100UL,  0x017FUL ),  /* Latin Extended-A */
+    AF_UNIRANGE_REC(  0x0180UL,  0x024FUL ),  /* Latin Extended-B */
+    AF_UNIRANGE_REC(  0x0250UL,  0x02AFUL ),  /* IPA Extensions */
+    AF_UNIRANGE_REC(  0x02B0UL,  0x02FFUL ),  /* Spacing Modifier Letters */
+    AF_UNIRANGE_REC(  0x0300UL,  0x036FUL ),  /* Combining Diacritical Marks */
+    AF_UNIRANGE_REC(  0x0370UL,  0x03FFUL ),  /* Greek and Coptic */
+    AF_UNIRANGE_REC(  0x0400UL,  0x04FFUL ),  /* Cyrillic */
+    AF_UNIRANGE_REC(  0x0500UL,  0x052FUL ),  /* Cyrillic Supplement */
+    AF_UNIRANGE_REC(  0x1D00UL,  0x1D7FUL ),  /* Phonetic Extensions */
+    AF_UNIRANGE_REC(  0x1D80UL,  0x1DBFUL ),  /* Phonetic Extensions Supplement */
+    AF_UNIRANGE_REC(  0x1DC0UL,  0x1DFFUL ),  /* Combining Diacritical Marks Supplement */
+    AF_UNIRANGE_REC(  0x1E00UL,  0x1EFFUL ),  /* Latin Extended Additional */
+    AF_UNIRANGE_REC(  0x1F00UL,  0x1FFFUL ),  /* Greek Extended */
+    AF_UNIRANGE_REC(  0x2000UL,  0x206FUL ),  /* General Punctuation */
+    AF_UNIRANGE_REC(  0x2070UL,  0x209FUL ),  /* Superscripts and Subscripts */
+    AF_UNIRANGE_REC(  0x20A0UL,  0x20CFUL ),  /* Currency Symbols */
+    AF_UNIRANGE_REC(  0x2150UL,  0x218FUL ),  /* Number Forms */
+    AF_UNIRANGE_REC(  0x2460UL,  0x24FFUL ),  /* Enclosed Alphanumerics */
+    AF_UNIRANGE_REC(  0x2C60UL,  0x2C7FUL ),  /* Latin Extended-C */
+    AF_UNIRANGE_REC(  0x2DE0UL,  0x2DFFUL ),  /* Cyrillic Extended-A */
+    AF_UNIRANGE_REC(  0x2E00UL,  0x2E7FUL ),  /* Supplemental Punctuation */
+    AF_UNIRANGE_REC(  0xA640UL,  0xA69FUL ),  /* Cyrillic Extended-B */
+    AF_UNIRANGE_REC(  0xA720UL,  0xA7FFUL ),  /* Latin Extended-D */
+    AF_UNIRANGE_REC(  0xFB00UL,  0xFB06UL ),  /* Alphab. Present. Forms (Latin Ligs) */
+    AF_UNIRANGE_REC( 0x1D400UL, 0x1D7FFUL ),  /* Mathematical Alphanumeric Symbols */
+    AF_UNIRANGE_REC( 0x1F100UL, 0x1F1FFUL ),  /* Enclosed Alphanumeric Supplement */
+    AF_UNIRANGE_REC(       0UL,       0UL )
+  };
+
+
+  AF_DEFINE_SCRIPT_CLASS(
+    af_ltn2_script_class,
+
+    AF_SCRIPT_LTN2,
+    AF_BLUE_STRINGSET_LATN,
+    AF_WRITING_SYSTEM_LATIN2,
+
+    af_ltn2_uniranges,
+    'o'
+  )
+
+
 /* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aflatin2.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aflatin2.h
index cbfa395522e..f7f6d8d7c57 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aflatin2.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aflatin2.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for latin script (specification).       */
 /*                                                                         */
-/*  Copyright 2003-2007, 2012 by                                           */
+/*  Copyright 2003-2007, 2012, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -25,9 +25,21 @@
 FT_BEGIN_HEADER
 
 
-  /* the latin-specific script class */
+  /* the `latin' writing system */
+
+  AF_DECLARE_WRITING_SYSTEM_CLASS( af_latin2_writing_system_class )
+
+
+  /* the latin-specific script classes */
+
+  AF_DECLARE_SCRIPT_CLASS( af_ltn2_script_class )  /* XXX */
+#if 0
+  AF_DECLARE_SCRIPT_CLASS( af_arm2_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_cyr2_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_grk2_script_class )
+  AF_DECLARE_SCRIPT_CLASS( af_hbr2_script_class )
+#endif
 
-  AF_DECLARE_SCRIPT_CLASS( af_latin2_script_class )
 
 /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afloader.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afloader.c
index 17a6fb7c3b8..b49f8c096ae 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afloader.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afloader.c
@@ -21,6 +21,7 @@
 #include "afhints.h"
 #include "aferrors.h"
 #include "afmodule.h"
+#include "afpic.h"
 
 
   /* Initialize glyph loader. */
@@ -180,10 +181,20 @@
 
       /* now load the slot image into the auto-outline and run the */
       /* automatic hinting process                                 */
-      if ( metrics->clazz->script_hints_apply )
-        metrics->clazz->script_hints_apply( hints,
-                                            &gloader->current.outline,
-                                            metrics );
+      {
+#ifdef FT_CONFIG_OPTION_PIC
+        AF_FaceGlobals         globals              = loader->globals;
+#endif
+        AF_WritingSystemClass  writing_system_class =
+                                 AF_WRITING_SYSTEM_CLASSES_GET
+                                   [metrics->script_class->writing_system];
+
+
+        if ( writing_system_class->script_hints_apply )
+          writing_system_class->script_hints_apply( hints,
+                                                    &gloader->current.outline,
+                                                    metrics );
+      }
 
       /* we now need to adjust the metrics according to the change in */
       /* width/positioning that occurred during the hinting process   */
@@ -519,33 +530,41 @@
     if ( !error )
     {
       AF_ScriptMetrics  metrics;
-      FT_UInt           options = 0;
+      FT_UInt           options = AF_SCRIPT_DFLT;
 
 
 #ifdef FT_OPTION_AUTOFIT2
-      /* XXX: undocumented hook to activate the latin2 hinter */
+      /* XXX: undocumented hook to activate the latin2 writing system */
       if ( load_flags & ( 1UL << 20 ) )
-        options = 2;
+        options = AF_SCRIPT_LTN2;
 #endif
 
       error = af_face_globals_get_metrics( loader->globals, gindex,
                                            options, &metrics );
       if ( !error )
       {
+#ifdef FT_CONFIG_OPTION_PIC
+        AF_FaceGlobals         globals              = loader->globals;
+#endif
+        AF_WritingSystemClass  writing_system_class =
+                                 AF_WRITING_SYSTEM_CLASSES_GET
+                                   [metrics->script_class->writing_system];
+
+
         loader->metrics = metrics;
 
-        if ( metrics->clazz->script_metrics_scale )
-          metrics->clazz->script_metrics_scale( metrics, &scaler );
+        if ( writing_system_class->script_metrics_scale )
+          writing_system_class->script_metrics_scale( metrics, &scaler );
         else
           metrics->scaler = scaler;
 
         load_flags |=  FT_LOAD_NO_SCALE | FT_LOAD_IGNORE_TRANSFORM;
         load_flags &= ~FT_LOAD_RENDER;
 
-        if ( metrics->clazz->script_hints_init )
+        if ( writing_system_class->script_hints_init )
         {
-          error = metrics->clazz->script_hints_init( &loader->hints,
-                                                     metrics );
+          error = writing_system_class->script_hints_init( &loader->hints,
+                                                           metrics );
           if ( error )
             goto Exit;
         }
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afloader.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afloader.h
index 1f34d17cce0..1f34d17cce0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afloader.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afloader.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afmodule.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afmodule.c
index b1bb5ee0ed5..b1bb5ee0ed5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afmodule.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afmodule.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afmodule.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afmodule.h
index c4e8f8f66ad..c4e8f8f66ad 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afpic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afpic.c
index 45e1448c089..92d696d296d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afpic.c
@@ -43,13 +43,10 @@
 
 
   /* forward declaration of PIC init functions from script classes */
-#include "aflatin.h"
-#ifdef FT_OPTION_AUTOFIT2
-#include "aflatin2.h"
-#endif
-#include "afcjk.h"
-#include "afdummy.h"
-#include "afindic.h"
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )  /* empty */
+
+#include "afwrtsys.h"
 
 
   void
@@ -100,27 +97,31 @@
 
     FT_Init_Class_af_service_properties( &container->af_service_properties );
 
-    for ( ss = 0 ; ss < AF_SCRIPT_CLASSES_REC_COUNT ; ss++ )
-    {
+    for ( ss = 0; ss < AF_WRITING_SYSTEM_MAX - 1; ss++ )
+      container->af_writing_system_classes[ss] =
+        &container->af_writing_system_classes_rec[ss];
+    container->af_writing_system_classes[AF_WRITING_SYSTEM_MAX - 1] = NULL;
+
+    for ( ss = 0; ss < AF_SCRIPT_MAX - 1; ss++ )
       container->af_script_classes[ss] =
         &container->af_script_classes_rec[ss];
-    }
-    container->af_script_classes[AF_SCRIPT_CLASSES_COUNT - 1] = NULL;
+    container->af_script_classes[AF_SCRIPT_MAX - 1] = NULL;
+
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )                             \
+        FT_Init_Class_af_ ## ws ## _writing_system_class(    \
+          &container->af_writing_system_classes_rec[ss++] );
+
+    ss = 0;
+#include "afwrtsys.h"
+
+#undef  SCRIPT
+#define SCRIPT( s, S, d )                            \
+        FT_Init_Class_af_ ## s ## _script_class(     \
+          &container->af_script_classes_rec[ss++] );
 
-    /* add call to initialization function when you add new scripts */
     ss = 0;
-    FT_Init_Class_af_dummy_script_class(
-      &container->af_script_classes_rec[ss++] );
-#ifdef FT_OPTION_AUTOFIT2
-    FT_Init_Class_af_latin2_script_class(
-      &container->af_script_classes_rec[ss++] );
-#endif
-    FT_Init_Class_af_latin_script_class(
-      &container->af_script_classes_rec[ss++] );
-    FT_Init_Class_af_cjk_script_class(
-      &container->af_script_classes_rec[ss++] );
-    FT_Init_Class_af_indic_script_class(
-      &container->af_script_classes_rec[ss++] );
+#include "afscript.h"
 
     FT_Init_Class_af_autofitter_interface(
       library, &container->af_autofitter_interface );
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afpic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afpic.h
index 0acf803894c..09f8258a2e8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afpic.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType position independent code services for autofit module.  */
 /*                                                                         */
-/*  Copyright 2009, 2011-2012 by                                           */
+/*  Copyright 2009, 2011-2013 by                                           */
 /*  Oran Agra and Mickey Gabel.                                            */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -27,11 +27,12 @@ FT_BEGIN_HEADER
 
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define AF_SERVICES_GET            af_services
-#define AF_SERVICE_PROPERTIES_GET  af_service_properties
+#define AF_SERVICES_GET                af_services
+#define AF_SERVICE_PROPERTIES_GET      af_service_properties
 
-#define AF_SCRIPT_CLASSES_GET      af_script_classes
-#define AF_INTERFACE_GET           af_autofitter_interface
+#define AF_WRITING_SYSTEM_CLASSES_GET  af_writing_system_classes
+#define AF_SCRIPT_CLASSES_GET          af_script_classes
+#define AF_INTERFACE_GET               af_autofitter_interface
 
 #else /* FT_CONFIG_OPTION_PIC */
 
@@ -40,24 +41,22 @@ FT_BEGIN_HEADER
 
 #include "aftypes.h"
 
-  /* increase these when you add new scripts, */
-  /* and update autofit_module_class_pic_init */
-#ifdef FT_OPTION_AUTOFIT2
-#define AF_SCRIPT_CLASSES_COUNT  6
-#else
-#define AF_SCRIPT_CLASSES_COUNT  5
-#endif
-
-#define AF_SCRIPT_CLASSES_REC_COUNT  ( AF_SCRIPT_CLASSES_COUNT - 1 )
-
 
   typedef struct  AFModulePIC_
   {
     FT_ServiceDescRec*          af_services;
     FT_Service_PropertiesRec    af_service_properties;
 
-    AF_ScriptClass              af_script_classes[AF_SCRIPT_CLASSES_COUNT];
-    AF_ScriptClassRec           af_script_classes_rec[AF_SCRIPT_CLASSES_REC_COUNT];
+    AF_WritingSystemClass       af_writing_system_classes
+                                  [AF_WRITING_SYSTEM_MAX];
+    AF_WritingSystemClassRec    af_writing_system_classes_rec
+                                  [AF_WRITING_SYSTEM_MAX - 1];
+
+    AF_ScriptClass              af_script_classes
+                                  [AF_SCRIPT_MAX];
+    AF_ScriptClassRec           af_script_classes_rec
+                                  [AF_SCRIPT_MAX - 1];
+
     FT_AutoHinter_InterfaceRec  af_autofitter_interface;
 
   } AFModulePIC;
@@ -71,6 +70,8 @@ FT_BEGIN_HEADER
 #define AF_SERVICE_PROPERTIES_GET  \
           ( GET_PIC( library )->af_service_properties )
 
+#define AF_WRITING_SYSTEM_CLASSES_GET  \
+          ( GET_PIC( FT_FACE_LIBRARY( globals->face ) )->af_writing_system_classes )
 #define AF_SCRIPT_CLASSES_GET  \
           ( GET_PIC( FT_FACE_LIBRARY( globals->face ) )->af_script_classes )
 #define AF_INTERFACE_GET  \
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afscript.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afscript.h
new file mode 100644
index 00000000000..be0169a83cb
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afscript.h
@@ -0,0 +1,37 @@
+/***************************************************************************/
+/*                                                                         */
+/*  afscript.h                                                             */
+/*                                                                         */
+/*    Auto-fitter scripts (specification only).                            */
+/*                                                                         */
+/*  Copyright 2013 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.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+  /* The following part can be included multiple times. */
+  /* Define `SCRIPT' as needed.                         */
+
+
+  /* Add new scripts here. */
+
+  SCRIPT( cyrl, CYRL, "Cyrillic" )
+  SCRIPT( deva, DEVA, "Indic scripts" )
+  SCRIPT( dflt, DFLT, "no script" )
+  SCRIPT( grek, GREK, "Greek" )
+  SCRIPT( hani, HANI, "CJKV ideographs" )
+  SCRIPT( hebr, HEBR, "Hebrew" )
+  SCRIPT( latn, LATN, "Latin" )
+#ifdef FT_OPTION_AUTOFIT2
+  SCRIPT( ltn2, LTN2, "Latin 2" )
+#endif
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aftypes.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aftypes.h
index 9acd7ad6d24..cda1f896595 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/aftypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/aftypes.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter types (specification only).                              */
 /*                                                                         */
-/*  Copyright 2003-2009, 2011-2012 by                                      */
+/*  Copyright 2003-2009, 2011-2013 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,15 +20,12 @@
    *
    *  The auto-fitter is a complete rewrite of the old auto-hinter.
    *  Its main feature is the ability to differentiate between different
-   *  scripts in order to apply language-specific rules.
+   *  writing systems in order to apply script-specific rules.
    *
    *  The code has also been compartmentized into several entities that
    *  should make algorithmic experimentation easier than with the old
    *  code.
    *
-   *  Finally, we get rid of the Catharon license, since this code is
-   *  released under the FreeType one.
-   *
    *************************************************************************/
 
 
@@ -42,6 +39,8 @@
 #include FT_INTERNAL_OBJECTS_H
 #include FT_INTERNAL_DEBUG_H
 
+#include "afblue.h"
+
 
 FT_BEGIN_HEADER
 
@@ -201,56 +200,21 @@ extern void*  _af_debug_hints;
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
-  /*****                       S C R I P T S                           *****/
+  /*****                 S C R I P T   M E T R I C S                   *****/
   /*****                                                               *****/
   /*************************************************************************/
   /*************************************************************************/
 
-  /*
-   *  The list of known scripts.  Each different script corresponds to the
-   *  following information:
-   *
-   *   - A set of Unicode ranges to test whether the face supports the
-   *     script.
-   *
-   *   - A specific global analyzer that will compute global metrics
-   *     specific to the script.
-   *
-   *   - A specific glyph analyzer that will compute segments and
-   *     edges for each glyph covered by the script.
-   *
-   *   - A specific grid-fitting algorithm that will distort the
-   *     scaled glyph outline according to the results of the glyph
-   *     analyzer.
-   *
-   *  Note that a given analyzer and/or grid-fitting algorithm can be
-   *  used by more than one script.
-   */
-
-  typedef enum  AF_Script_
-  {
-    AF_SCRIPT_DUMMY = 0,
-    AF_SCRIPT_LATIN = 1,
-    AF_SCRIPT_CJK   = 2,
-    AF_SCRIPT_INDIC = 3,
-#ifdef FT_OPTION_AUTOFIT2
-    AF_SCRIPT_LATIN2 = 4,
-#endif
-
-    /* add new scripts here.  Don't forget to update the list in */
-    /* `afglobal.c'.                                             */
-
-    AF_SCRIPT_MAX   /* do not remove */
-
-  } AF_Script;
+  /* This is the main structure which combines writing systems and script */
+  /* data (for a given face object, see below).                           */
 
-
-  typedef struct AF_ScriptClassRec_ const*  AF_ScriptClass;
-  typedef struct AF_FaceGlobalsRec_*        AF_FaceGlobals;
+  typedef struct AF_WritingSystemClassRec_ const*  AF_WritingSystemClass;
+  typedef struct AF_ScriptClassRec_ const*         AF_ScriptClass;
+  typedef struct AF_FaceGlobalsRec_*               AF_FaceGlobals;
 
   typedef struct  AF_ScriptMetricsRec_
   {
-    AF_ScriptClass  clazz;
+    AF_ScriptClass  script_class;
     AF_ScalerRec    scaler;
     FT_Bool         digits_have_same_width;
 
@@ -284,23 +248,54 @@ extern void*  _af_debug_hints;
                                AF_ScriptMetrics  metrics );
 
 
-  typedef struct  AF_Script_UniRangeRec_
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                W R I T I N G   S Y S T E M S                  *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*
+   *  In FreeType, a writing system consists of multiple scripts which can
+   *  be handled similarly *in a typographical way*; the relationship is not
+   *  based on history.  For example, both the Greek and the unrelated
+   *  Armenian scripts share the same features like ascender, descender,
+   *  x-height, etc.  Essentially, a writing system is covered by a
+   *  submodule of the auto-fitter; it contains
+   *
+   *  - a specific global analyzer which computes global metrics specific to
+   *    the script (based on script-specific characters to identify ascender
+   *    height, x-height, etc.),
+   *
+   *  - a specific glyph analyzer that computes segments and edges for each
+   *    glyph covered by the script,
+   *
+   *  - a specific grid-fitting algorithm that distorts the scaled glyph
+   *    outline according to the results of the glyph analyzer.
+   */
+
+#define __AFWRTSYS_H__  /* don't load header files */
+#undef  WRITING_SYSTEM
+#define WRITING_SYSTEM( ws, WS )    \
+          AF_WRITING_SYSTEM_ ## WS,
+
+  /* The list of known writing systems. */
+  typedef enum  AF_WritingSystem_
   {
-    FT_UInt32  first;
-    FT_UInt32  last;
 
-  } AF_Script_UniRangeRec;
+#include "afwrtsys.h"
 
-#define AF_UNIRANGE_REC( a, b ) { (FT_UInt32)(a), (FT_UInt32)(b) }
+    AF_WRITING_SYSTEM_MAX   /* do not remove */
 
-  typedef const AF_Script_UniRangeRec  *AF_Script_UniRange;
+  } AF_WritingSystem;
 
+#undef  __AFWRTSYS_H__
 
-  typedef struct  AF_ScriptClassRec_
+
+  typedef struct  AF_WritingSystemClassRec_
   {
-    AF_Script           script;
-    AF_Script_UniRange  script_uni_ranges; /* last must be { 0, 0 }        */
-    FT_UInt32           standard_char;     /* for default width and height */
+    AF_WritingSystem  writing_system;
 
     FT_Offset                   script_metrics_size;
     AF_Script_InitMetricsFunc   script_metrics_init;
@@ -310,59 +305,167 @@ extern void*  _af_debug_hints;
     AF_Script_InitHintsFunc     script_hints_init;
     AF_Script_ApplyHintsFunc    script_hints_apply;
 
+  } AF_WritingSystemClassRec;
+
+
+  /*************************************************************************/
+  /*************************************************************************/
+  /*****                                                               *****/
+  /*****                        S C R I P T S                          *****/
+  /*****                                                               *****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+  /*
+   *  Each script is associated with a set of Unicode ranges which gets used
+   *  to test whether the font face supports the script.  It also references
+   *  the writing system it belongs to.
+   *
+   *  We use four-letter script tags from the OpenType specification.
+   */
+
+#undef  SCRIPT
+#define SCRIPT( s, S, d ) \
+          AF_SCRIPT_ ## S,
+
+  /* The list of known scripts. */
+  typedef enum  AF_Script_
+  {
+
+#include "afscript.h"
+
+    AF_SCRIPT_MAX   /* do not remove */
+
+  } AF_Script;
+
+
+  typedef struct  AF_Script_UniRangeRec_
+  {
+    FT_UInt32  first;
+    FT_UInt32  last;
+
+  } AF_Script_UniRangeRec;
+
+#define AF_UNIRANGE_REC( a, b ) { (FT_UInt32)(a), (FT_UInt32)(b) }
+
+  typedef const AF_Script_UniRangeRec*  AF_Script_UniRange;
+
+
+  typedef struct  AF_ScriptClassRec_
+  {
+    AF_Script          script;
+    AF_Blue_Stringset  blue_stringset;
+    AF_WritingSystem   writing_system;
+
+    AF_Script_UniRange  script_uni_ranges; /* last must be { 0, 0 }        */
+    FT_UInt32           standard_char;     /* for default width and height */
+
   } AF_ScriptClassRec;
 
 
   /* Declare and define vtables for classes */
 #ifndef FT_CONFIG_OPTION_PIC
 
+#define AF_DECLARE_WRITING_SYSTEM_CLASS( writing_system_class ) \
+  FT_CALLBACK_TABLE const AF_WritingSystemClassRec              \
+  writing_system_class;
+
+#define AF_DEFINE_WRITING_SYSTEM_CLASS(                  \
+          writing_system_class,                          \
+          system,                                        \
+          m_size,                                        \
+          m_init,                                        \
+          m_scale,                                       \
+          m_done,                                        \
+          h_init,                                        \
+          h_apply )                                      \
+  FT_CALLBACK_TABLE_DEF                                  \
+  const AF_WritingSystemClassRec  writing_system_class = \
+  {                                                      \
+    system,                                              \
+                                                         \
+    m_size,                                              \
+                                                         \
+    m_init,                                              \
+    m_scale,                                             \
+    m_done,                                              \
+                                                         \
+    h_init,                                              \
+    h_apply                                              \
+  };
+
+
 #define AF_DECLARE_SCRIPT_CLASS( script_class ) \
   FT_CALLBACK_TABLE const AF_ScriptClassRec     \
   script_class;
 
-#define AF_DEFINE_SCRIPT_CLASS( script_class, script_, ranges, def_char,   \
-                                m_size,                                    \
-                                m_init, m_scale, m_done, h_init, h_apply ) \
-  FT_CALLBACK_TABLE_DEF const AF_ScriptClassRec  script_class =            \
-  {                                                                        \
-    script_,                                                               \
-    ranges,                                                                \
-    def_char,                                                              \
-                                                                           \
-    m_size,                                                                \
-                                                                           \
-    m_init,                                                                \
-    m_scale,                                                               \
-    m_done,                                                                \
-                                                                           \
-    h_init,                                                                \
-    h_apply                                                                \
+#define AF_DEFINE_SCRIPT_CLASS(           \
+          script_class,                   \
+          script_,                        \
+          blue_stringset_,                \
+          writing_system_,                \
+          ranges,                         \
+          std_char )                      \
+  FT_CALLBACK_TABLE_DEF                   \
+  const AF_ScriptClassRec  script_class = \
+  {                                       \
+    script_,                              \
+    blue_stringset_,                      \
+    writing_system_,                      \
+    ranges,                               \
+    std_char                              \
   };
 
 #else /* FT_CONFIG_OPTION_PIC */
 
+#define AF_DECLARE_WRITING_SYSTEM_CLASS( writing_system_class )            \
+  FT_LOCAL( void )                                                         \
+  FT_Init_Class_ ## writing_system_class( AF_WritingSystemClassRec*  ac );
+
+#define AF_DEFINE_WRITING_SYSTEM_CLASS(                                   \
+          writing_system_class,                                           \
+          system,                                                         \
+          m_size,                                                         \
+          m_init,                                                         \
+          m_scale,                                                        \
+          m_done,                                                         \
+          h_init,                                                         \
+          h_apply )                                                       \
+  FT_LOCAL_DEF( void )                                                    \
+  FT_Init_Class_ ## writing_system_class( AF_WritingSystemClassRec*  ac ) \
+  {                                                                       \
+    ac->writing_system       = system;                                    \
+                                                                          \
+    ac->script_metrics_size  = m_size;                                    \
+                                                                          \
+    ac->script_metrics_init  = m_init;                                    \
+    ac->script_metrics_scale = m_scale;                                   \
+    ac->script_metrics_done  = m_done;                                    \
+                                                                          \
+    ac->script_hints_init    = h_init;                                    \
+    ac->script_hints_apply   = h_apply;                                   \
+  }
+
+
 #define AF_DECLARE_SCRIPT_CLASS( script_class )             \
   FT_LOCAL( void )                                          \
   FT_Init_Class_ ## script_class( AF_ScriptClassRec*  ac );
 
-#define AF_DEFINE_SCRIPT_CLASS( script_class, script_, ranges, def_char,   \
-                                m_size,                                    \
-                                m_init, m_scale, m_done, h_init, h_apply ) \
-  FT_LOCAL_DEF( void )                                                     \
-  FT_Init_Class_ ## script_class( AF_ScriptClassRec*  ac )                 \
-  {                                                                        \
-    ac->script               = script_;                                    \
-    ac->script_uni_ranges    = ranges;                                     \
-    ac->default_char         = def_char;                                   \
-                                                                           \
-    ac->script_metrics_size  = m_size;                                     \
-                                                                           \
-    ac->script_metrics_init  = m_init;                                     \
-    ac->script_metrics_scale = m_scale;                                    \
-    ac->script_metrics_done  = m_done;                                     \
-                                                                           \
-    ac->script_hints_init    = h_init;                                     \
-    ac->script_hints_apply   = h_apply;                                    \
+#define AF_DEFINE_SCRIPT_CLASS(                            \
+          script_class,                                    \
+          script_,                                         \
+          blue_string_set_,                                \
+          writing_system_,                                 \
+          ranges,                                          \
+          std_char )                                       \
+  FT_LOCAL_DEF( void )                                     \
+  FT_Init_Class_ ## script_class( AF_ScriptClassRec*  ac ) \
+  {                                                        \
+    ac->script            = script_;                       \
+    ac->blue_stringset    = blue_stringset_;               \
+    ac->writing_system    = writing_system_;               \
+    ac->script_uni_ranges = ranges;                        \
+    ac->standard_char     = std_char;                      \
   }
 
 #endif /* FT_CONFIG_OPTION_PIC */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afwarp.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afwarp.c
index 34a97ffc57c..34a97ffc57c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afwarp.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afwarp.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afwarp.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afwarp.h
index 7343fdd5ef5..7343fdd5ef5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/afwarp.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afwarp.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afwrtsys.h b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afwrtsys.h
new file mode 100644
index 00000000000..602c558842e
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/afwrtsys.h
@@ -0,0 +1,51 @@
+/***************************************************************************/
+/*                                                                         */
+/*  afwrtsys.h                                                             */
+/*                                                                         */
+/*    Auto-fitter writing systems (specification only).                    */
+/*                                                                         */
+/*  Copyright 2013 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 __AFWRTSYS_H__
+#define __AFWRTSYS_H__
+
+  /* Since preprocessor directives can't create other preprocessor */
+  /* directives, we have to include the header files manually.     */
+
+#include "afdummy.h"
+#include "aflatin.h"
+#include "afcjk.h"
+#include "afindic.h"
+#ifdef FT_OPTION_AUTOFIT2
+#include "aflatin2.h"
+#endif
+
+#endif /* __AFWRTSYS_H__ */
+
+
+  /* The following part can be included multiple times. */
+  /* Define `WRITING_SYSTEM' as needed.                 */
+
+
+  /* Add new writing systems here. */
+
+  WRITING_SYSTEM( dummy,  DUMMY  )
+  WRITING_SYSTEM( latin,  LATIN  )
+  WRITING_SYSTEM( cjk,    CJK    )
+  WRITING_SYSTEM( indic,  INDIC  )
+#ifdef FT_OPTION_AUTOFIT2
+  WRITING_SYSTEM( latin2, LATIN2 )
+#endif
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/autofit.c b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/autofit.c
index 3883a0a7060..b23374a23a1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/autofit.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/autofit.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter module (body).                                           */
 /*                                                                         */
-/*  Copyright 2003-2007, 2011 by                                           */
+/*  Copyright 2003-2007, 2011, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,6 +20,7 @@
 #include <ft2build.h>
 #include "afpic.c"
 #include "afangles.c"
+#include "afblue.c"
 #include "afglobal.c"
 #include "afhints.c"
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/module.mk
index 6ec60912ab7..6ec60912ab7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/rules.mk
index b76bb79ab43..745adab25d7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/autofit/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/autofit/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2003, 2004, 2005, 2006, 2007, 2011 by
+# Copyright 2003-2007, 2011, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -26,6 +26,7 @@ AUTOF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(AUTOF_DIR))
 # AUTOF driver sources (i.e., C files)
 #
 AUTOF_DRV_SRC := $(AUTOF_DIR)/afangles.c \
+                 $(AUTOF_DIR)/afblue.c   \
                  $(AUTOF_DIR)/afcjk.c    \
                  $(AUTOF_DIR)/afdummy.c  \
                  $(AUTOF_DIR)/afglobal.c \
@@ -41,7 +42,9 @@ AUTOF_DRV_SRC := $(AUTOF_DIR)/afangles.c \
 #
 AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h)  \
                $(AUTOF_DIR)/aferrors.h \
-               $(AUTOF_DIR)/aftypes.h
+               $(AUTOF_DIR)/afscript.h \
+               $(AUTOF_DIR)/aftypes.h  \
+               $(AUTOF_DIR)/afwrtsys.h
 
 
 # AUTOF driver object(s)
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/base/Jamfile
index 832e8b84249..832e8b84249 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/basepic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/basepic.c
index 0af770ebc29..0af770ebc29 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/basepic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/basepic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/basepic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/base/basepic.h
index 329d7c8fd61..329d7c8fd61 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/basepic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/basepic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftadvanc.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftadvanc.c
index 52078478df3..52078478df3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftadvanc.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftadvanc.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftapi.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftapi.c
index 8914d1f4e99..8914d1f4e99 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftapi.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftapi.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbase.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbase.c
index 5e5d70ec4b6..5e5d70ec4b6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbase.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbase.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbase.h b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbase.h
index 51a1db18b84..51a1db18b84 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbase.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbase.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbbox.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbbox.c
index 6d1c44cb2e8..8d3f383b4d6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbbox.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbbox.c
@@ -85,7 +85,7 @@
   /*    BBox_Conic_Check                                                   */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Finds the extrema of a 1-dimensional conic Bezier curve and update */
+  /*    Find the extrema of a 1-dimensional conic Bezier curve and update  */
   /*    a bounding range.  This version uses direct computation, as it     */
   /*    doesn't need square roots.                                         */
   /*                                                                       */
@@ -108,30 +108,19 @@
                     FT_Pos*  min,
                     FT_Pos*  max )
   {
-    if ( y1 <= y3 && y2 == y1 )     /* flat arc */
-      goto Suite;
-
-    if ( y1 < y3 )
-    {
-      if ( y2 >= y1 && y2 <= y3 )   /* ascending arc */
-        goto Suite;
-    }
-    else
-    {
-      if ( y2 >= y3 && y2 <= y1 )   /* descending arc */
-      {
-        y2 = y1;
-        y1 = y3;
-        y3 = y2;
-        goto Suite;
-      }
-    }
-
-    y1 = y3 = y1 - FT_MulDiv( y2 - y1, y2 - y1, y1 - 2*y2 + y3 );
-
-  Suite:
-    if ( y1 < *min ) *min = y1;
-    if ( y3 > *max ) *max = y3;
+    /* This function is only called when a control off-point is outside */
+    /* the bbox that contains all on-points.  It finds a local extremum */
+    /* within the segment, equal to (y1*y3 - y2*y2)/(y1 - 2*y2 + y3).   */
+    /* Or, offsetting from y2, we get                                   */
+
+    y1 -= y2;
+    y3 -= y2;
+    y2 += FT_MulDiv( y1, y3, y1 + y3 );
+
+    if ( y2 < *min )
+      *min = y2;
+    if ( y2 > *max )
+      *max = y2;
   }
 
 
@@ -195,9 +184,9 @@
   /*    BBox_Cubic_Check                                                   */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Finds the extrema of a 1-dimensional cubic Bezier curve and        */
-  /*    updates a bounding range.  This version uses splitting because we  */
-  /*    don't want to use square roots and extra accuracy.                 */
+  /*    Find the extrema of a 1-dimensional cubic Bezier curve and         */
+  /*    update a bounding range.  This version uses iterative splitting    */
+  /*    because it is faster than the exact solution with square roots.    */
   /*                                                                       */
   /* <Input>                                                               */
   /*    p1  :: The start coordinate.                                       */
@@ -213,28 +202,16 @@
   /*                                                                       */
   /*    max :: The address of the current maximum.                         */
   /*                                                                       */
-
-#if 0
-
-  static void
-  BBox_Cubic_Check( FT_Pos   p1,
-                    FT_Pos   p2,
-                    FT_Pos   p3,
-                    FT_Pos   p4,
-                    FT_Pos*  min,
-                    FT_Pos*  max )
+  static FT_Pos
+  update_cubic_max( FT_Pos  q1,
+                    FT_Pos  q2,
+                    FT_Pos  q3,
+                    FT_Pos  q4,
+                    FT_Pos  max )
   {
-    FT_Pos  q1, q2, q3, q4;
-
-
-    q1 = p1;
-    q2 = p2;
-    q3 = p3;
-    q4 = p4;
-
-    /* for a conic segment to possibly reach new maximum     */
-    /* one of its off-points must be above the current value */
-    while ( q2 > *max || q3 > *max )
+    /* for a cubic segment to possibly reach new maximum, at least */
+    /* one of its off-points must stay above the current value     */
+    while ( q2 > max || q3 > max )
     {
       /* determine which half contains the maximum and split */
       if ( q1 + q2 > q3 + q4 ) /* first half */
@@ -260,231 +237,91 @@
         q3 = q3 / 2;
       }
 
-      /* check if either end reached the maximum */
+      /* check whether either end reached the maximum */
       if ( q1 == q2 && q1 >= q3 )
       {
-        *max = q1;
+        max = q1;
         break;
       }
       if ( q3 == q4 && q2 <= q4 )
       {
-        *max = q4;
+        max = q4;
         break;
       }
     }
 
-    q1 = p1;
-    q2 = p2;
-    q3 = p3;
-    q4 = p4;
-
-    /* for a conic segment to possibly reach new minimum     */
-    /* one of its off-points must be below the current value */
-    while ( q2 < *min || q3 < *min )
-    {
-      /* determine which half contains the minimum and split */
-      if ( q1 + q2 < q3 + q4 ) /* first half */
-      {
-        q4 = q4 + q3;
-        q3 = q3 + q2;
-        q2 = q2 + q1;
-        q4 = q4 + q3;
-        q3 = q3 + q2;
-        q4 = ( q4 + q3 ) / 8;
-        q3 = q3 / 4;
-        q2 = q2 / 2;
-      }
-      else                     /* second half */
-      {
-        q1 = q1 + q2;
-        q2 = q2 + q3;
-        q3 = q3 + q4;
-        q1 = q1 + q2;
-        q2 = q2 + q3;
-        q1 = ( q1 + q2 ) / 8;
-        q2 = q2 / 4;
-        q3 = q3 / 2;
-      }
-
-      /* check if either end reached the minimum */
-      if ( q1 == q2 && q1 <= q3 )
-      {
-        *min = q1;
-        break;
-      }
-      if ( q3 == q4 && q2 >= q4 )
-      {
-        *min = q4;
-        break;
-      }
-    }
-  }
-
-#else
-
-  static void
-  test_cubic_extrema( FT_Pos    y1,
-                      FT_Pos    y2,
-                      FT_Pos    y3,
-                      FT_Pos    y4,
-                      FT_Fixed  u,
-                      FT_Pos*   min,
-                      FT_Pos*   max )
-  {
- /* FT_Pos    a = y4 - 3*y3 + 3*y2 - y1; */
-    FT_Pos    b = y3 - 2*y2 + y1;
-    FT_Pos    c = y2 - y1;
-    FT_Pos    d = y1;
-    FT_Pos    y;
-    FT_Fixed  uu;
-
-    FT_UNUSED ( y4 );
-
-
-    /* The polynomial is                      */
-    /*                                        */
-    /*    P(x) = a*x^3 + 3b*x^2 + 3c*x + d  , */
-    /*                                        */
-    /*   dP/dx = 3a*x^2 + 6b*x + 3c         . */
-    /*                                        */
-    /* However, we also have                  */
-    /*                                        */
-    /*   dP/dx(u) = 0                       , */
-    /*                                        */
-    /* which implies by subtraction that      */
-    /*                                        */
-    /*   P(u) = b*u^2 + 2c*u + d            . */
-
-    if ( u > 0 && u < 0x10000L )
-    {
-      uu = FT_MulFix( u, u );
-      y  = d + FT_MulFix( c, 2*u ) + FT_MulFix( b, uu );
-
-      if ( y < *min ) *min = y;
-      if ( y > *max ) *max = y;
-    }
+    return max;
   }
 
 
   static void
-  BBox_Cubic_Check( FT_Pos   y1,
-                    FT_Pos   y2,
-                    FT_Pos   y3,
-                    FT_Pos   y4,
+  BBox_Cubic_Check( FT_Pos   p1,
+                    FT_Pos   p2,
+                    FT_Pos   p3,
+                    FT_Pos   p4,
                     FT_Pos*  min,
                     FT_Pos*  max )
   {
-    /* always compare first and last points */
-    if      ( y1 < *min )  *min = y1;
-    else if ( y1 > *max )  *max = y1;
+    FT_Pos  nmin, nmax;
+    FT_Int  shift;
 
-    if      ( y4 < *min )  *min = y4;
-    else if ( y4 > *max )  *max = y4;
 
-    /* now, try to see if there are split points here */
-    if ( y1 <= y4 )
+    /* This function is only called when a control off-point is outside  */
+    /* the bbox that contains all on-points.  It finds a local extremum  */
+    /* within the segment using iterative bisection of the segment.      */
+    /* The fixed-point arithmetic of bisection is inherently stable      */
+    /* but may loose accuracy in the two lowest bits.  To compensate,    */
+    /* we upscale the segment if there is room.  Large values may need   */
+    /* to be downscaled to avoid overflows during bisection.             */
+    /* The control off-point outside the bbox is likely to have the top  */
+    /* absolute value among arguments.                                   */
+
+    shift = 27 - FT_MSB( FT_ABS( p2 ) | FT_ABS( p3 ) );
+
+    if ( shift > 0 )
     {
-      /* flat or ascending arc test */
-      if ( y1 <= y2 && y2 <= y4 && y1 <= y3 && y3 <= y4 )
-        return;
+      /* upscaling too much just wastes time */
+      if ( shift > 2 )
+        shift = 2;
+
+      p1 <<=  shift;
+      p2 <<=  shift;
+      p3 <<=  shift;
+      p4 <<=  shift;
+      nmin = *min << shift;
+      nmax = *max << shift;
     }
-    else /* y1 > y4 */
+    else
     {
-      /* descending arc test */
-      if ( y1 >= y2 && y2 >= y4 && y1 >= y3 && y3 >= y4 )
-        return;
+      p1 >>= -shift;
+      p2 >>= -shift;
+      p3 >>= -shift;
+      p4 >>= -shift;
+      nmin = *min >> -shift;
+      nmax = *max >> -shift;
     }
 
-    /* There are some split points.  Find them.                        */
-    /* We already made sure that a, b, and c below cannot be all zero. */
-    {
-      FT_Pos    a = y4 - 3*y3 + 3*y2 - y1;
-      FT_Pos    b = y3 - 2*y2 + y1;
-      FT_Pos    c = y2 - y1;
-      FT_Pos    d;
-      FT_Fixed  t;
-      FT_Int    shift;
-
-
-      /* We need to solve `ax^2+2bx+c' here, without floating points!      */
-      /* The trick is to normalize to a different representation in order  */
-      /* to use our 16.16 fixed-point routines.                            */
-      /*                                                                   */
-      /* We compute FT_MulFix(b,b) and FT_MulFix(a,c) after normalization. */
-      /* These values must fit into a single 16.16 value.                  */
-      /*                                                                   */
-      /* We normalize a, b, and c to `8.16' fixed-point values to ensure   */
-      /* that their product is held in a `16.16' value including the sign. */
-      /* Necessarily, we need to shift `a', `b', and `c' so that the most  */
-      /* significant bit of their absolute values is at position 22.       */
-      /*                                                                   */
-      /* This also means that we are using 23 bits of precision to compute */
-      /* the zeros, independently of the range of the original polynomial  */
-      /* coefficients.                                                     */
-      /*                                                                   */
-      /* This algorithm should ensure reasonably accurate values for the   */
-      /* zeros.  Note that they are only expressed with 16 bits when       */
-      /* computing the extrema (the zeros need to be in 0..1 exclusive     */
-      /* to be considered part of the arc).                                */
-
-      shift = FT_MSB( FT_ABS( a ) | FT_ABS( b ) | FT_ABS( c ) );
-
-      if ( shift > 22 )
-      {
-        shift -= 22;
+    nmax =  update_cubic_max(  p1,  p2,  p3,  p4,  nmax );
 
-        /* this loses some bits of precision, but we use 23 of them */
-        /* for the computation anyway                               */
-        a >>= shift;
-        b >>= shift;
-        c >>= shift;
-      }
-      else
-      {
-        shift = 22 - shift;
-
-        a <<= shift;
-        b <<= shift;
-        c <<= shift;
-      }
+    /* now flip the signs to update the minimum */
+    nmin = -update_cubic_max( -p1, -p2, -p3, -p4, -nmin );
 
-      /* handle a == 0 */
-      if ( a == 0 )
-      {
-        if ( b != 0 )
-        {
-          t = - FT_DivFix( c, b ) / 2;
-          test_cubic_extrema( y1, y2, y3, y4, t, min, max );
-        }
-      }
-      else
-      {
-        /* solve the equation now */
-        d = FT_MulFix( b, b ) - FT_MulFix( a, c );
-        if ( d < 0 )
-          return;
-
-        if ( d == 0 )
-        {
-          /* there is a single split point at -b/a */
-          t = - FT_DivFix( b, a );
-          test_cubic_extrema( y1, y2, y3, y4, t, min, max );
-        }
-        else
-        {
-          /* there are two solutions; we need to filter them */
-          d = FT_SqrtFixed( (FT_Int32)d );
-          t = - FT_DivFix( b - d, a );
-          test_cubic_extrema( y1, y2, y3, y4, t, min, max );
-
-          t = - FT_DivFix( b + d, a );
-          test_cubic_extrema( y1, y2, y3, y4, t, min, max );
-        }
-      }
+    if ( shift > 0 )
+    {
+      nmin >>=  shift;
+      nmax >>=  shift;
+    }
+    else
+    {
+      nmin <<= -shift;
+      nmax <<= -shift;
     }
-  }
 
-#endif
+    if ( nmin < *min )
+      *min = nmin;
+    if ( nmax > *max )
+      *max = nmax;
+  }
 
 
   /*************************************************************************/
@@ -521,8 +358,9 @@
                  FT_Vector*  to,
                  TBBox_Rec*  user )
   {
-    /* we don't need to check `to' since it is always an `on' point, thus */
-    /* within the bbox                                                    */
+    /* We don't need to check `to' since it is always an on-point,    */
+    /* thus within the bbox.  Only segments with an off-point outside */
+    /* the bbox can possibly reach new extreme values.                */
 
     if ( CHECK_X( control1, user->bbox ) ||
          CHECK_X( control2, user->bbox ) )
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbdf.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbdf.c
index 5755f8558de..5755f8558de 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbdf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbdf.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbitmap.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbitmap.c
index 975818e14f0..182b1cc2268 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftbitmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftbitmap.c
@@ -385,6 +385,10 @@
     FT_Long  l;
 
 
+    /* Short-circuit transparent color to avoid div-by-zero. */
+    if ( !a )
+      return 0;
+
     /*
      * Luminosity for sRGB is defined using ~0.2126,0.7152,0.0722
      * coefficients for RGB channels *on the linear colors*.
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftcalc.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftcalc.c
index 0ec0d78930f..b23b4d44a46 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftcalc.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftcalc.c
@@ -816,6 +816,8 @@
   }
 
 
+#if 0
+
   /* documentation is in ftcalc.h */
 
   FT_BASE_DEF( FT_Int32 )
@@ -850,6 +852,8 @@
     return (FT_Int32)root;
   }
 
+#endif /* 0 */
+
 
   /* documentation is in ftcalc.h */
 
@@ -945,11 +949,27 @@
     FT_Pos  d_in, d_out, d_corner;
 
 
+    /* We approximate the Euclidean metric (sqrt(x^2 + y^2)) with */
+    /* the Taxicab metric (|x| + |y|), which can be computed much */
+    /* faster.  If one of the two vectors is much longer than the */
+    /* other one, the direction of the shorter vector doesn't     */
+    /* influence the result any more.                             */
+    /*                                                            */
+    /*                 corner                                     */
+    /*       x---------------------------x                        */
+    /*        \                      /                            */
+    /*         \                /                                 */
+    /*      in  \          /  out                                 */
+    /*           \    /                                           */
+    /*            o                                               */
+    /*              Point                                         */
+    /*                                                            */
+
     if ( ax < 0 )
       ax = -ax;
     if ( ay < 0 )
       ay = -ay;
-    d_in = ax + ay;
+    d_in = ax + ay;  /* d_in = || in || */
 
     ax = out_x;
     if ( ax < 0 )
@@ -957,7 +977,7 @@
     ay = out_y;
     if ( ay < 0 )
       ay = -ay;
-    d_out = ax + ay;
+    d_out = ax + ay;  /* d_out = || out || */
 
     ax = out_x + in_x;
     if ( ax < 0 )
@@ -965,7 +985,11 @@
     ay = out_y + in_y;
     if ( ay < 0 )
       ay = -ay;
-    d_corner = ax + ay;
+    d_corner = ax + ay;  /* d_corner = || in + out || */
+
+    /* now do a simple length comparison: */
+    /*                                    */
+    /*   d_in + d_out < 17/16 d_corner    */
 
     return ( d_in + d_out - d_corner ) < ( d_corner >> 4 );
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftcid.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftcid.c
index 741879d9220..741879d9220 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftcid.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftcid.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftdbgmem.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftdbgmem.c
index 6fb86fe77de..6fb86fe77de 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftdbgmem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftdbgmem.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftdebug.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftdebug.c
index b9156d15ee3..39ac6add057 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftdebug.c
@@ -152,7 +152,7 @@
   /* the memory and stream components which are set to 7 and 5,            */
   /* respectively.                                                         */
   /*                                                                       */
-  /* See the file <include/freetype/internal/fttrace.h> for details of the */
+  /* See the file <include/internal/fttrace.h> for details of the          */
   /* available toggle names.                                               */
   /*                                                                       */
   /* The level must be between 0 and 7; 0 means quiet (except for serious  */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftfstype.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftfstype.c
index d0ef7b7c1b0..d0ef7b7c1b0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftfstype.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftfstype.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftgasp.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftgasp.c
index 8485d29259e..8485d29259e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftgasp.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftgasp.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftgloadr.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftgloadr.c
index 3cc5c7a8057..3cc5c7a8057 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftgloadr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftgloadr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftglyph.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftglyph.c
index 5dd28a8c524..c62b3db0c39 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftglyph.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftglyph.c
@@ -424,15 +424,16 @@
                       FT_Matrix*  matrix,
                       FT_Vector*  delta )
   {
-    const FT_Glyph_Class*  clazz;
-    FT_Error               error = FT_Err_Ok;
+    FT_Error  error = FT_Err_Ok;
 
 
     if ( !glyph || !glyph->clazz )
       error = FT_THROW( Invalid_Argument );
     else
     {
-      clazz = glyph->clazz;
+      const FT_Glyph_Class*  clazz = glyph->clazz;
+
+
       if ( clazz->glyph_transform )
       {
         /* transform glyph image */
@@ -466,38 +467,33 @@
 
     if ( !glyph || !glyph->clazz )
       return;
-    else
+
+    clazz = glyph->clazz;
+    if ( !clazz->glyph_bbox )
+      return;
+
+    /* retrieve bbox in 26.6 coordinates */
+    clazz->glyph_bbox( glyph, acbox );
+
+    /* perform grid fitting if needed */
+    if ( bbox_mode == FT_GLYPH_BBOX_GRIDFIT ||
+         bbox_mode == FT_GLYPH_BBOX_PIXELS  )
     {
-      clazz = glyph->clazz;
-      if ( !clazz->glyph_bbox )
-        return;
-      else
-      {
-        /* retrieve bbox in 26.6 coordinates */
-        clazz->glyph_bbox( glyph, acbox );
-
-        /* perform grid fitting if needed */
-        if ( bbox_mode == FT_GLYPH_BBOX_GRIDFIT ||
-             bbox_mode == FT_GLYPH_BBOX_PIXELS  )
-        {
-          acbox->xMin = FT_PIX_FLOOR( acbox->xMin );
-          acbox->yMin = FT_PIX_FLOOR( acbox->yMin );
-          acbox->xMax = FT_PIX_CEIL( acbox->xMax );
-          acbox->yMax = FT_PIX_CEIL( acbox->yMax );
-        }
-
-        /* convert to integer pixels if needed */
-        if ( bbox_mode == FT_GLYPH_BBOX_TRUNCATE ||
-             bbox_mode == FT_GLYPH_BBOX_PIXELS   )
-        {
-          acbox->xMin >>= 6;
-          acbox->yMin >>= 6;
-          acbox->xMax >>= 6;
-          acbox->yMax >>= 6;
-        }
-      }
+      acbox->xMin = FT_PIX_FLOOR( acbox->xMin );
+      acbox->yMin = FT_PIX_FLOOR( acbox->yMin );
+      acbox->xMax = FT_PIX_CEIL( acbox->xMax );
+      acbox->yMax = FT_PIX_CEIL( acbox->yMax );
+    }
+
+    /* convert to integer pixels if needed */
+    if ( bbox_mode == FT_GLYPH_BBOX_TRUNCATE ||
+         bbox_mode == FT_GLYPH_BBOX_PIXELS   )
+    {
+      acbox->xMin >>= 6;
+      acbox->yMin >>= 6;
+      acbox->xMax >>= 6;
+      acbox->yMax >>= 6;
     }
-    return;
   }
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftgxval.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftgxval.c
index a8ec44ac00c..a8ec44ac00c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftgxval.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftgxval.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftinit.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftinit.c
index 85f321fd2d4..6176273f0a6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftinit.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftinit.c
@@ -23,8 +23,8 @@
   /*  FT_Add_Default_Modules():                                            */
   /*     This function is used to add the set of default modules to a      */
   /*     fresh new library object.  The set is taken from the header file  */
-  /*     `freetype/config/ftmodule.h'.  See the document `FreeType 2.0     */
-  /*     Build System' for more information.                               */
+  /*     `config/ftmodule.h'.  See the document `FreeType 2.0 Build        */
+  /*     System' for more information.                                     */
   /*                                                                       */
   /*  FT_Init_FreeType():                                                  */
   /*     This function creates a system object for the current platform,   */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftlcdfil.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftlcdfil.c
index 852fb329828..852fb329828 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftlcdfil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftlcdfil.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftmac.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftmac.c
index 5b5aae61cce..9b49da81402 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftmac.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftmac.c
@@ -963,7 +963,6 @@
     if ( !pathname )
       return FT_THROW( Invalid_Argument );
 
-    error  = FT_Err_Ok;
     *aface = NULL;
 
     /* try resourcefork based font: LWFN, FFIL */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftmm.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftmm.c
index 18ff879bfc4..18ff879bfc4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftmm.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftmm.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftobjs.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftobjs.c
index 157bf456349..b1c2a2bf1e2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftobjs.c
@@ -56,9 +56,7 @@
 #endif /* _MSC_VER */
 
   /* it's easiest to include `md5.c' directly */
-#define free  md5_free /* suppress a shadow warning */
 #include "md5.c"
-#undef free
 
 #if defined( _MSC_VER )
 #pragma warning( pop )
@@ -667,11 +665,18 @@
 
         /* the check for `num_locations' assures that we actually    */
         /* test for instructions in a TTF and not in a CFF-based OTF */
+        /*                                                           */
+        /* since `maxSizeOfInstructions' might be unreliable, we     */
+        /* check the size of the `fpgm' and `prep' tables, too --    */
+        /* the assumption is that there don't exist real TTFs where  */
+        /* both `fpgm' and `prep' tables are missing                 */
         if ( mode == FT_RENDER_MODE_LIGHT                       ||
              face->internal->ignore_unpatented_hinter           ||
              ( FT_IS_SFNT( face )                             &&
                ttface->num_locations                          &&
-               ttface->max_profile.maxSizeOfInstructions == 0 ) )
+               ttface->max_profile.maxSizeOfInstructions == 0 &&
+               ttface->font_program_size == 0                 &&
+               ttface->cvt_program_size == 0                  ) )
           autohint = TRUE;
       }
     }
@@ -1133,7 +1138,8 @@
   /*                                                                       */
   static FT_Error
   open_face( FT_Driver      driver,
-             FT_Stream      stream,
+             FT_Stream      *astream,
+             FT_Bool        external_stream,
              FT_Long        face_index,
              FT_Int         num_params,
              FT_Parameter*  params,
@@ -1141,10 +1147,11 @@
   {
     FT_Memory         memory;
     FT_Driver_Class   clazz;
-    FT_Face           face = 0;
-    FT_Error          error, error2;
+    FT_Face           face     = NULL;
     FT_Face_Internal  internal = NULL;
 
+    FT_Error          error, error2;
+
 
     clazz  = driver->clazz;
     memory = driver->root.memory;
@@ -1155,7 +1162,11 @@
 
     face->driver = driver;
     face->memory = memory;
-    face->stream = stream;
+    face->stream = *astream;
+
+    /* set the FT_FACE_FLAG_EXTERNAL_STREAM bit for FT_Done_Face */
+    if ( external_stream )
+      face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM;
 
     if ( FT_NEW( internal ) )
       goto Fail;
@@ -1177,11 +1188,12 @@
 #endif
 
     if ( clazz->init_face )
-      error = clazz->init_face( stream,
+      error = clazz->init_face( *astream,
                                 face,
                                 (FT_Int)face_index,
                                 num_params,
                                 params );
+    *astream = face->stream; /* Stream may have been changed. */
     if ( error )
       goto Fail;
 
@@ -2069,7 +2081,7 @@
           params     = args->params;
         }
 
-        error = open_face( driver, stream, face_index,
+        error = open_face( driver, &stream, external_stream, face_index,
                            num_params, params, &face );
         if ( !error )
           goto Success;
@@ -2105,7 +2117,7 @@
             params     = args->params;
           }
 
-          error = open_face( driver, stream, face_index,
+          error = open_face( driver, &stream, external_stream, face_index,
                              num_params, params, &face );
           if ( !error )
             goto Success;
@@ -2174,10 +2186,6 @@
   Success:
     FT_TRACE4(( "FT_Open_Face: New face object, adding to list\n" ));
 
-    /* set the FT_FACE_FLAG_EXTERNAL_STREAM bit for FT_Done_Face */
-    if ( external_stream )
-      face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM;
-
     /* add the face object to its driver's list */
     if ( FT_NEW( node ) )
       goto Fail;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftotval.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftotval.c
index 5fc73d76ab3..5fc73d76ab3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftotval.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftotval.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftoutln.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftoutln.c
index 54ca5cdcf6e..177a4caba4c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftoutln.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftoutln.c
@@ -576,11 +576,13 @@
       {
         char*  p = outline->tags + first;
         char*  q = outline->tags + last;
-        char   swap;
 
 
         while ( p < q )
         {
+          char  swap;
+
+
           swap = *p;
           *p   = *q;
           *q   = swap;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftpatent.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftpatent.c
index 82b42f03438..82b42f03438 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftpatent.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftpatent.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftpfr.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftpfr.c
index 0ba955f01fb..0ba955f01fb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftpfr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftpfr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftpic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftpic.c
index 1c871016969..9bd92f785a1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftpic.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType position independent code services (body).              */
 /*                                                                         */
-/*  Copyright 2009 by                                                      */
+/*  Copyright 2009, 2013 by                                                */
 /*  Oran Agra and Mickey Gabel.                                            */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,7 +29,7 @@
   ft_pic_container_init( FT_Library  library )
   {
     FT_PIC_Container*  pic_container = &library->pic_container;
-    FT_Error           error         = FT_Err_Ok;
+    FT_Error           error;
 
 
     FT_MEM_SET( pic_container, 0, sizeof ( *pic_container ) );
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftrfork.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftrfork.c
index 804911721dd..804911721dd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftrfork.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftrfork.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftsnames.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftsnames.c
index 260e91c148e..260e91c148e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftsnames.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftsnames.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftstream.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftstream.c
index d965333daa2..d965333daa2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftstream.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftstream.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftstroke.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftstroke.c
index ee61ceca0eb..ee61ceca0eb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftstroke.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftstroke.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftsynth.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftsynth.c
index 241d37f4262..3098a60fa89 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftsynth.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftsynth.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType synthesizing code for emboldening and slanting (body).      */
 /*                                                                         */
-/*  Copyright 2000-2006, 2010, 2012 by                                     */
+/*  Copyright 2000-2006, 2010, 2012, 2013 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -139,10 +139,11 @@
     if ( slot->advance.y )
       slot->advance.y += ystr;
 
-    slot->metrics.width       += xstr;
-    slot->metrics.height      += ystr;
-    slot->metrics.horiAdvance += xstr;
-    slot->metrics.vertAdvance += ystr;
+    slot->metrics.width        += xstr;
+    slot->metrics.height       += ystr;
+    slot->metrics.horiAdvance  += xstr;
+    slot->metrics.vertAdvance  += ystr;
+    slot->metrics.horiBearingY += ystr;
 
     /* XXX: 16-bit overflow case must be excluded before here */
     if ( slot->format == FT_GLYPH_FORMAT_BITMAP )
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftsystem.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftsystem.c
index 2c6ddac10c2..2c6ddac10c2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/fttrigon.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/fttrigon.c
index 4ffdcb77f1b..4ffdcb77f1b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/fttrigon.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/fttrigon.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/fttype1.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/fttype1.c
index c1f9931dbba..c1f9931dbba 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/fttype1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/fttype1.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftutil.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftutil.c
index 879d0275291..879d0275291 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftutil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftwinfnt.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftwinfnt.c
index 463ae761d8f..463ae761d8f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftwinfnt.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftwinfnt.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftxf86.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftxf86.c
index a4bf767dfa2..a4bf767dfa2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/ftxf86.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/ftxf86.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/md5.c b/Build/source/libs/freetype2/freetype-2.5.1/src/base/md5.c
index 2f01c9302cb..52d96accd30 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/md5.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/md5.c
@@ -50,7 +50,8 @@
  */
 #define F(x, y, z)			((z) ^ ((x) & ((y) ^ (z))))
 #define G(x, y, z)			((y) ^ ((z) & ((x) ^ (y))))
-#define H(x, y, z)			((x) ^ (y) ^ (z))
+#define H(x, y, z)			(((x) ^ (y)) ^ (z))
+#define H2(x, y, z)			((x) ^ ((y) ^ (z)))
 #define I(x, y, z)			((y) ^ ((x) | ~(z)))
 
 /*
@@ -89,13 +90,13 @@
  * This processes one or more 64-byte data blocks, but does NOT update
  * the bit counters.  There are no alignment requirements.
  */
-static void *body(MD5_CTX *ctx, void *data, unsigned long size)
+static const void *body(MD5_CTX *ctx, const void *data, unsigned long size)
 {
-	unsigned char *ptr;
+	const unsigned char *ptr;
 	MD5_u32plus a, b, c, d;
 	MD5_u32plus saved_a, saved_b, saved_c, saved_d;
 
-	ptr = (unsigned char *)data;
+	ptr = (const unsigned char *)data;
 
 	a = ctx->a;
 	b = ctx->b;
@@ -146,21 +147,21 @@ static void *body(MD5_CTX *ctx, void *data, unsigned long size)
 
 /* Round 3 */
 		STEP(H, a, b, c, d, GET(5), 0xfffa3942, 4)
-		STEP(H, d, a, b, c, GET(8), 0x8771f681, 11)
+		STEP(H2, d, a, b, c, GET(8), 0x8771f681, 11)
 		STEP(H, c, d, a, b, GET(11), 0x6d9d6122, 16)
-		STEP(H, b, c, d, a, GET(14), 0xfde5380c, 23)
+		STEP(H2, b, c, d, a, GET(14), 0xfde5380c, 23)
 		STEP(H, a, b, c, d, GET(1), 0xa4beea44, 4)
-		STEP(H, d, a, b, c, GET(4), 0x4bdecfa9, 11)
+		STEP(H2, d, a, b, c, GET(4), 0x4bdecfa9, 11)
 		STEP(H, c, d, a, b, GET(7), 0xf6bb4b60, 16)
-		STEP(H, b, c, d, a, GET(10), 0xbebfbc70, 23)
+		STEP(H2, b, c, d, a, GET(10), 0xbebfbc70, 23)
 		STEP(H, a, b, c, d, GET(13), 0x289b7ec6, 4)
-		STEP(H, d, a, b, c, GET(0), 0xeaa127fa, 11)
+		STEP(H2, d, a, b, c, GET(0), 0xeaa127fa, 11)
 		STEP(H, c, d, a, b, GET(3), 0xd4ef3085, 16)
-		STEP(H, b, c, d, a, GET(6), 0x04881d05, 23)
+		STEP(H2, b, c, d, a, GET(6), 0x04881d05, 23)
 		STEP(H, a, b, c, d, GET(9), 0xd9d4d039, 4)
-		STEP(H, d, a, b, c, GET(12), 0xe6db99e5, 11)
+		STEP(H2, d, a, b, c, GET(12), 0xe6db99e5, 11)
 		STEP(H, c, d, a, b, GET(15), 0x1fa27cf8, 16)
-		STEP(H, b, c, d, a, GET(2), 0xc4ac5665, 23)
+		STEP(H2, b, c, d, a, GET(2), 0xc4ac5665, 23)
 
 /* Round 4 */
 		STEP(I, a, b, c, d, GET(0), 0xf4292244, 6)
@@ -207,10 +208,10 @@ void MD5_Init(MD5_CTX *ctx)
 	ctx->hi = 0;
 }
 
-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
+void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size)
 {
 	MD5_u32plus saved_lo;
-	unsigned long used, free;
+	unsigned long used, available;
 
 	saved_lo = ctx->lo;
 	if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)
@@ -220,16 +221,16 @@ void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
 	used = saved_lo & 0x3f;
 
 	if (used) {
-		free = 64 - used;
+		available = 64 - used;
 
-		if (size < free) {
+		if (size < available) {
 			memcpy(&ctx->buffer[used], data, size);
 			return;
 		}
 
-		memcpy(&ctx->buffer[used], data, free);
-		data = (unsigned char *)data + free;
-		size -= free;
+		memcpy(&ctx->buffer[used], data, available);
+		data = (const unsigned char *)data + available;
+		size -= available;
 		body(ctx, ctx->buffer, 64);
 	}
 
@@ -243,22 +244,22 @@ void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
 
 void MD5_Final(unsigned char *result, MD5_CTX *ctx)
 {
-	unsigned long used, free;
+	unsigned long used, available;
 
 	used = ctx->lo & 0x3f;
 
 	ctx->buffer[used++] = 0x80;
 
-	free = 64 - used;
+	available = 64 - used;
 
-	if (free < 8) {
-		memset(&ctx->buffer[used], 0, free);
+	if (available < 8) {
+		memset(&ctx->buffer[used], 0, available);
 		body(ctx, ctx->buffer, 64);
 		used = 0;
-		free = 64;
+		available = 64;
 	}
 
-	memset(&ctx->buffer[used], 0, free - 8);
+	memset(&ctx->buffer[used], 0, available - 8);
 
 	ctx->lo <<= 3;
 	ctx->buffer[56] = ctx->lo;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/md5.h b/Build/source/libs/freetype2/freetype-2.5.1/src/base/md5.h
index f1a68576401..2da44bf355a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/md5.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/md5.h
@@ -39,7 +39,7 @@ typedef struct {
 } MD5_CTX;
 
 extern void MD5_Init(MD5_CTX *ctx);
-extern void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size);
+extern void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size);
 extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
 
 #endif
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/base/rules.mk
index e932191157a..874533754fa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/base/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/base/rules.mk
@@ -19,8 +19,8 @@
 #   BASE_OBJ_S:   The single-object base layer.
 #   BASE_OBJ_M:   A list of all objects for a multiple-objects build.
 #   BASE_EXT_OBJ: A list of base layer extensions, i.e., components found
-#                 in `freetype/src/base' which are not compiled within the
-#                 base layer proper.
+#                 in `src/base' which are not compiled within the base
+#                 layer proper.
 
 
 BASE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SRC_DIR)/base)
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/Jamfile
index da23ccd0add..da23ccd0add 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/README b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/README
index b761aba2b28..b761aba2b28 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/README
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdf.c b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdf.c
index f95fb76225f..f95fb76225f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdf.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdf.h b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdf.h
index d11be6f147f..d11be6f147f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdfdrivr.c b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdfdrivr.c
index 0ea0a5ea5eb..caa142b5ef4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdfdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdfdrivr.c
@@ -351,7 +351,6 @@ THE SOFTWARE.
 
     FT_UNUSED( num_params );
     FT_UNUSED( params );
-    FT_UNUSED( face_index );
 
 
     FT_TRACE2(( "BDF driver\n" ));
@@ -375,6 +374,19 @@ THE SOFTWARE.
 
     /* we have a bdf font: let's construct the face object */
     face->bdffont = font;
+
+    /* BDF could not have multiple face in single font file.
+     * XXX: non-zero face_index is already invalid argument, but
+     *      Type1, Type42 driver has a convention to return
+     *      an invalid argument error when the font could be
+     *      opened by the specified driver.
+     */
+    if ( face_index > 0 ) {
+      FT_ERROR(( "BDF_Face_Init: invalid face index\n" ));
+      BDF_Face_Done( bdfface );
+      return FT_THROW( Invalid_Argument );
+    }
+ 
     {
       bdf_property_t*  prop = NULL;
 
@@ -674,6 +686,8 @@ THE SOFTWARE.
       goto Exit;
     }
 
+    FT_TRACE1(( "BDF_Glyph_Load: glyph index %d\n", glyph_index ));
+
     /* index 0 is the undefined glyph */
     if ( glyph_index == 0 )
       glyph_index = bdf->default_glyph;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdfdrivr.h b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdfdrivr.h
index ca0dae50d22..ca0dae50d22 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdfdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdfdrivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdferror.h b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdferror.h
index ea545aca06c..ea545aca06c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdferror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdferror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdflib.c b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdflib.c
index 0b8412d9eb5..0b8412d9eb5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/bdflib.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/bdflib.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/module.mk
index fe06ae8e064..fe06ae8e064 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/rules.mk
index 6ff1614ddec..6ff1614ddec 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bdf/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bdf/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bzip2/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/bzip2/Jamfile
index 3da986dce65..3da986dce65 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bzip2/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bzip2/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bzip2/ftbzip2.c b/Build/source/libs/freetype2/freetype-2.5.1/src/bzip2/ftbzip2.c
index 74941302710..74941302710 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bzip2/ftbzip2.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bzip2/ftbzip2.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bzip2/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/bzip2/rules.mk
index 0ff2628b4a1..0ff2628b4a1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/bzip2/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/bzip2/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/Jamfile
index 340cff77423..6563991375b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/Jamfile
@@ -1,6 +1,6 @@
 # FreeType 2 src/cache Jamfile
 #
-# Copyright 2001, 2003, 2004 by
+# Copyright 2001, 2003, 2004, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -11,7 +11,7 @@
 
 SubDir  FT2_TOP $(FT2_SRC_DIR) cache ;
 
-# The file <freetype/ftcache.h> contains some macro definitions that are
+# The file <ftcache.h> contains some macro definitions that are
 # later used in #include statements related to the cache sub-system.  It
 # needs to be parsed through a HDRMACRO rule for macro definitions.
 #
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcache.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcache.c
index d41e91e5ec1..d41e91e5ec1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcache.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcache.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcbasic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcbasic.c
index 84d336d5d6b..84d336d5d6b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcbasic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcbasic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftccache.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftccache.c
index f20dd4502c0..f20dd4502c0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftccache.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftccache.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftccache.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftccache.h
index 4155f320e05..4155f320e05 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftccache.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftccache.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftccback.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftccback.h
index 95282792732..95282792732 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftccback.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftccback.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftccmap.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftccmap.c
index 848349be2d1..848349be2d1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftccmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftccmap.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcerror.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcerror.h
index 0e055709bb7..0e055709bb7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcerror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcerror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcglyph.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcglyph.c
index 441e177238a..441e177238a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcglyph.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcglyph.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcglyph.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcglyph.h
index 5fed19cb8fa..5fed19cb8fa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcglyph.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcglyph.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcimage.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcimage.c
index c242ece021e..c242ece021e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcimage.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcimage.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcimage.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcimage.h
index 20d5d3e07df..20d5d3e07df 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcimage.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcimage.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcmanag.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcmanag.c
index 4eb2c5bfd69..4eb2c5bfd69 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcmanag.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcmanag.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcmanag.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcmanag.h
index 0aec33c5843..0aec33c5843 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcmanag.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcmanag.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcmru.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcmru.c
index dc8b4cc3970..dc8b4cc3970 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcmru.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcmru.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcmru.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcmru.h
index 6fccf11781c..6fccf11781c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcmru.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcmru.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcsbits.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcsbits.c
index 6df1c19930c..6df1c19930c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcsbits.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcsbits.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcsbits.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcsbits.h
index df55dca8066..df55dca8066 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/ftcsbits.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/ftcsbits.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/rules.mk
index ed75a6a91fd..ed75a6a91fd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cache/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cache/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/Jamfile
index 6705d3cfdb7..6705d3cfdb7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2arrst.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2arrst.c
index c8d6f130985..c8d6f130985 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2arrst.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2arrst.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2arrst.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2arrst.h
index ff5ad8b1268..ff5ad8b1268 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2arrst.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2arrst.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2blues.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2blues.c
index 5b348398af8..eec589ef036 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2blues.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2blues.c
@@ -86,11 +86,13 @@
     size_t     i;
     CF2_Fixed  emBoxBottom, emBoxTop;
 
+#if 0
     CF2_Int  unitsPerEm = font->unitsPerEm;
 
 
     if ( unitsPerEm == 0 )
       unitsPerEm = 1000;
+#endif
 
     FT_ZERO( blues );
     blues->scale = font->innerTransform.d;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2blues.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2blues.h
index 2f38fcad8f5..2f38fcad8f5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2blues.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2blues.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2error.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2error.c
index b5595a3d1f3..b5595a3d1f3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2error.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2error.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2error.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2error.h
index 6453ebcb7b8..6453ebcb7b8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2error.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2error.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2fixed.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2fixed.h
index ed1452a7daa..ed1452a7daa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2fixed.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2fixed.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2font.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2font.c
index 479d9125d15..718d1e27ec1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2font.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2font.c
@@ -51,10 +51,59 @@
                         CF2_Fixed   stemWidth,
                         CF2_Fixed*  darkenAmount,
                         CF2_Fixed   boldenAmount,
-                        FT_Bool     stemDarkened )
+                        FT_Bool     stemDarkened,
+                        FT_Int*     darkenParams )
   {
+    /*
+     * Total darkening amount is computed in 1000 unit character space
+     * using the modified 5 part curve as Adobe's Avalon rasterizer.
+     * The darkening amount is smaller for thicker stems.
+     * It becomes zero when the stem is thicker than 2.333 pixels.
+     *
+     * By default, we use
+     *
+     *   darkenAmount = 0.4 pixels   if scaledStem <= 0.5 pixels,
+     *   darkenAmount = 0.275 pixels if 1 <= scaledStem <= 1.667 pixels,
+     *   darkenAmount = 0 pixel      if scaledStem >= 2.333 pixels,
+     *
+     * and piecewise linear in-between:
+     *
+     *
+     *   darkening
+     *       ^
+     *       |
+     *       |      (x1,y1)
+     *       |--------+
+     *       |         \
+     *       |          \
+     *       |           \          (x3,y3)
+     *       |            +----------+
+     *       |        (x2,y2)         \
+     *       |                         \
+     *       |                          \
+     *       |                           +-----------------
+     *       |                         (x4,y4)
+     *       +--------------------------------------------->   stem
+     *                                                       thickness
+     *
+     *
+     * This corresponds to the following values for the
+     * `darkening-parameters' property:
+     *
+     *   (x1, y1) = (500, 400)
+     *   (x2, y2) = (1000, 275)
+     *   (x3, y3) = (1667, 275)
+     *   (x4, y4) = (2333, 0)
+     *
+     */
+
     /* Internal calculations are done in units per thousand for */
-    /* convenience.                                             */
+    /* convenience. The x axis is scaled stem width in          */
+    /* thousandths of a pixel. That is, 1000 is 1 pixel.        */
+    /* The y axis is darkening amount in thousandths of a pixel.*/
+    /* In the code, below, dividing by ppem and                 */
+    /* adjusting for emRatio converts darkenAmount to character */
+    /* space (font units).                                      */
     CF2_Fixed  stemWidthPer1000, scaledStem;
 
 
@@ -69,6 +118,16 @@
 
     if ( stemDarkened )
     {
+      FT_Int  x1 = darkenParams[0];
+      FT_Int  y1 = darkenParams[1];
+      FT_Int  x2 = darkenParams[2];
+      FT_Int  y2 = darkenParams[3];
+      FT_Int  x3 = darkenParams[4];
+      FT_Int  y3 = darkenParams[5];
+      FT_Int  x4 = darkenParams[6];
+      FT_Int  y4 = darkenParams[7];
+
+
       /* convert from true character space to 1000 unit character space; */
       /* add synthetic emboldening effect                                */
 
@@ -81,7 +140,7 @@
            stemWidthPer1000 <= ( stemWidth + boldenAmount ) )
       {
         stemWidthPer1000 = 0;                      /* to pacify compiler */
-        scaledStem       = cf2_intToFixed( 2333 );
+        scaledStem       = cf2_intToFixed( x4 );
       }
       else
       {
@@ -89,39 +148,70 @@
 
         if ( ppem > CF2_FIXED_ONE           &&
              scaledStem <= stemWidthPer1000 )
-          scaledStem = cf2_intToFixed( 2333 );
+          scaledStem = cf2_intToFixed( x4 );
+      }
+
+      /* now apply the darkening parameters */
+
+      if ( scaledStem < cf2_intToFixed( x1 ) )
+        *darkenAmount = FT_DivFix( cf2_intToFixed( y1 ), ppem );
+
+      else if ( scaledStem < cf2_intToFixed( x2 ) )
+      {
+        FT_Int  xdelta = x2 - x1;
+        FT_Int  ydelta = y2 - y1;
+        FT_Int  x      = stemWidthPer1000 -
+                           FT_DivFix( cf2_intToFixed( x1 ), ppem );
+
+
+        if ( !xdelta )
+          goto Try_x3;
+
+        *darkenAmount = FT_MulFix( x, FT_DivFix( ydelta, xdelta ) ) +
+                          FT_DivFix( cf2_intToFixed( y1 ), ppem );
+      }
+
+      else if ( scaledStem < cf2_intToFixed( x3 ) )
+      {
+      Try_x3:
+        {
+          FT_Int  xdelta = x3 - x2;
+          FT_Int  ydelta = y3 - y2;
+          FT_Int  x      = stemWidthPer1000 -
+                             FT_DivFix( cf2_intToFixed( x2 ), ppem );
+
+
+          if ( !xdelta )
+            goto Try_x4;
+
+          *darkenAmount = FT_MulFix( x, FT_DivFix( ydelta, xdelta ) ) +
+                            FT_DivFix( cf2_intToFixed( y2 ), ppem );
+        }
       }
 
-      /*
-       * Total darkening amount is computed in 1000 unit character space
-       * using the modified 5 part curve as Avalon rasterizer.
-       * The darkening amount is smaller for thicker stems.
-       * It becomes zero when the stem is thicker than 2.333 pixels.
-       *
-       * In Avalon rasterizer,
-       *
-       *   darkenAmount = 0.5 pixels   if scaledStem <= 0.5 pixels,
-       *   darkenAmount = 0.333 pixels if 1 <= scaledStem <= 1.667 pixels,
-       *   darkenAmount = 0 pixel      if scaledStem >= 2.333 pixels,
-       *
-       * and piecewise linear in-between.
-       *
-       */
-      if ( scaledStem < cf2_intToFixed( 500 ) )
-        *darkenAmount = FT_DivFix( cf2_intToFixed( 400 ), ppem );
-
-      else if ( scaledStem < cf2_intToFixed( 1000 ) )
-        *darkenAmount = FT_DivFix( cf2_intToFixed( 525 ), ppem ) -
-                          FT_MulFix( stemWidthPer1000,
-                                     cf2_floatToFixed( .25 ) );
-
-      else if ( scaledStem < cf2_intToFixed( 1667 ) )
-        *darkenAmount = FT_DivFix( cf2_intToFixed( 275 ), ppem );
-
-      else if ( scaledStem < cf2_intToFixed( 2333 ) )
-        *darkenAmount = FT_DivFix( cf2_intToFixed( 963 ), ppem ) -
-                          FT_MulFix( stemWidthPer1000,
-                                     cf2_floatToFixed( .413 ) );
+      else if ( scaledStem < cf2_intToFixed( x4 ) )
+      {
+      Try_x4:
+        {
+          FT_Int  xdelta = x4 - x3;
+          FT_Int  ydelta = y4 - y3;
+          FT_Int  x      = stemWidthPer1000 -
+                             FT_DivFix( cf2_intToFixed( x3 ), ppem );
+
+
+          if ( !xdelta )
+            goto Use_y4;
+
+          *darkenAmount = FT_MulFix( x, FT_DivFix( ydelta, xdelta ) ) +
+                            FT_DivFix( cf2_intToFixed( y3 ), ppem );
+        }
+      }
+
+      else
+      {
+      Use_y4:
+        *darkenAmount = FT_DivFix( cf2_intToFixed( y4 ), ppem );
+      }
 
       /* use half the amount on each side and convert back to true */
       /* character space                                           */
@@ -268,7 +358,8 @@
                               font->stdVW,
                               &font->darkenX,
                               boldenX,
-                              FALSE );
+                              FALSE,
+                              font->darkenParams );
       }
       else
         cf2_computeDarkening( emRatio,
@@ -276,7 +367,8 @@
                               font->stdVW,
                               &font->darkenX,
                               0,
-                              font->stemDarkened );
+                              font->stemDarkened,
+                              font->darkenParams );
 
 #if 0
       /* since hstem is measured in the y-direction, we use the `d' member */
@@ -303,7 +395,8 @@
                             font->stdHW,
                             &font->darkenY,
                             boldenY,
-                            font->stemDarkened );
+                            font->stemDarkened,
+                            font->darkenParams );
 
       if ( font->darkenX != 0 || font->darkenY != 0 )
         font->darkened = TRUE;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2font.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2font.h
index f9dd1bbd408..d8860ce8ed5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2font.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2font.h
@@ -85,6 +85,8 @@ FT_BEGIN_HEADER
                              /* i.e. darkenX != 0 || darkenY != 0      */
     FT_Bool  stemDarkened;
 
+    FT_Int  darkenParams[8];              /* 1000 unit character space */
+
     /* variables that depend on both FontDict and Transform */
     CF2_Fixed  stdVW;     /* in character space; depends on dict entry */
     CF2_Fixed  stdHW;     /* in character space; depends on dict entry */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2ft.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2ft.c
index c09a0244a83..4abbc9d798d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2ft.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2ft.c
@@ -344,6 +344,15 @@
       if ( scaled && !driver->no_stem_darkening )
         font->renderingFlags |= CF2_FlagsDarkened;
 
+      font->darkenParams[0] = driver->darken_params[0];
+      font->darkenParams[1] = driver->darken_params[1];
+      font->darkenParams[2] = driver->darken_params[2];
+      font->darkenParams[3] = driver->darken_params[3];
+      font->darkenParams[4] = driver->darken_params[4];
+      font->darkenParams[5] = driver->darken_params[5];
+      font->darkenParams[6] = driver->darken_params[6];
+      font->darkenParams[7] = driver->darken_params[7];
+
       /* now get an outline for this glyph;      */
       /* also get units per em to validate scale */
       font->unitsPerEm = (CF2_Int)cf2_getUnitsPerEm( decoder );
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2ft.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2ft.h
index 731da3ca8c7..731da3ca8c7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2ft.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2ft.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2glue.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2glue.h
index a24da39e93c..a24da39e93c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2glue.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2glue.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2hints.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2hints.c
index 96bd49f186a..5f441616866 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2hints.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2hints.c
@@ -596,22 +596,31 @@
     indexInsert = 0;
     for ( ; indexInsert < hintmap->count; indexInsert++ )
     {
-      if ( hintmap->edge[indexInsert].csCoord > firstHintEdge->csCoord )
+      if ( hintmap->edge[indexInsert].csCoord >= firstHintEdge->csCoord )
         break;
     }
 
     /*
-     * Discard any hints that overlap in character space.  Most often,
-     * this is while building the initial map, but in theory, it can also
-     * occur because of darkening.
+     * Discard any hints that overlap in character space.  Most often, this
+     * is while building the initial map, where captured hints from all
+     * zones are combined.  Define overlap to include hints that `touch'
+     * (overlap zero).  Hiragino Sans/Gothic fonts have numerous hints that
+     * touch.  Some fonts have non-ideographic glyphs that overlap our
+     * synthetic hints.
+     *
+     * Overlap also occurs when darkening stem hints that are close.
      *
      */
     if ( indexInsert < hintmap->count )
     {
-      /* we are inserting before an existing edge:              */
+      /* we are inserting before an existing edge:    */
+      /* verify that an existing edge is not the same */
+      if ( hintmap->edge[indexInsert].csCoord == firstHintEdge->csCoord )
+        return; /* ignore overlapping stem hint */
+
       /* verify that a new pair does not straddle the next edge */
-      if ( isPair                                                       &&
-           hintmap->edge[indexInsert].csCoord < secondHintEdge->csCoord )
+      if ( isPair                                                        &&
+           hintmap->edge[indexInsert].csCoord <= secondHintEdge->csCoord )
         return; /* ignore overlapping stem hint */
 
       /* verify that we are not inserting between paired edges */
@@ -645,8 +654,27 @@
                                                   firstHintEdge->csCoord );
     }
 
-    /* discard any hints that overlap in device space; this can occur */
-    /* because locked hints have been moved to align with blue zones  */
+    /*
+     * Discard any hints that overlap in device space; this can occur
+     * because locked hints have been moved to align with blue zones.
+     *
+     * TODO: Although we might correct this later during adjustment, we
+     * don't currently have a way to delete a conflicting hint once it has
+     * been inserted.  See v2.030 MinionPro-Regular, 12 ppem darkened,
+     * initial hint map for second path, glyph 945 (the perispomeni (tilde)
+     * in U+1F6E, Greek omega with psili and perispomeni).  Darkening is
+     * 25.  Pair 667,747 initially conflicts in design space with top edge
+     * 660.  This is because 667 maps to 7.87, and the top edge was
+     * captured by a zone at 8.0.  The pair is later successfully inserted
+     * in a zone without the top edge.  In this zone it is adjusted to 8.0,
+     * and no longer conflicts with the top edge in design space.  This
+     * means it can be included in yet a later zone which does have the top
+     * edge hint.  This produces a small mismatch between the first and
+     * last points of this path, even though the hint masks are the same.
+     * The density map difference is tiny (1/256).
+     *
+     */
+
     if ( indexInsert > 0 )
     {
       /* we are inserting after an existing edge */
@@ -1035,6 +1063,7 @@
 
     glyphpath->moveIsPending = TRUE;
     glyphpath->pathIsOpen    = FALSE;
+    glyphpath->pathIsClosing = FALSE;
     glyphpath->elemIsQueued  = FALSE;
   }
 
@@ -1175,12 +1204,16 @@
   /*
    * Push the cached element (glyphpath->prevElem*) to the outline
    * consumer.  When a darkening offset is used, the end point of the
-   * cached element may be adjusted to an intersection point or it may be
-   * connected by a line to the current element.  This calculation must
-   * use a HintMap that was valid at the time the element was saved.  For
-   * the first point in a subpath, that is a saved HintMap.  For most
-   * elements, it just means the caller has delayed building a HintMap
-   * from the current HintMask.
+   * cached element may be adjusted to an intersection point or we may
+   * synthesize a connecting line to the current element.  If we are
+   * closing a subpath, we may also generate a connecting line to the start
+   * point.
+   *
+   * This is where Character Space (CS) is converted to Device Space (DS)
+   * using a hint map.  This calculation must use a HintMap that was valid
+   * at the time the element was saved.  For the first point in a subpath,
+   * that is a saved HintMap.  For most elements, it just means the caller
+   * has delayed building a HintMap from the current HintMask.
    *
    * Transform each point with outerTransform and call the outline
    * callbacks.  This is a general 3x3 transform:
@@ -1250,16 +1283,32 @@
       params.op = CF2_PathOpLineTo;
 
       /* note: pt2 and pt3 are unused */
-      cf2_glyphpath_hintPoint( glyphpath,
-                               hintmap,
-                               &params.pt1,
-                               glyphpath->prevElemP1.x,
-                               glyphpath->prevElemP1.y );
 
-      glyphpath->callbacks->lineTo( glyphpath->callbacks, &params );
+      if ( close )
+      {
+        /* use first hint map if closing */
+        cf2_glyphpath_hintPoint( glyphpath,
+                                 &glyphpath->firstHintMap,
+                                 &params.pt1,
+                                 glyphpath->prevElemP1.x,
+                                 glyphpath->prevElemP1.y );
+      }
+      else
+      {
+        cf2_glyphpath_hintPoint( glyphpath,
+                                 hintmap,
+                                 &params.pt1,
+                                 glyphpath->prevElemP1.x,
+                                 glyphpath->prevElemP1.y );
+      }
 
-      glyphpath->currentDS = params.pt1;
+      /* output only non-zero length lines */
+      if ( params.pt0.x != params.pt1.x || params.pt0.y != params.pt1.y )
+      {
+        glyphpath->callbacks->lineTo( glyphpath->callbacks, &params );
 
+        glyphpath->currentDS = params.pt1;
+      }
       break;
 
     case CF2_PathOpCubeTo:
@@ -1296,11 +1345,24 @@
       /* note: at the end of a subpath, we might do both, so use `nextP0' */
       /* before we change it, below                                       */
 
-      cf2_glyphpath_hintPoint( glyphpath,
-                               hintmap,
-                               &params.pt1,
-                               nextP0->x,
-                               nextP0->y );
+      if ( close )
+      {
+        /* if we are closing the subpath, then nextP0 is in the first     */
+        /* hint zone                                                      */
+        cf2_glyphpath_hintPoint( glyphpath,
+                                 &glyphpath->firstHintMap,
+                                 &params.pt1,
+                                 nextP0->x,
+                                 nextP0->y );
+      }
+      else
+      {
+        cf2_glyphpath_hintPoint( glyphpath,
+                                 hintmap,
+                                 &params.pt1,
+                                 nextP0->x,
+                                 nextP0->y );
+      }
 
       if ( params.pt1.x != glyphpath->currentDS.x ||
            params.pt1.y != glyphpath->currentDS.y )
@@ -1511,6 +1573,16 @@
   }
 
 
+  /*
+   * The functions cf2_glyphpath_{moveTo,lineTo,curveTo,closeOpenPath} are
+   * called by the interpreter with Character Space (CS) coordinates.  Each
+   * path element is placed into a queue of length one to await the
+   * calculation of the following element.  At that time, the darkening
+   * offset of the following element is known and joins can be computed,
+   * including possible modification of this element, before mapping to
+   * Device Space (DS) and passing it on to the outline consumer.
+   *
+   */
   FT_LOCAL_DEF( void )
   cf2_glyphpath_moveTo( CF2_GlyphPath  glyphpath,
                         CF2_Fixed      x,
@@ -1548,10 +1620,46 @@
   {
     CF2_Fixed  xOffset, yOffset;
     FT_Vector  P0, P1;
+    FT_Bool    newHintMap;
+
+    /*
+     * New hints will be applied after cf2_glyphpath_pushPrevElem has run.
+     * In case this is a synthesized closing line, any new hints should be
+     * delayed until this path is closed (`cf2_hintmask_isNew' will be
+     * called again before the next line or curve).
+     */
+
+    /* true if new hint map not on close */
+    newHintMap = cf2_hintmask_isNew( glyphpath->hintMask ) &&
+                 !glyphpath->pathIsClosing;
+
+    /*
+     * Zero-length lines may occur in the charstring.  Because we cannot
+     * compute darkening offsets or intersections from zero-length lines,
+     * it is best to remove them and avoid artifacts.  However, zero-length
+     * lines in CS at the start of a new hint map can generate non-zero
+     * lines in DS due to hint substitution.  We detect a change in hint
+     * map here and pass those zero-length lines along.
+     */
 
+    /*
+     * Note: Find explicitly closed paths here with a conditional
+     *       breakpoint using
+     *
+     *         !gp->pathIsClosing && gp->start.x == x && gp->start.y == y
+     *
+     */
 
-    /* can't compute offset of zero length line, so ignore them */
-    if ( glyphpath->currentCS.x == x && glyphpath->currentCS.y == y )
+    if ( glyphpath->currentCS.x == x &&
+         glyphpath->currentCS.y == y &&
+         !newHintMap                 )
+      /*
+       * Ignore zero-length lines in CS where the hint map is the same
+       * because the line in DS will also be zero length.
+       *
+       * Ignore zero-length lines when we synthesize a closing line because
+       * the close will be handled in cf2_glyphPath_pushPrevElem.
+       */
       return;
 
     cf2_glyphpath_computeOffset( glyphpath,
@@ -1597,7 +1705,7 @@
     glyphpath->prevElemP1   = P1;
 
     /* update current map */
-    if ( cf2_hintmask_isNew( glyphpath->hintMask ) )
+    if ( newHintMap )
       cf2_hintmap_build( &glyphpath->hintMap,
                          glyphpath->hStemHintArray,
                          glyphpath->vStemHintArray,
@@ -1703,29 +1811,29 @@
   {
     if ( glyphpath->pathIsOpen )
     {
-      FT_ASSERT( cf2_hintmap_isValid( &glyphpath->firstHintMap ) );
+      /*
+       * A closing line in Character Space line is always generated below
+       * with `cf2_glyphPath_lineTo'.  It may be ignored later if it turns
+       * out to be zero length in Device Space.
+       */
+      glyphpath->pathIsClosing = TRUE;
 
-      /* since we need to apply an offset to the implicit lineto, we make */
-      /* it explicit here                                                 */
       cf2_glyphpath_lineTo( glyphpath,
                             glyphpath->start.x,
                             glyphpath->start.y );
 
-      /* Draw previous element (the explicit LineTo we just created,      */
-      /* above) and connect it to the start point, but with the offset we */
-      /* saved from the first element.                                    */
-      /* Use the saved HintMap, too. */
-      FT_ASSERT( glyphpath->elemIsQueued );
-
-      cf2_glyphpath_pushPrevElem( glyphpath,
-                                  &glyphpath->firstHintMap,
-                                  &glyphpath->offsetStart0,
-                                  glyphpath->offsetStart1,
-                                  TRUE );
+      /* empty the final element from the queue and close the path */
+      if ( glyphpath->elemIsQueued )
+        cf2_glyphpath_pushPrevElem( glyphpath,
+                                    &glyphpath->hintMap,
+                                    &glyphpath->offsetStart0,
+                                    glyphpath->offsetStart1,
+                                    TRUE );
 
       /* reset state machine */
       glyphpath->moveIsPending = TRUE;
       glyphpath->pathIsOpen    = FALSE;
+      glyphpath->pathIsClosing = FALSE;
       glyphpath->elemIsQueued  = FALSE;
     }
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2hints.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2hints.h
index c4fa922a396..f25d91bf89f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2hints.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2hints.h
@@ -204,6 +204,7 @@ FT_BEGIN_HEADER
 #endif
 
     FT_Bool  pathIsOpen;     /* true after MoveTo                     */
+    FT_Bool  pathIsClosing;  /* true when synthesizing closepath line */
     FT_Bool  darken;         /* true if stem darkening                */
     FT_Bool  moveIsPending;  /* true between MoveTo and offset MoveTo */
 
@@ -229,7 +230,8 @@ FT_BEGIN_HEADER
     FT_Vector  currentCS;
     /* current point, device space */
     FT_Vector  currentDS;
-    FT_Vector  start;         /* start point of subpath */
+    /* start point of subpath, character space */
+    FT_Vector  start;
 
     /* the following members constitute the `queue' of one element */
     FT_Bool  elemIsQueued;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2intrp.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2intrp.c
index 5610917cc3f..5610917cc3f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2intrp.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2intrp.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2intrp.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2intrp.h
index b5d8947838e..b5d8947838e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2intrp.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2intrp.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2read.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2read.c
index 2b429e3eeb0..2b429e3eeb0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2read.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2read.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2read.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2read.h
index 7ef7c8c1493..7ef7c8c1493 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2read.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2read.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2stack.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2stack.c
index 8332b5d91aa..8332b5d91aa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2stack.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2stack.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2stack.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2stack.h
index 7d6d1961fe9..7d6d1961fe9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2stack.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2stack.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2types.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2types.h
index ac6a02266e7..ac6a02266e7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cf2types.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cf2types.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cff.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cff.c
index c3840b58384..c3840b58384 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cff.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cff.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffcmap.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffcmap.c
index f6e03c6420e..f6e03c6420e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffcmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffcmap.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffcmap.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffcmap.h
index 3f7f67bbe05..3f7f67bbe05 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffcmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffdrivr.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffdrivr.c
index c8ca96ba495..dde7d448801 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffdrivr.c
@@ -164,6 +164,8 @@
     if ( !slot )
       return FT_THROW( Invalid_Slot_Handle );
 
+    FT_TRACE1(( "cff_glyph_load: glyph index %d\n", glyph_index ));
+
     /* check whether we want a scaled outline or bitmap */
     if ( !size )
       load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
@@ -586,7 +588,38 @@
     CFF_Driver  driver = (CFF_Driver)module;
 
 
-    if ( !ft_strcmp( property_name, "hinting-engine" ) )
+    if ( !ft_strcmp( property_name, "darkening-parameters" ) )
+    {
+      FT_Int*  darken_params = (FT_Int*)value;
+
+      FT_Int  x1 = darken_params[0];
+      FT_Int  y1 = darken_params[1];
+      FT_Int  x2 = darken_params[2];
+      FT_Int  y2 = darken_params[3];
+      FT_Int  x3 = darken_params[4];
+      FT_Int  y3 = darken_params[5];
+      FT_Int  x4 = darken_params[6];
+      FT_Int  y4 = darken_params[7];
+
+
+      if ( x1 < 0   || x2 < 0   || x3 < 0   || x4 < 0   ||
+           y1 < 0   || y2 < 0   || y3 < 0   || y4 < 0   ||
+           x1 > x2  || x2 > x3  || x3 > x4              ||
+           y1 > 500 || y2 > 500 || y3 > 500 || y4 > 500 )
+        return FT_THROW( Invalid_Argument );
+
+      driver->darken_params[0] = x1;
+      driver->darken_params[1] = y1;
+      driver->darken_params[2] = x2;
+      driver->darken_params[3] = y2;
+      driver->darken_params[4] = x3;
+      driver->darken_params[5] = y3;
+      driver->darken_params[6] = x4;
+      driver->darken_params[7] = y4;
+
+      return error;
+    }
+    else if ( !ft_strcmp( property_name, "hinting-engine" ) )
     {
       FT_UInt*  hinting_engine = (FT_UInt*)value;
 
@@ -624,13 +657,28 @@
     FT_Error    error  = FT_Err_Ok;
     CFF_Driver  driver = (CFF_Driver)module;
 
-    FT_UInt  hinting_engine    = driver->hinting_engine;
-    FT_Bool  no_stem_darkening = driver->no_stem_darkening;
 
+    if ( !ft_strcmp( property_name, "darkening-parameters" ) )
+    {
+      FT_Int*  darken_params = driver->darken_params;
+      FT_Int*  val           = (FT_Int*)value;
+
+
+      val[0] = darken_params[0];
+      val[1] = darken_params[1];
+      val[2] = darken_params[2];
+      val[3] = darken_params[3];
+      val[4] = darken_params[4];
+      val[5] = darken_params[5];
+      val[6] = darken_params[6];
+      val[7] = darken_params[7];
 
-    if ( !ft_strcmp( property_name, "hinting-engine" ) )
+      return error;
+    }
+    else if ( !ft_strcmp( property_name, "hinting-engine" ) )
     {
-      FT_UInt*  val = (FT_UInt*)value;
+      FT_UInt   hinting_engine    = driver->hinting_engine;
+      FT_UInt*  val               = (FT_UInt*)value;
 
 
       *val = hinting_engine;
@@ -639,7 +687,8 @@
     }
     else if ( !ft_strcmp( property_name, "no-stem-darkening" ) )
     {
-      FT_Bool*  val = (FT_Bool*)value;
+      FT_Bool   no_stem_darkening = driver->no_stem_darkening;
+      FT_Bool*  val               = (FT_Bool*)value;
 
 
       *val = no_stem_darkening;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffdrivr.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffdrivr.h
index 50e8138701e..50e8138701e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffdrivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cfferrs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cfferrs.h
index 801d73ec6b7..801d73ec6b7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cfferrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cfferrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffgload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffgload.c
index 6a8494fa9ff..c8e9f9124b6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffgload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffgload.c
@@ -434,7 +434,7 @@
         goto Exit;
       }
 
-      FT_TRACE3(( "glyph index %d (subfont %d):\n", glyph_index, fd_index ));
+      FT_TRACE3(( "  in subfont %d:\n", fd_index ));
 
       sub = cff->subfonts[fd_index];
 
@@ -447,10 +447,6 @@
         builder->hints_globals = (void *)internal->subfonts[fd_index];
       }
     }
-#ifdef FT_DEBUG_LEVEL_TRACE
-    else
-      FT_TRACE3(( "glyph index %d:\n", glyph_index ));
-#endif
 
     decoder->num_locals    = sub->local_subrs_index.count;
     decoder->locals        = sub->local_subrs;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffgload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffgload.h
index 41df7db6928..41df7db6928 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffgload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffload.c
index 64b497168d8..ff271f3d583 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffload.c
@@ -414,7 +414,7 @@
       cur_offset = idx->offsets[0] - 1;
 
       /* sanity check */
-      if ( cur_offset >= idx->data_size )
+      if ( cur_offset != 0 )
       {
         FT_TRACE0(( "cff_index_get_pointers:"
                     " invalid first offset value %d set to zero\n",
@@ -432,11 +432,11 @@
         FT_ULong  next_offset = idx->offsets[n] - 1;
 
 
-        /* empty slot + two sanity checks for invalid offset tables */
-        if ( next_offset == 0                                    ||
-             next_offset < cur_offset                            ||
-             ( next_offset >= idx->data_size && n < idx->count ) )
+        /* two sanity checks for invalid offset tables */
+        if ( next_offset < cur_offset )
           next_offset = cur_offset;
+        else if ( next_offset > idx->data_size )
+          next_offset = idx->data_size;
 
         if ( !pool )
           t[n] = org_bytes + next_offset;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffload.h
index 804961964b8..804961964b8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffobjs.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffobjs.c
index dd750d10416..29c36915084 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffobjs.c
@@ -1055,7 +1055,7 @@
     CFF_Driver  driver = (CFF_Driver)module;
 
 
-    /* set default property values */
+    /* set default property values, cf `ftcffdrv.h' */
 #ifdef CFF_CONFIG_OPTION_OLD_ENGINE
     driver->hinting_engine    = FT_CFF_HINTING_FREETYPE;
 #else
@@ -1063,6 +1063,15 @@
 #endif
     driver->no_stem_darkening = FALSE;
 
+    driver->darken_params[0] =  500;
+    driver->darken_params[1] =  400;
+    driver->darken_params[2] = 1000;
+    driver->darken_params[3] =  275;
+    driver->darken_params[4] = 1667;
+    driver->darken_params[5] =  275;
+    driver->darken_params[6] = 2333;
+    driver->darken_params[7] =    0;
+
     return FT_Err_Ok;
   }
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffobjs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffobjs.h
index b375c20c743..dfbf9a96b0b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffobjs.h
@@ -121,6 +121,8 @@ FT_BEGIN_HEADER
     FT_UInt  hinting_engine;
     FT_Bool  no_stem_darkening;
 
+    FT_Int  darken_params[8];
+
   } CFF_DriverRec;
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffparse.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffparse.c
index 96222120b01..96222120b01 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffparse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffparse.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffparse.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffparse.h
index 61d91ed2e2d..61d91ed2e2d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffparse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffparse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffpic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffpic.c
index f22e4f0d537..f22e4f0d537 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffpic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffpic.h
index 50bab4c1739..50bab4c1739 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cffpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cffpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cfftoken.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cfftoken.h
index bcb4276a78f..bcb4276a78f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cfftoken.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cfftoken.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cfftypes.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cfftypes.h
index 87274466644..87274466644 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/cfftypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/cfftypes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/module.mk
index ef1391c279b..ef1391c279b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/rules.mk
index 13115c25509..13115c25509 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cff/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cff/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/Jamfile
index ebeaed54ea2..ebeaed54ea2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/ciderrs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/ciderrs.h
index ef13155504e..ef13155504e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/ciderrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/ciderrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidgload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidgload.c
index a1a86586935..7febab81c41 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidgload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidgload.c
@@ -58,7 +58,7 @@
 #endif
 
 
-    FT_TRACE4(( "cid_load_glyph: glyph index %d\n", glyph_index ));
+    FT_TRACE1(( "cid_load_glyph: glyph index %d\n", glyph_index ));
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidgload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidgload.h
index a0a91bfea83..a0a91bfea83 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidgload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidload.c
index f2a18ea5105..46def71b79e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidload.c
@@ -150,8 +150,6 @@
   cid_parse_font_matrix( CID_Face     face,
                          CID_Parser*  parser )
   {
-    FT_Matrix*    matrix;
-    FT_Vector*    offset;
     CID_FaceDict  dict;
     FT_Face       root = (FT_Face)&face->root;
     FT_Fixed      temp[6];
@@ -160,6 +158,10 @@
 
     if ( parser->num_dict >= 0 && parser->num_dict < face->cid.num_dicts )
     {
+      FT_Matrix*  matrix;
+      FT_Vector*  offset;
+
+
       dict   = face->cid.font_dicts + parser->num_dict;
       matrix = &dict->font_matrix;
       offset = &dict->font_offset;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidload.h
index 8c172ffee2d..8c172ffee2d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidobjs.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidobjs.c
index 46555e2dc85..46555e2dc85 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidobjs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidobjs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidobjs.h
index aee346d1c88..aee346d1c88 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidparse.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidparse.c
index 53df3155d11..53df3155d11 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidparse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidparse.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidparse.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidparse.h
index ca37deab936..ca37deab936 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidparse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidparse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidriver.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidriver.c
index 6132a277633..6132a277633 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidriver.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidriver.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidriver.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidriver.h
index 3c45e068862..3c45e068862 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidriver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidtoken.h b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidtoken.h
index 904cb09cf4d..904cb09cf4d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/cidtoken.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/cidtoken.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/module.mk
index ce30bfd7ae4..ce30bfd7ae4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/rules.mk
index f3627446126..f3627446126 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/type1cid.c b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/type1cid.c
index 0b866e97c44..0b866e97c44 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/cid/type1cid.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/cid/type1cid.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/Jamfile
index 88049a625d3..88049a625d3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/README b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/README
index 28e535b0bcc..28e535b0bcc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/README
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvalid.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvalid.c
index bc36e675d14..bc36e675d14 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvalid.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvalid.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvalid.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvalid.h
index 27be9ecca85..27be9ecca85 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvalid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvalid.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvbsln.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvbsln.c
index 3d100315636..3d100315636 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvbsln.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvbsln.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvcommn.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvcommn.c
index 2ac80be8c7a..7af52342ba0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvcommn.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvcommn.c
@@ -1288,7 +1288,9 @@
                                valid );
     else
     {
+#if 0
       maxState = 1;     /* 0:start of text, 1:start of line are predefined */
+#endif
       maxEntry = 0;
     }
 
@@ -1621,8 +1623,10 @@
       gxv_LookupTable_validate( table + classTable,
                                 table + classTable + classTable_length,
                                 valid );
+#if 0
       if ( valid->subtable_length < classTable_length )
         classTable_length = valid->subtable_length;
+#endif
     }
     else
     {
@@ -1641,7 +1645,9 @@
                                 valid );
     else
     {
+#if 0
       maxState = 1; /* 0:start of text, 1:start of line are predefined */
+#endif
       maxEntry = 0;
     }
 
@@ -1727,6 +1733,7 @@
                                       odtect->range[j].start,
                                       odtect->range[j].length ) )
         {
+#ifdef FT_DEBUG_LEVEL_TRACE
           if ( odtect->range[i].name || odtect->range[j].name )
             GXV_TRACE(( "found overlap between range %d and range %d\n",
                         i, j ));
@@ -1734,6 +1741,7 @@
             GXV_TRACE(( "found overlap between `%s' and `%s\'\n",
                         odtect->range[i].name,
                         odtect->range[j].name ));
+#endif
           FT_INVALID_OFFSET;
         }
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvcommn.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvcommn.h
index 1ff87e4423c..2f44a7515e3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvcommn.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvcommn.h
@@ -318,7 +318,7 @@ FT_BEGIN_HEADER
           FT_BEGIN_STMNT                  \
             {                             \
               if ( (a) & 3 )              \
-                FT_INVALID_OFFSET ;       \
+                FT_INVALID_OFFSET;        \
             }                             \
           FT_END_STMNT
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxverror.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxverror.h
index c573b72de7d..c573b72de7d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxverror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxverror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvfeat.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvfeat.c
index 6f75650991a..6f75650991a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvfeat.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvfeat.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvfeat.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvfeat.h
index 049d23a0b92..049d23a0b92 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvfeat.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvfeat.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvfgen.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvfgen.c
index e48778a2a15..e48778a2a15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvfgen.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvfgen.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvjust.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvjust.c
index 7816e0b7fb8..7816e0b7fb8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvjust.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvjust.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvkern.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvkern.c
index 557c5f1fe4e..557c5f1fe4e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvkern.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvkern.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvlcar.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvlcar.c
index f14fa5b1313..f14fa5b1313 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvlcar.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvlcar.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmod.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmod.c
index 278d47688ab..278d47688ab 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmod.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmod.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmod.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmod.h
index 22732ba9920..22732ba9920 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmod.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmod.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort.c
index 5356e67ca72..c4d49b32d35 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort.c
@@ -123,6 +123,7 @@
   {
     FT_UNUSED( valid );
 
+#ifdef FT_DEBUG_LEVEL_TRACE
     if ( coverage & 0x8000U )
       GXV_TRACE(( " this subtable is for vertical text only\n" ));
     else
@@ -141,6 +142,7 @@
 
     if ( coverage & 0x1FF8 )
       GXV_TRACE(( " coverage has non-zero bits in reserved area\n" ));
+#endif
   }
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort.h
index 1e5a1f5ab68..1e5a1f5ab68 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort0.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort0.c
index b136ceda275..b136ceda275 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort0.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort0.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort1.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort1.c
index 1c17a5d92ad..1c17a5d92ad 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort1.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort2.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort2.c
index 9e08fb792a2..9e08fb792a2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort2.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort2.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort4.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort4.c
index 83470988c09..83470988c09 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort4.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort4.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort5.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort5.c
index 32cfb036399..32cfb036399 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmort5.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmort5.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx.c
index 5ae04d32125..5ae04d32125 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx.h
index 28c1a44f6fb..28c1a44f6fb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx0.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx0.c
index 6a736c17750..6a736c17750 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx0.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx0.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx1.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx1.c
index ce0009a16f1..ce0009a16f1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx1.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx2.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx2.c
index 9d2b0bc4af0..95b8ea40b44 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx2.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx2.c
@@ -5,7 +5,7 @@
 /*    TrueTypeGX/AAT morx table validation                                 */
 /*    body for type2 (Ligature Substitution) subtable.                     */
 /*                                                                         */
-/*  Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K.,       */
+/*  Copyright 2005, 2013 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -317,7 +317,9 @@
 
     gxv_XStateTable_validate( p, limit, valid );
 
+#if 0
     p += valid->subtable_length;
+#endif
     gxv_morx_subtable_type2_ligatureTable_validate( table, valid );
 
     GXV_EXIT;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx4.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx4.c
index c0d2f78e397..c0d2f78e397 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx4.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx4.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx5.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx5.c
index d8cf7007978..d8cf7007978 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvmorx5.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvmorx5.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvopbd.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvopbd.c
index e1250609460..e1250609460 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvopbd.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvopbd.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvprop.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvprop.c
index 0be21336f86..0be21336f86 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvprop.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvprop.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvtrak.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvtrak.c
index 11fbd7ccfb8..11fbd7ccfb8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/gxvtrak.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/gxvtrak.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/module.mk
index 9fd098e2c5e..9fd098e2c5e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/rules.mk
index 57bc0823db7..57bc0823db7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gxvalid/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gxvalid/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/Jamfile
index a7aafa05180..a7aafa05180 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/adler32.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/adler32.c
index c53f9dd125d..c53f9dd125d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/adler32.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/adler32.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/ftgzip.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/ftgzip.c
index f26755834f4..2c60b6c571c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/ftgzip.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/ftgzip.c
@@ -596,6 +596,8 @@
   }
 
 
+  /* documentation is in ftgzip.h */
+
   FT_EXPORT_DEF( FT_Error )
   FT_Stream_OpenGzip( FT_Stream  stream,
                       FT_Stream  source )
@@ -684,7 +686,64 @@
     return error;
   }
 
-#else  /* !FT_CONFIG_OPTION_USE_ZLIB */
+
+  /* documentation is in ftgzip.h */
+
+  FT_EXPORT_DEF( FT_Error )
+  FT_Gzip_Uncompress( FT_Memory       memory,
+                      FT_Byte*        output,
+                      FT_ULong*       output_len,
+                      const FT_Byte*  input,
+                      FT_ULong        input_len )
+  {
+    z_stream  stream;
+    int       err;
+
+
+    /* this function is modeled after zlib's `uncompress' function */
+
+    stream.next_in  = (Bytef*)input;
+    stream.avail_in = (uInt)input_len;
+
+    stream.next_out  = output;
+    stream.avail_out = (uInt)*output_len;
+
+    stream.zalloc = (alloc_func)ft_gzip_alloc;
+    stream.zfree  = (free_func) ft_gzip_free;
+    stream.opaque = memory;
+
+    err = inflateInit2( &stream, MAX_WBITS );
+    if ( err != Z_OK )
+      return FT_THROW( Invalid_Argument );
+
+    err = inflate( &stream, Z_FINISH );
+    if ( err != Z_STREAM_END )
+    {
+      inflateEnd( &stream );
+      if ( err == Z_OK )
+        err = Z_BUF_ERROR;
+    }
+    else
+    {
+      *output_len = stream.total_out;
+
+      err = inflateEnd( &stream );
+    }
+
+    if ( err == Z_MEM_ERROR )
+      return FT_THROW( Out_Of_Memory );
+
+    if ( err == Z_BUF_ERROR )
+      return FT_THROW( Array_Too_Large );
+
+    if ( err == Z_DATA_ERROR )
+      return FT_THROW( Invalid_Table );
+
+    return FT_Err_Ok;
+  }
+
+
+#else /* !FT_CONFIG_OPTION_USE_ZLIB */
 
   FT_EXPORT_DEF( FT_Error )
   FT_Stream_OpenGzip( FT_Stream  stream,
@@ -696,6 +755,23 @@
     return FT_THROW( Unimplemented_Feature );
   }
 
+
+  FT_EXPORT_DEF( FT_Error )
+  FT_Gzip_Uncompress( FT_Memory       memory,
+                      FT_Byte*        output,
+                      FT_ULong*       output_len,
+                      const FT_Byte*  input,
+                      FT_ULong        input_len )
+  {
+    FT_UNUSED( memory );
+    FT_UNUSED( output );
+    FT_UNUSED( output_len );
+    FT_UNUSED( input );
+    FT_UNUSED( input_len );
+
+    return FT_THROW( Unimplemented_Feature );
+  }
+
 #endif /* !FT_CONFIG_OPTION_USE_ZLIB */
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infblock.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infblock.c
index d6e2dc297da..d6e2dc297da 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infblock.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infblock.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infblock.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infblock.h
index c2535a1e452..c2535a1e452 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infblock.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infblock.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infcodes.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infcodes.c
index f7bfd58c4ff..f7bfd58c4ff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infcodes.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infcodes.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infcodes.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infcodes.h
index 154d7f896ca..154d7f896ca 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infcodes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infcodes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/inffixed.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/inffixed.h
index 4d4760ea00e..4d4760ea00e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/inffixed.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/inffixed.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/inflate.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/inflate.c
index 8877fa3eb2b..8877fa3eb2b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/inflate.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/inflate.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/inftrees.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/inftrees.c
index ef536521686..ef536521686 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/inftrees.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/inftrees.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/inftrees.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/inftrees.h
index 07bf2aa0bf8..07bf2aa0bf8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/inftrees.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/inftrees.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infutil.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infutil.c
index 6087b406473..6087b406473 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infutil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infutil.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infutil.h
index 7174b6dd0ff..7174b6dd0ff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/infutil.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/infutil.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/rules.mk
new file mode 100644
index 00000000000..37cd9917653
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/rules.mk
@@ -0,0 +1,78 @@
+#
+# FreeType 2 GZip support configuration rules
+#
+
+
+# Copyright 2002, 2003, 2013 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.
+
+
+# gzip driver directory
+#
+GZIP_DIR := $(SRC_DIR)/gzip
+
+
+# compilation flags for the driver
+#
+ifeq ($(SYSTEM_ZLIB),)
+  GZIP_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(GZIP_DIR))
+else
+  GZIP_COMPILE := $(FT_COMPILE)
+endif
+
+
+# gzip support sources
+#
+# All source and header files get loaded by `ftgzip.c' only if SYTEM_ZLIB is
+# not defined (regardless whether we have a `single' or a `multi' build).
+# However, it doesn't harm if we add everything as a dependency
+# unconditionally.
+#
+GZIP_DRV_SRCS := $(GZIP_DIR)/adler32.c  \
+                 $(GZIP_DIR)/infblock.c \
+                 $(GZIP_DIR)/infblock.h \
+                 $(GZIP_DIR)/infcodes.c \
+                 $(GZIP_DIR)/infcodes.h \
+                 $(GZIP_DIR)/inffixed.h \
+                 $(GZIP_DIR)/inflate.c  \
+                 $(GZIP_DIR)/inftrees.c \
+                 $(GZIP_DIR)/inftrees.h \
+                 $(GZIP_DIR)/infutil.c  \
+                 $(GZIP_DIR)/infutil.h  \
+                 $(GZIP_DIR)/zconf.h    \
+                 $(GZIP_DIR)/zlib.h     \
+                 $(GZIP_DIR)/zutil.c    \
+                 $(GZIP_DIR)/zutil.h
+
+
+# gzip driver object(s)
+#
+#   GZIP_DRV_OBJ is used during both `single' and `multi' builds
+#
+GZIP_DRV_OBJ := $(OBJ_DIR)/ftgzip.$O
+
+
+# gzip main source file
+#
+GZIP_DRV_SRC := $(GZIP_DIR)/ftgzip.c
+
+
+# gzip support - object
+#
+$(GZIP_DRV_OBJ): $(GZIP_DRV_SRC) $(GZIP_DRV_SRCS) $(FREETYPE_H)
+	$(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(GZIP_DRV_SRC))
+
+
+# update main driver object lists
+#
+DRV_OBJS_S += $(GZIP_DRV_OBJ)
+DRV_OBJS_M += $(GZIP_DRV_OBJ)
+
+
+# EOF
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/zconf.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/zconf.h
index 3abf0ba03b0..3abf0ba03b0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/zconf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/zconf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/zlib.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/zlib.h
index 50d0d3f146d..50d0d3f146d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/zlib.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/zlib.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/zutil.c b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/zutil.c
index 7ad0c1f81bb..7ad0c1f81bb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/zutil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/zutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/zutil.h b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/zutil.h
index c9688cd9c04..c9688cd9c04 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/gzip/zutil.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/gzip/zutil.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/Jamfile
index 6f1f516e7cf..6f1f516e7cf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/ftlzw.c b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/ftlzw.c
index 82e6c0070b9..82e6c0070b9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/ftlzw.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/ftlzw.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/ftzopen.c b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/ftzopen.c
index d7a64576bad..d7a64576bad 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/ftzopen.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/ftzopen.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/ftzopen.h b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/ftzopen.h
index f7d2936be2f..f7d2936be2f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/ftzopen.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/ftzopen.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/rules.mk
index 5550a48d64b..5550a48d64b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/lzw/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/lzw/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/Jamfile
index b457143de4f..b457143de4f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/module.mk
index 9cadde55e46..9cadde55e46 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvalid.c b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvalid.c
index d5c2b75abb6..d5c2b75abb6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvalid.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvalid.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvalid.h b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvalid.h
index eb99b9cc48e..eb99b9cc48e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvalid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvalid.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvbase.c b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvbase.c
index d742d2dc95f..d742d2dc95f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvbase.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvbase.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvcommn.c b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvcommn.c
index a4f885b51f8..a4f885b51f8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvcommn.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvcommn.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvcommn.h b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvcommn.h
index 898887fc954..898887fc954 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvcommn.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvcommn.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otverror.h b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otverror.h
index b6f00c9dba2..b6f00c9dba2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otverror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otverror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvgdef.c b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvgdef.c
index 3633ad0de18..3633ad0de18 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvgdef.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvgdef.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvgpos.c b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvgpos.c
index 49b46183a32..49b46183a32 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvgpos.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvgpos.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvgpos.h b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvgpos.h
index 14ca408261d..14ca408261d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvgpos.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvgpos.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvgsub.c b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvgsub.c
index ed499d1e92d..ed499d1e92d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvgsub.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvgsub.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvjstf.c b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvjstf.c
index a616a23432c..a616a23432c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvjstf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvjstf.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvmath.c b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvmath.c
index 96f841f2a9c..96f841f2a9c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvmath.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvmath.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvmod.c b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvmod.c
index 37c6e869dd6..37c6e869dd6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvmod.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvmod.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvmod.h b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvmod.h
index f7e1550787a..f7e1550787a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/otvmod.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/otvmod.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/rules.mk
index 53bd41e5e7d..53bd41e5e7d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/otvalid/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/otvalid/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/Jamfile
index 752fcac2a11..752fcac2a11 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/README b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/README
index 10eff15fbe8..10eff15fbe8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/README
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/module.mk
index df383ff0fbe..df383ff0fbe 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcf.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcf.c
index 11d5b7b2a06..11d5b7b2a06 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcf.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcf.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcf.h
index af0ffc33781..af0ffc33781 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfdrivr.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfdrivr.c
index df25a645a07..748cbca8f1b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfdrivr.c
@@ -218,25 +218,24 @@ THE SOFTWARE.
     FT_FREE( face->metrics );
 
     /* free properties */
+    if ( face->properties )
     {
-      PCF_Property  prop;
-      FT_Int        i;
+      FT_Int  i;
 
 
-      if ( face->properties )
+      for ( i = 0; i < face->nprops; i++ )
       {
-        for ( i = 0; i < face->nprops; i++ )
+        PCF_Property  prop = &face->properties[i];
+
+
+        if ( prop )
         {
-          prop = &face->properties[i];
-
-          if ( prop )
-          {
-            FT_FREE( prop->name );
-            if ( prop->isString )
-              FT_FREE( prop->value.atom );
-          }
+          FT_FREE( prop->name );
+          if ( prop->isString )
+            FT_FREE( prop->value.atom );
         }
       }
+
       FT_FREE( face->properties );
     }
 
@@ -264,11 +263,10 @@ THE SOFTWARE.
                  FT_Parameter*  params )
   {
     PCF_Face  face  = (PCF_Face)pcfface;
-    FT_Error  error = FT_Err_Ok;
+    FT_Error  error;
 
     FT_UNUSED( num_params );
     FT_UNUSED( params );
-    FT_UNUSED( face_index );
 
 
     FT_TRACE2(( "PCF driver\n" ));
@@ -347,6 +345,18 @@ THE SOFTWARE.
 #endif
     }
 
+    /* PCF could not have multiple face in single font file.
+     * XXX: non-zero face_index is already invalid argument, but
+     *      Type1, Type42 driver has a convention to return
+     *      an invalid argument error when the font could be
+     *      opened by the specified driver.
+     */
+    if ( face_index > 0 ) {
+      FT_ERROR(( "PCF_Face_Init: invalid face index\n" ));
+      PCF_Face_Done( pcfface );
+      return FT_THROW( Invalid_Argument );
+    }
+
     /* set up charmap */
     {
       FT_String  *charset_registry = face->charset_registry;
@@ -482,7 +492,7 @@ THE SOFTWARE.
     FT_UNUSED( load_flags );
 
 
-    FT_TRACE4(( "load_glyph %d ---", glyph_index ));
+    FT_TRACE1(( "PCF_Glyph_Load: glyph index %d\n", glyph_index ));
 
     if ( !face || glyph_index >= (FT_UInt)face->root.num_glyphs )
     {
@@ -576,8 +586,6 @@ THE SOFTWARE.
                                     ( face->accel.fontAscent +
                                       face->accel.fontDescent ) << 6 );
 
-    FT_TRACE4(( " --- ok\n" ));
-
   Exit:
     return error;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfdrivr.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfdrivr.h
index 54614951b5d..54614951b5d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfdrivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcferror.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcferror.h
index e51fff8ea60..e51fff8ea60 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcferror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcferror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfread.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfread.c
index 3c1bb7dfa24..ee41c5df3ae 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfread.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfread.c
@@ -1096,7 +1096,7 @@ THE SOFTWARE.
   pcf_load_font( FT_Stream  stream,
                  PCF_Face   face )
   {
-    FT_Error   error  = FT_Err_Ok;
+    FT_Error   error;
     FT_Memory  memory = FT_FACE( face )->memory;
     FT_Bool    hasBDFAccelerators;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfread.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfread.h
index c9524f13464..c9524f13464 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfread.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfread.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfutil.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfutil.c
index b91274f935b..0451ee8deff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfutil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfutil.c
@@ -66,11 +66,11 @@ in this Software without prior written authorization from The Open Group.
   TwoByteSwap( unsigned char*  buf,
                size_t          nbytes )
   {
-    unsigned char  c;
-
-
     for ( ; nbytes >= 2; nbytes -= 2, buf += 2 )
     {
+      unsigned char  c;
+
+
       c      = buf[0];
       buf[0] = buf[1];
       buf[1] = c;
@@ -85,11 +85,11 @@ in this Software without prior written authorization from The Open Group.
   FourByteSwap( unsigned char*  buf,
                 size_t          nbytes )
   {
-    unsigned char  c;
-
-
     for ( ; nbytes >= 4; nbytes -= 4, buf += 4 )
     {
+      unsigned char  c;
+
+
       c      = buf[0];
       buf[0] = buf[3];
       buf[3] = c;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfutil.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfutil.h
index ce10fb541d5..ce10fb541d5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/pcfutil.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/pcfutil.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/rules.mk
index 78641528fab..78641528fab 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pcf/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pcf/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/Jamfile
index 9e2f2b8d050..9e2f2b8d050 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/module.mk
index 8d1d28a9d23..8d1d28a9d23 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfr.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfr.c
index eb2c4edb7ec..eb2c4edb7ec 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrcmap.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrcmap.c
index 740c433d662..1f05640cc60 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrcmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrcmap.c
@@ -67,14 +67,16 @@
   pfr_cmap_char_index( PFR_CMap   cmap,
                        FT_UInt32  char_code )
   {
-    FT_UInt   min = 0;
-    FT_UInt   max = cmap->num_chars;
-    FT_UInt   mid;
-    PFR_Char  gchar;
+    FT_UInt  min = 0;
+    FT_UInt  max = cmap->num_chars;
 
 
     while ( min < max )
     {
+      PFR_Char  gchar;
+      FT_UInt   mid;
+
+
       mid   = min + ( max - min ) / 2;
       gchar = cmap->chars + mid;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrcmap.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrcmap.h
index a6269530543..a6269530543 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrcmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrdrivr.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrdrivr.c
index 4c43947bf49..4c43947bf49 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrdrivr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrdrivr.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrdrivr.h
index 75f86c5cddf..75f86c5cddf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrdrivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrerror.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrerror.h
index 94dc8c5e1c1..94dc8c5e1c1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrerror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrerror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrgload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrgload.c
index 88b4d66a134..2ce093779c3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrgload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrgload.c
@@ -763,7 +763,7 @@
         PFR_SubGlyph  subglyph;
 
 
-        FT_TRACE4(( "subglyph %d:\n", n ));
+        FT_TRACE4(( "  subglyph %d:\n", n ));
 
         subglyph   = glyph->subs + old_count + n;
         old_points = base->n_points;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrgload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrgload.h
index 7cc7a8702a4..7cc7a8702a4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrgload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrload.c
index c19fceb1eef..c19fceb1eef 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrload.h
index ed010715d1c..ed010715d1c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrobjs.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrobjs.c
index 75fc4c3f1f2..8d3cd2920b9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrobjs.c
@@ -324,6 +324,8 @@
     FT_ULong     gps_offset;
 
 
+    FT_TRACE1(( "pfr_slot_load: glyph index %d\n", gindex ));
+
     if ( gindex > 0 )
       gindex--;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrobjs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrobjs.h
index f6aa8b44cc6..f6aa8b44cc6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrsbit.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrsbit.c
index 2da1500707a..2da1500707a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrsbit.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrsbit.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrsbit.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrsbit.h
index 015e9e6dada..015e9e6dada 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrsbit.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrsbit.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrtypes.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrtypes.h
index 918310814c5..918310814c5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/pfrtypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/pfrtypes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/rules.mk
index 60b96c74154..60b96c74154 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pfr/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pfr/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/Jamfile
index faeded90445..faeded90445 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/afmparse.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/afmparse.c
index 6a40e110dc6..6a40e110dc6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/afmparse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/afmparse.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/afmparse.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/afmparse.h
index 35d96046c5d..35d96046c5d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/afmparse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/afmparse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/module.mk
index 42bf6f51999..42bf6f51999 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psaux.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psaux.c
index a4b9c5c6e45..a4b9c5c6e45 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psaux.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psaux.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psauxerr.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psauxerr.h
index d52375f8cb8..d52375f8cb8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psauxerr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psauxerr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psauxmod.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psauxmod.c
index 4b1249d49b6..4b1249d49b6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psauxmod.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psauxmod.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psauxmod.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psauxmod.h
index 12172369248..12172369248 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psauxmod.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psauxmod.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psconv.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psconv.c
index d0d8861c22f..d0d8861c22f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psconv.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psconv.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psconv.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psconv.h
index d91c7622104..d91c7622104 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psconv.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psconv.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psobjs.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psobjs.c
index dd976d3a96b..dd976d3a96b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psobjs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psobjs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psobjs.h
index e380c60dabb..e380c60dabb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/psobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/psobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/rules.mk
index 7a1be37b692..7a1be37b692 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/t1cmap.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/t1cmap.c
index 9e5bd34ffec..9e5bd34ffec 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/t1cmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/t1cmap.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/t1cmap.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/t1cmap.h
index 7ae65d2fa16..7ae65d2fa16 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/t1cmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/t1cmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/t1decode.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/t1decode.c
index 6ce370bfaaa..6ce370bfaaa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/t1decode.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/t1decode.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/t1decode.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/t1decode.h
index 00728db501e..00728db501e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psaux/t1decode.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psaux/t1decode.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/Jamfile
index 779f1b0b828..779f1b0b828 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/module.mk
index ed24eb7fa89..ed24eb7fa89 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshalgo.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshalgo.c
index 343472ddb38..343472ddb38 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshalgo.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshalgo.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshalgo.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshalgo.h
index c70f31ea949..c70f31ea949 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshalgo.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshalgo.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshglob.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshglob.c
index 9285efc9e16..f75bae45105 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshglob.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshglob.c
@@ -5,7 +5,7 @@
 /*    PostScript hinter global hinting management (body).                  */
 /*    Inspired by the new auto-hinter module.                              */
 /*                                                                         */
-/*  Copyright 2001-2004, 2006, 2010, 2012 by                               */
+/*  Copyright 2001-2004, 2006, 2010, 2012, 2013 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used        */
@@ -757,7 +757,7 @@
                          FT_Fixed     x_delta,
                          FT_Fixed     y_delta )
   {
-    PSH_Dimension  dim = &globals->dimension[0];
+    PSH_Dimension  dim;
 
 
     dim = &globals->dimension[0];
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshglob.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshglob.h
index c511626157a..c511626157a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshglob.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshglob.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshinter.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshinter.c
index b35a2a91c53..b35a2a91c53 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshinter.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshinter.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshmod.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshmod.c
index cdeaca18c9b..cdeaca18c9b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshmod.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshmod.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshmod.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshmod.h
index 0ae7e96f54e..0ae7e96f54e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshmod.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshmod.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshnterr.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshnterr.h
index 7cc180f0cac..7cc180f0cac 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshnterr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshnterr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshpic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshpic.c
index 568f4ac4b01..568f4ac4b01 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshpic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshpic.h
index b46f8531138..b46f8531138 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshrec.c b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshrec.c
index cd66ea869a2..cd66ea869a2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshrec.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshrec.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshrec.h b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshrec.h
index dcb3197f94d..dcb3197f94d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/pshrec.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/pshrec.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/rules.mk
index 888ece10589..888ece10589 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/pshinter/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/pshinter/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/Jamfile
index 06c0dda66f2..06c0dda66f2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/module.mk
index a6e908257cb..a6e908257cb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/psmodule.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/psmodule.c
index 0a5bcb7d2a1..0a5bcb7d2a1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/psmodule.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/psmodule.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/psmodule.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/psmodule.h
index 28fa14807c0..28fa14807c0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/psmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/psmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/psnamerr.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/psnamerr.h
index acda7f967ee..acda7f967ee 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/psnamerr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/psnamerr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/psnames.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/psnames.c
index 1ede225dc9c..1ede225dc9c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/psnames.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/psnames.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/pspic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/pspic.c
index 3820f65a74a..3820f65a74a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/pspic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/pspic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/pspic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/pspic.h
index 6ff002c6037..6ff002c6037 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/pspic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/pspic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/pstables.h b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/pstables.h
index 0a6637f9853..0a6637f9853 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/pstables.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/pstables.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/rules.mk
index 4cd39a8ccf1..4cd39a8ccf1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/psnames/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/psnames/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/Jamfile
index 4f60e87c788..4f60e87c788 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftmisc.h b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftmisc.h
index 703155a4291..703155a4291 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftmisc.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftmisc.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftraster.c b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftraster.c
index bbd503d97d2..8aa11133ab8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftraster.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftraster.c
@@ -24,8 +24,8 @@
   /*                                                                       */
   /* - copy `src/raster/ftraster.c' (this file) to your current directory  */
   /*                                                                       */
-  /* - copy `include/freetype/ftimage.h' and `src/raster/ftmisc.h'         */
-  /*   to your current directory                                           */
+  /* - copy `include/ftimage.h' and `src/raster/ftmisc.h' to your current  */
+  /*   directory                                                           */
   /*                                                                       */
   /* - compile `ftraster' with the _STANDALONE_ macro defined, as in       */
   /*                                                                       */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftraster.h b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftraster.h
index 80fe46debaf..80fe46debaf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftraster.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftraster.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftrend1.c b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftrend1.c
index aa7f6d56649..aa7f6d56649 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftrend1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftrend1.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftrend1.h b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftrend1.h
index 4cf128622a9..4cf128622a9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/ftrend1.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/ftrend1.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/module.mk
index cbff5df96ea..cbff5df96ea 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/raster.c b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/raster.c
index 1202a116cdf..1202a116cdf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/raster.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/raster.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/rasterrs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/rasterrs.h
index ab85c002a30..ab85c002a30 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/rasterrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/rasterrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/rastpic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/rastpic.c
index 5e9f7cc9c4e..5e9f7cc9c4e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/rastpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/rastpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/rastpic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/rastpic.h
index e0ddba624ee..e0ddba624ee 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/rastpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/rastpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/rules.mk
index 0e0b5e4ebd6..0e0b5e4ebd6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/raster/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/raster/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/Jamfile
index cb20b1b04b1..cb20b1b04b1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/module.mk
index 95fd6a31437..95fd6a31437 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/pngshim.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/pngshim.c
index 408f879c348..878de1fefac 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/pngshim.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/pngshim.c
@@ -122,7 +122,7 @@
   error_callback( png_structp      png,
                   png_const_charp  error_msg )
   {
-    FT_Error*  error = png_get_error_ptr( png );
+    FT_Error*  error = (FT_Error*)png_get_error_ptr( png );
 
     FT_UNUSED( error_msg );
 
@@ -159,7 +159,7 @@
 
     if ( FT_FRAME_ENTER( length ) )
     {
-      FT_Error*  e = png_get_error_ptr( png );
+      FT_Error*  e = (FT_Error*)png_get_error_ptr( png );
 
 
       *e = FT_THROW( Invalid_Stream_Read );
@@ -174,16 +174,18 @@
   }
 
 
-  static FT_Error
-  Load_SBit_Png( FT_Bitmap*       map,
+  FT_LOCAL_DEF( FT_Error )
+  Load_SBit_Png( FT_GlyphSlot     slot,
                  FT_Int           x_offset,
                  FT_Int           y_offset,
                  FT_Int           pix_bits,
                  TT_SBit_Metrics  metrics,
                  FT_Memory        memory,
                  FT_Byte*         data,
-                 FT_UInt          png_len )
+                 FT_UInt          png_len,
+                 FT_Bool          populate_map_and_metrics )
   {
+    FT_Bitmap    *map   = &slot->bitmap;
     FT_Error      error = FT_Err_Ok;
     FT_StreamRec  stream;
 
@@ -193,12 +195,21 @@
 
     int         bitdepth, color_type, interlace;
     FT_Int      i;
-    png_byte*  *rows;
+    png_byte*  *rows = NULL; /* pacify compiler */
 
 
-    if ( x_offset < 0 || x_offset + metrics->width  > map->width ||
-         y_offset < 0 || y_offset + metrics->height > map->rows  ||
-         pix_bits != 32 || map->pixel_mode != FT_PIXEL_MODE_BGRA )
+    if ( x_offset < 0 ||
+         y_offset < 0 )
+    {
+      error = FT_THROW( Invalid_Argument );
+      goto Exit;
+    }
+
+    if ( !populate_map_and_metrics                   &&
+         ( x_offset + metrics->width  > map->width ||
+           y_offset + metrics->height > map->rows  ||
+           pix_bits != 32                          ||
+           map->pixel_mode != FT_PIXEL_MODE_BGRA   ) )
     {
       error = FT_THROW( Invalid_Argument );
       goto Exit;
@@ -238,11 +249,33 @@
                   &bitdepth, &color_type, &interlace,
                   NULL, NULL );
 
-    if ( error != FT_Err_Ok                   ||
-         (FT_Int)imgWidth  != metrics->width  ||
-         (FT_Int)imgHeight != metrics->height )
+    if ( error                                        ||
+         ( !populate_map_and_metrics                &&
+           ( (FT_Int)imgWidth  != metrics->width  ||
+             (FT_Int)imgHeight != metrics->height ) ) )
       goto DestroyExit;
 
+    if ( populate_map_and_metrics )
+    {
+      FT_Long  size;
+
+
+      metrics->width  = (FT_Int)imgWidth;
+      metrics->height = (FT_Int)imgHeight;
+
+      map->width      = metrics->width;
+      map->rows       = metrics->height;
+      map->pixel_mode = FT_PIXEL_MODE_BGRA;
+      map->pitch      = map->width * 4;
+      map->num_grays  = 256;
+
+      size = map->rows * map->pitch;
+
+      error = ft_glyphslot_alloc_bitmap( slot, size );
+      if ( error )
+        goto DestroyExit;
+    }
+
     /* convert palette/gray image to rgb */
     if ( color_type == PNG_COLOR_TYPE_PALETTE )
       png_set_palette_to_rgb( png );
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/pngshim.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/pngshim.h
index 8a2e69ccf9f..dc9ecaf9189 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/pngshim.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/pngshim.h
@@ -29,14 +29,15 @@ FT_BEGIN_HEADER
 #ifdef FT_CONFIG_OPTION_USE_PNG
 
   FT_LOCAL( FT_Error )
-  Load_SBit_Png( FT_Bitmap*       map,
+  Load_SBit_Png( FT_GlyphSlot     slot,
                  FT_Int           x_offset,
                  FT_Int           y_offset,
                  FT_Int           pix_bits,
                  TT_SBit_Metrics  metrics,
                  FT_Memory        memory,
                  FT_Byte*         data,
-                 FT_UInt          png_len );
+                 FT_UInt          png_len,
+                 FT_Bool          populate_map_and_metrics );
 
 #endif
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/rules.mk
index a6c956ab657..a6c956ab657 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfdriver.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfdriver.c
index a368b8caeaa..e0132c920cc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfdriver.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfdriver.c
@@ -499,8 +499,8 @@
     tt_face_load_hmtx,
 
     /* see `ttsbit.h' and `sfnt.h' */
-    PUT_EMBEDDED_BITMAPS( tt_face_load_eblc ),
-    PUT_EMBEDDED_BITMAPS( tt_face_free_eblc ),
+    PUT_EMBEDDED_BITMAPS( tt_face_load_sbit ),
+    PUT_EMBEDDED_BITMAPS( tt_face_free_sbit ),
 
     PUT_EMBEDDED_BITMAPS( tt_face_set_sbit_strike     ),
     PUT_EMBEDDED_BITMAPS( tt_face_load_strike_metrics ),
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfdriver.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfdriver.h
index 5de25d51ca4..5de25d51ca4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfdriver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfdriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sferrors.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sferrors.h
index e981e1d26fb..e981e1d26fb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sferrors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sferrors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfnt.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfnt.c
index d62ed4e0b55..d62ed4e0b55 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfnt.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfnt.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfntpic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfntpic.c
index b3fb24b3f00..b3fb24b3f00 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfntpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfntpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfntpic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfntpic.h
index b09a9141e07..b09a9141e07 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfntpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfntpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfobjs.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfobjs.c
index f975e71c3ba..5c0d0f61c5c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfobjs.c
@@ -27,6 +27,7 @@
 #include FT_TRUETYPE_TAGS_H
 #include FT_SERVICE_POSTSCRIPT_CMAPS_H
 #include FT_SFNT_NAMES_H
+#include FT_GZIP_H
 #include "sferrors.h"
 
 #ifdef TT_CONFIG_OPTION_BDF
@@ -347,6 +348,380 @@
   }
 
 
+#define WRITE_BYTE( p, v )     \
+          do                   \
+          {                    \
+            *(p)++ = (v) >> 0; \
+                               \
+          } while ( 0 )
+
+#define WRITE_USHORT( p, v )   \
+          do                   \
+          {                    \
+            *(p)++ = (v) >> 8; \
+            *(p)++ = (v) >> 0; \
+                               \
+          } while ( 0 )
+
+#define WRITE_ULONG( p, v )     \
+          do                    \
+          {                     \
+            *(p)++ = (v) >> 24; \
+            *(p)++ = (v) >> 16; \
+            *(p)++ = (v) >>  8; \
+            *(p)++ = (v) >>  0; \
+                                \
+          } while ( 0 )
+
+
+  static void
+  sfnt_stream_close( FT_Stream  stream )
+  {
+    FT_Memory  memory = stream->memory;
+
+
+    FT_FREE( stream->base );
+
+    stream->size  = 0;
+    stream->base  = 0;
+    stream->close = 0;
+  }
+
+
+  FT_CALLBACK_DEF( int )
+  compare_offsets( const void*  a,
+                   const void*  b )
+  {
+    WOFF_Table  table1 = *(WOFF_Table*)a;
+    WOFF_Table  table2 = *(WOFF_Table*)b;
+
+    FT_ULong  offset1 = table1->Offset;
+    FT_ULong  offset2 = table2->Offset;
+
+
+    if ( offset1 > offset2 )
+      return 1;
+    else if ( offset1 < offset2 )
+      return -1;
+    else
+      return 0;
+  }
+
+
+  /* Replace `face->root.stream' with a stream containing the extracted */
+  /* SFNT of a WOFF font.                                               */
+
+  static FT_Error
+  woff_open_font( FT_Stream  stream,
+                  TT_Face    face )
+  {
+    FT_Memory       memory = stream->memory;
+    FT_Error        error  = FT_Err_Ok;
+
+    WOFF_HeaderRec  woff;
+    WOFF_Table      tables  = NULL;
+    WOFF_Table*     indices = NULL;
+
+    FT_ULong        woff_offset;
+
+    FT_Byte*        sfnt        = NULL;
+    FT_Stream       sfnt_stream = NULL;
+
+    FT_Byte*        sfnt_header;
+    FT_ULong        sfnt_offset;
+
+    FT_Int          nn;
+    FT_ULong        old_tag = 0;
+
+    static const FT_Frame_Field  woff_header_fields[] =
+    {
+#undef  FT_STRUCTURE
+#define FT_STRUCTURE  WOFF_HeaderRec
+
+      FT_FRAME_START( 44 ),
+        FT_FRAME_ULONG ( signature ),
+        FT_FRAME_ULONG ( flavor ),
+        FT_FRAME_ULONG ( length ),
+        FT_FRAME_USHORT( num_tables ),
+        FT_FRAME_USHORT( reserved ),
+        FT_FRAME_ULONG ( totalSfntSize ),
+        FT_FRAME_USHORT( majorVersion ),
+        FT_FRAME_USHORT( minorVersion ),
+        FT_FRAME_ULONG ( metaOffset ),
+        FT_FRAME_ULONG ( metaLength ),
+        FT_FRAME_ULONG ( metaOrigLength ),
+        FT_FRAME_ULONG ( privOffset ),
+        FT_FRAME_ULONG ( privLength ),
+      FT_FRAME_END
+    };
+
+
+    FT_ASSERT( stream == face->root.stream );
+    FT_ASSERT( FT_STREAM_POS() == 0 );
+
+    if ( FT_STREAM_READ_FIELDS( woff_header_fields, &woff ) )
+      return error;
+
+    /* Make sure we don't recurse back here or hit TTC code. */
+    if ( woff.flavor == TTAG_wOFF || woff.flavor == TTAG_ttcf )
+      return FT_THROW( Invalid_Table );
+
+    /* Miscellaneous checks. */
+    if ( woff.length != stream->size                              ||
+         woff.num_tables == 0                                     ||
+         44 + woff.num_tables * 20UL >= woff.length               ||
+         12 + woff.num_tables * 16UL >= woff.totalSfntSize        ||
+         ( woff.totalSfntSize & 3 ) != 0                          ||
+         ( woff.metaOffset == 0 && ( woff.metaLength != 0     ||
+                                     woff.metaOrigLength != 0 ) ) ||
+         ( woff.metaLength != 0 && woff.metaOrigLength == 0 )     ||
+         ( woff.privOffset == 0 && woff.privLength != 0 )         )
+      return FT_THROW( Invalid_Table );
+
+    if ( FT_ALLOC( sfnt, woff.totalSfntSize ) ||
+         FT_NEW( sfnt_stream )                )
+      goto Exit;
+
+    sfnt_header = sfnt;
+
+    /* Write sfnt header. */
+    {
+      FT_UInt  searchRange, entrySelector, rangeShift, x;
+
+
+      x             = woff.num_tables;
+      entrySelector = 0;
+      while ( x )
+      {
+        x            >>= 1;
+        entrySelector += 1;
+      }
+      entrySelector--;
+
+      searchRange = ( 1 << entrySelector ) * 16;
+      rangeShift  = woff.num_tables * 16 - searchRange;
+
+      WRITE_ULONG ( sfnt_header, woff.flavor );
+      WRITE_USHORT( sfnt_header, woff.num_tables );
+      WRITE_USHORT( sfnt_header, searchRange );
+      WRITE_USHORT( sfnt_header, entrySelector );
+      WRITE_USHORT( sfnt_header, rangeShift );
+    }
+
+    /* While the entries in the sfnt header must be sorted by the */
+    /* tag value, the tables themselves are not.  We thus have to */
+    /* sort them by offset and check that they don't overlap.     */
+
+    if ( FT_NEW_ARRAY( tables, woff.num_tables )  ||
+         FT_NEW_ARRAY( indices, woff.num_tables ) )
+      goto Exit;
+
+    FT_TRACE2(( "\n"
+                "  tag    offset    compLen  origLen  checksum\n"
+                "  -------------------------------------------\n" ));
+
+    if ( FT_FRAME_ENTER( 20L * woff.num_tables ) )
+      goto Exit;
+
+    for ( nn = 0; nn < woff.num_tables; nn++ )
+    {
+      WOFF_Table  table = tables + nn;
+
+      table->Tag        = FT_GET_TAG4();
+      table->Offset     = FT_GET_ULONG();
+      table->CompLength = FT_GET_ULONG();
+      table->OrigLength = FT_GET_ULONG();
+      table->CheckSum   = FT_GET_ULONG();
+
+      FT_TRACE2(( "  %c%c%c%c  %08lx  %08lx  %08lx  %08lx\n",
+                  (FT_Char)( table->Tag >> 24 ),
+                  (FT_Char)( table->Tag >> 16 ),
+                  (FT_Char)( table->Tag >> 8  ),
+                  (FT_Char)( table->Tag       ),
+                  table->Offset,
+                  table->CompLength,
+                  table->OrigLength,
+                  table->CheckSum ));
+
+      if ( table->Tag <= old_tag )
+      {
+        FT_FRAME_EXIT();
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
+      old_tag     = table->Tag;
+      indices[nn] = table;
+    }
+
+    FT_FRAME_EXIT();
+
+    /* Sort by offset. */
+
+    ft_qsort( indices,
+              woff.num_tables,
+              sizeof ( WOFF_Table ),
+              compare_offsets );
+
+    /* Check offsets and lengths. */
+
+    woff_offset = 44 + woff.num_tables * 20L;
+    sfnt_offset = 12 + woff.num_tables * 16L;
+
+    for ( nn = 0; nn < woff.num_tables; nn++ )
+    {
+      WOFF_Table  table = indices[nn];
+
+
+      if ( table->Offset != woff_offset                         ||
+           table->Offset + table->CompLength > woff.length      ||
+           sfnt_offset + table->OrigLength > woff.totalSfntSize ||
+           table->CompLength > table->OrigLength                )
+      {
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
+      table->OrigOffset = sfnt_offset;
+
+      /* The offsets must be multiples of 4. */
+      woff_offset += ( table->CompLength + 3 ) & ~3;
+      sfnt_offset += ( table->OrigLength + 3 ) & ~3;
+    }
+
+    /*
+     * Final checks!
+     *
+     * We don't decode and check the metadata block.
+     * We don't check table checksums either.
+     * But other than those, I think we implement all
+     * `MUST' checks from the spec.
+     */
+
+    if ( woff.metaOffset )
+    {
+      if ( woff.metaOffset != woff_offset                  ||
+           woff.metaOffset + woff.metaLength > woff.length )
+      {
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
+      /* We have padding only ... */
+      woff_offset += woff.metaLength;
+    }
+
+    if ( woff.privOffset )
+    {
+      /* ... if it isn't the last block. */
+      woff_offset = ( woff_offset + 3 ) & ~3;
+
+      if ( woff.privOffset != woff_offset                  ||
+           woff.privOffset + woff.privLength > woff.length )
+      {
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
+      /* No padding for the last block. */
+      woff_offset += woff.privLength;
+    }
+
+    if ( sfnt_offset != woff.totalSfntSize ||
+         woff_offset != woff.length        )
+    {
+      error = FT_THROW( Invalid_Table );
+      goto Exit;
+    }
+
+    /* Write the tables. */
+
+    for ( nn = 0; nn < woff.num_tables; nn++ )
+    {
+      WOFF_Table  table = tables + nn;
+
+
+      /* Write SFNT table entry. */
+      WRITE_ULONG( sfnt_header, table->Tag );
+      WRITE_ULONG( sfnt_header, table->CheckSum );
+      WRITE_ULONG( sfnt_header, table->OrigOffset );
+      WRITE_ULONG( sfnt_header, table->OrigLength );
+
+      /* Write table data. */
+      if ( FT_STREAM_SEEK( table->Offset )     ||
+           FT_FRAME_ENTER( table->CompLength ) )
+        goto Exit;
+
+      if ( table->CompLength == table->OrigLength )
+      {
+        /* Uncompressed data; just copy. */
+        ft_memcpy( sfnt + table->OrigOffset,
+                   stream->cursor,
+                   table->OrigLength );
+      }
+      else
+      {
+        /* Uncompress with zlib. */
+        FT_ULong  output_len = table->OrigLength;
+
+
+        error = FT_Gzip_Uncompress( memory,
+                                    sfnt + table->OrigOffset, &output_len,
+                                    stream->cursor, table->CompLength );
+        if ( error )
+          goto Exit;
+        if ( output_len != table->OrigLength )
+        {
+          error = FT_THROW( Invalid_Table );
+          goto Exit;
+        }
+      }
+
+      FT_FRAME_EXIT();
+
+      /* We don't check whether the padding bytes in the WOFF file are     */
+      /* actually '\0'.  For the output, however, we do set them properly. */
+      sfnt_offset = table->OrigOffset + table->OrigLength;
+      while ( sfnt_offset & 3 )
+      {
+        sfnt[sfnt_offset] = '\0';
+        sfnt_offset++;
+      }
+    }
+
+    /* Ok!  Finally ready.  Swap out stream and return. */
+    FT_Stream_OpenMemory( sfnt_stream, sfnt, woff.totalSfntSize );
+    sfnt_stream->memory = stream->memory;
+    sfnt_stream->close  = sfnt_stream_close;
+
+    FT_Stream_Free(
+      face->root.stream,
+      ( face->root.face_flags & FT_FACE_FLAG_EXTERNAL_STREAM ) != 0 );
+
+    face->root.stream = sfnt_stream;
+
+    face->root.face_flags &= ~FT_FACE_FLAG_EXTERNAL_STREAM;
+
+  Exit:
+    FT_FREE( tables );
+    FT_FREE( indices );
+
+    if ( error )
+    {
+      FT_FREE( sfnt );
+      FT_Stream_Close( sfnt_stream );
+      FT_FREE( sfnt_stream );
+    }
+
+    return error;
+  }
+
+
+#undef WRITE_BYTE
+#undef WRITE_USHORT
+#undef WRITE_ULONG
+
+
   /* Fill in face->ttc_header.  If the font is not a TTC, it is */
   /* synthesized into a TTC with one offset table.              */
   static FT_Error
@@ -373,11 +748,28 @@
     face->ttc_header.version = 0;
     face->ttc_header.count   = 0;
 
+  retry:
     offset = FT_STREAM_POS();
 
     if ( FT_READ_ULONG( tag ) )
       return error;
 
+    if ( tag == TTAG_wOFF )
+    {
+      FT_TRACE2(( "sfnt_open_font: file is a WOFF; synthesizing SFNT\n" ));
+
+      if ( FT_STREAM_SEEK( offset ) )
+        return error;
+
+      error = woff_open_font( stream, face );
+      if ( error )
+        return error;
+
+      /* Swap out stream and retry! */
+      stream = face->root.stream;
+      goto retry;
+    }
+
     if ( tag != 0x00010000UL &&
          tag != TTAG_ttcf    &&
          tag != TTAG_OTTO    &&
@@ -480,6 +872,9 @@
     if ( error )
       return error;
 
+    /* Stream may have changed in sfnt_open_font. */
+    stream = face->root.stream;
+
     FT_TRACE2(( "sfnt_init_face: %08p, %ld\n", face, face_index ));
 
     if ( face_index < 0 )
@@ -555,6 +950,7 @@
 #endif
     FT_Bool       has_outline;
     FT_Bool       is_apple_sbit;
+    FT_Bool       is_apple_sbix;
     FT_Bool       ignore_preferred_family    = FALSE;
     FT_Bool       ignore_preferred_subfamily = FALSE;
 
@@ -608,6 +1004,14 @@
 #endif
 
     is_apple_sbit = 0;
+    is_apple_sbix = !face->goto_table( face, TTAG_sbix, stream, 0 );
+
+    /* Apple 'sbix' color bitmaps are rendered scaled and then the 'glyf'
+     * outline rendered on top.  We don't support that yet, so just ignore
+     * the 'glyf' outline and advertise it as a bitmap-only font. */
+    if ( is_apple_sbix )
+      has_outline = FALSE;
+
 
     /* if this font doesn't contain outlines, we try to load */
     /* a `bhed' table                                        */
@@ -619,7 +1023,7 @@
 
     /* load the font header (`head' table) if this isn't an Apple */
     /* sbit font file                                             */
-    if ( !is_apple_sbit )
+    if ( !is_apple_sbit || is_apple_sbix )
     {
       LOAD_( head );
       if ( error )
@@ -803,6 +1207,10 @@
       /*                                                                   */
       /* Compute face flags.                                               */
       /*                                                                   */
+      if ( face->sbit_table_type == TT_SBIT_TABLE_TYPE_CBLC ||
+           face->sbit_table_type == TT_SBIT_TABLE_TYPE_SBIX )
+        flags |= FT_FACE_FLAG_COLOR;      /* color glyphs */
+
       if ( has_outline == TRUE )
         flags |= FT_FACE_FLAG_SCALABLE;   /* scalable outlines */
 
@@ -931,7 +1339,7 @@
 
           if ( em_size == 0 || face->os2.version == 0xFFFFU )
           {
-            avgwidth = 0;
+            avgwidth = 1;
             em_size = 1;
           }
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfobjs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfobjs.h
index 6241c93b392..6241c93b392 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/sfobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/sfobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttbdf.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttbdf.c
index 9401dae5f86..9401dae5f86 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttbdf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttbdf.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttbdf.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttbdf.h
index 48a10d6e9b3..48a10d6e9b3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttbdf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttbdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttcmap.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttcmap.c
index 1507202ea82..9b7856ba589 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttcmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttcmap.c
@@ -320,9 +320,8 @@
     /* parse sub-headers */
     for ( n = 0; n <= max_subs; n++ )
     {
-      FT_UInt   first_code, code_count, offset;
-      FT_Int    delta;
-      FT_Byte*  ids;
+      FT_UInt  first_code, code_count, offset;
+      FT_Int   delta;
 
 
       first_code = TT_NEXT_USHORT( p );
@@ -344,6 +343,9 @@
       /* check offset */
       if ( offset != 0 )
       {
+        FT_Byte*  ids;
+
+
         ids = p - 2 + offset;
         if ( ids < glyph_ids || ids + code_count*2 > table + length )
           FT_INVALID_OFFSET;
@@ -3208,7 +3210,6 @@
   {
     FT_Byte    *p  = tt_cmap14_find_variant( cmap->data + 6,
                                              variantSelector );
-    FT_UInt32  *ret;
     FT_Int      i;
     FT_ULong    defOff;
     FT_ULong    nondefOff;
@@ -3242,6 +3243,8 @@
       FT_Byte*   dp;
       FT_UInt    di, ni, k;
 
+      FT_UInt32  *ret;
+
 
       p  = cmap->data + nondefOff;
       dp = cmap->data + defOff;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttcmap.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttcmap.h
index 0fde1676bfa..0fde1676bfa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttcmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttcmapc.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttcmapc.h
index 2ea204309cf..2ea204309cf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttcmapc.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttcmapc.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttkern.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttkern.c
index 60ee546d793..32c4008b23c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttkern.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttkern.c
@@ -5,7 +5,7 @@
 /*    Load the basic TrueType kerning table.  This doesn't handle          */
 /*    kerning data within the GPOS table at the moment.                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */
+/*  Copyright 1996-2007, 2009, 2010, 2013 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -183,7 +183,7 @@
                        FT_UInt  right_glyph )
   {
     FT_Int    result = 0;
-    FT_UInt   count, mask = 1;
+    FT_UInt   count, mask;
     FT_Byte*  p       = face->kern_table;
     FT_Byte*  p_limit = p + face->kern_table_size;
 
@@ -196,7 +196,7 @@
           count--, mask <<= 1 )
     {
       FT_Byte* base     = p;
-      FT_Byte* next     = base;
+      FT_Byte* next;
       FT_UInt  version  = FT_NEXT_USHORT( p );
       FT_UInt  length   = FT_NEXT_USHORT( p );
       FT_UInt  coverage = FT_NEXT_USHORT( p );
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttkern.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttkern.h
index df1da9b273e..df1da9b273e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttkern.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttkern.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttload.c
index fbe70f7974a..0a3cd29dbae 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttload.c
@@ -236,7 +236,8 @@
          */
         if ( table.Length < 0x36 )
         {
-          FT_TRACE2(( "check_table_dir: `head' table too small\n" ));
+          FT_TRACE2(( "check_table_dir:"
+                      " `head' or `bhed' table too small\n" ));
           error = FT_THROW( Table_Missing );
           goto Exit;
         }
@@ -246,12 +247,8 @@
           goto Exit;
 
         if ( magic != 0x5F0F3CF5UL )
-        {
           FT_TRACE2(( "check_table_dir:"
-                      " no magic number found in `head' table\n"));
-          error = FT_THROW( Table_Missing );
-          goto Exit;
-        }
+                      " invalid magic number in `head' or `bhed' table\n"));
 
         if ( FT_STREAM_SEEK( offset + ( nn + 1 ) * 16 ) )
           goto Exit;
@@ -394,8 +391,8 @@
     {
       entry->Tag      = FT_GET_TAG4();
       entry->CheckSum = FT_GET_ULONG();
-      entry->Offset   = FT_GET_LONG();
-      entry->Length   = FT_GET_LONG();
+      entry->Offset   = FT_GET_ULONG();
+      entry->Length   = FT_GET_ULONG();
 
       /* ignore invalid tables */
       if ( entry->Offset + entry->Length > stream->size )
@@ -1006,7 +1003,8 @@
       FT_FRAME_END
     };
 
-    static const FT_Frame_Field  os2_fields_extra[] =
+    /* `OS/2' version 1 and newer */
+    static const FT_Frame_Field  os2_fields_extra1[] =
     {
       FT_FRAME_START( 8 ),
         FT_FRAME_ULONG( ulCodePageRange1 ),
@@ -1014,6 +1012,7 @@
       FT_FRAME_END
     };
 
+    /* `OS/2' version 2 and newer */
     static const FT_Frame_Field  os2_fields_extra2[] =
     {
       FT_FRAME_START( 10 ),
@@ -1025,6 +1024,15 @@
       FT_FRAME_END
     };
 
+    /* `OS/2' version 5 and newer */
+    static const FT_Frame_Field  os2_fields_extra5[] =
+    {
+      FT_FRAME_START( 4 ),
+        FT_FRAME_USHORT( usLowerOpticalPointSize ),
+        FT_FRAME_USHORT( usUpperOpticalPointSize ),
+      FT_FRAME_END
+    };
+
 
     /* We now support old Mac fonts where the OS/2 table doesn't  */
     /* exist.  Simply put, we set the `version' field to 0xFFFF   */
@@ -1038,18 +1046,20 @@
     if ( FT_STREAM_READ_FIELDS( os2_fields, os2 ) )
       goto Exit;
 
-    os2->ulCodePageRange1 = 0;
-    os2->ulCodePageRange2 = 0;
-    os2->sxHeight         = 0;
-    os2->sCapHeight       = 0;
-    os2->usDefaultChar    = 0;
-    os2->usBreakChar      = 0;
-    os2->usMaxContext     = 0;
+    os2->ulCodePageRange1        = 0;
+    os2->ulCodePageRange2        = 0;
+    os2->sxHeight                = 0;
+    os2->sCapHeight              = 0;
+    os2->usDefaultChar           = 0;
+    os2->usBreakChar             = 0;
+    os2->usMaxContext            = 0;
+    os2->usLowerOpticalPointSize = 0;
+    os2->usUpperOpticalPointSize = 0xFFFF;
 
     if ( os2->version >= 0x0001 )
     {
       /* only version 1 tables */
-      if ( FT_STREAM_READ_FIELDS( os2_fields_extra, os2 ) )
+      if ( FT_STREAM_READ_FIELDS( os2_fields_extra1, os2 ) )
         goto Exit;
 
       if ( os2->version >= 0x0002 )
@@ -1057,6 +1067,13 @@
         /* only version 2 tables */
         if ( FT_STREAM_READ_FIELDS( os2_fields_extra2, os2 ) )
           goto Exit;
+
+        if ( os2->version >= 0x0005 )
+        {
+          /* only version 5 tables */
+          if ( FT_STREAM_READ_FIELDS( os2_fields_extra5, os2 ) )
+            goto Exit;
+        }
       }
     }
 
@@ -1164,6 +1181,7 @@
         FT_FRAME_USHORT( Style ),
         FT_FRAME_USHORT( TypeFamily ),
         FT_FRAME_USHORT( CapHeight ),
+        FT_FRAME_USHORT( SymbolSet ),
         FT_FRAME_BYTES ( TypeFace, 16 ),
         FT_FRAME_BYTES ( CharacterComplement, 8 ),
         FT_FRAME_BYTES ( FileName, 6 ),
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttload.h
index 49a1aee1633..49a1aee1633 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttmtx.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttmtx.c
index 371a9edabee..a8cc63a1151 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttmtx.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttmtx.c
@@ -183,20 +183,23 @@
   /*    tt_face_get_metrics                                                */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Returns the horizontal or vertical metrics in font units for a     */
-  /*    given glyph.  The metrics are the left side bearing (resp. top     */
-  /*    side bearing) and advance width (resp. advance height).            */
+  /*    Return the horizontal or vertical metrics in font units for a      */
+  /*    given glyph.  The values are the left side bearing (top side       */
+  /*    bearing for vertical metrics) and advance width (advance height    */
+  /*    for vertical metrics).                                             */
   /*                                                                       */
   /* <Input>                                                               */
-  /*    header  :: A pointer to either the horizontal or vertical metrics  */
-  /*               structure.                                              */
+  /*    face     :: A pointer to the TrueType face structure.              */
   /*                                                                       */
-  /*    idx     :: The glyph index.                                        */
+  /*    vertical :: If set to TRUE, get vertical metrics.                  */
+  /*                                                                       */
+  /*    gindex   :: The glyph index.                                       */
   /*                                                                       */
   /* <Output>                                                              */
-  /*    bearing :: The bearing, either left side or top side.              */
+  /*    abearing :: The bearing, either left side or top side.             */
   /*                                                                       */
-  /*    advance :: The advance width resp. advance height.                 */
+  /*    aadvance :: The advance width or advance height, depending on      */
+  /*                the `vertical' flag.                                   */
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
   tt_face_get_metrics( TT_Face     face,
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttmtx.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttmtx.h
index 8b91a113d85..8b91a113d85 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttmtx.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttmtx.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttpost.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttpost.c
index 47a85c0c9f4..47a85c0c9f4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttpost.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttpost.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttpost.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttpost.h
index 6f06d75a719..6f06d75a719 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttpost.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttpost.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttsbit.c b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttsbit.c
index cd3e5a4a004..890e7947d7c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttsbit.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttsbit.c
@@ -28,6 +28,7 @@
 
 #include "sferrors.h"
 
+#include "ttmtx.h"
 #include "pngshim.h"
 
 
@@ -42,25 +43,36 @@
 
 
   FT_LOCAL_DEF( FT_Error )
-  tt_face_load_eblc( TT_Face    face,
+  tt_face_load_sbit( TT_Face    face,
                      FT_Stream  stream )
   {
-    FT_Error  error = FT_Err_Ok;
-    FT_Fixed  version;
-    FT_ULong  num_strikes, table_size;
-    FT_Byte*  p;
-    FT_Byte*  p_limit;
-    FT_UInt   count;
+    FT_Error  error;
+    FT_ULong  table_size;
 
 
+    face->sbit_table       = NULL;
+    face->sbit_table_size  = 0;
+    face->sbit_table_type  = TT_SBIT_TABLE_TYPE_NONE;
     face->sbit_num_strikes = 0;
 
-    /* this table is optional */
     error = face->goto_table( face, TTAG_CBLC, stream, &table_size );
-    if ( error )
+    if ( !error )
+      face->sbit_table_type = TT_SBIT_TABLE_TYPE_CBLC;
+    else
+    {
       error = face->goto_table( face, TTAG_EBLC, stream, &table_size );
+      if ( error )
+        error = face->goto_table( face, TTAG_bloc, stream, &table_size );
+      if ( !error )
+        face->sbit_table_type = TT_SBIT_TABLE_TYPE_EBLC;
+    }
+
     if ( error )
-      error = face->goto_table( face, TTAG_bloc, stream, &table_size );
+    {
+      error = face->goto_table( face, TTAG_sbix, stream, &table_size );
+      if ( !error )
+        face->sbit_table_type = TT_SBIT_TABLE_TYPE_SBIX;
+    }
     if ( error )
       goto Exit;
 
@@ -71,53 +83,130 @@
       goto Exit;
     }
 
-    if ( FT_FRAME_EXTRACT( table_size, face->sbit_table ) )
-      goto Exit;
+    switch ( (FT_UInt)face->sbit_table_type )
+    {
+    case TT_SBIT_TABLE_TYPE_EBLC:
+    case TT_SBIT_TABLE_TYPE_CBLC:
+      {
+        FT_Byte*  p;
+        FT_Fixed  version;
+        FT_ULong  num_strikes;
+        FT_UInt   count;
 
-    face->sbit_table_size = table_size;
 
-    p       = face->sbit_table;
-    p_limit = p + table_size;
+        if ( FT_FRAME_EXTRACT( table_size, face->sbit_table ) )
+          goto Exit;
 
-    version     = FT_NEXT_ULONG( p );
-    num_strikes = FT_NEXT_ULONG( p );
+        face->sbit_table_size = table_size;
 
-    if ( version != 0x00020000UL || num_strikes >= 0x10000UL )
-    {
-      FT_ERROR(( "tt_face_load_sbit_strikes: invalid table version\n" ));
-      error = FT_THROW( Invalid_File_Format );
-      goto Fail;
+        p = face->sbit_table;
+
+        version     = FT_NEXT_ULONG( p );
+        num_strikes = FT_NEXT_ULONG( p );
+
+        if ( ( version & 0xFFFF0000UL ) != 0x00020000UL )
+        {
+          error = FT_THROW( Unknown_File_Format );
+          goto Exit;
+        }
+
+        if ( num_strikes >= 0x10000UL )
+        {
+          error = FT_THROW( Invalid_File_Format );
+          goto Exit;
+        }
+
+        /*
+         *  Count the number of strikes available in the table.  We are a bit
+         *  paranoid there and don't trust the data.
+         */
+        count = (FT_UInt)num_strikes;
+        if ( 8 + 48UL * count > table_size )
+          count = (FT_UInt)( ( table_size - 8 ) / 48 );
+
+        face->sbit_num_strikes = count;
+      }
+      break;
+
+    case TT_SBIT_TABLE_TYPE_SBIX:
+      {
+        FT_UShort  version;
+        FT_UShort  flags;
+        FT_ULong   num_strikes;
+        FT_UInt    count;
+
+
+        if ( FT_FRAME_ENTER( 8 ) )
+          goto Exit;
+
+        version     = FT_GET_USHORT();
+        flags       = FT_GET_USHORT();
+        num_strikes = FT_GET_ULONG();
+
+        FT_FRAME_EXIT();
+
+        if ( version < 1 )
+        {
+          error = FT_THROW( Unknown_File_Format );
+          goto Exit;
+        }
+        if ( flags != 0x0001 || num_strikes >= 0x10000UL )
+        {
+          error = FT_THROW( Invalid_File_Format );
+          goto Exit;
+        }
+
+        /*
+         *  Count the number of strikes available in the table.  We are a bit
+         *  paranoid there and don't trust the data.
+         */
+        count = (FT_UInt)num_strikes;
+        if ( 8 + 4UL * count > table_size )
+          count = (FT_UInt)( ( table_size - 8 ) / 4 );
+
+        if ( FT_STREAM_SEEK( FT_STREAM_POS() - 8 ) )
+          goto Exit;
+
+        face->sbit_table_size = 8 + count * 4;
+        if ( FT_FRAME_EXTRACT( face->sbit_table_size, face->sbit_table ) )
+          goto Exit;
+
+        face->sbit_num_strikes = count;
+      }
+      break;
+
+    default:
+      error = FT_THROW( Unknown_File_Format );
+      break;
     }
 
-    /*
-     *  Count the number of strikes available in the table.  We are a bit
-     *  paranoid there and don't trust the data.
-     */
-    count = (FT_UInt)num_strikes;
-    if ( 8 + 48UL * count > table_size )
-      count = (FT_UInt)( ( p_limit - p ) / 48 );
+    if ( !error )
+      FT_TRACE3(( "sbit_num_strikes: %u\n", face->sbit_num_strikes ));
 
-    face->sbit_num_strikes = count;
+    return FT_Err_Ok;
 
-    FT_TRACE3(( "sbit_num_strikes: %u\n", count ));
   Exit:
-    return error;
+    if ( error )
+    {
+      if ( face->sbit_table )
+        FT_FRAME_RELEASE( face->sbit_table );
+      face->sbit_table_size = 0;
+      face->sbit_table_type = TT_SBIT_TABLE_TYPE_NONE;
+    }
 
-  Fail:
-    FT_FRAME_RELEASE( face->sbit_table );
-    face->sbit_table_size = 0;
-    goto Exit;
+    return error;
   }
 
 
   FT_LOCAL_DEF( void )
-  tt_face_free_eblc( TT_Face  face )
+  tt_face_free_sbit( TT_Face  face )
   {
     FT_Stream  stream = face->root.stream;
 
 
     FT_FRAME_RELEASE( face->sbit_table );
     face->sbit_table_size  = 0;
+    face->sbit_table_type  = TT_SBIT_TABLE_TYPE_NONE;
     face->sbit_num_strikes = 0;
   }
 
@@ -136,28 +225,85 @@
                                FT_ULong          strike_index,
                                FT_Size_Metrics*  metrics )
   {
-    FT_Byte*  strike;
-
-
     if ( strike_index >= (FT_ULong)face->sbit_num_strikes )
       return FT_THROW( Invalid_Argument );
 
-    strike = face->sbit_table + 8 + strike_index * 48;
+    switch ( (FT_UInt)face->sbit_table_type )
+    {
+    case TT_SBIT_TABLE_TYPE_EBLC:
+    case TT_SBIT_TABLE_TYPE_CBLC:
+      {
+        FT_Byte*  strike;
 
-    metrics->x_ppem = (FT_UShort)strike[44];
-    metrics->y_ppem = (FT_UShort)strike[45];
 
-    metrics->ascender  = (FT_Char)strike[16] << 6;  /* hori.ascender  */
-    metrics->descender = (FT_Char)strike[17] << 6;  /* hori.descender */
-    metrics->height    = metrics->ascender - metrics->descender;
+        strike = face->sbit_table + 8 + strike_index * 48;
 
-    /* XXX: Is this correct? */
-    metrics->max_advance = ( (FT_Char)strike[22] + /* min_origin_SB  */
-                                      strike[18] + /* max_width      */
-                             (FT_Char)strike[23]   /* min_advance_SB */
-                                                 ) << 6;
+        metrics->x_ppem = (FT_UShort)strike[44];
+        metrics->y_ppem = (FT_UShort)strike[45];
 
-    return FT_Err_Ok;
+        metrics->ascender  = (FT_Char)strike[16] << 6;  /* hori.ascender  */
+        metrics->descender = (FT_Char)strike[17] << 6;  /* hori.descender */
+        metrics->height    = metrics->ascender - metrics->descender;
+
+        /* Is this correct? */
+        metrics->max_advance = ( (FT_Char)strike[22] + /* min_origin_SB  */
+                                          strike[18] + /* max_width      */
+                                 (FT_Char)strike[23]   /* min_advance_SB */
+                                                     ) << 6;
+        return FT_Err_Ok;
+      }
+
+    case TT_SBIT_TABLE_TYPE_SBIX:
+      {
+        FT_Stream       stream = face->root.stream;
+        FT_UInt         offset, ppem, resolution, upem;
+        TT_HoriHeader  *hori;
+        FT_ULong        table_size;
+
+        FT_Error  error;
+        FT_Byte*  p;
+
+
+        p      = face->sbit_table + 8 + 4 * strike_index;
+        offset = FT_NEXT_ULONG( p );
+
+        error = face->goto_table( face, TTAG_sbix, stream, &table_size );
+        if ( error )
+          return error;
+
+        if ( offset + 4  > table_size )
+          return FT_THROW( Invalid_File_Format );
+
+        if ( FT_STREAM_SEEK( FT_STREAM_POS() + offset ) ||
+             FT_FRAME_ENTER( 4 )                        )
+          return error;
+
+        ppem       = FT_GET_USHORT();
+        resolution = FT_GET_USHORT();
+
+        FT_UNUSED( resolution ); /* What to do with this? */
+
+        FT_FRAME_EXIT();
+
+        upem = face->header.Units_Per_EM;
+        hori = &face->horizontal;
+
+        metrics->x_ppem = ppem;
+        metrics->y_ppem = ppem;
+
+        metrics->ascender    = ppem * hori->Ascender * 64 / upem;
+        metrics->descender   = ppem * hori->Descender * 64 / upem;
+        metrics->height      = ppem * ( hori->Ascender -
+                                        hori->Descender +
+                                        hori->Line_Gap ) * 64 / upem;
+        metrics->max_advance = ppem * hori->advance_Width_Max * 64 / upem;
+
+        return error;
+      }
+
+    default:
+      return FT_THROW( Unknown_File_Format );
+    }
   }
 
 
@@ -253,8 +399,7 @@
 
 
   static FT_Error
-  tt_sbit_decoder_alloc_bitmap( TT_SBitDecoder  decoder,
-                                FT_UInt         load_flags )
+  tt_sbit_decoder_alloc_bitmap( TT_SBitDecoder  decoder )
   {
     FT_Error    error = FT_Err_Ok;
     FT_UInt     width, height;
@@ -301,18 +446,9 @@
       break;
 
     case 32:
-      if ( load_flags & FT_LOAD_COLOR )
-      {
-        map->pixel_mode = FT_PIXEL_MODE_BGRA;
-        map->pitch      = map->width * 4;
-        map->num_grays  = 256;
-      }
-      else
-      {
-        map->pixel_mode = FT_PIXEL_MODE_GRAY;
-        map->pitch      = map->width;
-        map->num_grays  = 256;
-      }
+      map->pixel_mode = FT_PIXEL_MODE_BGRA;
+      map->pitch      = map->width * 4;
+      map->num_grays  = 256;
       break;
 
     default:
@@ -382,13 +518,11 @@
   /* forward declaration */
   static FT_Error
   tt_sbit_decoder_load_image( TT_SBitDecoder  decoder,
-                              FT_UInt         load_flags,
                               FT_UInt         glyph_index,
                               FT_Int          x_pos,
                               FT_Int          y_pos );
 
   typedef FT_Error  (*TT_SBitDecoder_LoadFunc)( TT_SBitDecoder  decoder,
-                                                FT_UInt         load_flags,
                                                 FT_Byte*        p,
                                                 FT_Byte*        plimit,
                                                 FT_Int          x_pos,
@@ -397,7 +531,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_byte_aligned( TT_SBitDecoder  decoder,
-                                     FT_UInt         load_flags,
                                      FT_Byte*        p,
                                      FT_Byte*        limit,
                                      FT_Int          x_pos,
@@ -408,8 +541,6 @@
     FT_Int      bit_height, bit_width, pitch, width, height, line_bits, h;
     FT_Bitmap*  bitmap;
 
-    FT_UNUSED( load_flags );
-
 
     /* check that we can write the glyph into the bitmap */
     bitmap     = decoder->bitmap;
@@ -538,7 +669,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_bit_aligned( TT_SBitDecoder  decoder,
-                                    FT_UInt         load_flags,
                                     FT_Byte*        p,
                                     FT_Byte*        limit,
                                     FT_Int          x_pos,
@@ -550,8 +680,6 @@
     FT_Bitmap*  bitmap;
     FT_UShort   rval;
 
-    FT_UNUSED( load_flags );
-
 
     /* check that we can write the glyph into the bitmap */
     bitmap     = decoder->bitmap;
@@ -664,7 +792,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_compound( TT_SBitDecoder  decoder,
-                                 FT_UInt         load_flags,
                                  FT_Byte*        p,
                                  FT_Byte*        limit,
                                  FT_Int          x_pos,
@@ -702,7 +829,7 @@
 
 
       /* NB: a recursive call */
-      error = tt_sbit_decoder_load_image( decoder, load_flags, gindex,
+      error = tt_sbit_decoder_load_image( decoder, gindex,
                                           x_pos + dx, y_pos + dy );
       if ( error )
         break;
@@ -732,7 +859,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_png( TT_SBitDecoder  decoder,
-                            FT_UInt         load_flags,
                             FT_Byte*        p,
                             FT_Byte*        limit,
                             FT_Int          x_pos,
@@ -741,8 +867,6 @@
     FT_Error  error = FT_Err_Ok;
     FT_ULong  png_len;
 
-    FT_UNUSED( load_flags );
-
 
     if ( limit - p < 4 )
     {
@@ -759,14 +883,15 @@
       goto Exit;
     }
 
-    error = Load_SBit_Png( decoder->bitmap,
+    error = Load_SBit_Png( decoder->face->root.glyph,
                            x_pos,
                            y_pos,
                            decoder->bit_depth,
                            decoder->metrics,
                            decoder->stream->memory,
                            p,
-                           png_len );
+                           png_len,
+                           FALSE );
 
   Exit:
     if ( !error )
@@ -779,7 +904,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_bitmap( TT_SBitDecoder  decoder,
-                               FT_UInt         load_flags,
                                FT_UInt         glyph_format,
                                FT_ULong        glyph_start,
                                FT_ULong        glyph_size,
@@ -845,7 +969,22 @@
       case 2:
       case 5:
       case 7:
-        loader = tt_sbit_decoder_load_bit_aligned;
+        {
+          /* Don't trust `glyph_format'.  For example, Apple's main Korean */
+          /* system font, `AppleMyungJo.ttf' (version 7.0d2e6), uses glyph */
+          /* format 7, but the data is format 6.  We check whether we have */
+          /* an excessive number of bytes in the image: If it is equal to  */
+          /* the value for a byte-aligned glyph, use the other loading     */
+          /* routine.                                                      */
+          FT_UInt  width  = decoder->metrics->width;
+          FT_UInt  height = decoder->metrics->height;
+
+
+          if ( height * ( ( width + 7 ) >> 3 ) == (FT_UInt)( p_limit - p ) )
+            loader = tt_sbit_decoder_load_byte_aligned;
+          else
+            loader = tt_sbit_decoder_load_bit_aligned;
+        }
         break;
 
       case 8:
@@ -859,13 +998,15 @@
         loader = tt_sbit_decoder_load_compound;
         break;
 
-#ifdef FT_CONFIG_OPTION_USE_PNG
       case 17: /* small metrics, PNG image data   */
       case 18: /* big metrics, PNG image data     */
       case 19: /* metrics in EBLC, PNG image data */
+#ifdef FT_CONFIG_OPTION_USE_PNG
         loader = tt_sbit_decoder_load_png;
-        break;
+#else
+        error = FT_THROW( Unimplemented_Feature );
 #endif /* FT_CONFIG_OPTION_USE_PNG */
+        break;
 
       default:
         error = FT_THROW( Invalid_Table );
@@ -874,64 +1015,12 @@
 
       if ( !decoder->bitmap_allocated )
       {
-        error = tt_sbit_decoder_alloc_bitmap( decoder, load_flags );
+        error = tt_sbit_decoder_alloc_bitmap( decoder );
         if ( error )
           goto Fail;
       }
 
-      if ( decoder->bit_depth == 32                          &&
-           decoder->bitmap->pixel_mode != FT_PIXEL_MODE_BGRA )
-      {
-        /* Flatten color bitmaps if color was not requested. */
-
-        FT_Library library = decoder->face->root.glyph->library;
-        FT_Memory  memory  = decoder->stream->memory;
-
-        FT_Bitmap color, *orig;
-
-
-        if ( decoder->bitmap->pixel_mode != FT_PIXEL_MODE_GRAY ||
-             x_pos != 0 || y_pos != 0                          )
-        {
-          /* Shouldn't happen. */
-          error = FT_THROW( Invalid_Table );
-          goto Fail;
-        }
-
-        FT_Bitmap_New( &color );
-
-        color.rows       = decoder->bitmap->rows;
-        color.width      = decoder->bitmap->width;
-        color.pitch      = color.width * 4;
-        color.pixel_mode = FT_PIXEL_MODE_BGRA;
-
-        if ( FT_ALLOC( color.buffer, color.rows * color.pitch ) )
-          goto Fail;
-
-        orig            = decoder->bitmap;
-        decoder->bitmap = &color;
-
-        error = loader( decoder, load_flags, p, p_limit, x_pos, y_pos );
-
-        decoder->bitmap = orig;
-
-        /* explicitly test against FT_Err_Ok to avoid compiler warnings */
-        /* (we do an assignment within a conditional)                   */
-        if ( error                                           ||
-             ( error = FT_Bitmap_Convert( library,
-                                          &color,
-                                          decoder->bitmap,
-                                          1 ) ) != FT_Err_Ok )
-        {
-          FT_Bitmap_Done( library, &color );
-          goto Fail;
-        }
-
-        FT_Bitmap_Done( library, &color );
-      }
-
-      else
-        error = loader( decoder, load_flags, p, p_limit, x_pos, y_pos );
+      error = loader( decoder, p, p_limit, x_pos, y_pos );
     }
 
   Fail:
@@ -944,7 +1033,6 @@
 
   static FT_Error
   tt_sbit_decoder_load_image( TT_SBitDecoder  decoder,
-                              FT_UInt         load_flags,
                               FT_UInt         glyph_index,
                               FT_Int          x_pos,
                               FT_Int          y_pos )
@@ -993,17 +1081,15 @@
     switch ( index_format )
     {
     case 1: /* 4-byte offsets relative to `image_offset' */
-      {
-        p += 4 * ( glyph_index - start );
-        if ( p + 8 > p_limit )
-          goto NoBitmap;
+      p += 4 * ( glyph_index - start );
+      if ( p + 8 > p_limit )
+        goto NoBitmap;
 
-        image_start = FT_NEXT_ULONG( p );
-        image_end   = FT_NEXT_ULONG( p );
+      image_start = FT_NEXT_ULONG( p );
+      image_end   = FT_NEXT_ULONG( p );
 
-        if ( image_start == image_end )  /* missing glyph */
-          goto NoBitmap;
-      }
+      if ( image_start == image_end )  /* missing glyph */
+        goto NoBitmap;
       break;
 
     case 2: /* big metrics, constant image size */
@@ -1025,17 +1111,15 @@
       break;
 
     case 3: /* 2-byte offsets relative to 'image_offset' */
-      {
-        p += 2 * ( glyph_index - start );
-        if ( p + 4 > p_limit )
-          goto NoBitmap;
+      p += 2 * ( glyph_index - start );
+      if ( p + 4 > p_limit )
+        goto NoBitmap;
 
-        image_start = FT_NEXT_USHORT( p );
-        image_end   = FT_NEXT_USHORT( p );
+      image_start = FT_NEXT_USHORT( p );
+      image_end   = FT_NEXT_USHORT( p );
 
-        if ( image_start == image_end )  /* missing glyph */
-          goto NoBitmap;
-      }
+      if ( image_start == image_end )  /* missing glyph */
+        goto NoBitmap;
       break;
 
     case 4: /* sparse glyph array with (glyph,offset) pairs */
@@ -1124,7 +1208,6 @@
                 image_format, glyph_index ));
 
     return tt_sbit_decoder_load_bitmap( decoder,
-                                        load_flags,
                                         image_format,
                                         image_start,
                                         image_end,
@@ -1142,6 +1225,129 @@
   }
 
 
+  static FT_Error
+  tt_face_load_sbix_image( TT_Face              face,
+                           FT_ULong             strike_index,
+                           FT_UInt              glyph_index,
+                           FT_Stream            stream,
+                           FT_Bitmap           *map,
+                           TT_SBit_MetricsRec  *metrics )
+  {
+    FT_UInt     sbix_pos, strike_offset, glyph_start, glyph_end;
+    FT_ULong    table_size, data_size;
+    FT_Int      originOffsetX, originOffsetY;
+    FT_Tag      graphicType;
+    FT_Int      recurse_depth = 0;
+
+    FT_Error  error;
+    FT_Byte*  p;
+
+    FT_UNUSED( map );
+
+
+    metrics->width  = 0;
+    metrics->height = 0;
+
+    p = face->sbit_table + 8 + 4 * strike_index;
+    strike_offset = FT_NEXT_ULONG( p );
+
+    error = face->goto_table( face, TTAG_sbix, stream, &table_size );
+    if ( error )
+      return error;
+    sbix_pos = FT_STREAM_POS();
+
+  retry:
+    if ( glyph_index > (FT_UInt)face->root.num_glyphs )
+      return FT_THROW( Invalid_Argument );
+
+    if ( strike_offset >= table_size                          ||
+         table_size - strike_offset < 4 + glyph_index * 4 + 8 )
+      return FT_THROW( Invalid_File_Format );
+
+    if ( FT_STREAM_SEEK( sbix_pos + strike_offset + 4 + glyph_index * 4 ) ||
+         FT_FRAME_ENTER( 8 )                                              )
+      return error;
+
+    glyph_start = FT_GET_ULONG();
+    glyph_end   = FT_GET_ULONG();
+
+    FT_FRAME_EXIT();
+
+    if ( glyph_start == glyph_end )
+      return FT_THROW( Invalid_Argument );
+    if ( glyph_start > glyph_end                ||
+         glyph_end - glyph_start < 8            ||
+         table_size - strike_offset < glyph_end )
+      return FT_THROW( Invalid_File_Format );
+
+    if ( FT_STREAM_SEEK( sbix_pos + strike_offset + glyph_start ) ||
+         FT_FRAME_ENTER( glyph_end - glyph_start )                )
+      return error;
+
+    originOffsetX = FT_GET_SHORT();
+    originOffsetY = FT_GET_SHORT();
+
+    graphicType = FT_GET_TAG4();
+    data_size   = glyph_end - glyph_start - 8;
+
+    switch ( graphicType )
+    {
+    case FT_MAKE_TAG( 'd', 'u', 'p', 'e' ):
+      if ( recurse_depth < 4 )
+      {
+        glyph_index = FT_GET_USHORT();
+        FT_FRAME_EXIT();
+        recurse_depth++;
+        goto retry;
+      }
+      error = FT_THROW( Invalid_File_Format );
+      break;
+
+    case FT_MAKE_TAG( 'p', 'n', 'g', ' ' ):
+#ifdef FT_CONFIG_OPTION_USE_PNG
+      error = Load_SBit_Png( face->root.glyph,
+                             0,
+                             0,
+                             32,
+                             metrics,
+                             stream->memory,
+                             stream->cursor,
+                             data_size,
+                             TRUE );
+#else
+      error = FT_THROW( Unimplemented_Feature );
+#endif
+      break;
+
+    case FT_MAKE_TAG( 'j', 'p', 'g', ' ' ):
+    case FT_MAKE_TAG( 't', 'i', 'f', 'f' ):
+      error = FT_THROW( Unknown_File_Format );
+      break;
+
+    default:
+      error = FT_THROW( Unimplemented_Feature );
+      break;
+    }
+
+    FT_FRAME_EXIT();
+
+    if ( !error )
+    {
+      FT_Short   abearing;
+      FT_UShort  aadvance;
+
+
+      tt_face_get_metrics( face, FALSE, glyph_index, &abearing, &aadvance );
+
+      metrics->horiBearingX = originOffsetX;
+      metrics->horiBearingY = -originOffsetY + metrics->height;
+      metrics->horiAdvance  = aadvance * face->root.size->metrics.x_ppem /
+                                face->header.Units_Per_EM;
+    }
+
+    return error;
+  }
+
   FT_LOCAL( FT_Error )
   tt_face_load_sbit_image( TT_Face              face,
                            FT_ULong             strike_index,
@@ -1151,23 +1357,67 @@
                            FT_Bitmap           *map,
                            TT_SBit_MetricsRec  *metrics )
   {
-    TT_SBitDecoderRec  decoder[1];
-    FT_Error           error;
+    FT_Error  error = FT_Err_Ok;
 
-    FT_UNUSED( load_flags );
-    FT_UNUSED( stream );
-    FT_UNUSED( map );
 
+    switch ( (FT_UInt)face->sbit_table_type )
+    {
+    case TT_SBIT_TABLE_TYPE_EBLC:
+    case TT_SBIT_TABLE_TYPE_CBLC:
+      {
+        TT_SBitDecoderRec  decoder[1];
 
-    error = tt_sbit_decoder_init( decoder, face, strike_index, metrics );
-    if ( !error )
+
+        error = tt_sbit_decoder_init( decoder, face, strike_index, metrics );
+        if ( !error )
+        {
+          error = tt_sbit_decoder_load_image( decoder,
+                                              glyph_index,
+                                              0,
+                                              0 );
+          tt_sbit_decoder_done( decoder );
+        }
+      }
+      break;
+
+    case TT_SBIT_TABLE_TYPE_SBIX:
+      error = tt_face_load_sbix_image( face,
+                                       strike_index,
+                                       glyph_index,
+                                       stream,
+                                       map,
+                                       metrics );
+      break;
+
+    default:
+      error = FT_THROW( Unknown_File_Format );
+      break;
+    }
+
+    /* Flatten color bitmaps if color was not requested. */
+    if ( !error                                &&
+         !( load_flags & FT_LOAD_COLOR )       &&
+         map->pixel_mode == FT_PIXEL_MODE_BGRA )
     {
-      error = tt_sbit_decoder_load_image( decoder,
-                                          load_flags,
-                                          glyph_index,
-                                          0,
-                                          0 );
-      tt_sbit_decoder_done( decoder );
+      FT_Bitmap   new_map;
+      FT_Library  library = face->root.glyph->library;
+
+
+      FT_Bitmap_New( &new_map );
+
+      /* Convert to 8bit grayscale. */
+      error = FT_Bitmap_Convert( library, map, &new_map, 1 );
+      if ( error )
+        FT_Bitmap_Done( library, &new_map );
+      else
+      {
+        map->pixel_mode = new_map.pixel_mode;
+        map->pitch      = new_map.pitch;
+        map->num_grays  = new_map.num_grays;
+
+        ft_glyphslot_set_bitmap( face->root.glyph, new_map.buffer );
+        face->root.glyph->internal->flags |= FT_GLYPH_OWN_BITMAP;
+      }
     }
 
     return error;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttsbit.h b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttsbit.h
index ea0b5f8adae..695d0d8d02e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/sfnt/ttsbit.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/sfnt/ttsbit.h
@@ -28,11 +28,11 @@ FT_BEGIN_HEADER
 
 
   FT_LOCAL( FT_Error )
-  tt_face_load_eblc( TT_Face    face,
+  tt_face_load_sbit( TT_Face    face,
                      FT_Stream  stream );
 
   FT_LOCAL( void )
-  tt_face_free_eblc( TT_Face  face );
+  tt_face_free_sbit( TT_Face  face );
 
 
   FT_LOCAL( FT_Error )
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/Jamfile
index a8496aa2c2c..a8496aa2c2c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftgrays.c b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftgrays.c
index 7532a358296..2c51e9f6ebf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftgrays.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftgrays.c
@@ -24,8 +24,8 @@
   /*                                                                       */
   /* - copy `src/smooth/ftgrays.c' (this file) to your current directory   */
   /*                                                                       */
-  /* - copy `include/freetype/ftimage.h' and `src/smooth/ftgrays.h' to the */
-  /*   same directory                                                      */
+  /* - copy `include/ftimage.h' and `src/smooth/ftgrays.h' to the same     */
+  /*   directory                                                           */
   /*                                                                       */
   /* - compile `ftgrays' with the _STANDALONE_ macro defined, as in        */
   /*                                                                       */
@@ -310,6 +310,40 @@ typedef ptrdiff_t  FT_PtrDist;
 #endif
 
 
+  /* Compute `dividend / divisor' and return both its quotient and     */
+  /* remainder, cast to a specific type.  This macro also ensures that */
+  /* the remainder is always positive.                                 */
+#define FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \
+  FT_BEGIN_STMNT                                                   \
+    (quotient)  = (type)( (dividend) / (divisor) );                \
+    (remainder) = (type)( (dividend) % (divisor) );                \
+    if ( (remainder) < 0 )                                         \
+    {                                                              \
+      (quotient)--;                                                \
+      (remainder) += (type)(divisor);                              \
+    }                                                              \
+  FT_END_STMNT
+
+#ifdef  __arm__
+  /* Work around a bug specific to GCC which make the compiler fail to */
+  /* optimize a division and modulo operation on the same parameters   */
+  /* into a single call to `__aeabi_idivmod'.  See                     */
+  /*                                                                   */
+  /*  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43721                */
+#undef FT_DIV_MOD
+#define FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \
+  FT_BEGIN_STMNT                                                   \
+    (quotient)  = (type)( (dividend) / (divisor) );                \
+    (remainder) = (type)( (dividend) - (quotient) * (divisor) );   \
+    if ( (remainder) < 0 )                                         \
+    {                                                              \
+      (quotient)--;                                                \
+      (remainder) += (type)(divisor);                              \
+    }                                                              \
+  FT_END_STMNT
+#endif /* __arm__ */
+
+
   /*************************************************************************/
   /*                                                                       */
   /*   TYPE DEFINITIONS                                                    */
@@ -548,7 +582,7 @@ typedef ptrdiff_t  FT_PtrDist;
   static void
   gray_record_cell( RAS_ARG )
   {
-    if ( !ras.invalid && ( ras.area | ras.cover ) )
+    if ( ras.area | ras.cover )
     {
       PCell  cell = gray_find_cell( RAS_VAR );
 
@@ -597,10 +631,10 @@ typedef ptrdiff_t  FT_PtrDist;
 
       ras.area  = 0;
       ras.cover = 0;
+      ras.ex    = ex;
+      ras.ey    = ey;
     }
 
-    ras.ex      = ex;
-    ras.ey      = ey;
     ras.invalid = ( (unsigned)ey >= (unsigned)ras.count_ey ||
                               ex >= ras.count_ex           );
   }
@@ -686,13 +720,7 @@ typedef ptrdiff_t  FT_PtrDist;
       dx    = -dx;
     }
 
-    delta = (TCoord)( p / dx );
-    mod   = (TCoord)( p % dx );
-    if ( mod < 0 )
-    {
-      delta--;
-      mod += (TCoord)dx;
-    }
+    FT_DIV_MOD( TCoord, p, dx, delta, mod );
 
     ras.area  += (TArea)(( fx1 + first ) * delta);
     ras.cover += delta;
@@ -706,14 +734,8 @@ typedef ptrdiff_t  FT_PtrDist;
       TCoord  lift, rem;
 
 
-      p    = ONE_PIXEL * ( y2 - y1 + delta );
-      lift = (TCoord)( p / dx );
-      rem  = (TCoord)( p % dx );
-      if ( rem < 0 )
-      {
-        lift--;
-        rem += (TCoord)dx;
-      }
+      p = ONE_PIXEL * ( y2 - y1 + delta );
+      FT_DIV_MOD( TCoord, p, dx, lift, rem );
 
       mod -= (int)dx;
 
@@ -763,9 +785,6 @@ typedef ptrdiff_t  FT_PtrDist;
     dx = to_x - ras.x;
     dy = to_y - ras.y;
 
-    /* XXX: we should do something about the trivial case where dx == 0, */
-    /*      as it happens very often!                                    */
-
     /* perform vertical clipping */
     {
       TCoord  min, max;
@@ -844,13 +863,7 @@ typedef ptrdiff_t  FT_PtrDist;
       dy    = -dy;
     }
 
-    delta = (int)( p / dy );
-    mod   = (int)( p % dy );
-    if ( mod < 0 )
-    {
-      delta--;
-      mod += (TCoord)dy;
-    }
+    FT_DIV_MOD( int, p, dy, delta, mod );
 
     x = ras.x + delta;
     gray_render_scanline( RAS_VAR_ ey1, ras.x, fy1, x, (TCoord)first );
@@ -861,13 +874,7 @@ typedef ptrdiff_t  FT_PtrDist;
     if ( ey1 != ey2 )
     {
       p     = ONE_PIXEL * dx;
-      lift  = (int)( p / dy );
-      rem   = (int)( p % dy );
-      if ( rem < 0 )
-      {
-        lift--;
-        rem += (int)dy;
-      }
+      FT_DIV_MOD( int, p, dy, lift, rem );
       mod -= (int)dy;
 
       while ( ey1 != ey2 )
@@ -1171,7 +1178,8 @@ typedef ptrdiff_t  FT_PtrDist;
 
 
     /* record current cell, if any */
-    gray_record_cell( RAS_VAR );
+    if ( !ras.invalid )
+      gray_record_cell( RAS_VAR );
 
     /* start to a new position */
     x = UPSCALE( to->x );
@@ -1781,7 +1789,8 @@ typedef ptrdiff_t  FT_PtrDist;
     if ( ft_setjmp( ras.jump_buffer ) == 0 )
     {
       error = FT_Outline_Decompose( &ras.outline, &func_interface, &ras );
-      gray_record_cell( RAS_VAR );
+      if ( !ras.invalid )
+        gray_record_cell( RAS_VAR );
     }
     else
       error = FT_THROW( Memory_Overflow );
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftgrays.h b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftgrays.h
index f20f55f14b6..f20f55f14b6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftgrays.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftgrays.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftsmerrs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftsmerrs.h
index 413d2f1f701..413d2f1f701 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftsmerrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftsmerrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftsmooth.c b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftsmooth.c
index 89088cd0911..89088cd0911 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftsmooth.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftsmooth.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftsmooth.h b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftsmooth.h
index 3708790df17..3708790df17 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftsmooth.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftsmooth.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftspic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftspic.c
index 67a2b8310cb..67a2b8310cb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftspic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftspic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftspic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftspic.h
index 334b51c3f15..334b51c3f15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/ftspic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/ftspic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/module.mk
index 47f6c040764..47f6c040764 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/rules.mk
index 88d0aa53ac2..88d0aa53ac2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/smooth.c b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/smooth.c
index a8ac51f9f8c..a8ac51f9f8c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/smooth/smooth.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/smooth/smooth.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/Jamfile
index 475161e07fd..475161e07fd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.1/src/tools/afblue.pl b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/afblue.pl
new file mode 100644
index 00000000000..774438f84a7
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/afblue.pl
@@ -0,0 +1,542 @@
+#! /usr/bin/perl -w
+# -*- Perl -*-
+#
+# afblue.pl
+#
+# Process a blue zone character data file.
+#
+# Copyright 2013 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.
+
+use strict;
+use warnings;
+use English '-no_match_vars';
+use open ':std', ':locale';
+
+
+my $prog = $PROGRAM_NAME;
+$prog =~ s| .* / ||x;      # Remove path.
+
+die "usage: $prog datafile < infile > outfile\n" if $#ARGV != 0;
+
+
+my $datafile = $ARGV[0];
+
+my %diversions;        # The extracted and massaged data from `datafile'.
+my @else_stack;        # Booleans to track else-clauses.
+my @name_stack;        # Stack of integers used for names of aux. variables.
+
+my $curr_enum;         # Name of the current enumeration.
+my $curr_array;        # Name of the current array.
+my $curr_max;          # Name of the current maximum value.
+
+my $curr_enum_element; # Name of the current enumeration element.
+my $curr_offset;       # The offset relative to current aux. variable.
+my $curr_elem_size;    # The size of the current string or block.
+
+my $have_sections = 0; # Boolean; set if start of a section has been seen.
+my $have_strings;      # Boolean; set if current section contains strings.
+my $have_blocks;       # Boolean; set if current section contains blocks.
+
+my $have_enum_element; # Boolean; set if we have an enumeration element.
+my $in_string;         # Boolean; set if a string has been parsed.
+
+my $num_sections = 0;  # Number of sections seen so far.
+
+my $last_aux;          # Name of last auxiliary variable.
+
+
+# Regular expressions.
+
+# [<ws>] <enum_name> <ws> <array_name> <ws> <max_name> [<ws>] ':' [<ws>] '\n'
+my $section_re = qr/ ^ \s* (\S+) \s+ (\S+) \s+ (\S+) \s* : \s* $ /x;
+
+# [<ws>] <enum_element_name> [<ws>] '\n'
+my $enum_element_re = qr/ ^ \s* ( [A-Za-z0-9_]+ ) \s* $ /x;
+
+# '#' <preprocessor directive> '\n'
+my $preprocessor_re = qr/ ^ \# /x;
+
+# '/' '/' <comment> '\n'
+my $comment_re = qr| ^ // |x;
+
+# empty line
+my $whitespace_only_re = qr/ ^ \s* $ /x;
+
+# [<ws>] '"' <string> '"' [<ws>] '\n'  (<string> doesn't contain newlines)
+my $string_re = qr/ ^ \s*
+                       " ( (?: [^"\\]++ | \\. )*+ ) "
+                       \s* $ /x;
+
+# [<ws>] '{' <block> '}' [<ws>] '\n'  (<block> can contain newlines)
+my $block_start_re = qr/ ^ \s* \{ /x;
+
+# We need the capturing group for `split' to make it return the separator
+# tokens (i.e., the opening and closing brace) also.
+my $brace_re = qr/ ( [{}] ) /x;
+
+
+sub Warn
+{
+  my $message = shift;
+  warn "$datafile:$INPUT_LINE_NUMBER: warning: $message\n";
+}
+
+
+sub Die
+{
+  my $message = shift;
+  die "$datafile:$INPUT_LINE_NUMBER: error: $message\n";
+}
+
+
+my $warned_before = 0;
+
+sub warn_before
+{
+  Warn("data before first section gets ignored") unless $warned_before;
+  $warned_before = 1;
+}
+
+
+sub strip_newline
+{
+  chomp;
+  s/ \x0D $ //x;
+}
+
+
+sub end_curr_string
+{
+  # Append final null byte to string.
+  if ($have_strings)
+  {
+    push @{$diversions{$curr_array}}, "    '\\0',\n" if $in_string;
+
+    $curr_offset++;
+    $in_string = 0;
+  }
+}
+
+
+sub update_max_elem_size
+{
+  if ($curr_elem_size)
+  {
+    my $max = pop @{$diversions{$curr_max}};
+    $max = $curr_elem_size if $curr_elem_size > $max;
+    push @{$diversions{$curr_max}}, $max;
+  }
+}
+
+
+sub convert_non_ascii_char
+{
+  # A UTF-8 character outside of the printable ASCII range, with possibly a
+  # leading backslash character.
+  my $s = shift;
+
+  # Here we count characters, not bytes.
+  $curr_elem_size += length $s;
+
+  utf8::encode($s);
+  $s = uc unpack 'H*', $s;
+
+  $curr_offset += $s =~ s/\G(..)/'\\x$1', /sg;
+
+  return $s;
+}
+
+
+sub convert_ascii_chars
+{
+  # A series of ASCII characters in the printable range.
+  my $s = shift;
+
+  my $count = $s =~ s/\G(.)/'$1', /g;
+  $curr_offset += $count;
+  $curr_elem_size += $count;
+
+  return $s;
+}
+
+
+sub convert_literal
+{
+  my $s = shift;
+  my $orig = $s;
+
+  # ASCII printables and space
+  my $safe_re = '\x20-\x7E';
+  # ASCII printables and space, no backslash
+  my $safe_no_backslash_re = '\x20-\x5B\x5D-\x7E';
+
+  $s =~ s{
+           (?: \\? ( [^$safe_re] )
+               | ( (?: [$safe_no_backslash_re]
+                       | \\ [$safe_re] )+ ) )
+         }
+         {
+           defined($1) ? convert_non_ascii_char($1)
+                       : convert_ascii_chars($2)
+         }egx;
+
+   # We assume that `$orig' doesn't contain `*/'
+   return $s . " /* $orig */";
+}
+
+
+sub aux_name
+{
+  return "af_blue_" . $num_sections. "_" . join('_', reverse @name_stack);
+}
+
+
+sub aux_name_next
+{
+  $name_stack[$#name_stack]++;
+  my $name = aux_name();
+  $name_stack[$#name_stack]--;
+
+  return $name;
+}
+
+
+sub enum_val_string
+{
+  # Build string which holds code to save the current offset in an
+  # enumeration element.
+  my $aux = shift;
+
+  my $add = ($last_aux eq "af_blue_" . $num_sections . "_0" )
+              ? ""
+              : "$last_aux + ";
+
+  return "    $aux = $add$curr_offset,\n";
+}
+
+
+
+# Process data file.
+
+open(DATA, $datafile) || die "$prog: can't open \`$datafile': $OS_ERROR\n";
+
+while (<DATA>)
+{
+  strip_newline();
+
+  next if /$comment_re/;
+  next if /$whitespace_only_re/;
+
+  if (/$section_re/)
+  {
+    Warn("previous section is empty") if ($have_sections
+                                          && !$have_strings
+                                          && !$have_blocks);
+
+    end_curr_string();
+    update_max_elem_size();
+
+    # Save captured groups from `section_re'.
+    $curr_enum = $1;
+    $curr_array = $2;
+    $curr_max = $3;
+
+    $curr_enum_element = "";
+    $curr_offset = 0;
+
+    Warn("overwriting already defined enumeration \`$curr_enum'")
+      if exists($diversions{$curr_enum});
+    Warn("overwriting already defined array \`$curr_array'")
+      if exists($diversions{$curr_array});
+    Warn("overwriting already defined maximum value \`$curr_max'")
+      if exists($diversions{$curr_max});
+
+    $diversions{$curr_enum} = [];
+    $diversions{$curr_array} = [];
+    $diversions{$curr_max} = [];
+
+    push @{$diversions{$curr_max}}, 0;
+
+    @name_stack = ();
+    push @name_stack, 0;
+
+    $have_sections = 1;
+    $have_strings = 0;
+    $have_blocks = 0;
+
+    $have_enum_element = 0;
+    $in_string = 0;
+
+    $num_sections++;
+    $curr_elem_size = 0;
+
+    $last_aux = aux_name();
+
+    next;
+  }
+
+  if (/$preprocessor_re/)
+  {
+    if ($have_sections)
+    {
+      # Having preprocessor conditionals complicates the computation of
+      # correct offset values.  We have to introduce auxiliary enumeration
+      # elements with the name `af_blue_<s>_<n1>_<n2>_...' which store
+      # offsets to be used in conditional clauses.  `<s>' is the number of
+      # sections seen so far, `<n1>' is the number of `#if' and `#endif'
+      # conditionals seen so far in the topmost level, `<n2>' the number of
+      # `#if' and `#endif' conditionals seen so far one level deeper, etc.
+      # As a consequence, uneven values are used within a clause, and even
+      # values after a clause, since the C standard doesn't allow the
+      # redefinition of an enumeration value.  For example, the name
+      # `af_blue_5_1_6' is used to construct enumeration values in the fifth
+      # section after the third (second-level) if-clause within the first
+      # (top-level) if-clause.  After the first top-level clause has
+      # finished, `af_blue_5_2' is used.  The current offset is then
+      # relative to the value stored in the current auxiliary element.
+
+      if (/ ^ \# \s* if /x)
+      {
+        push @else_stack, 0;
+
+        $name_stack[$#name_stack]++;
+
+        push @{$diversions{$curr_enum}}, enum_val_string(aux_name());
+        $last_aux = aux_name();
+
+        push @name_stack, 0;
+
+        $curr_offset = 0;
+      }
+      elsif (/ ^ \# \s* elif /x)
+      {
+        Die("unbalanced #elif") unless @else_stack;
+
+        pop @name_stack;
+
+        push @{$diversions{$curr_enum}}, enum_val_string(aux_name_next());
+        $last_aux = aux_name();
+
+        push @name_stack, 0;
+
+        $curr_offset = 0;
+      }
+      elsif (/ ^ \# \s* else /x)
+      {
+        my $prev_else = pop @else_stack;
+        Die("unbalanced #else") unless defined($prev_else);
+        Die("#else already seen") if $prev_else;
+        push @else_stack, 1;
+
+        pop @name_stack;
+
+        push @{$diversions{$curr_enum}}, enum_val_string(aux_name_next());
+        $last_aux = aux_name();
+
+        push @name_stack, 0;
+
+        $curr_offset = 0;
+      }
+      elsif (/ ^ \# \s* endif /x)
+      {
+        my $prev_else = pop @else_stack;
+        Die("unbalanced #endif") unless defined($prev_else);
+
+        pop @name_stack;
+        $name_stack[$#name_stack]++;
+
+        # If there is no else-clause for an if-clause, we add one.  This is
+        # necessary to have correct offsets.
+        if (!$prev_else)
+        {
+          push @{$diversions{$curr_enum}}, enum_val_string(aux_name())
+                                           . "#else\n";
+
+          $curr_offset = 0;
+        }
+
+        push @{$diversions{$curr_enum}}, enum_val_string(aux_name());
+        $last_aux = aux_name();
+
+        $curr_offset = 0;
+      }
+
+      # Handle (probably continued) preprocessor lines.
+    CONTINUED_LOOP:
+      {
+        do
+        {
+          strip_newline();
+
+          push @{$diversions{$curr_enum}}, $ARG . "\n";
+          push @{$diversions{$curr_array}}, $ARG . "\n";
+
+          last CONTINUED_LOOP unless / \\ $ /x;
+
+        } while (<DATA>);
+      }
+    }
+    else
+    {
+      warn_before();
+    }
+
+    next;
+  }
+
+  if (/$enum_element_re/)
+  {
+    end_curr_string();
+    update_max_elem_size();
+
+    $curr_enum_element = $1;
+    $have_enum_element = 1;
+    $curr_elem_size = 0;
+
+    next;
+  }
+
+  if (/$string_re/)
+  {
+    if ($have_sections)
+    {
+      Die("strings and blocks can't be mixed in a section") if $have_blocks;
+
+      # Save captured group from `string_re'.
+      my $string = $1;
+
+      if ($have_enum_element)
+      {
+        push @{$diversions{$curr_enum}}, enum_val_string($curr_enum_element);
+        $have_enum_element = 0;
+      }
+
+      $string = convert_literal($string);
+
+      push @{$diversions{$curr_array}}, "    $string\n";
+
+      $have_strings = 1;
+      $in_string = 1;
+    }
+    else
+    {
+      warn_before();
+    }
+
+    next;
+  }
+
+  if (/$block_start_re/)
+  {
+    if ($have_sections)
+    {
+      Die("strings and blocks can't be mixed in a section") if $have_strings;
+
+      my $depth = 0;
+      my $block = "";
+      my $block_end = 0;
+
+      # Count braces while getting the block.
+    BRACE_LOOP:
+      {
+        do
+        {
+          strip_newline();
+
+          foreach my $substring (split(/$brace_re/))
+          {
+            if ($block_end)
+            {
+              Die("invalid data after last matching closing brace")
+                if $substring !~ /$whitespace_only_re/;
+            }
+
+            $block .= $substring;
+
+            if ($substring eq '{')
+            {
+              $depth++;
+            }
+            elsif ($substring eq '}')
+            {
+              $depth--;
+
+              $block_end = 1 if $depth == 0;
+            }
+          }
+
+          # If we are here, we have run out of substrings, so get next line
+          # or exit.
+          last BRACE_LOOP if $block_end;
+
+          $block .= "\n";
+
+        } while (<DATA>);
+      }
+
+      if ($have_enum_element)
+      {
+        push @{$diversions{$curr_enum}}, enum_val_string($curr_enum_element);
+        $have_enum_element = 0;
+      }
+
+      push @{$diversions{$curr_array}}, $block . ",\n";
+
+      $curr_offset++;
+      $curr_elem_size++;
+
+      $have_blocks = 1;
+    }
+    else
+    {
+      warn_before();
+    }
+
+    next;
+  }
+
+  # Garbage.  We weren't able to parse the data.
+  Die("syntax error");
+}
+
+# Finalize data.
+end_curr_string();
+update_max_elem_size();
+
+
+# Filter stdin to stdout, replacing `@...@' templates.
+
+sub emit_diversion
+{
+  my $diversion_name = shift;
+  return (exists($diversions{$1})) ? "@{$diversions{$1}}"
+                                   : "@" . $diversion_name . "@";
+}
+
+
+$LIST_SEPARATOR = '';
+
+my $s1 = "This file has been generated by the Perl script \`$prog',";
+my $s1len = length $s1;
+my $s2 = "using data from file \`$datafile'.";
+my $s2len = length $s2;
+my $slen = ($s1len > $s2len) ? $s1len : $s2len;
+
+print "/* " . $s1 . " " x ($slen - $s1len) . " */\n"
+      . "/* " . $s2 . " " x ($slen - $s2len) . " */\n"
+      . "\n";
+
+while (<STDIN>)
+{
+  s/ @ ( [A-Za-z0-9_]+? ) @ / emit_diversion($1) /egx;
+  print;
+}
+
+# EOF
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/apinames.c b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/apinames.c
index c85df721a06..c85df721a06 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/apinames.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/apinames.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/chktrcmp.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/chktrcmp.py
index d0f342e6bdd..ce6500c7e25 100755
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/chktrcmp.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/chktrcmp.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # Check trace components in FreeType 2 source.
-# Author: suzuki toshiya, 2009
+# Author: suzuki toshiya, 2009, 2013
 #
 # This code is explicitly into the public domain.
 
@@ -15,7 +15,7 @@ USED_COMPONENT  = {}
 KNOWN_COMPONENT = {}
 
 SRC_FILE_DIRS   = [ "src" ]
-TRACE_DEF_FILES = [ "include/freetype/internal/fttrace.h" ]
+TRACE_DEF_FILES = [ "include/internal/fttrace.h" ]
 
 
 # --------------------------------------------------------------
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/cordic.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/cordic.py
index 6742c90dfef..6742c90dfef 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/cordic.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/cordic.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/content.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/content.py
index 26087f7b88a..98025e67e5e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/content.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/content.py
@@ -1,4 +1,4 @@
-#  Content (c) 2002, 2004, 2006-2009, 2012
+#  Content (c) 2002, 2004, 2006-2009, 2012, 2013
 #    David Turner <david@freetype.org>
 #
 #  This file contains routines used to parse the content of documentation
@@ -268,15 +268,6 @@ class  DocMarkup:
         except:
             return None
 
-    def  get_start( self ):
-        try:
-            result = ""
-            for word in self.fields[0].items[0].words:
-                result = result + " " + word
-            return result[1:]
-        except:
-            return "ERROR"
-
     def  dump( self, margin ):
         print " " * margin + "<" + self.tag + ">"
         for f in self.fields:
@@ -555,14 +546,6 @@ class  DocBlock:
                 return m
         return None
 
-    def  get_markup_name( self, tag_name ):
-        """return the name of a given primary markup in a block"""
-        try:
-            m = self.get_markup( tag_name )
-            return m.get_name()
-        except:
-            return None
-
     def  get_markup_words( self, tag_name ):
         try:
             m = self.get_markup( tag_name )
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/docbeauty.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/docbeauty.py
index 3ddf4a94a15..3ddf4a94a15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/docbeauty.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/docbeauty.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/docmaker.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/docmaker.py
index 1d9de9fbff2..bf75c5d5f01 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/docmaker.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/docmaker.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 #
-#  DocMaker (c) 2002, 2004, 2008 David Turner <david@freetype.org>
+#  DocMaker (c) 2002, 2004, 2008, 2013 David Turner <david@freetype.org>
 #
-# This program is a re-write of the original DocMaker took used
+# This program is a re-write of the original DocMaker tool used
 # to generate the API Reference of the FreeType font engine
 # by converting in-source comments into structured HTML.
 #
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/formatter.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/formatter.py
index f62ce676c15..f62ce676c15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/formatter.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/formatter.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/sources.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/sources.py
index 490ba25063a..dab83497865 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/sources.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/sources.py
@@ -1,4 +1,4 @@
-#  Sources (c) 2002-2004, 2006-2009, 2012
+#  Sources (c) 2002-2004, 2006-2009, 2012, 2013
 #    David Turner <david@freetype.org>
 #
 #
@@ -132,7 +132,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|-)*)(.*)' )    #  @foo
 
 #
 # used to detect italic and bold styles in paragraph text
@@ -141,6 +141,42 @@ re_italic = re.compile( r"_(\w(\w|')*)_(.*)" )     #  _italic_
 re_bold   = re.compile( r"\*(\w(\w|')*)\*(.*)" )   #  *bold*
 
 #
+# this regular expression code to identify an URL has been taken from
+#
+#   http://mail.python.org/pipermail/tutor/2002-September/017228.html
+#
+# (with slight modifications)
+#
+
+urls = r'(?:https?|telnet|gopher|file|wais|ftp)'
+ltrs = r'\w'
+gunk = r'/#~:.?+=&%@!\-'
+punc = r'.:?\-'
+any  = "%(ltrs)s%(gunk)s%(punc)s" % { 'ltrs' : ltrs,
+                                      'gunk' : gunk,
+                                      'punc' : punc }
+url  = r"""
+         (
+           \b                    # start at word boundary
+           %(urls)s :            # need resource and a colon
+           [%(any)s] +?          # followed by one or more of any valid
+                                 # character, but be conservative and
+                                 # take only what you need to...
+           (?=                   # [look-ahead non-consumptive assertion]
+             [%(punc)s]*         # either 0 or more punctuation
+             (?:                 # [non-grouping parentheses]
+               [^%(any)s] | $    # followed by a non-url char
+                                 # or end of the string
+             )
+           )
+         )
+        """ % {'urls' : urls,
+               'any'  : any,
+               'punc' : punc }
+
+re_url = re.compile( url, re.VERBOSE | re.MULTILINE )
+
+#
 # used to detect the end of commented source lines
 #
 re_source_sep = re.compile( r'\s*/\*\s*\*/' )
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/tohtml.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/tohtml.py
index 1cbda755b8f..7944f1c995b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/tohtml.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/tohtml.py
@@ -1,4 +1,4 @@
-#  ToHTML (c) 2002, 2003, 2005, 2006, 2007, 2008
+#  ToHTML (c) 2002, 2003, 2005-2008, 2013
 #    David Turner <david@freetype.org>
 
 from sources import *
@@ -175,25 +175,6 @@ def  html_quote( line ):
     return result
 
 
-# same as 'html_quote', but ignores left and right brackets
-def  html_quote0( line ):
-    return string.replace( line, "&", "&amp;" )
-
-
-def  dump_html_code( lines, prefix = "" ):
-    # clean the last empty lines
-    l = len( self.lines )
-    while l > 0 and string.strip( self.lines[l - 1] ) == "":
-        l = l - 1
-
-    # The code footer should be directly appended to the last code
-    # line to avoid an additional blank line.
-    print prefix + code_header,
-    for line in self.lines[0 : l + 1]:
-        print '\n' + prefix + html_quote( line ),
-    print prefix + code_footer,
-
-
 
 class  HtmlFormatter( Formatter ):
 
@@ -242,16 +223,6 @@ class  HtmlFormatter( Formatter ):
     def  make_block_url( self, block ):
         return self.make_section_url( block.section ) + "#" + block.name
 
-    def  make_html_words( self, words ):
-        """ convert a series of simple words into some HTML text """
-        line = ""
-        if words:
-            line = html_quote( words[0] )
-            for w in words[1:]:
-                line = line + " " + html_quote( w )
-
-        return line
-
     def  make_html_word( self, word ):
         """analyze a simple word to detect cross-references and styling"""
         # look for cross-references
@@ -291,6 +262,8 @@ class  HtmlFormatter( Formatter ):
             line = self.make_html_word( words[0] )
             for word in words[1:]:
                 line = line + " " + self.make_html_word( word )
+            # handle hyperlinks
+            line = re_url.sub( r'<a href="\1">\1</a>', line )
             # convert `...' quotations into real left and right single quotes
             line = re.sub( r"(^|\W)`(.*?)'(\W|$)",  \
                            r'\1&lsquo;\2&rsquo;\3', \
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/utils.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/utils.py
index 1d96658c7d5..1d96658c7d5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/docmaker/utils.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/docmaker/utils.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/ftrandom/Makefile b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/ftrandom/Makefile
index 2e619299cdf..2e619299cdf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/ftrandom/Makefile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/ftrandom/Makefile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/ftrandom/README b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/ftrandom/README
index 71bf05323da..71bf05323da 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/ftrandom/README
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/ftrandom/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/ftrandom/ftrandom.c b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/ftrandom/ftrandom.c
index 7c97957119e..7c97957119e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/ftrandom/ftrandom.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/ftrandom/ftrandom.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/glnames.py b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/glnames.py
index 8810bf57f1f..8810bf57f1f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/glnames.py
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/glnames.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/test_afm.c b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/test_afm.c
index 24cd0c4f0e1..24cd0c4f0e1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/test_afm.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/test_afm.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/test_bbox.c b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/test_bbox.c
index 64b82c384b6..64b82c384b6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/test_bbox.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/test_bbox.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/test_trig.c b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/test_trig.c
index 49d927e36e9..49d927e36e9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/tools/test_trig.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/tools/test_trig.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/Jamfile
index a8cccfe1372..a8cccfe1372 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/module.mk
index baee81a7730..baee81a7730 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/rules.mk
index d4b69f578be..d4b69f578be 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/truetype.c b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/truetype.c
index 576912b219d..576912b219d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/truetype.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/truetype.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttdriver.c b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttdriver.c
index fb25706ab83..36d23a282e8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttdriver.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttdriver.c
@@ -215,7 +215,8 @@
         FT_UShort  ah;
 
 
-        TT_Get_VMetrics( face, start + nn, &tsb, &ah );
+        /* since we don't need `tsb', we use zero for `yMax' parameter */
+        TT_Get_VMetrics( face, start + nn, 0, &tsb, &ah );
         advances[nn] = ah;
       }
     }
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttdriver.h b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttdriver.h
index aae00f2617f..aae00f2617f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttdriver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttdriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/tterrors.h b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/tterrors.h
index 78d138fab2e..78d138fab2e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/tterrors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/tterrors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttgload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttgload.c
index f640a6c78ed..cc62f93b7e6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttgload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttgload.c
@@ -85,51 +85,36 @@
   /*************************************************************************/
   /*                                                                       */
   /* Return the vertical metrics in font units for a given glyph.          */
-  /* Greg Hitchcock from Microsoft told us that if there were no `vmtx'    */
-  /* table, typoAscender/Descender from the `OS/2' table would be used     */
-  /* instead, and if there were no `OS/2' table, use ascender/descender    */
-  /* from the `hhea' table.  But that is not what Microsoft's rasterizer   */
-  /* apparently does: It uses the ppem value as the advance height, and    */
-  /* sets the top side bearing to be zero.                                 */
+  /* See macro `TT_LOADER_SET_PP' below for explanations.                  */
   /*                                                                       */
   FT_LOCAL_DEF( void )
   TT_Get_VMetrics( TT_Face     face,
                    FT_UInt     idx,
+                   FT_Pos      yMax,
                    FT_Short*   tsb,
                    FT_UShort*  ah )
   {
     if ( face->vertical_info )
       ( (SFNT_Service)face->sfnt )->get_metrics( face, 1, idx, tsb, ah );
 
-#if 1             /* Empirically determined, at variance with what MS said */
-
-    else
-    {
-      *tsb = 0;
-      *ah  = face->root.units_per_EM;
-    }
-
-#else      /* This is what MS said to do.  It isn't what they do, however. */
-
     else if ( face->os2.version != 0xFFFFU )
     {
-      *tsb = face->os2.sTypoAscender;
+      *tsb = face->os2.sTypoAscender - yMax;
       *ah  = face->os2.sTypoAscender - face->os2.sTypoDescender;
     }
+
     else
     {
-      *tsb = face->horizontal.Ascender;
+      *tsb = face->horizontal.Ascender - yMax;
       *ah  = face->horizontal.Ascender - face->horizontal.Descender;
     }
 
-#endif
-
     FT_TRACE5(( "  advance height (font units): %d\n", *ah ));
     FT_TRACE5(( "  top side bearing (font units): %d\n", *tsb ));
   }
 
 
-  static void
+  static FT_Error
   tt_get_metrics( TT_Loader  loader,
                   FT_UInt    glyph_index )
   {
@@ -138,17 +123,28 @@
     TT_Driver  driver = (TT_Driver)FT_FACE_DRIVER( face );
 #endif
 
+    FT_Error   error;
+    FT_Stream  stream = loader->stream;
+
     FT_Short   left_bearing = 0, top_bearing = 0;
     FT_UShort  advance_width = 0, advance_height = 0;
 
+    /* we must preserve the stream position          */
+    /* (which gets altered by the metrics functions) */
+    FT_ULong  pos = FT_STREAM_POS();
+
 
     TT_Get_HMetrics( face, glyph_index,
                      &left_bearing,
                      &advance_width );
     TT_Get_VMetrics( face, glyph_index,
+                     loader->bbox.yMax,
                      &top_bearing,
                      &advance_height );
 
+    if ( FT_STREAM_SEEK( pos ) )
+      return error;
+
     loader->left_bearing = left_bearing;
     loader->advance      = advance_width;
     loader->top_bearing  = top_bearing;
@@ -171,6 +167,8 @@
       loader->linear_def = 1;
       loader->linear     = advance_width;
     }
+
+    return FT_Err_Ok;
   }
 
 
@@ -351,8 +349,9 @@
     FT_Int          n_contours = load->n_contours;
     FT_Outline*     outline;
     TT_Face         face       = (TT_Face)load->face;
-    FT_UShort       n_ins;
+    FT_UShort       n_ins, max_ins;
     FT_Int          n_points;
+    FT_ULong        tmp;
 
     FT_Byte         *flag, *flag_limit;
     FT_Byte         c, count;
@@ -418,12 +417,29 @@
 
     FT_TRACE5(( "  Instructions size: %u\n", n_ins ));
 
-    if ( n_ins > face->max_profile.maxSizeOfInstructions )
+    /* check it */
+    max_ins = face->max_profile.maxSizeOfInstructions;
+    if ( n_ins > max_ins )
     {
-      FT_TRACE0(( "TT_Load_Simple_Glyph: too many instructions (%d)\n",
-                  n_ins ));
-      error = FT_THROW( Too_Many_Hints );
-      goto Fail;
+      /* don't trust `maxSizeOfInstructions'; */
+      /* only do a rough safety check         */
+      if ( (FT_Int)n_ins > load->byte_len )
+      {
+        FT_TRACE1(( "TT_Load_Simple_Glyph:"
+                    " too many instructions (%d) for glyph with length %d\n",
+                    n_ins, load->byte_len ));
+        return FT_THROW( Too_Many_Hints );
+      }
+
+      tmp = load->exec->glyphSize;
+      error = Update_Max( load->exec->memory,
+                          &tmp,
+                          sizeof ( FT_Byte ),
+                          (void*)&load->exec->glyphIns,
+                          n_ins );
+      load->exec->glyphSize = (FT_UShort)tmp;
+      if ( error )
+        return error;
     }
 
     if ( ( limit - p ) < n_ins )
@@ -745,8 +761,8 @@
 #ifdef TT_USE_BYTECODE_INTERPRETER
     if ( loader->glyph->control_len > 0xFFFFL )
     {
-      FT_TRACE1(( "TT_Hint_Glyph: too long instructions " ));
-      FT_TRACE1(( "(0x%lx byte) is truncated\n",
+      FT_TRACE1(( "TT_Hint_Glyph: too long instructions" ));
+      FT_TRACE1(( " (0x%lx byte) is truncated\n",
                  loader->glyph->control_len ));
     }
     n_ins = (FT_UInt)( loader->glyph->control_len );
@@ -1218,11 +1234,12 @@
       max_ins = ((TT_Face)loader->face)->max_profile.maxSizeOfInstructions;
       if ( n_ins > max_ins )
       {
-        /* acroread ignores this field, so we only do a rough safety check */
+        /* don't trust `maxSizeOfInstructions'; */
+        /* only do a rough safety check         */
         if ( (FT_Int)n_ins > loader->byte_len )
         {
-          FT_TRACE1(( "TT_Process_Composite_Glyph: "
-                      "too many instructions (%d) for glyph with length %d\n",
+          FT_TRACE1(( "TT_Process_Composite_Glyph:"
+                      " too many instructions (%d) for glyph with length %d\n",
                       n_ins, loader->byte_len ));
           return FT_THROW( Too_Many_Hints );
         }
@@ -1254,7 +1271,7 @@
 
     /* Some points are likely touched during execution of  */
     /* instructions on components.  So let's untouch them. */
-    for ( i = start_point; i < loader->zone.n_points; i++ )
+    for ( i = 0; i < loader->zone.n_points; i++ )
       loader->zone.tags[i] &= ~FT_CURVE_TAG_TOUCH_BOTH;
 
     loader->zone.n_points += 4;
@@ -1263,18 +1280,78 @@
   }
 
 
-  /* Calculate the four phantom points.                     */
-  /* The first two stand for horizontal origin and advance. */
-  /* The last two stand for vertical origin and advance.    */
+  /*
+   * Calculate the phantom points
+   *
+   * Defining the right side bearing (rsb) as
+   *
+   *   rsb = aw - (lsb + xmax - xmin)
+   *
+   * (with `aw' the advance width, `lsb' the left side bearing, and `xmin'
+   * and `xmax' the glyph's minimum and maximum x value), the OpenType
+   * specification defines the initial position of horizontal phantom points
+   * as
+   *
+   *   pp1 = (xmin - lsb, 0)      ,
+   *   pp2 = (pp1 + aw, 0)        .
+   *
+   * However, the specification lacks the precise definition of vertical
+   * phantom points.  Greg Hitchcock provided the following explanation.
+   *
+   * - a `vmtx' table is present
+   *
+   *   For any glyph, the minimum and maximum y values (`ymin' and `ymax')
+   *   are given in the `glyf' table, the top side bearing (tsb) and advance
+   *   height (ah) are given in the `vmtx' table.  The bottom side bearing
+   *   (bsb) is then calculated as
+   *
+   *     bsb = ah - (tsb + ymax - ymin)       ,
+   *
+   *   and the initial position of vertical phantom points is
+   *
+   *     pp3 = (x, ymax + tsb)       ,
+   *     pp4 = (x, pp3 - ah)         .
+   *
+   *   See below for value `x'.
+   *
+   * - no `vmtx' table in the font
+   *
+   *   If there is an `OS/2' table, we set
+   *
+   *     DefaultAscender = sTypoAscender       ,
+   *     DefaultDescender = sTypoDescender     ,
+   *
+   *   otherwise we use data from the `hhea' table:
+   *
+   *     DefaultAscender = Ascender         ,
+   *     DefaultDescender = Descender       .
+   *
+   *   With these two variables we can now set
+   *
+   *     ah = DefaultAscender - sDefaultDescender    ,
+   *     tsb = DefaultAscender - yMax                ,
+   *
+   *   and proceed as if a `vmtx' table was present.
+   *
+   * Usually we have
+   *
+   *   x = aw / 2      ,
+   *
+   * but there is a compatibility case where it can be set to
+   *
+   *   x = -DefaultDescender -
+   *         ((DefaultAscender - DefaultDescender - aw) / 2)     .
+   *
+   */
 #define TT_LOADER_SET_PP( loader )                                          \
           do {                                                              \
             (loader)->pp1.x = (loader)->bbox.xMin - (loader)->left_bearing; \
             (loader)->pp1.y = 0;                                            \
             (loader)->pp2.x = (loader)->pp1.x + (loader)->advance;          \
             (loader)->pp2.y = 0;                                            \
-            (loader)->pp3.x = 0;                                            \
-            (loader)->pp3.y = (loader)->top_bearing + (loader)->bbox.yMax;  \
-            (loader)->pp4.x = 0;                                            \
+            (loader)->pp3.x = (loader)->advance / 2;                        \
+            (loader)->pp3.y = (loader)->bbox.yMax + (loader)->top_bearing;  \
+            (loader)->pp4.x = (loader)->advance / 2;                        \
             (loader)->pp4.y = (loader)->pp3.y - (loader)->vadvance;         \
           } while ( 0 )
 
@@ -1341,8 +1418,6 @@
       y_scale = 0x10000L;
     }
 
-    tt_get_metrics( loader, glyph_index );
-
     /* Set `offset' to the start of the glyph relative to the start of */
     /* the `glyf' table, and `byte_len' to the length of the glyph in  */
     /* bytes.                                                          */
@@ -1402,7 +1477,17 @@
 
       /* read glyph header first */
       error = face->read_glyph_header( loader );
-      if ( error || header_only )
+      if ( error )
+        goto Exit;
+
+      /* the metrics must be computed after loading the glyph header */
+      /* since we need the glyph's `yMax' value in case the vertical */
+      /* metrics must be emulated                                    */
+      error = tt_get_metrics( loader, glyph_index );
+      if ( error )
+        goto Exit;
+
+      if ( header_only )
         goto Exit;
     }
 
@@ -1413,6 +1498,10 @@
       loader->bbox.yMin = 0;
       loader->bbox.yMax = 0;
 
+      error = tt_get_metrics( loader, glyph_index );
+      if ( error )
+        goto Exit;
+
       if ( header_only )
         goto Exit;
 
@@ -2204,6 +2293,8 @@
 
     error = FT_Err_Ok;
 
+    FT_TRACE1(( "TT_Load_Glyph: glyph index %d\n", glyph_index ));
+
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
 
     /* try to load embedded bitmap if any              */
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttgload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttgload.h
index 05f75882dc6..3f1699e6867 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttgload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttgload.h
@@ -43,6 +43,7 @@ FT_BEGIN_HEADER
   FT_LOCAL( void )
   TT_Get_VMetrics( TT_Face     face,
                    FT_UInt     idx,
+                   FT_Pos      yMax,
                    FT_Short*   tsb,
                    FT_UShort*  ah );
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttgxvar.c b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttgxvar.c
index 7899d3671dc..7899d3671dc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttgxvar.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttgxvar.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttgxvar.h b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttgxvar.h
index 82dfc4431f2..82dfc4431f2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttgxvar.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttgxvar.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttinterp.c b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttinterp.c
index e7ffb987cee..92e6d43b693 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttinterp.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttinterp.c
@@ -1437,9 +1437,108 @@
 
 #undef PACK
 
-#if 1
+
+#ifndef FT_CONFIG_OPTION_NO_ASSEMBLER
+
+#if defined( __arm__ )                                 && \
+    ( defined( __thumb2__ ) || !defined( __thumb__ ) )
+
+#define TT_MulFix14  TT_MulFix14_arm
 
   static FT_Int32
+  TT_MulFix14_arm( FT_Int32  a,
+                   FT_Int    b )
+  {
+    register FT_Int32  t, t2;
+
+
+#if defined( __CC_ARM ) || defined( __ARMCC__ )
+
+    __asm
+    {
+      smull t2, t,  b,  a           /* (lo=t2,hi=t) = a*b */
+      mov   a,  t,  asr #31         /* a   = (hi >> 31) */
+      add   a,  a,  #0x2000         /* a  += 0x2000 */
+      adds  t2, t2, a               /* t2 += a */
+      adc   t,  t,  #0              /* t  += carry */
+      mov   a,  t2, lsr #14         /* a   = t2 >> 14 */
+      orr   a,  a,  t,  lsl #18     /* a  |= t << 18 */
+    }
+
+#elif defined( __GNUC__ )
+
+    __asm__ __volatile__ (
+      "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
+      "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
+#ifdef __clang__
+      "add.w  %0, %0, #0x2000\n\t"      /* %0 += 0x2000 */
+#else
+      "add    %0, %0, #0x2000\n\t"      /* %0 += 0x2000 */
+#endif
+      "adds   %1, %1, %0\n\t"           /* %1 += %0 */
+      "adc    %2, %2, #0\n\t"           /* %2 += carry */
+      "mov    %0, %1, lsr #14\n\t"      /* %0  = %1 >> 16 */
+      "orr    %0, %0, %2, lsl #18\n\t"  /* %0 |= %2 << 16 */
+      : "=r"(a), "=&r"(t2), "=&r"(t)
+      : "r"(a), "r"(b)
+      : "cc" );
+
+#endif
+
+    return a;
+  }
+
+#endif /* __arm__ && ( __thumb2__ || !__thumb__ ) */
+
+#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
+
+
+#if defined( __GNUC__ )                              && \
+    ( defined( __i386__ ) || defined( __x86_64__ ) )
+
+#define TT_MulFix14  TT_MulFix14_long_long
+
+  /* Temporarily disable the warning that C90 doesn't support `long long'. */
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
+#pragma GCC diagnostic push
+#endif
+#pragma GCC diagnostic ignored "-Wlong-long"
+
+  /* This is declared `noinline' because inlining the function results */
+  /* in slower code.  The `pure' attribute indicates that the result   */
+  /* only depends on the parameters.                                   */
+  static __attribute__(( noinline ))
+         __attribute__(( pure )) FT_Int32
+  TT_MulFix14_long_long( FT_Int32  a,
+                         FT_Int    b )
+  {
+
+    long long  ret = (long long)a * b;
+
+    /* The following line assumes that right shifting of signed values */
+    /* will actually preserve the sign bit.  The exact behaviour is    */
+    /* undefined, but this is true on x86 and x86_64.                  */
+    long long  tmp = ret >> 63;
+
+
+    ret += 0x2000 + tmp;
+
+    return (FT_Int32)( ret >> 14 );
+  }
+
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
+#pragma GCC diagnostic pop
+#endif
+
+#endif /* __GNUC__ && ( __i386__ || __x86_64__ ) */
+
+
+#ifndef TT_MulFix14
+
+  /* Compute (a*b)/2^14 with maximum accuracy and rounding.  */
+  /* This is optimized to be faster than calling FT_MulFix() */
+  /* for platforms where sizeof(int) == 2.                   */
+  static FT_Int32
   TT_MulFix14( FT_Int32  a,
                FT_Int    b )
   {
@@ -1470,37 +1569,50 @@
     return sign >= 0 ? (FT_Int32)mid : -(FT_Int32)mid;
   }
 
-#else
+#endif  /* !TT_MulFix14 */
 
-  /* compute (a*b)/2^14 with maximum accuracy and rounding */
-  static FT_Int32
-  TT_MulFix14( FT_Int32  a,
-               FT_Int    b )
-  {
-    FT_Int32   m, s, hi;
-    FT_UInt32  l, lo;
 
+#if defined( __GNUC__ )        && \
+    ( defined( __i386__ )   ||    \
+      defined( __x86_64__ ) ||    \
+      defined( __arm__ )    )
 
-    /* compute ax*bx as 64-bit value */
-    l  = (FT_UInt32)( ( a & 0xFFFFU ) * b );
-    m  = ( a >> 16 ) * b;
+#define TT_DotFix14  TT_DotFix14_long_long
 
-    lo = l + ( (FT_UInt32)m << 16 );
-    hi = ( m >> 16 ) + ( (FT_Int32)l >> 31 ) + ( lo < l );
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
+#pragma GCC diagnostic push
+#endif
+#pragma GCC diagnostic ignored "-Wlong-long"
 
-    /* divide the result by 2^14 with rounding */
-    s   = hi >> 31;
-    l   = lo + (FT_UInt32)s;
-    hi += s + ( l < lo );
-    lo  = l;
+  static __attribute__(( pure )) FT_Int32
+  TT_DotFix14_long_long( FT_Int32  ax,
+                         FT_Int32  ay,
+                         FT_Int    bx,
+                         FT_Int    by )
+  {
+    /* Temporarily disable the warning that C90 doesn't support */
+    /* `long long'.                                             */
 
-    l   = lo + 0x2000U;
-    hi += l < lo;
+    long long  temp1 = (long long)ax * bx;
+    long long  temp2 = (long long)ay * by;
+
+
+    temp1 += temp2;
+    temp2  = temp1 >> 63;
+    temp1 += 0x2000 + temp2;
+
+    return (FT_Int32)( temp1 >> 14 );
 
-    return (FT_Int32)( ( (FT_UInt32)hi << 18 ) | ( l >> 14 ) );
   }
+
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
+#pragma GCC diagnostic pop
 #endif
 
+#endif /* __GNUC__ && (__arm__ || __i386__ || __x86_64__) */
+
+
+#ifndef TT_DotFix14
 
   /* compute (ax*bx+ay*by)/2^14 with maximum accuracy and rounding */
   static FT_Int32
@@ -1543,6 +1655,8 @@
     return (FT_Int32)( ( (FT_UInt32)hi << 18 ) | ( l >> 14 ) );
   }
 
+#endif /* TT_DotFix14 */
+
 
   /*************************************************************************/
   /*                                                                       */
@@ -3037,42 +3151,42 @@
   }
 
 
-#define DO_JROT                                                   \
-    if ( args[1] != 0 )                                           \
-    {                                                             \
-      if ( args[0] == 0 && CUR.args == 0 )                        \
-        CUR.error = FT_THROW( Bad_Argument );                     \
-      CUR.IP += args[0];                                          \
-      if ( CUR.IP < 0                                          || \
-           ( CUR.callTop > 0                                 &&   \
-             CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) )  \
-        CUR.error = FT_THROW( Bad_Argument );                     \
-      CUR.step_ins = FALSE;                                       \
+#define DO_JROT                                                    \
+    if ( args[1] != 0 )                                            \
+    {                                                              \
+      if ( args[0] == 0 && CUR.args == 0 )                         \
+        CUR.error = FT_THROW( Bad_Argument );                      \
+      CUR.IP += args[0];                                           \
+      if ( CUR.IP < 0                                           || \
+           ( CUR.callTop > 0                                  &&   \
+             CUR.IP > CUR.callStack[CUR.callTop - 1].Def->end ) )  \
+        CUR.error = FT_THROW( Bad_Argument );                      \
+      CUR.step_ins = FALSE;                                        \
     }
 
 
-#define DO_JMPR                                                 \
-    if ( args[0] == 0 && CUR.args == 0 )                        \
-      CUR.error = FT_THROW( Bad_Argument );                     \
-    CUR.IP += args[0];                                          \
-    if ( CUR.IP < 0                                          || \
-         ( CUR.callTop > 0                                 &&   \
-           CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) )  \
-      CUR.error = FT_THROW( Bad_Argument );                     \
+#define DO_JMPR                                                  \
+    if ( args[0] == 0 && CUR.args == 0 )                         \
+      CUR.error = FT_THROW( Bad_Argument );                      \
+    CUR.IP += args[0];                                           \
+    if ( CUR.IP < 0                                           || \
+         ( CUR.callTop > 0                                  &&   \
+           CUR.IP > CUR.callStack[CUR.callTop - 1].Def->end ) )  \
+      CUR.error = FT_THROW( Bad_Argument );                      \
     CUR.step_ins = FALSE;
 
 
-#define DO_JROF                                                   \
-    if ( args[1] == 0 )                                           \
-    {                                                             \
-      if ( args[0] == 0 && CUR.args == 0 )                        \
-        CUR.error = FT_THROW( Bad_Argument );                     \
-      CUR.IP += args[0];                                          \
-      if ( CUR.IP < 0                                          || \
-           ( CUR.callTop > 0                                 &&   \
-             CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) )  \
-        CUR.error = FT_THROW( Bad_Argument );                     \
-      CUR.step_ins = FALSE;                                       \
+#define DO_JROF                                                    \
+    if ( args[1] == 0 )                                            \
+    {                                                              \
+      if ( args[0] == 0 && CUR.args == 0 )                         \
+        CUR.error = FT_THROW( Bad_Argument );                      \
+      CUR.IP += args[0];                                           \
+      if ( CUR.IP < 0                                           || \
+           ( CUR.callTop > 0                                  &&   \
+             CUR.IP > CUR.callStack[CUR.callTop - 1].Def->end ) )  \
+        CUR.error = FT_THROW( Bad_Argument );                      \
+      CUR.step_ins = FALSE;                                        \
     }
 
 
@@ -4788,7 +4902,7 @@
     if ( pRec->Cur_Count > 0 )
     {
       CUR.callTop++;
-      CUR.IP = pRec->Cur_Restart;
+      CUR.IP = pRec->Def->start;
     }
     else
       /* Loop through the current function */
@@ -4878,8 +4992,7 @@
     pCrec->Caller_Range = CUR.curRange;
     pCrec->Caller_IP    = CUR.IP + 1;
     pCrec->Cur_Count    = 1;
-    pCrec->Cur_Restart  = def->start;
-    pCrec->Cur_End      = def->end;
+    pCrec->Def          = def;
 
     CUR.callTop++;
 
@@ -4967,8 +5080,7 @@
       pCrec->Caller_Range = CUR.curRange;
       pCrec->Caller_IP    = CUR.IP + 1;
       pCrec->Cur_Count    = (FT_Int)args[0];
-      pCrec->Cur_Restart  = def->start;
-      pCrec->Cur_End      = def->end;
+      pCrec->Def          = def;
 
       CUR.callTop++;
 
@@ -7716,18 +7828,15 @@
       if ( ( args[0] & 32 ) != 0 && CUR.grayscale_hinting )
         K |= 1 << 12;
 
-      /********************************/
-      /* HINTING FOR SUBPIXEL         */
-      /* Selector Bit:  6             */
-      /* Return Bit(s): 13            */
-      /*                              */
-      if ( ( args[0] & 64 ) != 0        &&
-           CUR.subpixel_hinting         &&
-           CUR.rasterizer_version >= 37 )
+      if ( CUR.rasterizer_version >= 37 )
       {
-        K |= 1 << 13;
-
-        /* the stuff below is irrelevant if subpixel_hinting is not set */
+        /********************************/
+        /* HINTING FOR SUBPIXEL         */
+        /* Selector Bit:  6             */
+        /* Return Bit(s): 13            */
+        /*                              */
+        if ( ( args[0] & 64 ) != 0 && CUR.subpixel_hinting )
+          K |= 1 << 13;
 
         /********************************/
         /* COMPATIBLE WIDTHS ENABLED    */
@@ -7803,8 +7912,7 @@
         call->Caller_Range = CUR.curRange;
         call->Caller_IP    = CUR.IP + 1;
         call->Cur_Count    = 1;
-        call->Cur_Restart  = def->start;
-        call->Cur_End      = def->end;
+        call->Def          = def;
 
         INS_Goto_CodeRange( def->range, def->start );
 
@@ -8860,8 +8968,7 @@
                 callrec->Caller_Range = CUR.curRange;
                 callrec->Caller_IP    = CUR.IP + 1;
                 callrec->Cur_Count    = 1;
-                callrec->Cur_Restart  = def->start;
-                callrec->Cur_End      = def->end;
+                callrec->Def          = def;
 
                 if ( INS_Goto_CodeRange( def->range, def->start ) == FAILURE )
                   goto LErrorLabel_;
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttinterp.h b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttinterp.h
index 69f5011ed40..b3916acb699 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttinterp.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttinterp.h
@@ -101,8 +101,8 @@ FT_BEGIN_HEADER
     FT_Int   Caller_Range;
     FT_Long  Caller_IP;
     FT_Long  Cur_Count;
-    FT_Long  Cur_Restart;
-    FT_Long  Cur_End;
+
+    TT_DefRecord  *Def; /* either FDEF or IDEF */
 
   } TT_CallRec, *TT_CallStack;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttobjs.c b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttobjs.c
index 7897efa77a9..4adba58f7bb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttobjs.c
@@ -150,20 +150,21 @@
   tt_check_trickyness_family( FT_String*  name )
   {
 
-#define TRICK_NAMES_MAX_CHARACTERS  16
-#define TRICK_NAMES_COUNT            8
+#define TRICK_NAMES_MAX_CHARACTERS  19
+#define TRICK_NAMES_COUNT            9
 
     static const char trick_names[TRICK_NAMES_COUNT]
                                  [TRICK_NAMES_MAX_CHARACTERS + 1] =
     {
-      "DFKaiSho-SB",     /* dfkaisb.ttf */
+      "DFKaiSho-SB",        /* dfkaisb.ttf */
       "DFKaiShu",
-      "DFKai-SB",        /* kaiu.ttf */
-      "HuaTianKaiTi?",   /* htkt2.ttf */
-      "HuaTianSongTi?",  /* htst3.ttf */
-      "MingLiU",         /* mingliu.ttf & mingliu.ttc */
-      "PMingLiU",        /* mingliu.ttc */
-      "MingLi43",        /* mingli.ttf */
+      "DFKai-SB",           /* kaiu.ttf */
+      "HuaTianKaiTi?",      /* htkt2.ttf */
+      "HuaTianSongTi?",     /* htst3.ttf */
+      "Ming(for ISO10646)", /* hkscsiic.ttf & iicore.ttf */
+      "MingLiU",            /* mingliu.ttf & mingliu.ttc */
+      "PMingLiU",           /* mingliu.ttc */
+      "MingLi43",           /* mingli.ttf */
     };
 
     int  nn;
@@ -532,6 +533,10 @@
 
     /* check that we have a valid TrueType file */
     error = sfnt->init_face( stream, face, face_index, num_params, params );
+
+    /* Stream may have changed. */
+    stream = face->root.stream;
+
     if ( error )
       goto Exit;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttobjs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttobjs.h
index a11dd3752a3..a11dd3752a3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttpic.c b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttpic.c
index edefae72c5c..edefae72c5c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttpic.h b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttpic.h
index cfb4ee62812..cfb4ee62812 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttpload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttpload.c
index 9723a515b9f..9723a515b9f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttpload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttpload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttpload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttpload.h
index f61ac079ce0..f61ac079ce0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttpload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttpload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttsubpix.c b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttsubpix.c
index 28470ad655a..28470ad655a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttsubpix.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttsubpix.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttsubpix.h b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttsubpix.h
index 8a54fc7cc77..8a54fc7cc77 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/truetype/ttsubpix.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/truetype/ttsubpix.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/Jamfile
index 8e366baae51..8e366baae51 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/module.mk
index ade0210d76c..ade0210d76c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/rules.mk
index 15087b03044..15087b03044 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1afm.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1afm.c
index de9c1997c46..de9c1997c46 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1afm.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1afm.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1afm.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1afm.h
index 8eb1764de70..8eb1764de70 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1afm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1afm.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1driver.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1driver.c
index 697288d66dc..697288d66dc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1driver.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1driver.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1driver.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1driver.h
index 639cd4a7ad9..639cd4a7ad9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1driver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1driver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1errors.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1errors.h
index 8740530eef7..8740530eef7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1errors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1errors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1gload.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1gload.c
index 23478d12886..35f5b5795d9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1gload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1gload.c
@@ -300,6 +300,8 @@
       goto Exit;
     }
 
+    FT_TRACE1(( "T1_Load_Glyph: glyph index %d\n", glyph_index ));
+
     FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) );
 
     if ( load_flags & FT_LOAD_NO_RECURSE )
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1gload.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1gload.h
index 0bdea3a8d5b..0bdea3a8d5b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1gload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1gload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1load.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1load.c
index 1c834a17bb8..4b5026bfccf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1load.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1load.c
@@ -2209,7 +2209,6 @@
     if ( type1->encoding_type == T1_ENCODING_TYPE_ARRAY )
     {
       FT_Int    charcode, idx, min_char, max_char;
-      FT_Byte*  char_name;
       FT_Byte*  glyph_name;
 
 
@@ -2224,6 +2223,9 @@
       charcode = 0;
       for ( ; charcode < loader.encoding_table.max_elems; charcode++ )
       {
+        FT_Byte*  char_name;
+
+
         type1->encoding.char_index[charcode] = 0;
         type1->encoding.char_name [charcode] = (char *)".notdef";
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1load.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1load.h
index 546fc33530b..546fc33530b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1load.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1load.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1objs.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1objs.c
index 837b7911d4b..837b7911d4b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1objs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1objs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1objs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1objs.h
index 54ccbb996a1..54ccbb996a1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1objs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1objs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1parse.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1parse.c
index 106e4e7ecd1..106e4e7ecd1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1parse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1parse.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1parse.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1parse.h
index fb1c8a88308..fb1c8a88308 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1parse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1parse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1tokens.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1tokens.h
index e37276b9083..e37276b9083 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/t1tokens.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/t1tokens.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/type1.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/type1.c
index ccc12be1038..ccc12be1038 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type1/type1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type1/type1.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/Jamfile
index 00371d54f32..00371d54f32 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/module.mk
index b3f10a8d3c8..b3f10a8d3c8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/rules.mk
index eac1081eb1f..eac1081eb1f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42drivr.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42drivr.c
index 3ad1bde79f2..3ad1bde79f2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42drivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42drivr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42drivr.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42drivr.h
index 9a1e97e30e3..9a1e97e30e3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42drivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42drivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42error.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42error.h
index 217ae8bd529..217ae8bd529 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42error.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42error.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42objs.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42objs.c
index 18e2c0b6250..f5aa2caf2c0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42objs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42objs.c
@@ -171,7 +171,6 @@
 
     FT_UNUSED( num_params );
     FT_UNUSED( params );
-    FT_UNUSED( face_index );
     FT_UNUSED( stream );
 
 
@@ -507,7 +506,7 @@
     FT_Face   face    = size->face;
     T42_Face  t42face = (T42_Face)face;
     FT_Size   ttsize;
-    FT_Error  error   = FT_Err_Ok;
+    FT_Error  error;
 
 
     error = FT_New_Size( t42face->ttf_face, &ttsize );
@@ -648,6 +647,8 @@
     FT_Driver_Class  ttclazz = ((T42_Driver)glyph->face->driver)->ttclazz;
 
 
+    FT_TRACE1(( "T42_GlyphSlot_Load: glyph index %d\n", glyph_index ));
+
     t42_glyphslot_clear( t42slot->ttslot );
     error = ttclazz->load_glyph( t42slot->ttslot,
                                  t42size->ttsize,
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42objs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42objs.h
index 02d13259bed..02d13259bed 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42objs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42objs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42parse.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42parse.c
index 3cdd8a1acf2..3cdd8a1acf2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42parse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42parse.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42parse.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42parse.h
index f77ec4af4f4..f77ec4af4f4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42parse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42parse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42types.h b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42types.h
index c7c2db490df..c7c2db490df 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/t42types.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/t42types.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/type42.c b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/type42.c
index d13df56b10c..d13df56b10c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/type42/type42.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/type42/type42.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/Jamfile b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/Jamfile
index 71cf5678e8b..71cf5678e8b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/fnterrs.h b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/fnterrs.h
index 463ba77ee24..463ba77ee24 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/fnterrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/fnterrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/module.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/module.mk
index b44d7f0570a..b44d7f0570a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/rules.mk b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/rules.mk
index 71a7df2d8ab..71a7df2d8ab 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/winfnt.c b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/winfnt.c
index e8055c0898e..68432438bfb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/winfnt.c
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/winfnt.c
@@ -984,6 +984,8 @@
       goto Exit;
     }
 
+    FT_TRACE1(( "FNT_Load_Glyph: glyph index %d\n", glyph_index ));
+
     if ( glyph_index > 0 )
       glyph_index--;                           /* revert to real index */
     else
@@ -1024,7 +1026,7 @@
       bitmap->rows       = font->header.pixel_height;
       bitmap->pixel_mode = FT_PIXEL_MODE_MONO;
 
-      if ( offset + pitch * bitmap->rows >= font->header.file_size )
+      if ( offset + pitch * bitmap->rows > font->header.file_size )
       {
         FT_TRACE2(( "invalid bitmap width\n" ));
         error = FT_THROW( Invalid_File_Format );
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/winfnt.h b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/winfnt.h
index b7a80736d83..b7a80736d83 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/src/winfonts/winfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.1/src/winfonts/winfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/version.sed b/Build/source/libs/freetype2/freetype-2.5.1/version.sed
index c281ff506b4..c281ff506b4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/version.sed
+++ b/Build/source/libs/freetype2/freetype-2.5.1/version.sed
diff --git a/Build/source/libs/freetype2/freetype-2.5.0.1/vms_make.com b/Build/source/libs/freetype2/freetype-2.5.1/vms_make.com
index 1aa83e7e304..8d8fdf771c1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.0.1/vms_make.com
+++ b/Build/source/libs/freetype2/freetype-2.5.1/vms_make.com
@@ -1,6 +1,6 @@
 $! make Freetype2 under OpenVMS
 $!
-$! Copyright 2003, 2004, 2006, 2007 by
+$! Copyright 2003, 2004, 2006, 2007, 2013 by
 $! David Turner, Robert Wilhelm, and Werner Lemberg.
 $!
 $! This file is part of the FreeType project, and may only be used, modified,
@@ -172,7 +172,7 @@ $ deck
 
 
 all :
-        define freetype [--.include.freetype]
+        define freetype [--.include]
         define psaux [-.psaux]
         define autofit [-.autofit]
         define autohint [-.autohint]
diff --git a/Build/source/libs/freetype2/version.ac b/Build/source/libs/freetype2/version.ac
index 0f7242eae07..83a25a27545 100644
--- a/Build/source/libs/freetype2/version.ac
+++ b/Build/source/libs/freetype2/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current freetype version
-m4_define([freetype_version], [2.5.0.1])
+m4_define([freetype_version], [2.5.1])
diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure
index 311f14d9b4f..898937d9869 100755
--- a/Build/source/libs/gd/configure
+++ b/Build/source/libs/gd/configure
@@ -5840,7 +5840,7 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
 else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
+  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
   FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
   FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
   FREETYPE2_RULE='# Rebuild libfreetype
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index 5d5161dea59..96e37f16b3f 100755
--- a/Build/source/libs/harfbuzz/configure
+++ b/Build/source/libs/harfbuzz/configure
@@ -5563,7 +5563,7 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
 else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
+  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
   FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
   FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
   FREETYPE2_RULE='# Rebuild libfreetype
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 29691d2d3d8..eaab86487b9 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-freetype2-flags.m4: New layout of installed headers.
+
 2013-10-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-pkgs.m4 (kpse_libs_pkgs): Add paper.
diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4
index 4e11f6ee525..69f60bc599e 100644
--- a/Build/source/m4/kpse-freetype2-flags.m4
+++ b/Build/source/m4/kpse-freetype2-flags.m4
@@ -14,7 +14,7 @@
 AC_DEFUN([KPSE_FREETYPE2_FLAGS], [dnl
 AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
 _KPSE_LIB_FLAGS([freetype2], [freetype], [],
-                [-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2],
+                [-IBLD/libs/freetype2/freetype2],
                 [BLD/libs/freetype2/libfreetype.a], [],
                 [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl
 ]) # KPSE_FREETYPE2_FLAGS
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 578cf1f6874..34cd12a70d2 100755
--- a/Build/source/texk/dvipdfm-x/configure
+++ b/Build/source/texk/dvipdfm-x/configure
@@ -15615,7 +15615,7 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
 else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
+  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
   FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
   FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
   FREETYPE2_RULE='# Rebuild libfreetype
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 2eb91bcc143..affb7932a53 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -16281,7 +16281,7 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
 else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
+  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
   FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
   FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
   FREETYPE2_RULE='# Rebuild libfreetype
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index c32b7f70b03..479c1b31145 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -19237,7 +19237,7 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
 else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
+  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
   FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
   FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
   FREETYPE2_RULE='# Rebuild libfreetype
diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure
index c8585282a1f..d0328b72998 100755
--- a/Build/source/texk/ttf2pk2/configure
+++ b/Build/source/texk/ttf2pk2/configure
@@ -14623,7 +14623,7 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
 else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
+  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
   FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
   FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
   FREETYPE2_RULE='# Rebuild libfreetype
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 4c213987146..1b84717f14a 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -23207,7 +23207,7 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
 else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
+  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
   FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
   FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
   FREETYPE2_RULE='# Rebuild libfreetype
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index b6cf8461c73..48f7fa86bec 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -18346,7 +18346,7 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
 else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
+  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
   FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
   FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
   FREETYPE2_RULE='# Rebuild libfreetype