Move tests for spacing marks to general tests.

Also add test for font vendor ID in the OS/2 table and remove
no-longer-necessary touchups from touchup_for_android.py.

3 files changed, 58 insertions, 131 deletions

diff --git a/scripts/run_android_tests.py b/scripts/run_android_tests.py
index 1c9e45c..b3903ef 100755
--- a/scripts/run_android_tests.py
+++ b/scripts/run_android_tests.py
@@ -84,58 +84,5 @@ class TestCharacterCoverage(unittest.TestCase):
             self.assertTrue(pua_chars <= self.LEGACY_PUA)
 
 
-class TestSpacingMarks(unittest.TestCase):
-    """Tests that spacing marks are indeed spacing."""
-
-    def setUp(self):
-        self.font_files, _ = load_fonts()
-        charset = coverage.character_set(self.font_files[0])
-        self.marks_to_test = [char for char in charset
-                              if unicode_data.category(char) in ['Lm', 'Sk']]
-        self.advance_cache = {}
-
-    def get_advances(self, text, font):
-        """Get a list of horizontal advances for text rendered in a font."""
-        try:
-            return self.advance_cache[(text, font)]
-        except KeyError:
-            hb_output = render.run_harfbuzz_on_text(text, font, '')
-            hb_output = json.loads(hb_output)
-            advances = [glyph['ax'] for glyph in hb_output]
-            self.advance_cache[(text, font)] = advances
-            return advances
-
-    def test_individual_spacing_marks(self):
-        """Tests that spacing marks are spacing by themselves."""
-        for font in self.font_files:
-            print 'Testing %s for stand-alone spacing marks...' % font
-            for mark in self.marks_to_test:
-                mark = unichr(mark)
-                advances = self.get_advances(mark, font)
-                assert len(advances) == 1
-                self.assertNotEqual(advances[0], 0)
-
-    def test_spacing_marks_in_combination(self):
-        """Tests that spacing marks do not combine with base letters."""
-        for font in self.font_files:
-            print 'Testing %s for spacing marks in combination...' % font
-            for base_letter in (u'A\u00C6BCDEFGHIJKLMNO\u00D8\u01A0PRST'
-                                u'U\u01AFVWXYZ'
-                                u'a\u00E6bcdefghi\u0131j\u0237klmn'
-                                u'o\u00F8\u01A1prs\u017Ftu\u01B0vwxyz'
-                                u'\u03D2'):
-                print 'Testing %s combinations' % base_letter
-                for mark in self.marks_to_test:
-                    if mark == 0x02DE:
-                        # Skip rhotic hook, as it's perhaps OK for it to form
-                        # ligatures
-                        continue
-                    mark = unichr(mark)
-                    advances = self.get_advances(base_letter + mark, font)
-                    self.assertEqual(len(advances), 2,
-                        'The sequence <%04X, %04X> combines, '
-                        'but it should not' % (ord(base_letter), ord(mark)))
-
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/scripts/run_general_tests.py b/scripts/run_general_tests.py
index f032762..df2a16f 100755
--- a/scripts/run_general_tests.py
+++ b/scripts/run_general_tests.py
@@ -63,6 +63,11 @@ class TestMetaInfo(unittest.TestCase):
         for font in self.fonts:
             self.assertEqual(font['OS/2'].fsType, 0)
 
+    def test_vendor_id(self):
+        """Tests the vendor ID of the fonts to be 'GOOG'."""
+        for font in self.fonts:
+            self.assertEqual(font['OS/2'].achVendID, 'GOOG')
+
 
 class TestDigitWidths(unittest.TestCase):
     """Tests the width of digits."""
@@ -104,5 +109,58 @@ class TestCharacterCoverage(unittest.TestCase):
                 'U+2117 not found in %s.' % font_data.font_name(font))
 
 
+class TestSpacingMarks(unittest.TestCase):
+    """Tests that spacing marks are indeed spacing."""
+
+    def setUp(self):
+        self.font_files, _ = load_fonts()
+        charset = coverage.character_set(self.font_files[0])
+        self.marks_to_test = [char for char in charset
+                              if unicode_data.category(char) in ['Lm', 'Sk']]
+        self.advance_cache = {}
+
+    def get_advances(self, text, font):
+        """Get a list of horizontal advances for text rendered in a font."""
+        try:
+            return self.advance_cache[(text, font)]
+        except KeyError:
+            hb_output = render.run_harfbuzz_on_text(text, font, '')
+            hb_output = json.loads(hb_output)
+            advances = [glyph['ax'] for glyph in hb_output]
+            self.advance_cache[(text, font)] = advances
+            return advances
+
+    def test_individual_spacing_marks(self):
+        """Tests that spacing marks are spacing by themselves."""
+        for font in self.font_files:
+            print 'Testing %s for stand-alone spacing marks...' % font
+            for mark in self.marks_to_test:
+                mark = unichr(mark)
+                advances = self.get_advances(mark, font)
+                assert len(advances) == 1
+                self.assertNotEqual(advances[0], 0)
+
+    def test_spacing_marks_in_combination(self):
+        """Tests that spacing marks do not combine with base letters."""
+        for font in self.font_files:
+            print 'Testing %s for spacing marks in combination...' % font
+            for base_letter in (u'A\u00C6BCDEFGHIJKLMNO\u00D8\u01A0PRST'
+                                u'U\u01AFVWXYZ'
+                                u'a\u00E6bcdefghi\u0131j\u0237klmn'
+                                u'o\u00F8\u01A1prs\u017Ftu\u01B0vwxyz'
+                                u'\u03D2'):
+                print 'Testing %s combinations' % base_letter
+                for mark in self.marks_to_test:
+                    if mark == 0x02DE:
+                        # Skip rhotic hook, as it's perhaps OK for it to form
+                        # ligatures
+                        continue
+                    mark = unichr(mark)
+                    advances = self.get_advances(base_letter + mark, font)
+                    self.assertEqual(len(advances), 2,
+                        'The sequence <%04X, %04X> combines, '
+                        'but it should not' % (ord(base_letter), ord(mark)))
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/scripts/touchup_for_android.py b/scripts/touchup_for_android.py
index 8019852..67fb77f 100755
--- a/scripts/touchup_for_android.py
+++ b/scripts/touchup_for_android.py
@@ -25,87 +25,9 @@ def drop_lookup(table, 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.
     """
-    # Set the font vendor to Google
-    # https://code.google.com/a/google.com/p/roboto/issues/detail?id=46
-    os2 = font['OS/2']
-    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)