ref: 785f38573b479c2ae57d4e81be8b18fe21a84dba
parent: c9d9947c68d56b10b25015d40002e874d4299583
author: Werner Lemberg <[email protected]>
date: Tue Dec 31 04:45:10 EST 2013
[autofit] s/AF_STYLE_...._DEFAULT/AF_STYLE_...._DFLT/i.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-12-31 Werner Lemberg <[email protected]>
+ [autofit] s/AF_STYLE_...._DEFAULT/AF_STYLE_...._DFLT/i.
+
+2013-12-31 Werner Lemberg <[email protected]>
+
[autofit] Fix interface of `af_get_char_index'.
* src/autofit/hbshim.c (af_get_char_index): Return error value.
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -76,7 +76,7 @@
FT_TRACE5(( "\n"
"cjk standard widths computation (style `%s')\n"
- "===============================================\n"
+ "===================================================\n"
"\n",
af_style_names[metrics->root.style_class->style] ));
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -335,7 +335,7 @@
/* if we have a forced style (via `options'), use it, */
/* otherwise look into `glyph_styles' array */
- if ( style == AF_STYLE_NONE_DEFAULT || style + 1 >= AF_STYLE_MAX )
+ if ( style == AF_STYLE_NONE_DFLT || style + 1 >= AF_STYLE_MAX )
style = (AF_Style)( globals->glyph_styles[gindex] &
AF_STYLE_UNASSIGNED );
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -66,9 +66,9 @@
/* index of fallback style in `af_style_classes' */
#ifdef AF_CONFIG_OPTION_CJK
-#define AF_STYLE_FALLBACK AF_STYLE_HANI_DEFAULT
+#define AF_STYLE_FALLBACK AF_STYLE_HANI_DFLT
#else
-#define AF_STYLE_FALLBACK AF_STYLE_NONE_DEFAULT
+#define AF_STYLE_FALLBACK AF_STYLE_NONE_DFLT
#endif
/* default script for OpenType; ignored if HarfBuzz isn't used */
#define AF_SCRIPT_DEFAULT AF_SCRIPT_LATN
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -63,7 +63,7 @@
FT_TRACE5(( "\n"
"latin standard widths computation (style `%s')\n"
- "================================================\n"
+ "=====================================================\n"
"\n",
af_style_names[metrics->root.style_class->style] ));
--- a/src/autofit/afloader.c
+++ b/src/autofit/afloader.c
@@ -530,13 +530,13 @@
if ( !error )
{
AF_StyleMetrics metrics;
- FT_UInt options = AF_STYLE_NONE_DEFAULT;
+ FT_UInt options = AF_STYLE_NONE_DFLT;
#ifdef FT_OPTION_AUTOFIT2
/* XXX: undocumented hook to activate the latin2 writing system */
if ( load_flags & ( 1UL << 20 ) )
- options = AF_STYLE_LTN2_DEFAULT;
+ options = AF_STYLE_LTN2_DFLT;
#endif
error = af_face_globals_get_metrics( loader->globals, gindex,
--- a/src/autofit/afstyles.h
+++ b/src/autofit/afstyles.h
@@ -26,7 +26,7 @@
/* corresponding writing system, script, blue stringset, and */
/* coverage. */
- STYLE( cyrl_default, CYRL_DEFAULT,
+ STYLE( cyrl_dflt, CYRL_DFLT,
"Cyrillic default style",
AF_WRITING_SYSTEM_LATIN,
AF_SCRIPT_CYRL,
@@ -33,7 +33,7 @@
AF_BLUE_STRINGSET_CYRL,
AF_COVERAGE_DEFAULT )
- STYLE( deva_default, DEVA_DEFAULT,
+ STYLE( deva_dflt, DEVA_DFLT,
"Indic scripts default style",
AF_WRITING_SYSTEM_INDIC,
AF_SCRIPT_DEVA,
@@ -40,7 +40,7 @@
(AF_Blue_Stringset)0, /* XXX */
AF_COVERAGE_DEFAULT )
- STYLE( grek_default, GREK_DEFAULT,
+ STYLE( grek_dflt, GREK_DFLT,
"Greek default style",
AF_WRITING_SYSTEM_LATIN,
AF_SCRIPT_GREK,
@@ -47,7 +47,7 @@
AF_BLUE_STRINGSET_GREK,
AF_COVERAGE_DEFAULT )
- STYLE( hani_default, HANI_DEFAULT,
+ STYLE( hani_dflt, HANI_DFLT,
"CJKV ideographs default style",
AF_WRITING_SYSTEM_CJK,
AF_SCRIPT_HANI,
@@ -54,7 +54,7 @@
AF_BLUE_STRINGSET_HANI,
AF_COVERAGE_DEFAULT )
- STYLE( hebr_default, HEBR_DEFAULT,
+ STYLE( hebr_dflt, HEBR_DFLT,
"Hebrew default style",
AF_WRITING_SYSTEM_LATIN,
AF_SCRIPT_HEBR,
@@ -61,7 +61,7 @@
AF_BLUE_STRINGSET_HEBR,
AF_COVERAGE_DEFAULT )
- STYLE( latn_default, LATN_DEFAULT,
+ STYLE( latn_dflt, LATN_DFLT,
"Latin default style",
AF_WRITING_SYSTEM_LATIN,
AF_SCRIPT_LATN,
@@ -69,7 +69,7 @@
AF_COVERAGE_DEFAULT )
#ifdef FT_OPTION_AUTOFIT2
- STYLE( ltn2_default, LTN2_DEFAULT,
+ STYLE( ltn2_dflt, LTN2_DFLT,
"Latin 2 default style",
AF_WRITING_SYSTEM_LATIN2,
AF_SCRIPT_LATN,
@@ -77,7 +77,7 @@
AF_COVERAGE_DEFAULT )
#endif
- STYLE( none_default, NONE_DEFAULT,
+ STYLE( none_dflt, NONE_DFLT,
"no style",
AF_WRITING_SYSTEM_DUMMY,
AF_SCRIPT_NONE,