minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[autofit] s/AF_STYLE_...._DEFAULT/AF_STYLE_...._DFLT/i.

This commit is contained in:
Werner Lemberg 2013-12-31 09:45:10 +01:00
parent c9d9947c68
commit 785f38573b
7 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
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> 2013-12-31 Werner Lemberg <wl@gnu.org>
[autofit] Fix interface of `af_get_char_index'. [autofit] Fix interface of `af_get_char_index'.

2
src/autofit/afcjk.c
View File

@ -76,7 +76,7 @@
FT_TRACE5(( "\n" FT_TRACE5(( "\n"
"cjk standard widths computation (style `%s')\n" "cjk standard widths computation (style `%s')\n"
"===============================================\n" "===================================================\n"
"\n", "\n",
af_style_names[metrics->root.style_class->style] )); af_style_names[metrics->root.style_class->style] ));

2
src/autofit/afglobal.c
View File

@ -335,7 +335,7 @@
/* if we have a forced style (via `options'), use it, */ /* if we have a forced style (via `options'), use it, */
/* otherwise look into `glyph_styles' array */ /* 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] & style = (AF_Style)( globals->glyph_styles[gindex] &
AF_STYLE_UNASSIGNED ); AF_STYLE_UNASSIGNED );

4
src/autofit/afglobal.h
View File

@ -66,9 +66,9 @@ FT_BEGIN_HEADER
/* index of fallback style in `af_style_classes' */ /* index of fallback style in `af_style_classes' */
#ifdef AF_CONFIG_OPTION_CJK #ifdef AF_CONFIG_OPTION_CJK
#define AF_STYLE_FALLBACK AF_STYLE_HANI_DEFAULT #define AF_STYLE_FALLBACK AF_STYLE_HANI_DFLT
#else #else
#define AF_STYLE_FALLBACK AF_STYLE_NONE_DEFAULT #define AF_STYLE_FALLBACK AF_STYLE_NONE_DFLT
#endif #endif
/* default script for OpenType; ignored if HarfBuzz isn't used */ /* default script for OpenType; ignored if HarfBuzz isn't used */
#define AF_SCRIPT_DEFAULT AF_SCRIPT_LATN #define AF_SCRIPT_DEFAULT AF_SCRIPT_LATN

2
src/autofit/aflatin.c
View File

@ -63,7 +63,7 @@
FT_TRACE5(( "\n" FT_TRACE5(( "\n"
"latin standard widths computation (style `%s')\n" "latin standard widths computation (style `%s')\n"
"================================================\n" "=====================================================\n"
"\n", "\n",
af_style_names[metrics->root.style_class->style] )); af_style_names[metrics->root.style_class->style] ));

4
src/autofit/afloader.c
View File

@ -530,13 +530,13 @@
if ( !error ) if ( !error )
{ {
AF_StyleMetrics metrics; AF_StyleMetrics metrics;
FT_UInt options = AF_STYLE_NONE_DEFAULT; FT_UInt options = AF_STYLE_NONE_DFLT;
#ifdef FT_OPTION_AUTOFIT2 #ifdef FT_OPTION_AUTOFIT2
/* XXX: undocumented hook to activate the latin2 writing system */ /* XXX: undocumented hook to activate the latin2 writing system */
if ( load_flags & ( 1UL << 20 ) ) if ( load_flags & ( 1UL << 20 ) )
options = AF_STYLE_LTN2_DEFAULT; options = AF_STYLE_LTN2_DFLT;
#endif #endif
error = af_face_globals_get_metrics( loader->globals, gindex, error = af_face_globals_get_metrics( loader->globals, gindex,

16
src/autofit/afstyles.h
View File

@ -26,42 +26,42 @@
/* corresponding writing system, script, blue stringset, and */ /* corresponding writing system, script, blue stringset, and */
/* coverage. */ /* coverage. */
STYLE( cyrl_default, CYRL_DEFAULT, STYLE( cyrl_dflt, CYRL_DFLT,
"Cyrillic default style", "Cyrillic default style",
AF_WRITING_SYSTEM_LATIN, AF_WRITING_SYSTEM_LATIN,
AF_SCRIPT_CYRL, AF_SCRIPT_CYRL,
AF_BLUE_STRINGSET_CYRL, AF_BLUE_STRINGSET_CYRL,
AF_COVERAGE_DEFAULT ) AF_COVERAGE_DEFAULT )
STYLE( deva_default, DEVA_DEFAULT, STYLE( deva_dflt, DEVA_DFLT,
"Indic scripts default style", "Indic scripts default style",
AF_WRITING_SYSTEM_INDIC, AF_WRITING_SYSTEM_INDIC,
AF_SCRIPT_DEVA, AF_SCRIPT_DEVA,
(AF_Blue_Stringset)0, /* XXX */ (AF_Blue_Stringset)0, /* XXX */
AF_COVERAGE_DEFAULT ) AF_COVERAGE_DEFAULT )
STYLE( grek_default, GREK_DEFAULT, STYLE( grek_dflt, GREK_DFLT,
"Greek default style", "Greek default style",
AF_WRITING_SYSTEM_LATIN, AF_WRITING_SYSTEM_LATIN,
AF_SCRIPT_GREK, AF_SCRIPT_GREK,
AF_BLUE_STRINGSET_GREK, AF_BLUE_STRINGSET_GREK,
AF_COVERAGE_DEFAULT ) AF_COVERAGE_DEFAULT )
STYLE( hani_default, HANI_DEFAULT, STYLE( hani_dflt, HANI_DFLT,
"CJKV ideographs default style", "CJKV ideographs default style",
AF_WRITING_SYSTEM_CJK, AF_WRITING_SYSTEM_CJK,
AF_SCRIPT_HANI, AF_SCRIPT_HANI,
AF_BLUE_STRINGSET_HANI, AF_BLUE_STRINGSET_HANI,
AF_COVERAGE_DEFAULT ) AF_COVERAGE_DEFAULT )
STYLE( hebr_default, HEBR_DEFAULT, STYLE( hebr_dflt, HEBR_DFLT,
"Hebrew default style", "Hebrew default style",
AF_WRITING_SYSTEM_LATIN, AF_WRITING_SYSTEM_LATIN,
AF_SCRIPT_HEBR, AF_SCRIPT_HEBR,
AF_BLUE_STRINGSET_HEBR, AF_BLUE_STRINGSET_HEBR,
AF_COVERAGE_DEFAULT ) AF_COVERAGE_DEFAULT )
STYLE( latn_default, LATN_DEFAULT, STYLE( latn_dflt, LATN_DFLT,
"Latin default style", "Latin default style",
AF_WRITING_SYSTEM_LATIN, AF_WRITING_SYSTEM_LATIN,
AF_SCRIPT_LATN, AF_SCRIPT_LATN,
@ -69,7 +69,7 @@
AF_COVERAGE_DEFAULT ) AF_COVERAGE_DEFAULT )
#ifdef FT_OPTION_AUTOFIT2 #ifdef FT_OPTION_AUTOFIT2
STYLE( ltn2_default, LTN2_DEFAULT, STYLE( ltn2_dflt, LTN2_DFLT,
"Latin 2 default style", "Latin 2 default style",
AF_WRITING_SYSTEM_LATIN2, AF_WRITING_SYSTEM_LATIN2,
AF_SCRIPT_LATN, AF_SCRIPT_LATN,
@ -77,7 +77,7 @@
AF_COVERAGE_DEFAULT ) AF_COVERAGE_DEFAULT )
#endif #endif
STYLE( none_default, NONE_DEFAULT, STYLE( none_dflt, NONE_DFLT,
"no style", "no style",
AF_WRITING_SYSTEM_DUMMY, AF_WRITING_SYSTEM_DUMMY,
AF_SCRIPT_NONE, AF_SCRIPT_NONE,