From 7bbbcbfb1aa8c908fe713743f2909ba774b2072e Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Wed, 12 Sep 2012 17:45:39 +0200
Subject: [PATCH] [autofit] Minor reorganization.

* src/autofit/afglobal.c (AF_SCRIPT_LIST_DEFAULT,
AF_SCRIPT_LIST_NONE, AF_DIGIT): Move to...
* src/autofit/afglobal.h (AF_SCRIPT_DEFAULT, AF_SCRIPT_LIST_NONE,
AF_DIGIT): This and update code.
---
 ChangeLog              |  9 +++++++++
 src/autofit/afglobal.c | 23 ++++++++---------------
 src/autofit/afglobal.h |  8 ++++++++
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a08dee51..faa190841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-09-12  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Minor reorganization.
+
+	* src/autofit/afglobal.c (AF_SCRIPT_LIST_DEFAULT,
+	AF_SCRIPT_LIST_NONE, AF_DIGIT): Move to...
+	* src/autofit/afglobal.h (AF_SCRIPT_DEFAULT, AF_SCRIPT_LIST_NONE,
+	AF_DIGIT): This and update code.
+
 2012-09-01  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Implement `glyph-to-script-map' property.
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index 9a5bac29d..1842c8610 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -49,13 +49,6 @@
 
 #endif /* !FT_CONFIG_OPTION_PIC */
 
-  /* index of default script in `af_script_classes' */
-#define AF_SCRIPT_LIST_DEFAULT  2
-  /* a bit mask indicating an uncovered glyph       */
-#define AF_SCRIPT_LIST_NONE     0x7F
-  /* if this flag is set, we have an ASCII digit    */
-#define AF_DIGIT                0x80
-
 
   /* Compute the script index of each glyph within a given face. */
 
@@ -70,9 +63,9 @@
     FT_UInt     i;
 
 
-    /* the value AF_SCRIPT_LIST_NONE means `uncovered glyph' */
+    /* the value AF_SCRIPT_NONE means `uncovered glyph' */
     FT_MEM_SET( globals->glyph_scripts,
-                AF_SCRIPT_LIST_NONE,
+                AF_SCRIPT_NONE,
                 globals->glyph_count );
 
     error = FT_Select_Charmap( face, FT_ENCODING_UNICODE );
@@ -110,7 +103,7 @@
 
         if ( gindex != 0                             &&
              gindex < (FT_ULong)globals->glyph_count &&
-             gscripts[gindex] == AF_SCRIPT_LIST_NONE )
+             gscripts[gindex] == AF_SCRIPT_NONE )
           gscripts[gindex] = (FT_Byte)ss;
 
         for (;;)
@@ -121,7 +114,7 @@
             break;
 
           if ( gindex < (FT_ULong)globals->glyph_count &&
-               gscripts[gindex] == AF_SCRIPT_LIST_NONE )
+               gscripts[gindex] == AF_SCRIPT_NONE )
             gscripts[gindex] = (FT_Byte)ss;
         }
       }
@@ -148,10 +141,10 @@
 
       for ( nn = 0; nn < globals->glyph_count; nn++ )
       {
-        if ( ( gscripts[nn] & ~AF_DIGIT ) == AF_SCRIPT_LIST_NONE )
+        if ( ( gscripts[nn] & ~AF_DIGIT ) == AF_SCRIPT_NONE )
         {
-          gscripts[nn] &= ~AF_SCRIPT_LIST_NONE;
-          gscripts[nn] |= AF_SCRIPT_LIST_DEFAULT;
+          gscripts[nn] &= ~AF_SCRIPT_NONE;
+          gscripts[nn] |= AF_SCRIPT_DEFAULT;
         }
       }
     }
@@ -250,7 +243,7 @@
 
     gidx = script;
     if ( gidx == 0 || gidx + 1 >= script_max )
-      gidx = globals->glyph_scripts[gindex] & AF_SCRIPT_LIST_NONE;
+      gidx = globals->glyph_scripts[gindex] & AF_SCRIPT_NONE;
 
     clazz = AF_SCRIPT_CLASSES_GET[gidx];
     if ( script == 0 )
diff --git a/src/autofit/afglobal.h b/src/autofit/afglobal.h
index 9137dced2..3bb77d157 100644
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -36,6 +36,14 @@ FT_BEGIN_HEADER
   /************************************************************************/
 
 
+  /* index of default script in `af_script_classes' */
+#define AF_SCRIPT_DEFAULT  2
+  /* a bit mask indicating an uncovered glyph       */
+#define AF_SCRIPT_NONE     0x7F
+  /* if this flag is set, we have an ASCII digit    */
+#define AF_DIGIT           0x80
+
+
   /*
    *  Note that glyph_scripts[] is used to map each glyph into
    *  an index into the `af_script_classes' array.