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

[subset] Handle direct mapping in HVAR/VVAR

Browse Source 
Untested. Sigh...

Last part of https://github.com/fonttools/fonttools/issues/1179
This commit is contained in:
Behdad Esfahbod 2018-02-18 23:25:42 -08:00
parent 200268846a
commit f01c86ca9b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/fontTools/subset/__init__.py
View File

@ -1810,6 +1810,10 @@ def subset_glyphs(self, s):
if table.AdvWidthMap:
table.AdvWidthMap.mapping = _dict_subset(table.AdvWidthMap.mapping, s.glyphs)
used.update(table.AdvWidthMap.mapping.values())
else:
assert table.LsbMap is None and table.RsbMap is None, "File a bug."
used.update(s.reverseOrigGlyphMap.values())
if table.LsbMap:
table.LsbMap.mapping = _dict_subset(table.LsbMap.mapping, s.glyphs)
used.update(table.LsbMap.mapping.values())
@ -1833,14 +1837,14 @@ def subset_glyphs(self, s):
def subset_glyphs(self, s):
table = self.table
# TODO Handle direct mapping
assert table.AdvHeightMap, "File a bug."
used = set()
if table.AdvHeightMap:
table.AdvHeightMap.mapping = _dict_subset(table.AdvHeightMap.mapping, s.glyphs)
used.update(table.AdvHeightMap.mapping.values())
else:
assert table.TsbMap is None and table.BsbMap is None and table.VOrgMap is None, "File a bug."
used.update(s.reverseOrigGlyphMap.values())
if table.TsbMap:
table.TsbMap.mapping = _dict_subset(table.TsbMap.mapping, s.glyphs)
used.update(table.TsbMap.mapping.values())
@ -3054,6 +3058,9 @@ class Subsetter(object):
self.glyphs_all = frozenset(self.glyphs)
order = font.getReverseGlyphMap()
self.reverseOrigGlyphMap = {g:order[g] for g in self.glyphs_all}
log.info("Retaining %d glyphs", len(self.glyphs_all))
del self.glyphs