ref: 9193259cf236a7db4c1e1ca9e15ad53998d272ce
parent: 45244f80434ade2110b541e106da0322bb9988c1
author: Werner Lemberg <[email protected]>
date: Tue Dec 10 08:24:07 EST 2013
[autofit] s/DFLT/NONE/, s/dflt/none/.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-12-10 Werner Lemberg <[email protected]>
+ [autofit] s/DFLT/NONE/, s/dflt/none/.
+
+2013-12-10 Werner Lemberg <[email protected]>
+
[autofit] s/AF_SCRIPT_NONE/AF_SCRIPT_UNASSIGNED/.
2013-12-10 Werner Lemberg <[email protected]>
--- a/src/autofit/afdummy.c
+++ b/src/autofit/afdummy.c
@@ -69,9 +69,9 @@
AF_DEFINE_SCRIPT_CLASS(
- af_dflt_script_class,
+ af_none_script_class,
- AF_SCRIPT_DFLT,
+ AF_SCRIPT_NONE,
(AF_Blue_Stringset)0,
AF_WRITING_SYSTEM_DUMMY,
--- a/src/autofit/afdummy.h
+++ b/src/autofit/afdummy.h
@@ -31,7 +31,7 @@
AF_DECLARE_WRITING_SYSTEM_CLASS( af_dummy_writing_system_class )
- AF_DECLARE_SCRIPT_CLASS( af_dflt_script_class )
+ AF_DECLARE_SCRIPT_CLASS( af_none_script_class )
/* */
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -276,7 +276,7 @@
/* if we have a forced script (via `options'), use it, */
/* otherwise look into `glyph_scripts' array */
- if ( script == AF_SCRIPT_DFLT || script + 1 >= AF_SCRIPT_MAX )
+ if ( script == AF_SCRIPT_NONE || script + 1 >= AF_SCRIPT_MAX )
script = (AF_Script)( globals->glyph_scripts[gindex] &
AF_SCRIPT_UNASSIGNED );
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -48,7 +48,7 @@
#ifdef AF_CONFIG_OPTION_CJK
#define AF_SCRIPT_FALLBACK AF_SCRIPT_HANI
#else
-#define AF_SCRIPT_FALLBACK AF_SCRIPT_DFLT
+#define AF_SCRIPT_FALLBACK AF_SCRIPT_NONE
#endif
/* a bit mask indicating an uncovered glyph */
#define AF_SCRIPT_UNASSIGNED 0x7F
--- a/src/autofit/afloader.c
+++ b/src/autofit/afloader.c
@@ -530,7 +530,7 @@
if ( !error )
{AF_ScriptMetrics metrics;
- FT_UInt options = AF_SCRIPT_DFLT;
+ FT_UInt options = AF_SCRIPT_NONE;
#ifdef FT_OPTION_AUTOFIT2
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -24,7 +24,7 @@
SCRIPT( cyrl, CYRL, "Cyrillic" )
SCRIPT( deva, DEVA, "Indic scripts" )
- SCRIPT( dflt, DFLT, "no script" )
+ SCRIPT( none, NONE, "no script" )
SCRIPT( grek, GREK, "Greek" )
SCRIPT( hani, HANI, "CJKV ideographs" )
SCRIPT( hebr, HEBR, "Hebrew" )