ref: a5f22a9ed26461e7d77f2f302df66f41dfa43dbe
parent: 955f6a86a3c12c27fe0b96bfb880fa87a84712b7
author: Werner Lemberg <[email protected]>
date: Thu Oct 17 07:08:25 EDT 2013
[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.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2013-10-16 Werner Lemberg <[email protected]>
+ [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 <[email protected]>
+
[autofit] Improve tracing message for extra light flag.
* src/autofit/aflatin.c (af_latin_metrics_scale_dim): Do it.
--- 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[] =
--- 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++] );
--- 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
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -325,7 +325,7 @@
*/
#undef SCRIPT
-#define SCRIPT(s, S ) \
+#define SCRIPT( s, S, d ) \
AF_SCRIPT_ ## S,
/* The list of known scripts. */