Commit 9193259cf236a7db4c1e1ca9e15ad53998d272ce
2013-12-10T13:24:07
[autofit] s/DFLT/NONE/, s/dflt/none/.
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
diff --git a/ChangeLog b/ChangeLog
index ff31596..c79257f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-12-10 Werner Lemberg <wl@gnu.org>
+ [autofit] s/DFLT/NONE/, s/dflt/none/.
+
+2013-12-10 Werner Lemberg <wl@gnu.org>
+
[autofit] s/AF_SCRIPT_NONE/AF_SCRIPT_UNASSIGNED/.
2013-12-10 Werner Lemberg <wl@gnu.org>
diff --git a/src/autofit/afdummy.c b/src/autofit/afdummy.c
index aaa034d..b2b3a20 100644
--- 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,
diff --git a/src/autofit/afdummy.h b/src/autofit/afdummy.h
index bc34ddd..9a4d3c2 100644
--- a/src/autofit/afdummy.h
+++ b/src/autofit/afdummy.h
@@ -31,7 +31,7 @@ FT_BEGIN_HEADER
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 )
/* */
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index 4d6b9c8..c2151af 100644
--- 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 );
diff --git a/src/autofit/afglobal.h b/src/autofit/afglobal.h
index 124c76f..c01b474 100644
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -48,7 +48,7 @@ FT_BEGIN_HEADER
#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
diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c
index b49f8c0..400b01e 100644
--- 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
diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h
index be0169a..32ec2ca 100644
--- 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" )