Commit 785f38573b479c2ae57d4e81be8b18fe21a84dba
2013-12-31T09:45:10
[autofit] s/AF_STYLE_...._DEFAULT/AF_STYLE_...._DFLT/i.
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
diff --git a/ChangeLog b/ChangeLog
index 181cbe3..2580884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-12-31 Werner Lemberg <wl@gnu.org>
+ [autofit] s/AF_STYLE_...._DEFAULT/AF_STYLE_...._DFLT/i.
+
+2013-12-31 Werner Lemberg <wl@gnu.org>
+
[autofit] Fix interface of `af_get_char_index'.
* src/autofit/hbshim.c (af_get_char_index): Return error value.
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index c396d69..a1f0dca 100644
--- 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] ));
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index 9d82f94..cf121ac 100644
--- 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 );
diff --git a/src/autofit/afglobal.h b/src/autofit/afglobal.h
index b5a908d..0a7d273 100644
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -66,9 +66,9 @@ FT_BEGIN_HEADER
/* 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
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 279953f..fc1d443 100644
--- 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] ));
diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c
index 80c3950..ac1f07d 100644
--- 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,
diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h
index b5eb362..85cbbca 100644
--- a/src/autofit/afstyles.h
+++ b/src/autofit/afstyles.h
@@ -26,42 +26,42 @@
/* 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,
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,
(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,
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,
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,
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,