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

[subset.CFF] Drop empty subroutines

Browse Source
This commit is contained in:
Behdad Esfahbod 2017-02-15 01:17:26 -08:00
parent 079e10f31b
commit 65f0f98dba
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1923,7 +1923,13 @@ def subset_subroutines(self, subrs, gsubrs):
def drop_hints(self):
hints = self._hints
if hints.deletions:
p = self.program
for idx in reversed(hints.deletions):
del p[idx-2:idx]
if hints.has_hint:
assert not hints.deletions or hints.last_hint <= hints.deletions[0]
self.program = self.program[hints.last_hint:]
if hasattr(self, 'width'):
# Insert width back if needed
@ -1940,8 +1946,6 @@ def drop_hints(self):
continue
i += 1
# TODO: we currently don't drop calls to "empty" subroutines.
assert len(self.program)
del self._hints
@ -1986,6 +1990,8 @@ class _DehintingT2Decompiler(psCharStrings.T2WidthExtractor):
self.status = 0
# Has hintmask instructions; not recursive
self.has_hintmask = False
# List of indices of calls to empty subroutines to remove.
self.deletions = []
pass
def __init__(self, css, localSubrs, globalSubrs, nominalWidthX, defaultWidthX):
@ -2093,6 +2099,8 @@ class _DehintingT2Decompiler(psCharStrings.T2WidthExtractor):
hints.last_hint = index
else:
hints.last_hint = index - 2 # Leave the subr call in
elif subr_hints.status == 0:
hints.deletions.append(index)
hints.status = max(hints.status, subr_hints.status)