Merge pull request googlefonts#239 from moyogo/postscriptWeightName

CFF topDict Weight is optional, fallback to None

Lib/ufo2ft/fontInfoData.py

@@ -21,7 +21,7 @@
 import unicodedata
 import os
 
-from fontTools.misc.py23 import tobytes, tostr, tounicode, unichr, round, round2
+from fontTools.misc.py23 import tobytes, tostr, tounicode, unichr, round
 from fontTools.misc.textTools import binary2num
 import ufoLib
 
@@ -245,44 +245,6 @@ def postscriptUnderlinePositionFallback(info):
         'Underline position not set in UFO, defaulting to UPM * -0.075')
     return info.unitsPerEm * -0.075
 
-_postscriptWeightNameOptions = {
-    100 : "Thin",
-    200 : "Extra-light",
-    300 : "Light",
-    400 : "Normal",
-    500 : "Medium",
-    600 : "Semi-bold",
-    700 : "Bold",
-    800 : "Extra-bold",
-    900 : "Black"
-}
-
-def postscriptWeightNameFallback(info):
-    """
-    Fallback to the closest match of the *openTypeOS2WeightClass*
-    in this table:
-
-    ===  ===========
-    100  Thin
-    200  Extra-light
-    300  Light
-    400  Normal
-    500  Medium
-    600  Semi-bold
-    700  Bold
-    800  Extra-bold
-    900  Black
-    ===  ===========
-    """
-    value = getAttrWithFallback(info, "openTypeOS2WeightClass")
-    value = int(round2(value, -2))
-    if value < 100:
-        value = 100
-    elif value > 900:
-        value = 900
-    name = _postscriptWeightNameOptions[value]
-    return name
-
 def postscriptBlueScaleFallback(info):
     """
     Fallback to a calculated value: 3/(4 * *maxZoneHeight*)
@@ -368,6 +330,7 @@ def postscriptBlueScaleFallback(info):
     openTypeVheaCaretOffset=None,
 
     postscriptUniqueID=None,
+    postscriptWeightName=None,
     postscriptIsFixedPitch=False,
     postscriptBlueValues=[],
     postscriptOtherBlues=[],
@@ -414,7 +377,6 @@ def postscriptBlueScaleFallback(info):
     postscriptSlantAngle=postscriptSlantAngleFallback,
     postscriptUnderlineThickness=postscriptUnderlineThicknessFallback,
     postscriptUnderlinePosition=postscriptUnderlinePositionFallback,
-    postscriptWeightName=postscriptWeightNameFallback,
     postscriptBlueScale=postscriptBlueScaleFallback
 )
 

tests/fontInfoData_test.py

@@ -52,6 +52,14 @@ def test_redundant_metadata(self):
             "1.001;NONE;FamilyName-StyleName")
 
         self.assertEqual(getAttrWithFallback(info, "postscriptSlantAngle"), 0)
+
+    def test_unecessary_metadata(self):
+        info = TestInfoObject()
+
+        self.assertEqual(
+            getAttrWithFallback(info, "postscriptWeightName"),
+            None)
+        info.postscriptWeightName = "Normal"
         self.assertEqual(
             getAttrWithFallback(info, "postscriptWeightName"),
             "Normal")