Commit b09e77359121b911926af91b5f8a8a93ce4d9438
2018-08-06T11:02:51
* devel/ftoption.h: Synchronize with main `ftoption.h'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291
diff --git a/ChangeLog b/ChangeLog
index e0a6e20..dc090a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-06 Werner Lemberg <wl@gnu.org>
+
+ * devel/ftoption.h: Synchronize with main `ftoption.h'.
+
2018-08-06 Alexei Podtelezhnikov <apodtele@gmail.com>
[pcf] Use unsigned types.
diff --git a/devel/ftoption.h b/devel/ftoption.h
index 3aff1f4..801238a 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -75,32 +75,38 @@ FT_BEGIN_HEADER
/*************************************************************************/
- /**************************************************************************
+ /*#************************************************************************
*
* If you enable this configuration option, FreeType recognizes an
- * environment variable called `FREETYPE_PROPERTIES', which can be used
- * to control the various font drivers and modules. The controllable
- * properties are listed in the section `Controlling FreeType Modules'
- * in the reference's table of contents; currently there are properties
- * for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'),
- * TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h').
+ * environment variable called `FREETYPE_PROPERTIES', which can be used to
+ * control the various font drivers and modules. The controllable
+ * properties are listed in the section @properties.
+ *
+ * You have to undefine this configuration option on platforms that lack
+ * the concept of environment variables (and thus don't have the `getenv'
+ * function), for example Windows CE.
*
* `FREETYPE_PROPERTIES' has the following syntax form (broken here into
* multiple lines for better readability).
*
+ * {
* <optional whitespace>
* <module-name1> ':'
- * @property-name1: '=' <property-value1>
- * @whitespace:
- * <module-name2> ':'
- * @property-name2: '=' <property-value2>
- * ...
+ * <property-name1> '=' <property-value1>
+ * <whitespace>
+ * <module-name2> ':'
+ * <property-name2> '=' <property-value2>
+ * ...
+ * }
*
* Example:
*
- * FREETYPE_PROPERTIES=truetype:interpreter-version=35 \
- * cff:no-stem-darkening=1 \
- * autofitter:warping=1
+ * {
+ * FREETYPE_PROPERTIES=truetype:interpreter-version=35 \
+ * cff:no-stem-darkening=1 \
+ * autofitter:warping=1
+ * }
+ *
*/
#define FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES
@@ -211,6 +217,10 @@ FT_BEGIN_HEADER
*
* Do not #undef this macro here since the build system might define
* it for certain configurations only.
+ *
+ * If you use a build system like cmake or the `configure' script,
+ * options set by those programs have precendence, overwriting the
+ * value here with the configured one.
*/
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
@@ -227,6 +237,10 @@ FT_BEGIN_HEADER
* the system available bzip2 implementation.
*
* Define this macro if you want to enable this `feature'.
+ *
+ * If you use a build system like cmake or the `configure' script,
+ * options set by those programs have precendence, overwriting the
+ * value here with the configured one.
*/
#define FT_CONFIG_OPTION_USE_BZIP2
@@ -252,6 +266,10 @@ FT_BEGIN_HEADER
* supported regardless of this configuration.
*
* Define this macro if you want to enable this `feature'.
+ *
+ * If you use a build system like cmake or the `configure' script,
+ * options set by those programs have precendence, overwriting the
+ * value here with the configured one.
*/
#define FT_CONFIG_OPTION_USE_PNG
@@ -265,6 +283,10 @@ FT_BEGIN_HEADER
* by a font's character map will be hinted also.
*
* Define this macro if you want to enable this `feature'.
+ *
+ * If you use a build system like cmake or the `configure' script,
+ * options set by those programs have precendence, overwriting the
+ * value here with the configured one.
*/
#define FT_CONFIG_OPTION_USE_HARFBUZZ
@@ -577,17 +599,21 @@ FT_BEGIN_HEADER
* [1] for a technical overview on what this means. See `ttinterp.h'
* for more details on the LEAN option.
*
- * There are three options.
+ * There are three possible values.
*
- * 1. This option is associated with the `Infinality' moniker.
- * Contributed by an individual nicknamed Infinality with the goal of
+ * Value 1:
+ * This value is associated with the `Infinality' moniker,
+ * contributed by an individual nicknamed Infinality with the goal of
* making TrueType fonts render better than on Windows. A high
* amount of configurability and flexibility, down to rules for
* single glyphs in fonts, but also very slow. Its experimental and
* slow nature and the original developer losing interest meant that
* this option was never enabled in default builds.
*
- * 2. The new default mode for the TrueType driver. The Infinality code
+ * The corresponding interpreter version is v38.
+ *
+ * Value 2:
+ * The new default mode for the TrueType driver. The Infinality code
* base was stripped to the bare minimum and all configurability
* removed in the name of speed and simplicity. The configurability
* was mainly aimed at legacy fonts like Arial, Times New Roman, or
@@ -597,14 +623,19 @@ FT_BEGIN_HEADER
* that modern and web fonts render well while legacy fonts render
* okay.
*
- * 3. Compile both.
+ * The corresponding interpreter version is v40.
+ *
+ * Value 3:
+ * Compile both, making both v38 and v40 available (the latter is the
+ * default).
*
* By undefining these, you get rendering behavior like on Windows
* without ClearType, i.e., Windows XP without ClearType enabled and
* Win9x (interpreter version v35). Or not, depending on how much
* hinting blood and testing tears the font designer put into a given
* font. If you define one or both subpixel hinting options, you can
- * switch between between v35 and the ones you define.
+ * switch between between v35 and the ones you define (using
+ * `FT_Property_Set').
*
* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be
* defined.
@@ -751,8 +782,8 @@ FT_BEGIN_HEADER
* 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.
+ * `darkening-parameters' property (file `ftdriver.h'), which allows the
+ * control at run-time.
*
* Do *not* undefine these macros!
*/
@@ -824,7 +855,9 @@ FT_BEGIN_HEADER
/**************************************************************************
*
- * Compile autofit module with Indic script support.
+ * Compile autofit module with fallback Indic script support, covering
+ * some scripts that the `latin' submodule of the autofit module doesn't
+ * (yet) handle.
*/
#define AF_CONFIG_OPTION_INDIC
@@ -838,11 +871,31 @@ FT_BEGIN_HEADER
*
* This experimental option is active only if the rendering mode is
* FT_RENDER_MODE_LIGHT; you can switch warping on and off with the
- * `warping' property of the auto-hinter (see file `ftautoh.h' for more
+ * `warping' property of the auto-hinter (see file `ftdriver.h' for more
* information; by default it is switched off).
*/
#define AF_CONFIG_OPTION_USE_WARPER
+ /**************************************************************************
+ *
+ * Use TrueType-like size metrics for `light' auto-hinting.
+ *
+ * It is strongly recommended to avoid this option, which exists only to
+ * help some legacy applications retain its appearance and behaviour
+ * with respect to auto-hinted TrueType fonts.
+ *
+ * The very reason this option exists at all are GNU/Linux distributions
+ * like Fedora that did not un-patch the following change (which was
+ * present in FreeType between versions 2.4.6 and 2.7.1, inclusive).
+ *
+ * 2011-07-16 Steven Chu <steven.f.chu@gmail.com>
+ *
+ * [truetype] Fix metrics on size request for scalable fonts.
+ *
+ * This problematic commit is now reverted (more or less).
+ */
+/* #define AF_CONFIG_OPTION_TT_SIZE_METRICS */
+
/* */
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index a5d883f..3062e28 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -75,36 +75,39 @@ FT_BEGIN_HEADER
/*************************************************************************/
- /*#***********************************************************************/
- /* */
- /* If you enable this configuration option, FreeType recognizes an */
- /* environment variable called `FREETYPE_PROPERTIES', which can be used */
- /* to control the various font drivers and modules. The controllable */
- /* properties are listed in the section @properties. */
- /* */
- /* You have to undefine this configuration option on platforms that lack */
- /* the concept of environment variables (and thus don't have the */
- /* `getenv' function), for example Windows CE. */
- /* */
- /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */
- /* multiple lines for better readability). */
- /* */
- /* { */
- /* <optional whitespace> */
- /* <module-name1> ':' */
- /* <property-name1> '=' <property-value1> */
- /* <whitespace> */
- /* <module-name2> ':' */
- /* <property-name2> '=' <property-value2> */
- /* ... */
- /* } */
- /* */
- /* Example: */
- /* */
- /* FREETYPE_PROPERTIES=truetype:interpreter-version=35 \ */
- /* cff:no-stem-darkening=1 \ */
- /* autofitter:warping=1 */
- /* */
+ /*#************************************************************************
+ *
+ * If you enable this configuration option, FreeType recognizes an
+ * environment variable called `FREETYPE_PROPERTIES', which can be used to
+ * control the various font drivers and modules. The controllable
+ * properties are listed in the section @properties.
+ *
+ * You have to undefine this configuration option on platforms that lack
+ * the concept of environment variables (and thus don't have the `getenv'
+ * function), for example Windows CE.
+ *
+ * `FREETYPE_PROPERTIES' has the following syntax form (broken here into
+ * multiple lines for better readability).
+ *
+ * {
+ * <optional whitespace>
+ * <module-name1> ':'
+ * <property-name1> '=' <property-value1>
+ * <whitespace>
+ * <module-name2> ':'
+ * <property-name2> '=' <property-value2>
+ * ...
+ * }
+ *
+ * Example:
+ *
+ * {
+ * FREETYPE_PROPERTIES=truetype:interpreter-version=35 \
+ * cff:no-stem-darkening=1 \
+ * autofitter:warping=1
+ * }
+ *
+ */
#define FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES