From c2af28d90787b716ae5b51b15295d77df3b1ec00 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Fri, 13 Dec 2013 23:33:45 +0100
Subject: [PATCH] Synchronize front-ends with recent library changes.

---
 frontend/main.cpp         | 6 +++---
 frontend/maingui.cpp      | 8 ++++----
 lib/ttfautohint-scripts.h | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/main.cpp b/frontend/main.cpp
index d2e34ad..8bbdd73 100644
--- a/frontend/main.cpp
+++ b/frontend/main.cpp
@@ -182,7 +182,7 @@ show_help(bool
 #endif
 "  -c, --composites           hint glyph composites also\n"
 "  -d, --dehint               remove all hints\n"
-"  -f, --fallback-script=S    set fallback script (default: dflt)\n"
+"  -f, --fallback-script=S    set fallback script (default: none)\n"
 "  -G, --hinting-limit=N      switch off hinting above this PPEM value\n"
 "                             (default: %d); value 0 means no limit\n"
 "  -h, --help                 display this help and exit\n"
@@ -308,7 +308,7 @@ show_help(bool
   }
   fprintf(handle,
 "\n"
-"If no option -f is given, or if its value is `dflt',\n"
+"If no option -f is given, or if its value is `none',\n"
 "no fallback script is used.\n"
 "\n");
   fprintf(handle,
@@ -594,7 +594,7 @@ main(int argc,
   }
 
   if (!have_fallback_script)
-    fallback_script = "dflt";
+    fallback_script = "none";
   if (!have_hinting_range_min)
     hinting_range_min = TA_HINTING_RANGE_MIN;
   if (!have_hinting_range_max)
diff --git a/frontend/maingui.cpp b/frontend/maingui.cpp
index 220cc8f..ad00a96 100644
--- a/frontend/maingui.cpp
+++ b/frontend/maingui.cpp
@@ -90,18 +90,18 @@ Main_GUI::Main_GUI(bool horizontal_layout,
   dehint(dh)
 {
   int i;
-  int dflt_script_idx = 0;
+  int none_script_idx = 0;
 
   // map fallback script tag to an index,
   // replacing an invalid one with the default value
   for (i = 0; script_names[i].tag; i++)
   {
-    if (!strcmp("dflt", script_names[i].tag))
-      dflt_script_idx = i;
+    if (!strcmp("none", script_names[i].tag))
+      none_script_idx = i;
     if (!strcmp(fallback, script_names[i].tag))
       break;
   }
-  fallback_script_idx = script_names[i].tag ? i : dflt_script_idx;
+  fallback_script_idx = script_names[i].tag ? i : none_script_idx;
 
   x_height_snapping_exceptions = NULL;
 
diff --git a/lib/ttfautohint-scripts.h b/lib/ttfautohint-scripts.h
index 67d3d94..10a2531 100644
--- a/lib/ttfautohint-scripts.h
+++ b/lib/ttfautohint-scripts.h
@@ -23,10 +23,10 @@
 /* Add new scripts here. */
 
 SCRIPT(cyrl, CYRL, "Cyrillic")
-SCRIPT(none, NONE, "no script")
 SCRIPT(grek, GREK, "Greek")
 SCRIPT(hebr, HEBR, "Hebrew")
 SCRIPT(latn, LATN, "Latin")
+SCRIPT(none, NONE, "no script")
 #if 0
 SCRIPT(deva, DEVA, "Indic scripts")
 SCRIPT(hani, HANI, "CJKV ideographs")
-- 
2.11.4.GIT