shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support TTX format for MultipleSubst of FontTools 3.0 and earlier

Browse Source 
Fix a backwards compatibility problem introduced by
1356a6775b
(pull request https://github.com/behdad/fonttools/pull/364), where new versions
of FontTools would not be able to process `<MultipleSubst>` elements
in TTX files generated by older FontTools releases.

Resolves https://github.com/behdad/fonttools/issues/355.
This commit is contained in:
Sascha Brawer 2015-09-11 08:19:20 +02:00
parent 3c9c1d2631
commit 96da5a0f71
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/fontTools/ttLib/tables/otTables.py
View File

@ -242,6 +242,23 @@ class MultipleSubst(FormatSwitchingBaseTable):
if mapping is None:
mapping = {}
self.mapping = mapping
# TTX v3.0 and earlier.
if name == "Coverage":
self.old_coverage_ = [
element_attrs["value"]
for element_name, element_attrs, _ in content
if element_name == "Glyph"]
return
if name == "Sequence":
glyph = self.old_coverage_[int(attrs["index"])]
mapping[glyph] = [
element_attrs["value"]
for element_name, element_attrs, _ in content
if element_name == "Substitute"]
return
# TTX v3.1 and later.
outGlyphs = attrs["out"].split(",")
mapping[attrs["in"]] = [g.strip() for g in outGlyphs]

18
Lib/fontTools/ttLib/tables/otTables_test.py
View File

@ -142,6 +142,24 @@ class MultipleSubstTest(unittest.TestCase):
self.assertEqual(table.mapping,
{'c_t': ['c', 't'], 'f_f_i': ['f', 'f', 'i']})
def test_fromXML_oldFormat(self):
table = otTables.MultipleSubst()
table.fromXML("Coverage", {}, [
("Glyph", {"value": "c_t"}, []),
("Glyph", {"value": "f_f_i"}, [])
], self.font)
table.fromXML("Sequence", {"index": "0"}, [
("Substitute", {"index": "0", "value": "c"}, []),
("Substitute", {"index": "1", "value": "t"}, [])
], self.font)
table.fromXML("Sequence", {"index": "1"}, [
("Substitute", {"index": "0", "value": "f"}, []),
("Substitute", {"index": "1", "value": "f"}, []),
("Substitute", {"index": "2", "value": "i"}, [])
], self.font)
self.assertEqual(table.mapping,
{'c_t': ['c', 't'], 'f_f_i': ['f', 'f', 'i']})
class LigatureSubstTest(unittest.TestCase):
def setUp(self):