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

[subset] Remove activeLookup tracking during GSUB closure

Browse Source 
The memoize handles this as well...

This alone contributes a 10% speedup to the closure op.
This commit is contained in:
Behdad Esfahbod 2018-06-12 01:01:05 -04:00
parent a856e83112
commit 2e28fa4a31
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1162,14 +1162,9 @@ def closure_glyphs(self, s, cur_glyphs=None):
return return
covered.update(cur_glyphs) covered.update(cur_glyphs)
if self in s._activeLookups:
raise Exception("Circular loop in lookup recursion")
s._activeLookups.append(self)
for st in self.SubTable: for st in self.SubTable:
if not st: continue if not st: continue
st.closure_glyphs(s, cur_glyphs) st.closure_glyphs(s, cur_glyphs)
assert(s._activeLookups[-1] == self)
del s._activeLookups[-1]
@_add_method(otTables.Lookup) @_add_method(otTables.Lookup)
def subset_glyphs(self, s): def subset_glyphs(self, s):
@ -1402,14 +1397,13 @@ def closure_glyphs(self, s):
s._doneLookups = {} s._doneLookups = {}
while True: while True:
orig_glyphs = frozenset(s.glyphs) orig_glyphs = frozenset(s.glyphs)
s._activeLookups = []
for i in lookup_indices: for i in lookup_indices:
if i >= self.table.LookupList.LookupCount: continue if i >= self.table.LookupList.LookupCount: continue
if not self.table.LookupList.Lookup[i]: continue if not self.table.LookupList.Lookup[i]: continue
self.table.LookupList.Lookup[i].closure_glyphs(s) self.table.LookupList.Lookup[i].closure_glyphs(s)
if orig_glyphs == s.glyphs: if orig_glyphs == s.glyphs:
break break
del s._activeLookups, s._doneLookups del s._doneLookups
del s.table del s.table
@_add_method(ttLib.getTableClass('GSUB'), @_add_method(ttLib.getTableClass('GSUB'),