Expand scripts for webfont generation.

1 files changed, 32 insertions, 131 deletions

diff --git a/scripts/touchup_for_web.py b/scripts/touchup_for_web.py
index 0f30728..b055d89 100755
--- a/scripts/touchup_for_web.py
+++ b/scripts/touchup_for_web.py
@@ -1,136 +1,17 @@
 #!/usr/bin/python
 """Post-build web fonts changes for Roboto."""
 
-import collections
 import os
 from os import path
 import sys
 
 from fontTools import ttLib
 from nototools import font_data
-from nototools import unicode_data
-
-
-def drop_lookup(table, lookup_number):
-    """Drop a lookup from an OpenType table by number.
-
-    Actually remove pointers from features to the lookup, which should be less
-    intrusive.
-    """
-    for feature in table.table.FeatureList.FeatureRecord:
-        if lookup_number in feature.Feature.LookupListIndex:
-            feature.Feature.LookupListIndex.remove(lookup_number)
-            feature.Feature.LookupCount -= 1
-
-
-def get_font_name(font):
-    """Gets the name of the font from the name table."""
-    return font_data.get_name_records(font)[4]
-
-
-DIGITS = ['zero', 'one', 'two', 'three', 'four',
-          'five', 'six', 'seven', 'eight', 'nine']
-
-def fix_digit_widths(font):
-    """Change all digit widths in the font to be the same."""
-    hmtx_table = font['hmtx']
-    widths = [hmtx_table[digit][0] for digit in DIGITS]
-    if len(set(widths)) > 1:
-        width_counter = collections.Counter(widths)
-        most_common_width = width_counter.most_common(1)[0][0]
-        print 'Digit widths were %s.' % repr(widths)
-        print 'Setting all glyph widths to %d.' % most_common_width
-        for digit in DIGITS:
-            assert abs(hmtx_table[digit][0] - most_common_width) <= 1
-            hmtx_table[digit][0] = most_common_width
-
-
-_MAP_SPACING_TO_COMBINING = {
-    'acute': 'acutecomb',
-    'breve': 'brevenosp',
-    'caron': 'uni030C',
-    'cedilla': 'cedillanosp',
-    'circumflex': 'circumflexnosp',
-    'dieresis': 'dieresisnosp',
-    'dotaccent': 'dotnosp',
-    'grave': 'gravecomb',
-    'hungarumlaut': 'acutedblnosp',
-    'macron': 'macroncomb',
-    'ogonek': 'ogoneknosp',
-    'tilde': 'tildecomb',
-    'ring': 'ringnosp',
-    'tonos': 'acutecomb',
-    'uni02F3': 'ringsubnosp',
-}
-
-def fix_ccmp_lookup(font):
-    """Fixes the broken ccmp lookup."""
-    cmap = font_data.get_cmap(font)
-    reverse_cmap = {name: code for (code, name) in cmap.items()}
-
-    # Where we know the bad 'ccmp' is
-    ccmp_lookup = font['GSUB'].table.LookupList.Lookup[2]
-    assert ccmp_lookup.LookupType == 4
-    assert ccmp_lookup.SubTableCount == 1
-    ligatures = ccmp_lookup.SubTable[0].ligatures
-    for first_char, ligtable in ligatures.iteritems():
-        ligatures_to_delete = []
-        for index, ligature in enumerate(ligtable):
-            assert len(ligature.Component) == 1
-            component = ligature.Component[0]
-            if (component.endswith('comb')
-                or component in ['commaaccent',
-                                 'commaaccentrotate',
-                                 'ringacute']):
-                continue
-            # https://code.google.com/a/google.com/p/roboto/issues/detail?id=54
-            if first_char == 'a' and component == 'uni02BE':
-                ligatures_to_delete.append(index)
-                continue
-            char = reverse_cmap[component]
-            general_category = unicode_data.category(char)
-            if general_category != 'Mn': # not a combining mark
-                ligature.Component[0] = _MAP_SPACING_TO_COMBINING[component]
-        ligatures[first_char] = [
-            ligature for (index, ligature) in enumerate(ligtable)
-            if index not in ligatures_to_delete]
 
 
 def apply_temporary_fixes(font):
     """Apply some temporary fixes.
     """
-    # Make sure macStyle is correct
-    # https://code.google.com/a/google.com/p/roboto/issues/detail?id=8
-    font_name = get_font_name(font)
-    bold = ('Bold' in font_name) or ('Black' in font_name)
-    italic = 'Italic' in font_name
-    font['head'].macStyle = (italic << 1) | bold
-
-    # Mark the font free for installation, embedding, etc.
-    # https://code.google.com/a/google.com/p/roboto/issues/detail?id=29
-    os2 = font['OS/2']
-    os2.fsType = 0
-
-    # Set the font vendor to Google
-    # https://code.google.com/a/google.com/p/roboto/issues/detail?id=46
-    os2.achVendID = 'GOOG'
-
-    # Drop the lookup forming the ff ligature
-    # https://code.google.com/a/google.com/p/roboto/issues/detail?id=47
-    drop_lookup(font['GSUB'], 5)
-
-    # Correct the ccmp lookup to use combining marks instead of spacing ones
-    # https://code.google.com/a/google.com/p/roboto/issues/detail?id=48
-    fix_ccmp_lookup(font)
-
-    # Fix the digit widths
-    # https://code.google.com/a/google.com/p/roboto/issues/detail?id=49
-    fix_digit_widths(font)
-
-    # Add cmap for U+2117 SOUND RECORDING COPYRIGHT
-    # https://code.google.com/a/google.com/p/roboto/issues/detail?id=44
-    font_data.add_to_cmap(font, {0x2117: 'published'})
-
     # Fix version number from buildnumber.txt
     # https://code.google.com/a/google.com/p/roboto/issues/detail?id=50
     from datetime import date
@@ -139,17 +20,8 @@ def apply_temporary_fixes(font):
         path.dirname(__file__), os.pardir, 'res', 'buildnumber.txt')
     build_number = open(build_number_txt).read().strip()
 
-    version_record = 'Version 2.0%s; %d' % (build_number, date.today().year)
-
-    for record in font['name'].names:
-        if record.nameID == 5:
-            if record.platformID == 1 and record.platEncID == 0:  # MacRoman
-                record.string = version_record
-            elif record.platformID == 3 and record.platEncID == 1:
-                # Windows UCS-2
-                record.string = version_record.encode('UTF-16BE')
-            else:
-                assert False
+    version_record = 'Version 2.%s; %d' % (build_number, date.today().year)
+    font_data.set_name_record(font, 5, version_record)
 
 
 def apply_web_specific_fixes(font):
@@ -167,11 +39,40 @@ def apply_web_specific_fixes(font):
     os2.usWinAscent = 1946
     os2.usWinDescent = 512
 
+    family_name = 'RobotoDraft'
+    subfamily_name = font_data.get_name_records(font)[2].encode('ASCII')
+    assert(subfamily_name in
+        ['Thin', 'Thin Italic',
+         'Light', 'Light Italic',
+         'Regular', 'Italic',
+         'Medium', 'Medium Italic',
+         'Bold', 'Bold Italic',
+         'Black', 'Black Italic'])
+    full_name = family_name + ' ' + subfamily_name
+    year = '2014'
+
+    # Copyright message
+    font_data.set_name_record(
+        font, 0, 'Copyright %s Google Inc. All Rights Reserved.' % year)
+
+    # Family name
+    font_data.set_name_record(font, 1, family_name)
+    font_data.set_name_record(font, 16, family_name)
+
+    # Unique identifier and full name
+    font_data.set_name_record(font, 3, full_name)
+    font_data.set_name_record(font, 4, full_name)
+    font_data.set_name_record(font, 18, None)
+
+    # PostScript name
+    font_data.set_name_record(
+        font, 6, family_name+'-'+subfamily_name.replace(' ', ''))
+
 
 def correct_font(source_font_name, target_font_name):
     """Corrects metrics and other meta information."""
     font = ttLib.TTFont(source_font_name)
-#    apply_temporary_fixes(font)
+    apply_temporary_fixes(font)
     apply_web_specific_fixes(font)
     font.save(target_font_name)