Merge pull request #51 from google/name-table-fix

Correct metadata related to font names and weights.
googlefonts · Jun 22, 2015 · f8d8004 · f8d8004
2 parents 0efa603 + 67add46
commit f8d8004
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/scripts/lib/fontbuild/instanceNames.py b/scripts/lib/fontbuild/instanceNames.py
@@ -44,11 +44,10 @@ def __init__(self,names):
         self.fullname =        "%s %s" %(self.longfamily, self.longstyle)
         self.postscript =      re.sub(' ','', self.longfamily) + "-" + re.sub(' ','',self.longstyle)
 
-        # if self.subfamilyAbbrev != "" and self.subfamilyAbbrev != None and self.subfamilyAbbrev != "Rg":
-        #     self.shortfamily = "%s %s" %(self.longfamily, self.subfamilyAbbrev)
-        # else:
-        #     self.shortfamily = self.longfamily
-        self.shortfamily = self.longfamily
+        if self.subfamilyAbbrev != "" and self.subfamilyAbbrev != None and self.subfamilyAbbrev != "Rg":
+            self.shortfamily = "%s %s" %(self.longfamily, self.longstyle.split()[0])
+        else:
+            self.shortfamily = self.longfamily
 
     def setRFNames(self,f, version=1, versionMinor=0):
         f.info.familyName = self.longfamily
@@ -76,7 +75,9 @@ def setRFNames(self,f, version=1, versionMinor=0):
             f.info.openTypeNamePreferredFamilyName = self.longfamily 
             f.info.openTypeNamePreferredSubfamilyName = self.longstyle 
 
+        f.info.openTypeOS2WeightClass = self._getWeightCode(self.weight)
         f.info.macintoshFONDName = re.sub(' ','',self.longfamily) + " " + re.sub(' ','',self.longstyle)
+        f.info.postscriptFontName = f.info.macintoshFONDName.replace(" ", "-")
         if self.italic:
             f.info.italicAngle = -12.0