Version 1.5.2 update

Fixer.fixName(): Win->Mac must take place first because Win has more than one sections: winBMP, winSym and winFul.
Pal3love · Sep 9, 2017 · 0a1ddf9 · 0a1ddf9
1 parent 89f1350
commit 0a1ddf9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/Package/otRebuilder/Lib/Fixer.py b/Package/otRebuilder/Lib/Fixer.py
@@ -168,6 +168,15 @@ def fixName(self):
                     unsupported.append(namRec)
             else:
                 unsupported.append(namRec)
+        # The following order must be Win->Mac then Mac->Win!
+        # Convert Win names into Mac
+        for namRec in winNamRecs:
+            if namRec.nameID in [16, 17]:
+                continue  # Macintosh platform doesn't need preferred family/subfamily.
+            tmpMacRec = Workers.NameWorker.winName2Mac(namRec)
+            if tmpMacRec is None:
+                continue  
+            builder.addMacNameEx(tmpMacRec.string, tmpMacRec.nameID, tmpMacRec.langID)
         # Convert Mac names into Win
         for namRec in macNamRecs:
             if namRec.nameID == 18:
@@ -177,14 +186,6 @@ def fixName(self):
                 continue
             for tmpWinRec in tmpWinRecs:
                 builder.addWinNameEx(tmpWinRec.string, tmpWinRec.nameID, tmpWinRec.langID)
-        # Convert Win names into Mac
-        for namRec in winNamRecs:
-            if namRec.nameID in [16, 17]:
-                continue  # Macintosh platform doesn't need preferred family/subfamily.
-            tmpMacRec = Workers.NameWorker.winName2Mac(namRec)
-            if tmpMacRec is None:
-                continue  
-            builder.addMacNameEx(tmpMacRec.string, tmpMacRec.nameID, tmpMacRec.langID)
         # Update the `name` table with `cmap` consistency
         name = builder.build(cmap)
         name.names.extend(unsupported)

diff --git a/Package/otRebuilder/otrebuild.py b/Package/otRebuilder/otrebuild.py
@@ -24,7 +24,7 @@
 
 
 usageStr = "usage: otrebuild [options] <inputFont>"
-descriptionStr = """    OpenType Font Rebuilder: Version 1.5.1, powered by fontTools
+descriptionStr = """    OpenType Font Rebuilder: Version 1.5.2, powered by fontTools
 
     This is a simple tool to resolve naming, styling and mapping issues
         among OpenType fonts. Without any options given, it can scan and

diff --git a/Package/otrebuilder.egg-info/PKG-INFO b/Package/otrebuilder.egg-info/PKG-INFO
@@ -1,11 +1,12 @@
 Metadata-Version: 1.1
 Name: otrebuilder
-Version: 1.5.1
+Version: 1.5.2
 Summary: A simple tool to resolve OpenType fonts' mapping and naming issues, powered by fontTools.
 Home-page: https://github.com/Pal3love/otRebuilder
 Author: Pal3love
 Author-email: pal3love@gmail.com
 License: MIT
+Description-Content-Type: UNKNOWN
 Description: UNKNOWN
 Platform: Any
 Classifier: Environment :: Console

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name = "otrebuilder",
-    version = "1.5.1",
+    version = "1.5.2",
     description = "A simple tool to resolve OpenType fonts' mapping and naming issues, powered by fontTools.",
     author = "Pal3love",
     author_email = "pal3love@gmail.com",