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

[CFFToCFF2] Keep charset during initial round

Browse Source 
See comments.
This commit is contained in:
Behdad Esfahbod 2024-05-23 12:17:46 -06:00
parent 91775d2205
commit 33beeaa1a2
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/fontTools/cffLib/CFFToCFF2.py
View File

@ -172,6 +172,15 @@ def _convertCFFToCFF2(cff, otFont):
# Now delete up the deprecated topDict operators from CFF 1.0 # Now delete up the deprecated topDict operators from CFF 1.0
for entry in topDictOperators: for entry in topDictOperators:
key = entry[1] key = entry[1]
# We seem to need to keep the charset operator for now,
# or we fail to compile with some fonts, like AdditionFont.otf.
# I don't know which kind of CFF font those are. But keeping
# charset seems to work. It will be removed when we save and
# read the font again.
#
# AdditionFont.otf has <Encoding name="StandardEncoding"/>.
if key == "charset":
continue
if key not in opOrder: if key not in opOrder:
if key in topDict.rawDict: if key in topDict.rawDict:
del topDict.rawDict[key] del topDict.rawDict[key]
@ -183,6 +192,8 @@ def _convertCFFToCFF2(cff, otFont):
# were loaded for CFF1, and we need to reload them for CFF2 to set varstore, etc # were loaded for CFF1, and we need to reload them for CFF2 to set varstore, etc
# on them. At least that's what I understand. It's probably safe to remove this # on them. At least that's what I understand. It's probably safe to remove this
# and just set vstore where needed. # and just set vstore where needed.
#
# See comment above about charset as well.
# At this point, the Subrs and Charstrings are all still T2Charstring class # At this point, the Subrs and Charstrings are all still T2Charstring class
# easiest to fix this by compiling, then decompiling again # easiest to fix this by compiling, then decompiling again