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

[instancer.solver] Fix up, also route pinned through general

Browse Source
This commit is contained in:
Behdad Esfahbod 2022-08-08 05:59:46 -06:00
parent 16d7e335e4
commit 7f149f2617
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/instancer/solver.py
View File

@ -144,7 +144,7 @@ def _solveWithGain(tent, axisLimit):
# lower <= axisDef <= peak <= axisMax # lower <= axisDef <= peak <= axisMax
gain = supportScalar({tag: axisDef}, {tag: tent}) gain = supportScalar({'tag': axisDef}, {'tag': tent})
out = [(gain, axisLimit)] out = [(gain, axisLimit)]
@ -171,7 +171,7 @@ def _solveWithGain(tent, axisLimit):
scalar1 = 1 scalar1 = 1
loc2 = (peak, axisMax, axisMax) loc2 = (peak, axisMax, axisMax)
scalar2 = supportScalar({tag: axisMax}, {tag: tent}) scalar2 = supportScalar({'tag': axisMax}, {'tag': tent})
out.append((scalar1 - gain, loc1)) out.append((scalar1 - gain, loc1))
out.append((scalar2 - gain, loc2)) out.append((scalar2 - gain, loc2))
@ -182,7 +182,7 @@ def _solveWithGain(tent, axisLimit):
# case 1neg: lower extends beyond axisMin: we chop. # case 1neg: lower extends beyond axisMin: we chop.
if lower <= axisMin: if lower <= axisMin:
loc = (axisMin, axisMin, axisDef) loc = (axisMin, axisMin, axisDef)
scalar = supportScalar({tag: axisMin}, {tag: tent}) scalar = supportScalar({'tag': axisMin}, {'tag': tent})
out.append((scalar - gain, loc)) out.append((scalar - gain, loc))
@ -247,7 +247,7 @@ def rebaseTent(tent, axisLimit):
assert peak != 0 assert peak != 0
# Get the pinned case out of the way # Get the pinned case out of the way
if axisMin == axisMax: if False and axisMin == axisMax:
return _solvePinned(tent, axisLimit) return _solvePinned(tent, axisLimit)
# If default isn't moving, get that out of the way as well # If default isn't moving, get that out of the way as well