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

[merge] Simplify renaming CFF CharStrings

Browse Source
This commit is contained in:
Khaled Hosny 2021-11-17 06:32:04 +02:00
parent 8e9ab24c11
commit 5299a3cb83
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Lib/fontTools/merge.py
View File

@ -1066,17 +1066,15 @@ class Merger(object):
# #
fonts = [ttLib.TTFont(fontfile) for fontfile in fontfiles] fonts = [ttLib.TTFont(fontfile) for fontfile in fontfiles]
glyphOrders = [font.getGlyphOrder() for font in fonts]
megaGlyphOrder = self._mergeGlyphOrders(glyphOrders)
cffTables = [] cffTables = []
if sfntVersion == "OTTO": if sfntVersion == "OTTO":
for i, font in enumerate(fonts): for i, font in enumerate(fonts):
font['CFF '].cff.desubroutinize() font['CFF '].cff.desubroutinize()
cffTables.append(font['CFF ']) cffTables.append(font['CFF '])
glyphOrders = [font.getGlyphOrder() for font in fonts]
# Handle glyphOrder merging and cff glyphs renaming together
megaGlyphOrder = self._mergeGlyphOrders(glyphOrders, cffTables)
# Reload fonts and set new glyph names on them. # Reload fonts and set new glyph names on them.
# TODO Is it necessary to reload font? I think it is. At least # TODO Is it necessary to reload font? I think it is. At least
# it's safer, in case tables were loaded to provide glyph names. # it's safer, in case tables were loaded to provide glyph names.
@ -1085,6 +1083,8 @@ class Merger(object):
if len(cffTables): if len(cffTables):
for font, glyphOrder, cffTable in zip(fonts, glyphOrders, cffTables): for font, glyphOrder, cffTable in zip(fonts, glyphOrders, cffTables):
font.setGlyphOrder(glyphOrder) font.setGlyphOrder(glyphOrder)
# Rename CFF CharStrings to match the new glyphOrder.
self._renameCFFCharStrings(glyphOrder, cffTable)
font['CFF '] = cffTable font['CFF '] = cffTable
else: else:
for font, glyphOrder in zip(fonts, glyphOrders): for font, glyphOrder in zip(fonts, glyphOrders):
@ -1134,29 +1134,10 @@ class Merger(object):
return mega return mega
def _mergeGlyphOrders(self, glyphOrders, cffTables): def _mergeGlyphOrders(self, glyphOrders):
"""Modifies passed-in glyphOrders to reflect new glyph names. """Modifies passed-in glyphOrders to reflect new glyph names.
Returns glyphOrder for the merged font.""" Returns glyphOrder for the merged font."""
mega = {} mega = {}
# If we have CFF tables,
# rename topDictIndex charStrings
for cffTable in cffTables:
td = cffTable.cff.topDictIndex[0]
d = {}
for i, (glyphName, v) in enumerate(td.CharStrings.charStrings.items()):
if glyphName in mega:
n = mega[glyphName]
while (glyphName + "#" + repr(n)) in mega:
n += 1
mega[glyphName] = n
glyphName += "#" + repr(n)
mega[glyphName] = 1
d[glyphName] = v
cffTable.cff.topDictIndex[0].CharStrings.charStrings = d
mega = {}
for glyphOrder in glyphOrders: for glyphOrder in glyphOrders:
for i,glyphName in enumerate(glyphOrder): for i,glyphName in enumerate(glyphOrder):
if glyphName in mega: if glyphName in mega:
@ -1169,6 +1150,15 @@ class Merger(object):
mega[glyphName] = 1 mega[glyphName] = 1
return list(mega.keys()) return list(mega.keys())
def _renameCFFCharStrings(self, glyphOrder, cffTable):
"""Rename topDictIndex charStrings based on glyphOrder."""
td = cffTable.cff.topDictIndex[0]
charStrings = {}
for i, v in enumerate(td.CharStrings.charStrings.values()):
glyphName = glyphOrder[i]
charStrings[glyphName] = v
cffTable.cff.topDictIndex[0].CharStrings.charStrings = charStrings
def mergeObjects(self, returnTable, logic, tables): def mergeObjects(self, returnTable, logic, tables):
# Right now we don't use self at all. Will use in the future # Right now we don't use self at all. Will use in the future
# for options and logging. # for options and logging.