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

[subset] Fix for 1ec6d30aa9b03ee40148ae8115848340ffd852a1

Browse Source
This commit is contained in:
Behdad Esfahbod 2017-02-15 00:33:37 -08:00
parent 1ec6d30aa9
commit 8f03413aef
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2075,16 +2075,25 @@ class _DehintingT2Decompiler(psCharStrings.T2WidthExtractor):
hints = cs._hints
subr_hints = subr._hints
if hints.status != 2:
# Check from last_check, make sure we didn't have
# any operators.
for i in range(hints.last_checked, index - 1):
if isinstance(cs.program[i], str):
hints.status = 2
break
hints.last_checked = index
if subr_hints.has_hint:
if hints.status != 2:
hints.has_hint = True
hints.last_checked = index
hints.status = subr_hints.status
# Decide where to chop off from
if subr_hints.status == 0:
hints.last_hint = index
else:
hints.last_hint = index - 2 # Leave the subr call in
hints.has_hint = True
hints.status = subr_hints.status
else:
# If we get here, it's either a font bug, i.e., it has hint
# stems *after* path construction; Or, the subroutine starts
@ -2094,14 +2103,7 @@ class _DehintingT2Decompiler(psCharStrings.T2WidthExtractor):
pass
else:
hints.status = max(hints.status, subr_hints.status)
if hints.status != 2:
# Check from last_check, make sure we didn't have
# any operators.
for i in range(hints.last_checked, index - 1):
if isinstance(cs.program[i], str):
hints.status = 2
break
hints.last_checked = index
if hints.status != 2:
# Decide where to chop off from
if subr_hints.status == 0: