[freetype2-demos] master f7150c2 1/2: [ftdump] Sync with current FreeType.

[Werner LEMBERG]

branch: master
commit f7150c26c16eb6a35e83980f9bd9a90117e486e3
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [ftdump] Sync with current FreeType.
    
    * src/ftdump.c (name_id): Use updated ID macros.
    Add new ID macros.
---
 ChangeLog    |    7 +++++++
 src/ftdump.c |   21 +++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a697de..8508380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-28  Werner Lemberg  <address@hidden>
+
+       [ftdump] Sync with current FreeType.
+
+       * src/ftdump.c (name_id): Use updated ID macros.
+       Add new ID macros.
+
 2017-01-27  Alexei Podtelezhnikov  <address@hidden>
 
        [ftview] Align with current FreeType.
diff --git a/src/ftdump.c b/src/ftdump.c
index 6f30f06..632b46f 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -227,10 +227,10 @@
     case TT_NAME_ID_LICENSE_URL:
       return "license URL";
     /* number 15 is reserved */
-    case TT_NAME_ID_PREFERRED_FAMILY:
-      return "preferred family";
-    case TT_NAME_ID_PREFERRED_SUBFAMILY:
-      return "preferred subfamily";
+    case TT_NAME_ID_TYPOGRAPHIC_FAMILY:
+      return "typographic family";
+    case TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY:
+      return "typographic subfamily";
     case TT_NAME_ID_MAC_FULL_NAME:
       return "Mac full name";
 
@@ -248,6 +248,16 @@
     case TT_NAME_ID_WWS_SUBFAMILY:
       return "WWS subfamily name";
 
+    /* this is new in OpenType 1.7 */
+    case TT_NAME_ID_LIGHT_BACKGROUND:
+      return "light background palette";
+    case TT_NAME_ID_DARK_BACKGROUND:
+      return "dark background palette";
+
+    /* this is new in OpenType 1.8 */
+    case TT_NAME_ID_VARIATIONS_PREFIX:
+      return "variations PostScript name prefix";
+
     default:
       return NULL;
     }
@@ -344,8 +354,7 @@
 
           switch ( name.encoding_id )
           {
-            /* TT_MS_ID_SYMBOL_CS is supposed to be Unicode, according to */
-            /* information from the MS font development team              */
+            /* TT_MS_ID_SYMBOL_CS is Unicode, similar to PID/EID=3/1 */
           case TT_MS_ID_SYMBOL_CS:
           case TT_MS_ID_UNICODE_CS:
             put_unicode_be16( name.string, name.string_len, 6, utf8 );