Commit a5f22a9ed26461e7d77f2f302df66f41dfa43dbe
2013-10-17T11:08:25
[autofit] Add description strings to script entries. Currently, this is unused. * src/autofit/afscript.h: Do it. * src/autofit/afglobal.c, src/autofit/afpic.c, src/autofit/aftypes.h: Updated.
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 96
diff --git a/ChangeLog b/ChangeLog
index bb8d1b9..f1178a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2013-10-16 Werner Lemberg <wl@gnu.org>
+ [autofit] Add description strings to script entries.
+
+ Currently, this is unused.
+
+ * src/autofit/afscript.h: Do it.
+ * src/autofit/afglobal.c, src/autofit/afpic.c,
+ src/autofit/aftypes.h: Updated.
+
+2013-10-16 Werner Lemberg <wl@gnu.org>
+
[autofit] Improve tracing message for extra light flag.
* src/autofit/aflatin.c (af_latin_metrics_scale_dim): Do it.
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index 6672ebf..dc62bd7 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -44,7 +44,7 @@
#undef SCRIPT
-#define SCRIPT( s, S ) \
+#define SCRIPT( s, S, d ) \
&af_ ## s ## _script_class,
FT_LOCAL_ARRAY_DEF( AF_ScriptClass )
@@ -62,7 +62,7 @@
#ifdef FT_DEBUG_LEVEL_TRACE
#undef SCRIPT
-#define SCRIPT( s, S ) #s,
+#define SCRIPT( s, S, d ) #s,
FT_LOCAL_ARRAY_DEF( char* )
af_script_names[] =
diff --git a/src/autofit/afpic.c b/src/autofit/afpic.c
index 56cb077..92d696d 100644
--- a/src/autofit/afpic.c
+++ b/src/autofit/afpic.c
@@ -116,7 +116,7 @@
#include "afwrtsys.h"
#undef SCRIPT
-#define SCRIPT( s, S ) \
+#define SCRIPT( s, S, d ) \
FT_Init_Class_af_ ## s ## _script_class( \
&container->af_script_classes_rec[ss++] );
diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h
index e3b9434..be0169a 100644
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -22,15 +22,15 @@
/* Add new scripts here. */
- SCRIPT( cyrl, CYRL )
- SCRIPT( deva, DEVA )
- SCRIPT( dflt, DFLT )
- SCRIPT( grek, GREK )
- SCRIPT( hani, HANI )
- SCRIPT( hebr, HEBR )
- SCRIPT( latn, LATN )
+ SCRIPT( cyrl, CYRL, "Cyrillic" )
+ SCRIPT( deva, DEVA, "Indic scripts" )
+ SCRIPT( dflt, DFLT, "no script" )
+ SCRIPT( grek, GREK, "Greek" )
+ SCRIPT( hani, HANI, "CJKV ideographs" )
+ SCRIPT( hebr, HEBR, "Hebrew" )
+ SCRIPT( latn, LATN, "Latin" )
#ifdef FT_OPTION_AUTOFIT2
- SCRIPT( ltn2, LTN2 )
+ SCRIPT( ltn2, LTN2, "Latin 2" )
#endif
diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
index 2142319..cda1f89 100644
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -325,7 +325,7 @@ extern void* _af_debug_hints;
*/
#undef SCRIPT
-#define SCRIPT(s, S ) \
+#define SCRIPT( s, S, d ) \
AF_SCRIPT_ ## S,
/* The list of known scripts. */