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

[varLib.avarPlanner] Rename --design-units to --design-limits

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-07-23 19:57:15 -06:00
parent b008a9d47f
commit 4502be761a
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Lib/fontTools/varLib/avarPlanner.py
View File

@ -298,7 +298,7 @@ def planAxis(
values=None, values=None,
samples=None, samples=None,
glyphs=None, glyphs=None,
designUnits=None, designLimits=None,
pins=None, pins=None,
sanitizeFunc=None, sanitizeFunc=None,
): ):
@ -314,10 +314,10 @@ def planAxis(
log.info("Value min %g / default %g / max %g", minValue, defaultValue, maxValue) log.info("Value min %g / default %g / max %g", minValue, defaultValue, maxValue)
triple = (minValue, defaultValue, maxValue) triple = (minValue, defaultValue, maxValue)
if designUnits is not None: if designLimits is not None:
log.info("Value design-units min %g / default %g / max %g", *designUnits) log.info("Value design-limits min %g / default %g / max %g", *designLimits)
else: else:
designUnits = triple designLimits = triple
# if "avar" in font: # if "avar" in font:
# log.debug("Checking that font doesn't have axis mapping already.") # log.debug("Checking that font doesn't have axis mapping already.")
@ -329,9 +329,9 @@ def planAxis(
log.info("Pins %s", sorted(pins.items())) log.info("Pins %s", sorted(pins.items()))
pins.update( pins.update(
{ {
minValue: designUnits[0], minValue: designLimits[0],
defaultValue: designUnits[1], defaultValue: designLimits[1],
maxValue: designUnits[2], maxValue: designLimits[2],
} }
) )
@ -346,7 +346,7 @@ def planAxis(
if sanitizeFunc is not None: if sanitizeFunc is not None:
log.info("Sanitizing axis limit values for the `%s` axis.", axisTag) log.info("Sanitizing axis limit values for the `%s` axis.", axisTag)
sanitizeFunc(triple, designUnits, pins, axisMeasurements) sanitizeFunc(triple, designLimits, pins, axisMeasurements)
log.debug("Calculated average value:\n%s", pformat(axisMeasurements)) log.debug("Calculated average value:\n%s", pformat(axisMeasurements))
@ -360,8 +360,8 @@ def planAxis(
normalizedMin = normalizeValue(rangeMin, triple) normalizedMin = normalizeValue(rangeMin, triple)
normalizedMax = normalizeValue(rangeMax, triple) normalizedMax = normalizeValue(rangeMax, triple)
normalizedTargetMin = normalizeValue(targetMin, designUnits) normalizedTargetMin = normalizeValue(targetMin, designLimits)
normalizedTargetMax = normalizeValue(targetMax, designUnits) normalizedTargetMax = normalizeValue(targetMax, designLimits)
log.info("Planning target values %s.", sorted(targetValues)) log.info("Planning target values %s.", sorted(targetValues))
log.info("Sampling %u points in range %g,%g.", samples, rangeMin, rangeMax) log.info("Sampling %u points in range %g,%g.", samples, rangeMin, rangeMax)
@ -421,7 +421,7 @@ def planWeightAxis(
weights=None, weights=None,
samples=None, samples=None,
glyphs=None, glyphs=None,
designUnits=None, designLimits=None,
pins=None, pins=None,
sanitize=False, sanitize=False,
): ):
@ -439,7 +439,7 @@ def planWeightAxis(
values=weights, values=weights,
samples=samples, samples=samples,
glyphs=glyphs, glyphs=glyphs,
designUnits=designUnits, designLimits=designLimits,
pins=pins, pins=pins,
sanitizeFunc=sanitizeWeight if sanitize else None, sanitizeFunc=sanitizeWeight if sanitize else None,
) )
@ -453,7 +453,7 @@ def planWidthAxis(
widths=None, widths=None,
samples=None, samples=None,
glyphs=None, glyphs=None,
designUnits=None, designLimits=None,
pins=None, pins=None,
sanitize=False, sanitize=False,
): ):
@ -471,7 +471,7 @@ def planWidthAxis(
values=widths, values=widths,
samples=samples, samples=samples,
glyphs=glyphs, glyphs=glyphs,
designUnits=designUnits, designLimits=designLimits,
pins=pins, pins=pins,
sanitizeFunc=sanitizeWidth if sanitize else None, sanitizeFunc=sanitizeWidth if sanitize else None,
) )
@ -485,7 +485,7 @@ def planSlantAxis(
slants=None, slants=None,
samples=None, samples=None,
glyphs=None, glyphs=None,
designUnits=None, designLimits=None,
pins=None, pins=None,
sanitize=False, sanitize=False,
): ):
@ -503,7 +503,7 @@ def planSlantAxis(
values=slants, values=slants,
samples=samples, samples=samples,
glyphs=glyphs, glyphs=glyphs,
designUnits=designUnits, designLimits=designLimits,
pins=pins, pins=pins,
sanitizeFunc=sanitizeSlant if sanitize else None, sanitizeFunc=sanitizeSlant if sanitize else None,
) )
@ -576,17 +576,17 @@ def main(args=None):
help="Space-separate list of glyphs to use for sampling.", help="Space-separate list of glyphs to use for sampling.",
) )
parser.add_argument( parser.add_argument(
"--weight-design-units", "--weight-design-limits",
type=str, type=str,
help="min:default:max in design units for the `wght` axis.", help="min:default:max in design units for the `wght` axis.",
) )
parser.add_argument( parser.add_argument(
"--width-design-units", "--width-design-limits",
type=str, type=str,
help="min:default:max in design units for the `wdth` axis.", help="min:default:max in design units for the `wdth` axis.",
) )
parser.add_argument( parser.add_argument(
"--slant-design-units", "--slant-design-limits",
type=str, type=str,
help="min:default:max in design units for the `slnt` axis.", help="min:default:max in design units for the `slnt` axis.",
) )
@ -665,11 +665,11 @@ def main(args=None):
else: else:
widths = None widths = None
if options.width_design_units is not None: if options.width_design_limits is not None:
designUnits = [float(d) for d in options.width_design_units.split(":")] designLimits = [float(d) for d in options.width_design_limits.split(":")]
assert len(designUnits) == 3 and designUnits[0] <= designUnits[1] <= designUnits[2] assert len(designLimits) == 3 and designLimits[0] <= designLimits[1] <= designLimits[2]
else: else:
designUnits = None designLimits = None
if options.width_pins is not None: if options.width_pins is not None:
pins = {} pins = {}
@ -687,7 +687,7 @@ def main(args=None):
widths=widths, widths=widths,
samples=options.samples, samples=options.samples,
glyphs=glyphs, glyphs=glyphs,
designUnits=designUnits, designLimits=designLimits,
pins=pins, pins=pins,
sanitize=options.sanitize, sanitize=options.sanitize,
) )
@ -712,11 +712,11 @@ def main(args=None):
else: else:
weights = None weights = None
if options.weight_design_units is not None: if options.weight_design_limits is not None:
designUnits = [float(d) for d in options.weight_design_units.split(":")] designLimits = [float(d) for d in options.weight_design_limits.split(":")]
assert len(designUnits) == 3 and designUnits[0] <= designUnits[1] <= designUnits[2] assert len(designLimits) == 3 and designLimits[0] <= designLimits[1] <= designLimits[2]
else: else:
designUnits = None designLimits = None
if options.weight_pins is not None: if options.weight_pins is not None:
pins = {} pins = {}
@ -734,7 +734,7 @@ def main(args=None):
weights=weights, weights=weights,
samples=options.samples, samples=options.samples,
glyphs=glyphs, glyphs=glyphs,
designUnits=designUnits, designLimits=designLimits,
pins=pins, pins=pins,
sanitize=options.sanitize, sanitize=options.sanitize,
) )
@ -759,11 +759,11 @@ def main(args=None):
else: else:
slants = None slants = None
if options.slant_design_units is not None: if options.slant_design_limits is not None:
designUnits = [float(d) for d in options.slant_design_units.split(":")] designLimits = [float(d) for d in options.slant_design_limits.split(":")]
assert len(designUnits) == 3 and designUnits[0] <= designUnits[1] <= designUnits[2] assert len(designLimits) == 3 and designLimits[0] <= designLimits[1] <= designLimits[2]
else: else:
designUnits = None designLimits = None
if options.slant_pins is not None: if options.slant_pins is not None:
pins = {} pins = {}
@ -781,7 +781,7 @@ def main(args=None):
slants=slants, slants=slants,
samples=options.samples, samples=options.samples,
glyphs=glyphs, glyphs=glyphs,
designUnits=designUnits, designLimits=designLimits,
pins=pins, pins=pins,
sanitize=options.sanitize, sanitize=options.sanitize,
) )