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

[varLib.avarPlanner] Internal variable rename

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-07-23 14:55:24 -06:00
parent ac7753c338
commit b860194235
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,17 +112,17 @@ def planWeightAxis(
outNormalized = {} outNormalized = {}
upem = 1 # font["head"].unitsPerEm upem = 1 # font["head"].unitsPerEm
axisWeightAverage = {} axisBlackness = {}
for weight in sorted({minValue, defaultValue, maxValue} | set(pins.values())): for weight in sorted({minValue, defaultValue, maxValue} | set(pins.values())):
glyphset = glyphSetFunc(location={"wght": weight}) glyphset = glyphSetFunc(location={"wght": weight})
designWeight = piecewiseLinearMap(weight, pins) designWeight = piecewiseLinearMap(weight, pins)
axisWeightAverage[designWeight] = getGlyphsetBlackness(glyphset, glyphs) / ( axisBlackness[designWeight] = getGlyphsetBlackness(glyphset, glyphs) / (
upem * upem upem * upem
) )
log.debug("Calculated average glyph black ratio:\n%s", pformat(axisWeightAverage)) log.debug("Calculated average glyph black ratio:\n%s", pformat(axisBlackness))
for (rangeMin, targetMin), (rangeMax, targetMax) in zip( for (rangeMin, targetMin), (rangeMax, targetMax) in zip(
list(sorted(pins.items()))[:-1], list(sorted(pins.items()))[:-1],
@ -139,7 +139,7 @@ def planWeightAxis(
log.info("Planning target weights %s.", sorted(targetWeights)) log.info("Planning target weights %s.", sorted(targetWeights))
log.info("Sampling %u points in range %g,%g.", samples, rangeMin, rangeMax) log.info("Sampling %u points in range %g,%g.", samples, rangeMin, rangeMax)
weightBlackness = axisWeightAverage.copy() weightBlackness = axisBlackness.copy()
for sample in range(1, samples + 1): for sample in range(1, samples + 1):
weight = rangeMin + (rangeMax - rangeMin) * sample / (samples + 1) weight = rangeMin + (rangeMax - rangeMin) * sample / (samples + 1)
log.info("Sampling weight %g.", weight) log.info("Sampling weight %g.", weight)