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

[subset] set charstring's effective width to 0 when --retain-gids

Browse Source 
seems to be the consensus, despite this may add a few bytes when
the emptied glyph's width is different from PrivateDict.defaultWidthX
This commit is contained in:
Cosimo Lupo 2019-01-15 15:10:04 +00:00
parent af1a0d1fe5
commit 336abfcaf0
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,25 @@ def closure_glyphs(self, s):
s.glyphs.update(components) s.glyphs.update(components)
decompose = components decompose = components
def _empty_charstring(font, glyphName, width=None):
c, fdSelectIndex = font.CharStrings.getItemAndSelector(glyphName)
if hasattr(font, 'FDArray') and font.FDArray is not None:
private = font.FDArray[fdSelectIndex].Private
else:
private = font.Private
dfltWdX = private.defaultWidthX
nmnlWdX = private.nominalWidthX
if width is None:
pen = NullPen()
c.draw(pen) # this will set the charstring's width
width = c.width
else:
c.decompile()
if width != dfltWdX:
c.program = [width - nmnlWdX, 'endchar']
else:
c.program = ['endchar']
@_add_method(ttLib.getTableClass('CFF ')) @_add_method(ttLib.getTableClass('CFF '))
def prune_pre_subset(self, font, options): def prune_pre_subset(self, font, options):
cff = self.cff cff = self.cff
@ -75,19 +94,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]
c, fdSelectIndex = font.CharStrings.getItemAndSelector('.notdef') _empty_charstring(font, ".notdef")
if hasattr(font, 'FDArray') and font.FDArray is not None:
private = font.FDArray[fdSelectIndex].Private
else:
private = font.Private
dfltWdX = private.defaultWidthX
nmnlWdX = private.nominalWidthX
pen = NullPen()
c.draw(pen) # this will set the charstring's width
if c.width != dfltWdX:
c.program = [c.width - nmnlWdX, 'endchar']
else:
c.program = ['endchar']
# Clear useless Encoding # Clear useless Encoding
for fontname in cff.keys(): for fontname in cff.keys():
@ -105,11 +112,8 @@ def subset_glyphs(self, s):
cs = font.CharStrings cs = font.CharStrings
if s.options.retain_gids: if s.options.retain_gids:
for g in cs.keys(): for g in s.glyphs_emptied:
if g in s.glyphs_emptied: _empty_charstring(font, g, width=0)
c = cs[g]
c.decompile()
c.program = ["endchar"]
else: else:
# Load all glyphs # Load all glyphs
for g in font.charset: for g in font.charset:

2
Tests/subset/subset_test.py
View File

@ -540,7 +540,7 @@ class SubsetTest(unittest.TestCase):
subsetfont["CFF "].cff[0].decompileAllCharStrings() subsetfont["CFF "].cff[0].decompileAllCharStrings()
cs = subsetfont["CFF "].cff[0].CharStrings cs = subsetfont["CFF "].cff[0].CharStrings
self.assertGreater(len(cs["A"].program), 0) self.assertGreater(len(cs["A"].program), 0)
self.assertEqual(cs["B"].program, ["endchar"]) self.assertEqual(cs["B"].program, [-300, "endchar"])
if __name__ == "__main__": if __name__ == "__main__":