Index: third_party/freetype/include/config/ftoption.h |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/config/ftoption.h b/third_party/freetype/include/config/ftoption.h |
similarity index 92% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/config/ftoption.h |
rename to third_party/freetype/include/config/ftoption.h |
index e16e3c199c0cbc217c78ccc2e1aa53634451c1c6..6fceef7628612dccfe2e17ce263099cdbe4cfbca 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/config/ftoption.h |
+++ b/third_party/freetype/include/config/ftoption.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* User-selectable configuration macros (specification only). */ |
/* */ |
-/* Copyright 1996-2013 by */ |
+/* Copyright 1996-2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -20,7 +20,7 @@ |
#define __FTOPTION_H__ |
-#include "../../ft2build.h" |
+#include <ft2build.h> |
FT_BEGIN_HEADER |
@@ -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,9 +59,9 @@ 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. */ |
+ /* We highly recommend using the third method whenever possible. */ |
/* */ |
/*************************************************************************/ |
@@ -92,7 +92,7 @@ FT_BEGIN_HEADER |
/* This is done to allow FreeType clients to run unmodified, forcing */ |
/* them to display normal gray-level anti-aliased glyphs. */ |
/* */ |
-#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING |
+/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ |
/*************************************************************************/ |
@@ -163,7 +163,7 @@ FT_BEGIN_HEADER |
/* Define this macro if you want to enable this `feature'. See also */ |
/* the macro FT_CONFIG_OPTION_SYSTEM_ZLIB below. */ |
/* */ |
-#define FT_CONFIG_OPTION_USE_ZLIB |
+//#define FT_CONFIG_OPTION_USE_ZLIB |
/*************************************************************************/ |
@@ -216,7 +216,7 @@ FT_BEGIN_HEADER |
/*************************************************************************/ |
/* */ |
- /* PNG bitmap support. */ |
+ /* PNG bitmap support. */ |
/* */ |
/* FreeType now handles loading color bitmap glyphs in the PNG format. */ |
/* This requires help from the external libpng library. Uncompressed */ |
@@ -230,6 +230,19 @@ FT_BEGIN_HEADER |
/*************************************************************************/ |
/* */ |
+ /* HarfBuzz support. */ |
+ /* */ |
+ /* FreeType uses the HarfBuzz library to improve auto-hinting of */ |
+ /* OpenType fonts. If available, many glyphs not directly addressable */ |
+ /* by a font's character map will be hinted also. */ |
+ /* */ |
+ /* Define this macro if you want to enable this `feature'. */ |
+ /* */ |
+/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */ |
+ |
+ |
+ /*************************************************************************/ |
+ /* */ |
/* DLL export compilation */ |
/* */ |
/* When compiling FreeType as a DLL, some systems/compilers need a */ |
@@ -323,7 +336,7 @@ FT_BEGIN_HEADER |
/* */ |
/* Note that the `FOND' resource isn't checked. */ |
/* */ |
-//#define FT_CONFIG_OPTION_MAC_FONTS |
+#define FT_CONFIG_OPTION_MAC_FONTS |
/*************************************************************************/ |
@@ -501,7 +514,7 @@ FT_BEGIN_HEADER |
/* embedded bitmaps in all formats using the SFNT module (namely */ |
/* TrueType & OpenType). */ |
/* */ |
-#undef TT_CONFIG_OPTION_EMBEDDED_BITMAPS |
+#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS |
/*************************************************************************/ |
@@ -528,7 +541,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 |
@@ -683,7 +696,7 @@ FT_BEGIN_HEADER |
/* and avar tables). This has many similarities to Type 1 Multiple */ |
/* Masters support. */ |
/* */ |
-#undef TT_CONFIG_OPTION_GX_VAR_SUPPORT |
+#define TT_CONFIG_OPTION_GX_VAR_SUPPORT |
/*************************************************************************/ |
@@ -691,7 +704,7 @@ FT_BEGIN_HEADER |
/* Define TT_CONFIG_OPTION_BDF if you want to include support for */ |
/* an embedded `BDF ' table within SFNT-based bitmap formats. */ |
/* */ |
-#undef TT_CONFIG_OPTION_BDF |
+#define TT_CONFIG_OPTION_BDF |
/*************************************************************************/ |
@@ -727,7 +740,7 @@ FT_BEGIN_HEADER |
/* */ |
/* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */ |
/* */ |
-#define T1_MAX_CHARSTRINGS_OPERANDS 512 |
+#define T1_MAX_CHARSTRINGS_OPERANDS 256 |
/*************************************************************************/ |
@@ -760,6 +773,30 @@ FT_BEGIN_HEADER |
/*************************************************************************/ |
/* */ |
+ /* Using CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4} it is */ |
+ /* possible to set up the default values of the four control points that */ |
+ /* define the stem darkening behaviour of the (new) CFF engine. For */ |
+ /* more details please read the documentation of the */ |
+ /* `darkening-parameters' property of the cff driver module (file */ |
+ /* `ftcffdrv.h'), which allows the control at run-time. */ |
+ /* */ |
+ /* Do *not* undefine these macros! */ |
+ /* */ |
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 500 |
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 400 |
+ |
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 1000 |
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 275 |
+ |
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 1667 |
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 275 |
+ |
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 2333 |
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 0 |
+ |
+ |
+ /*************************************************************************/ |
+ /* */ |
/* CFF_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe CFF */ |
/* engine gets compiled into FreeType. If defined, it is possible to */ |
/* switch between the two engines using the `hinting-engine' property of */ |
@@ -807,8 +844,8 @@ FT_BEGIN_HEADER |
/* |
- * This macro is obsolete. Support has been removed in FreeType |
- * version 2.5. |
+ * This macro is obsolete. Support has been removed in FreeType |
+ * version 2.5. |
*/ |
/* #define FT_CONFIG_OPTION_OLD_INTERNALS */ |
@@ -824,6 +861,35 @@ FT_BEGIN_HEADER |
#define TT_USE_BYTECODE_INTERPRETER |
#endif |
+ |
+ /* |
+ * Check CFF darkening parameters. The checks are the same as in function |
+ * `cff_property_set' in file `cffdrivr.c'. |
+ */ |
+#if CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 < 0 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 < 0 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 < 0 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 < 0 || \ |
+ \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 < 0 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 < 0 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 < 0 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 < 0 || \ |
+ \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 > \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 > \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 > \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 || \ |
+ \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 > 500 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 > 500 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 > 500 || \ |
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 > 500 |
+#error "Invalid CFF darkening parameters!" |
+#endif |
+ |
FT_END_HEADER |