Commit 143971202acf2a76fe45ebb77e7bf1fe29971061

Werner Lemberg 2017-01-24T20:48:50

[sfnt] Fix Postscript name service for symbol fonts. * src/sfnt/sfdriver.c (sfnt_get_ps_name): Accept PID/EID=3/0 entries also.

diff --git a/ChangeLog b/ChangeLog
index 06f3143..a4ec6b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2017-01-24  Werner Lemberg  <wl@gnu.org>
 
+	[sfnt] Fix Postscript name service for symbol fonts.
+
+	* src/sfnt/sfdriver.c (sfnt_get_ps_name): Accept PID/EID=3/0
+	entries also.
+
+2017-01-24  Werner Lemberg  <wl@gnu.org>
+
 	[truetype] For OpenType 1.7: s/preferred/typographic/ (sub)family.
 
 	* include/freetype/ftsnames.h
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index 0b9867a..8877ad3 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -243,9 +243,10 @@
 
       if ( name->nameID == 6 && name->stringLength > 0 )
       {
-        if ( name->platformID == 3     &&
-             name->encodingID == 1     &&
-             name->languageID == 0x409 )
+        /* handling of PID/EID 3/0 and 3/1 is the same */
+        if ( name->platformID == 3                              &&
+             ( name->encodingID == 1 || name->encodingID == 0 ) &&
+             name->languageID == 0x409                          )
           found_win = n;
 
         if ( name->platformID == 1 &&