Merge pull request #371 from anthrotype/missing-opentype-name-ids

Support openType{SampleText, CompatibleFullName, WWS*FamilyName} nameIDs
googlefonts · Mar 24, 2020 · b796cb7 · b796cb7
2 parents c76448f + 5c84068
commit b796cb7
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 20 deletions.
diff --git a/Lib/ufo2ft/fontInfoData.py b/Lib/ufo2ft/fontInfoData.py
@@ -201,19 +201,6 @@ def openTypeNamePreferredSubfamilyNameFallback(info):
     return getAttrWithFallback(info, "styleName")
 
 
-def openTypeNameCompatibleFullNameFallback(info):
-    """
-    Fallback to *styleMapFamilyName styleMapStyleName*.
-    If *styleMapStyleName* is *regular* this will not add
-    the style name.
-    """
-    familyName = getAttrWithFallback(info, "styleMapFamilyName")
-    styleMapStyleName = getAttrWithFallback(info, "styleMapStyleName")
-    if styleMapStyleName != "regular":
-        familyName += " " + styleMapStyleName.title()
-    return familyName
-
-
 def openTypeNameWWSFamilyNameFallback(info):
     # not yet supported
     return None
@@ -388,6 +375,7 @@ def postscriptBlueScaleFallback(info):
     openTypeNameLicense=None,
     openTypeNameLicenseURL=None,
     openTypeNameDescription=None,
+    openTypeNameCompatibleFullName=None,
     openTypeNameSampleText=None,
     openTypeNameRecords=[],
     openTypeOS2WidthClass=5,
@@ -459,7 +447,6 @@ def postscriptBlueScaleFallback(info):
     openTypeNameUniqueID=openTypeNameUniqueIDFallback,
     openTypeNamePreferredFamilyName=openTypeNamePreferredFamilyNameFallback,
     openTypeNamePreferredSubfamilyName=openTypeNamePreferredSubfamilyNameFallback,
-    openTypeNameCompatibleFullName=openTypeNameCompatibleFullNameFallback,
     openTypeNameWWSFamilyName=openTypeNameWWSFamilyNameFallback,
     openTypeNameWWSSubfamilyName=openTypeNameWWSSubfamilyNameFallback,
     openTypeOS2TypoAscender=openTypeOS2TypoAscenderFallback,

diff --git a/Lib/ufo2ft/outlineCompiler.py b/Lib/ufo2ft/outlineCompiler.py
@@ -386,6 +386,10 @@ def setupTable_name(self):
             14: getAttrWithFallback(font.info, "openTypeNameLicenseURL"),
             16: preferredFamilyName,
             17: preferredSubfamilyName,
+            18: getAttrWithFallback(font.info, "openTypeNameCompatibleFullName"),
+            19: getAttrWithFallback(font.info, "openTypeNameSampleText"),
+            21: getAttrWithFallback(font.info, "openTypeNameWWSFamilyName"),
+            22: getAttrWithFallback(font.info, "openTypeNameWWSSubfamilyName"),
         }
 
         # don't add typographic names if they are the same as the legacy ones

diff --git a/tests/data/TestFont-CFF.ttx b/tests/data/TestFont-CFF.ttx
@@ -173,6 +173,18 @@
     <namerecord nameID="17" platformID="3" platEncID="1" langID="0x409">
       Regular (Preferred Subfamily Name)
     </namerecord>
+    <namerecord nameID="18" platformID="3" platEncID="1" langID="0x409">
+      Some Font Regular (Compatible Full Name)
+    </namerecord>
+    <namerecord nameID="19" platformID="3" platEncID="1" langID="0x409">
+      Sample Text for Some Font.
+    </namerecord>
+    <namerecord nameID="21" platformID="3" platEncID="1" langID="0x409">
+      Some Font (WWS Family Name)
+    </namerecord>
+    <namerecord nameID="22" platformID="3" platEncID="1" langID="0x409">
+      Regular (WWS Subfamily Name)
+    </namerecord>
   </name>
 
   <cmap>

diff --git a/tests/data/TestFont-NoOptimize-CFF.ttx b/tests/data/TestFont-NoOptimize-CFF.ttx
@@ -173,6 +173,18 @@
     <namerecord nameID="17" platformID="3" platEncID="1" langID="0x409">
       Regular (Preferred Subfamily Name)
     </namerecord>
+    <namerecord nameID="18" platformID="3" platEncID="1" langID="0x409">
+      Some Font Regular (Compatible Full Name)
+    </namerecord>
+    <namerecord nameID="19" platformID="3" platEncID="1" langID="0x409">
+      Sample Text for Some Font.
+    </namerecord>
+    <namerecord nameID="21" platformID="3" platEncID="1" langID="0x409">
+      Some Font (WWS Family Name)
+    </namerecord>
+    <namerecord nameID="22" platformID="3" platEncID="1" langID="0x409">
+      Regular (WWS Subfamily Name)
+    </namerecord>
   </name>
 
   <cmap>

diff --git a/tests/data/TestFont-NoOverlaps-CFF-pathops.ttx b/tests/data/TestFont-NoOverlaps-CFF-pathops.ttx
@@ -173,6 +173,18 @@
     <namerecord nameID="17" platformID="3" platEncID="1" langID="0x409">
       Regular (Preferred Subfamily Name)
     </namerecord>
+    <namerecord nameID="18" platformID="3" platEncID="1" langID="0x409">
+      Some Font Regular (Compatible Full Name)
+    </namerecord>
+    <namerecord nameID="19" platformID="3" platEncID="1" langID="0x409">
+      Sample Text for Some Font.
+    </namerecord>
+    <namerecord nameID="21" platformID="3" platEncID="1" langID="0x409">
+      Some Font (WWS Family Name)
+    </namerecord>
+    <namerecord nameID="22" platformID="3" platEncID="1" langID="0x409">
+      Regular (WWS Subfamily Name)
+    </namerecord>
   </name>
 
   <cmap>

diff --git a/tests/data/TestFont-NoOverlaps-CFF.ttx b/tests/data/TestFont-NoOverlaps-CFF.ttx
@@ -173,6 +173,18 @@
     <namerecord nameID="17" platformID="3" platEncID="1" langID="0x409">
       Regular (Preferred Subfamily Name)
     </namerecord>
+    <namerecord nameID="18" platformID="3" platEncID="1" langID="0x409">
+      Some Font Regular (Compatible Full Name)
+    </namerecord>
+    <namerecord nameID="19" platformID="3" platEncID="1" langID="0x409">
+      Sample Text for Some Font.
+    </namerecord>
+    <namerecord nameID="21" platformID="3" platEncID="1" langID="0x409">
+      Some Font (WWS Family Name)
+    </namerecord>
+    <namerecord nameID="22" platformID="3" platEncID="1" langID="0x409">
+      Regular (WWS Subfamily Name)
+    </namerecord>
   </name>
 
   <cmap>

diff --git a/tests/data/TestFont-NoOverlaps-TTF-pathops.ttx b/tests/data/TestFont-NoOverlaps-TTF-pathops.ttx
@@ -420,6 +420,18 @@
     <namerecord nameID="17" platformID="3" platEncID="1" langID="0x409">
       Regular (Preferred Subfamily Name)
     </namerecord>
+    <namerecord nameID="18" platformID="3" platEncID="1" langID="0x409">
+      Some Font Regular (Compatible Full Name)
+    </namerecord>
+    <namerecord nameID="19" platformID="3" platEncID="1" langID="0x409">
+      Sample Text for Some Font.
+    </namerecord>
+    <namerecord nameID="21" platformID="3" platEncID="1" langID="0x409">
+      Some Font (WWS Family Name)
+    </namerecord>
+    <namerecord nameID="22" platformID="3" platEncID="1" langID="0x409">
+      Regular (WWS Subfamily Name)
+    </namerecord>
   </name>
 
   <post>

diff --git a/tests/data/TestFont-NoOverlaps-TTF.ttx b/tests/data/TestFont-NoOverlaps-TTF.ttx
@@ -420,6 +420,18 @@
     <namerecord nameID="17" platformID="3" platEncID="1" langID="0x409">
       Regular (Preferred Subfamily Name)
     </namerecord>
+    <namerecord nameID="18" platformID="3" platEncID="1" langID="0x409">
+      Some Font Regular (Compatible Full Name)
+    </namerecord>
+    <namerecord nameID="19" platformID="3" platEncID="1" langID="0x409">
+      Sample Text for Some Font.
+    </namerecord>
+    <namerecord nameID="21" platformID="3" platEncID="1" langID="0x409">
+      Some Font (WWS Family Name)
+    </namerecord>
+    <namerecord nameID="22" platformID="3" platEncID="1" langID="0x409">
+      Regular (WWS Subfamily Name)
+    </namerecord>
   </name>
 
   <post>

diff --git a/tests/data/TestFont-Specialized-CFF.ttx b/tests/data/TestFont-Specialized-CFF.ttx
@@ -173,6 +173,18 @@
     <namerecord nameID="17" platformID="3" platEncID="1" langID="0x409">
       Regular (Preferred Subfamily Name)
     </namerecord>
+    <namerecord nameID="18" platformID="3" platEncID="1" langID="0x409">
+      Some Font Regular (Compatible Full Name)
+    </namerecord>
+    <namerecord nameID="19" platformID="3" platEncID="1" langID="0x409">
+      Sample Text for Some Font.
+    </namerecord>
+    <namerecord nameID="21" platformID="3" platEncID="1" langID="0x409">
+      Some Font (WWS Family Name)
+    </namerecord>
+    <namerecord nameID="22" platformID="3" platEncID="1" langID="0x409">
+      Regular (WWS Subfamily Name)
+    </namerecord>
   </name>
 
   <cmap>

diff --git a/tests/data/TestFont.ttx b/tests/data/TestFont.ttx
@@ -418,6 +418,18 @@
     <namerecord nameID="17" platformID="3" platEncID="1" langID="0x409">
       Regular (Preferred Subfamily Name)
     </namerecord>
+    <namerecord nameID="18" platformID="3" platEncID="1" langID="0x409">
+      Some Font Regular (Compatible Full Name)
+    </namerecord>
+    <namerecord nameID="19" platformID="3" platEncID="1" langID="0x409">
+      Sample Text for Some Font.
+    </namerecord>
+    <namerecord nameID="21" platformID="3" platEncID="1" langID="0x409">
+      Some Font (WWS Family Name)
+    </namerecord>
+    <namerecord nameID="22" platformID="3" platEncID="1" langID="0x409">
+      Regular (WWS Subfamily Name)
+    </namerecord>
   </name>
 
   <post>

diff --git a/tests/fontInfoData_test.py b/tests/fontInfoData_test.py
@@ -39,7 +39,6 @@ class GetAttrWithFallbackTest(object):
                     "styleMapStyleName": "regular",
                     "openTypeNamePreferredFamilyName": "Family Name",
                     "openTypeNamePreferredSubfamilyName": "Style Name",
-                    "openTypeNameCompatibleFullName": "Family Name Style Name",
                 },
             ),
             # no styleMapStyleName
@@ -50,7 +49,6 @@ class GetAttrWithFallbackTest(object):
                     "styleMapStyleName": "regular",
                     "openTypeNamePreferredFamilyName": "Family Name",
                     "openTypeNamePreferredSubfamilyName": "Style Name",
-                    "openTypeNameCompatibleFullName": "Style Map Family Name",
                 },
             ),
             # no styleMapFamilyName, no styleMapStyleName but styleName="Regular"
@@ -63,7 +61,6 @@ class GetAttrWithFallbackTest(object):
                     "styleMapStyleName": "regular",
                     "openTypeNamePreferredFamilyName": "Family Name",
                     "openTypeNamePreferredSubfamilyName": "Regular",
-                    "openTypeNameCompatibleFullName": "Family Name",
                 },
             ),
             # no styleMapFamilyName but styleName="Regular"
@@ -74,7 +71,6 @@ class GetAttrWithFallbackTest(object):
                     "styleMapStyleName": "regular",
                     "openTypeNamePreferredFamilyName": "Family Name",
                     "openTypeNamePreferredSubfamilyName": "Regular",
-                    "openTypeNameCompatibleFullName": "Family Name",
                 },
             ),
             # no styleMapStyleName but styleName="Regular"
@@ -85,7 +81,6 @@ class GetAttrWithFallbackTest(object):
                     "styleMapStyleName": "regular",
                     "openTypeNamePreferredFamilyName": "Family Name",
                     "openTypeNamePreferredSubfamilyName": "Regular",
-                    "openTypeNameCompatibleFullName": "Style Map Family Name",
                 },
             ),
             # no styleMapFamilyName, no styleMapStyleName but styleName="Bold"
@@ -98,7 +93,6 @@ class GetAttrWithFallbackTest(object):
                     "styleMapStyleName": "bold",
                     "openTypeNamePreferredFamilyName": "Family Name",
                     "openTypeNamePreferredSubfamilyName": "Bold",
-                    "openTypeNameCompatibleFullName": "Family Name Bold",
                 },
             ),
         ],