summaryrefslogtreecommitdiffstats
path: root/src/autofit/afglobal.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/autofit/afglobal.h')
-rw-r--r--src/autofit/afglobal.h27
1 files changed, 21 insertions, 6 deletions
diff --git a/src/autofit/afglobal.h b/src/autofit/afglobal.h
index 2e24900..c01b474 100644
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -5,7 +5,7 @@
/* Auto-fitter routines to compute global hinting values */
/* (specification). */
/* */
-/* Copyright 2003-2005, 2007, 2009, 2011-2012 by */
+/* Copyright 2003-2005, 2007, 2009, 2011-2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -28,17 +28,32 @@
FT_BEGIN_HEADER
+ FT_LOCAL_ARRAY( AF_WritingSystemClass )
+ af_writing_system_classes[];
+
+ FT_LOCAL_ARRAY( AF_ScriptClass )
+ af_script_classes[];
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+ FT_LOCAL_ARRAY( char* )
+ af_script_names[];
+#endif
+
/*
* Default values and flags for both autofitter globals (found in
* AF_ModuleRec) and face globals (in AF_FaceGlobalsRec).
*/
/* index of fallback script in `af_script_classes' */
-#define AF_SCRIPT_FALLBACK 2
+#ifdef AF_CONFIG_OPTION_CJK
+#define AF_SCRIPT_FALLBACK AF_SCRIPT_HANI
+#else
+#define AF_SCRIPT_FALLBACK AF_SCRIPT_NONE
+#endif
/* a bit mask indicating an uncovered glyph */
-#define AF_SCRIPT_NONE 0x7F
+#define AF_SCRIPT_UNASSIGNED 0x7F
/* if this flag is set, we have an ASCII digit */
-#define AF_DIGIT 0x80
+#define AF_DIGIT 0x80
/* `increase-x-height' property */
#define AF_PROP_INCREASE_X_HEIGHT_MIN 6
@@ -55,8 +70,8 @@ FT_BEGIN_HEADER
/*
- * Note that glyph_scripts[] is used to map each glyph into
- * an index into the `af_script_classes' array.
+ * Note that glyph_scripts[] maps each glyph to an index into the
+ * `af_script_classes' array.
*
*/
typedef struct AF_FaceGlobalsRec_