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

[instancer/L4] Fix crossing calculation

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-06-21 09:47:08 -06:00
parent 060b5f36bf
commit 023ad3a363
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/varLib/instancer/solver.py
View File

@ -100,7 +100,7 @@ def _solve(tent, axisLimit, negative=False):
if gain > outGain: if gain > outGain:
# Crossing point on the axis. # Crossing point on the axis.
crossing = peak + ((1 - gain) * (upper - peak) / (1 - outGain)) crossing = peak + (1 - gain) * (upper - peak)
loc = (axisDef, peak, crossing) loc = (axisDef, peak, crossing)
scalar = 1 scalar = 1

19
Tests/varLib/instancer/solver_test.py
View File

@ -91,6 +91,25 @@ class RebaseTentTest(object):
(-1, (-1, -1, 0)), (-1, (-1, -1, 0)),
], ],
), ),
pytest.param(
(0.0, 0.5, 1),
(0, 0.5, 0.75),
[
(1, None),
(-0.5, (0, 1, 1)),
(-1, (-1, -1, 0)),
],
),
pytest.param(
(0.0, 0.5, 1),
(0, 0.25, 0.8),
[
(0.5, None),
(0.5, (0, 0.45454545, 0.9090909090)),
(-0.1, (0.9090909090, 1.0, 1.0)),
(-0.5, (-1, -1, 0)),
],
),
# Case 3a/1neg # Case 3a/1neg
pytest.param( pytest.param(
(0.0, 0.5, 2), (0.0, 0.5, 2),