From 3615f785f5e88f1f9aa9535d2cd973de702b959f Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Thu, 17 Oct 2013 11:15:08 +0200
Subject: [PATCH] Synchronize with FreeType.

This corresponds to commit a5f22a9e `[autofit] Add description strings to
script entries.'.
---
 lib/taglobal.c |  4 ++--
 lib/tascript.h | 16 ++++++++--------
 lib/tatypes.h  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/taglobal.c b/lib/taglobal.c
index b06635b..1e92bc8 100644
--- a/lib/taglobal.c
+++ b/lib/taglobal.c
@@ -41,7 +41,7 @@ TA_WritingSystemClass const ta_writing_system_classes[] =
 
 
 #undef SCRIPT
-#define SCRIPT(s, S) \
+#define SCRIPT(s, S, d) \
           &ta_ ## s ## _script_class,
 
 TA_ScriptClass const ta_script_classes[] =
@@ -56,7 +56,7 @@ TA_ScriptClass const ta_script_classes[] =
 #ifdef TA_DEBUG
 
 #undef SCRIPT
-#define SCRIPT(s, S) #s,
+#define SCRIPT(s, S, d) #s,
 
 const char* ta_script_names[] =
 {
diff --git a/lib/tascript.h b/lib/tascript.h
index e58558e..5ee0ec7 100644
--- a/lib/tascript.h
+++ b/lib/tascript.h
@@ -22,17 +22,17 @@
 
 /* Add new scripts here. */
 
-SCRIPT(cyrl, CYRL)
-SCRIPT(dflt, DFLT)
-SCRIPT(grek, GREK)
-SCRIPT(hebr, HEBR)
-SCRIPT(latn, LATN)
+SCRIPT(cyrl, CYRL, "Cyrillic")
+SCRIPT(dflt, DFLT, "no script")
+SCRIPT(grek, GREK, "Greek")
+SCRIPT(hebr, HEBR, "Hebrew")
+SCRIPT(latn, LATN, "Latin")
 #if 0
-SCRIPT(deva, DEVA)
-SCRIPT(hani, HANI)
+SCRIPT(deva, DEVA, "Indic scripts")
+SCRIPT(hani, HANI, "CJKV ideographs")
 #endif
 #ifdef FT_OPTION_AUTOFIT2
-SCRIPT(ltn2, LTN2)
+SCRIPT(ltn2, LTN2, "Latin 2")
 #endif
 
 /* end of tascript.h */
diff --git a/lib/tatypes.h b/lib/tatypes.h
index 17bfdf7..fd8774f 100644
--- a/lib/tatypes.h
+++ b/lib/tatypes.h
@@ -252,7 +252,7 @@ typedef struct TA_WritingSystemClassRec_
  */
 
 #undef SCRIPT
-#define SCRIPT(s, S) \
+#define SCRIPT(s, S, d) \
           TA_SCRIPT_ ## S,
 
 /* The list of known scripts. */
-- 
2.11.4.GIT