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

don't add width and endchar for empty glyphs if it's CFF2

Browse Source 
This also seems to fix https://github.com/fonttools/fonttools/issues/1448
This commit is contained in:
Cosimo Lupo 2019-01-16 13:31:35 +00:00
parent 336abfcaf0
commit 3e400c8828
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/fontTools/subset/cff.py
View File

@ -66,8 +66,13 @@ def closure_glyphs(self, s):
s.glyphs.update(components) s.glyphs.update(components)
decompose = components decompose = components
def _empty_charstring(font, glyphName, width=None): def _empty_charstring(font, glyphName, isCFF2, width=None):
c, fdSelectIndex = font.CharStrings.getItemAndSelector(glyphName) c, fdSelectIndex = font.CharStrings.getItemAndSelector(glyphName)
if isCFF2:
# CFF2 charstrings have no widths nor 'endchar' operators
c.decompile()
c.program = []
return
if hasattr(font, 'FDArray') and font.FDArray is not None: if hasattr(font, 'FDArray') and font.FDArray is not None:
private = font.FDArray[fdSelectIndex].Private private = font.FDArray[fdSelectIndex].Private
else: else:
@ -94,7 +99,7 @@ def prune_pre_subset(self, font, options):
if options.notdef_glyph and not options.notdef_outline: if options.notdef_glyph and not options.notdef_outline:
for fontname in cff.keys(): for fontname in cff.keys():
font = cff[fontname] font = cff[fontname]
_empty_charstring(font, ".notdef") _empty_charstring(font, ".notdef", isCFF2=cff.major > 1)
# Clear useless Encoding # Clear useless Encoding
for fontname in cff.keys(): for fontname in cff.keys():
@ -113,7 +118,7 @@ def subset_glyphs(self, s):
if s.options.retain_gids: if s.options.retain_gids:
for g in s.glyphs_emptied: for g in s.glyphs_emptied:
_empty_charstring(font, g, width=0) _empty_charstring(font, g, isCFF2=cff.major > 1, width=0)
else: else:
# Load all glyphs # Load all glyphs
for g in font.charset: for g in font.charset: