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

[varLib.merger] Only insert PairPosFormat1 if non-empty

Browse Source 
This is proper fix for c8b2088162f1542dd29b2d370aa2a2c081452559
This commit is contained in:
Behdad Esfahbod 2017-03-16 16:15:10 -07:00
parent c8b2088162
commit 0f5a46b1f9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/fontTools/varLib/merger.py
View File

@ -531,7 +531,6 @@ def _Lookup_PairPos_subtables_canonicalize(lst, font):
tail.append(subtable) tail.append(subtable)
break break
tail.extend(it) tail.extend(it)
# TODO Only do this if at least one font has a Format1.
tail.insert(0, _Lookup_PairPosFormat1_subtables_merge_overlay(head, font)) tail.insert(0, _Lookup_PairPosFormat1_subtables_merge_overlay(head, font))
return tail return tail
@ -541,12 +540,20 @@ def merge(merger, self, lst):
exclude = [] exclude = []
if self.SubTable and isinstance(self.SubTable[0], ot.PairPos): if self.SubTable and isinstance(self.SubTable[0], ot.PairPos):
# AFDKO and feaLib sometimes generate two Format1 subtables instead of one. # AFDKO and feaLib sometimes generate two Format1 subtables instead of one.
# Merge those before continuing. # Merge those before continuing.
# https://github.com/fonttools/fonttools/issues/719 # https://github.com/fonttools/fonttools/issues/719
self.SubTable = _Lookup_PairPos_subtables_canonicalize(self.SubTable, merger.font) self.SubTable = _Lookup_PairPos_subtables_canonicalize(self.SubTable, merger.font)
subtables = [_Lookup_PairPos_subtables_canonicalize(l.SubTable, merger.font) for l in lst] subtables = [_Lookup_PairPos_subtables_canonicalize(l.SubTable, merger.font) for l in lst]
merger.mergeLists(self.SubTable, subtables) merger.mergeLists(self.SubTable, subtables)
# If format-1 subtable created during canonicalization is empty, remove it.
assert len(self.SubTable) >= 1 and self.SubTable[0].Format == 1
if not self.SubTable[0].Coverage.glyphs:
self.SubTable.pop(0)
self.SubTableCount = len(self.SubTable) self.SubTableCount = len(self.SubTable)
exclude.extend(['SubTable', 'SubTableCount']) exclude.extend(['SubTable', 'SubTableCount'])