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

[instancer] Add --downgrade-cff2

Browse Source
This commit is contained in:
Behdad Esfahbod 2024-05-17 11:45:35 -07:00
parent 9ffcabd360
commit 15af3425e9
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/fontTools/varLib/instancer/__init__.py
View File

@ -1522,6 +1522,8 @@ def instantiateVariableFont(
optimize=True, optimize=True,
overlap=OverlapMode.KEEP_AND_SET_FLAGS, overlap=OverlapMode.KEEP_AND_SET_FLAGS,
updateFontNames=False, updateFontNames=False,
*,
downgradeCFF2=False,
): ):
"""Instantiate variable font, either fully or partially. """Instantiate variable font, either fully or partially.
@ -1561,6 +1563,11 @@ def instantiateVariableFont(
in the head and OS/2 table will be updated so they conform to the R/I/B/BI in the head and OS/2 table will be updated so they conform to the R/I/B/BI
model. If the STAT table is missing or an Axis Value table is missing for model. If the STAT table is missing or an Axis Value table is missing for
a given axis coordinate, a ValueError will be raised. a given axis coordinate, a ValueError will be raised.
downgradeCFF2 (bool): if True, downgrade the CFF2 table to CFF table when possible
ie. full instancing of all axes. This is useful for compatibility with older
software that does not support CFF2. Defaults to False. Note that this
operation also removes overlaps within glyph shapes, as CFF does not support
overlaps but CFF2 does.
""" """
# 'overlap' used to be bool and is now enum; for backward compat keep accepting bool # 'overlap' used to be bool and is now enum; for backward compat keep accepting bool
overlap = OverlapMode(int(overlap)) overlap = OverlapMode(int(overlap))
@ -1586,7 +1593,7 @@ def instantiateVariableFont(
names.updateNameTable(varfont, axisLimits) names.updateNameTable(varfont, axisLimits)
if "CFF2" in varfont: if "CFF2" in varfont:
instantiateCFF2(varfont, normalizedLimits) instantiateCFF2(varfont, normalizedLimits, downgrade=downgradeCFF2)
if "gvar" in varfont: if "gvar" in varfont:
instantiateGvar(varfont, normalizedLimits, optimize=optimize) instantiateGvar(varfont, normalizedLimits, optimize=optimize)
@ -1779,6 +1786,11 @@ def parseArgs(args):
help="Update the instantiated font's `name` table. Input font must have " help="Update the instantiated font's `name` table. Input font must have "
"a STAT table with Axis Value Tables", "a STAT table with Axis Value Tables",
) )
parser.add_argument(
"--downgrade-cff2",
action="store_true",
help="If all axes are pinned, downgrade CFF2 to CFF table format",
)
parser.add_argument( parser.add_argument(
"--no-recalc-timestamp", "--no-recalc-timestamp",
dest="recalc_timestamp", dest="recalc_timestamp",
@ -1850,6 +1862,7 @@ def main(args=None):
optimize=options.optimize, optimize=options.optimize,
overlap=options.overlap, overlap=options.overlap,
updateFontNames=options.update_name_table, updateFontNames=options.update_name_table,
downgradeCFF2=options.downgrade_cff2,
) )
suffix = "-instance" if isFullInstance else "-partial" suffix = "-instance" if isFullInstance else "-partial"