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

[designspaceLib/avar2] Rename variables

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-05-30 11:20:27 -06:00
parent e587942b68
commit 588cbc982d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/fontTools/varLib/__init__.py
View File

@ -215,14 +215,14 @@ def _add_avar(font, axes, mappings, axisTags):
if mappings:
interesting = True
derived = [
inputLocations = [
{
axes[name].tag: models.normalizeValue(v, vals_triples[axes[name].tag])
for name, v in mapping.inputLocation.items()
}
for mapping in mappings
]
source = [
outputLocations = [
{
axes[name].tag: models.normalizeValue(v, vals_triples[axes[name].tag])
for name, v in mapping.outputLocation.items()
@ -230,17 +230,17 @@ def _add_avar(font, axes, mappings, axisTags):
for mapping in mappings
]
model = models.VariationModel(derived, axisTags)
model = models.VariationModel(inputLocations, axisTags)
builder = varStore.OnlineVarStoreBuilder(axisTags)
builder.setModel(model)
varIdxes = {}
for t in axisTags:
masterValues = []
for ms, md in zip(source, derived):
if t not in ms:
for vo, vi in zip(outputLocations, inputLocations):
if t not in vo:
masterValues.append(0)
continue
v = ms[t] - md.get(t, 0)
v = vo[t] - vi.get(t, 0)
masterValues.append(fl2fi(v, 14))
varIdxes[t] = builder.storeMasters(masterValues)[1]