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

[subset] Prune GDEF.MarkGlyphSetsDef

Browse Source 
Remove empty sets and fixup Lookup.MarkFilteringSet to use the new
indices.
This commit is contained in:
Khaled Hosny 2023-05-22 13:27:17 +03:00
parent 4c24a3e328
commit 04975b9a14
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1513,6 +1513,12 @@ def closure_glyphs(self, s, cur_glyphs=None):
def subset_glyphs(self, s): def subset_glyphs(self, s):
self.SubTable = [st for st in self.SubTable if st and st.subset_glyphs(s)] self.SubTable = [st for st in self.SubTable if st and st.subset_glyphs(s)]
self.SubTableCount = len(self.SubTable) self.SubTableCount = len(self.SubTable)
if hasattr(self, "MarkFilteringSet") and self.MarkFilteringSet is not None:
if self.MarkFilteringSet not in s.used_mark_sets:
self.MarkFilteringSet = None
self.LookupFlag &= ~0x10
else:
self.MarkFilteringSet = s.used_mark_sets.index(self.MarkFilteringSet)
return bool(self.SubTableCount) return bool(self.SubTableCount)
@ -2091,17 +2097,14 @@ def subset_glyphs(self, s):
] ]
table.AttachList.GlyphCount = len(table.AttachList.AttachPoint) table.AttachList.GlyphCount = len(table.AttachList.AttachPoint)
if hasattr(table, "MarkGlyphSetsDef") and table.MarkGlyphSetsDef: if hasattr(table, "MarkGlyphSetsDef") and table.MarkGlyphSetsDef:
for coverage in table.MarkGlyphSetsDef.Coverage: markGlyphSets = table.MarkGlyphSetsDef
for coverage in markGlyphSets.Coverage:
if coverage: if coverage:
coverage.subset(glyphs) coverage.subset(glyphs)
# TODO: The following is disabled. If enabling, we need to go fixup all s.used_mark_sets = [i for i, c in enumerate(markGlyphSets.Coverage) if c.glyphs]
# lookups that use MarkFilteringSet and map their set. markGlyphSets.Coverage = [c for c in markGlyphSets.Coverage if c.glyphs]
# indices = table.MarkGlyphSetsDef.Coverage = \
# [c for c in table.MarkGlyphSetsDef.Coverage if c.glyphs]
# TODO: The following is disabled, as ots doesn't like it. Phew...
# https://github.com/khaledhosny/ots/issues/172
# table.MarkGlyphSetsDef.Coverage = [c if c.glyphs else None for c in table.MarkGlyphSetsDef.Coverage]
return True return True
@ -3433,6 +3436,7 @@ class Subsetter(object):
del self.glyphs del self.glyphs
def _subset_glyphs(self, font): def _subset_glyphs(self, font):
self.used_mark_sets = []
for tag in self._sort_tables(font): for tag in self._sort_tables(font):
clazz = ttLib.getTableClass(tag) clazz = ttLib.getTableClass(tag)