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

[instancer.solver] Add tests

Browse Source
This commit is contained in:
Behdad Esfahbod 2022-08-08 06:57:40 -06:00
parent 5a2836d97b
commit f2ebccd468
2 changed files with 119 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,10 @@ def _solveWithoutGain(tent, axisLimit):
loc2 = (peak, axisMax, axisMax)
scalar2 = supportScalar({'tag': axisMax}, {'tag': tent})
return [(scalar1, loc1), (scalar2, loc2)]
if (peak < axisMax):
return [(scalar1, loc1), (scalar2, loc2)]
else:
return [(scalar1, loc1)]
def _solveWithGain(tent, axisLimit):
@ -72,7 +75,8 @@ def _solveWithGain(tent, axisLimit):
scalar2 = supportScalar({'tag': axisMax}, {'tag': tent})
out.append((scalar1 - gain, loc1))
out.append((scalar2 - gain, loc2))
if (peak < axisMax):
out.append((scalar2 - gain, loc2))
# Now, the negative side

113
Tests/varLib/instancer/solver_test.py Normal file
View File

@ -0,0 +1,113 @@
from fontTools.varLib.instancer import solver
import pytest
class RebaseTentTest(object):
@pytest.mark.parametrize(
"tent, axisRange, expected",
[
# Case 1: # Pin at default
pytest.param(
(0, 1, 1), (.0, .0, .0),
[
]
),
# Case 1:
pytest.param(
(0.3, .5, .8), (.1, .2, .3),
[
]
),
# Pin axis
pytest.param(
(0, 1, 1), (.5, .5, .5),
[
(.5, (0, 0, 0)),
]
),
# Case 2:
pytest.param(
(0, 1, 1), (-1, 0, .5),
[
(.5, (0, 1.0, 1.0)),
]
),
# Case 2:
pytest.param(
(0, 1, 1), (-1, 0, .75),
[
(.75, (0, 1.0, 1.0)),
]
),
#
# Without gain:
#
# Case 3
pytest.param(
(0, .2, 1), (-1, 0, .8),
[
(1, (0, 0.25, 1.25)),
]
),
# Case 3 boundary
pytest.param(
(0, .4, 1), (-1, 0, .5),
[
(1, (0.0, 0.8, 1.99993896484375)),
]
),
# Case 4
pytest.param(
(0, .25, 1), (-1, 0, .4),
[
(1, (0.0, 0.625, 1.0)),
(0.7999999999999999, (0.625, 1.0, 1.0)),
]
),
# Case 4 boundary
pytest.param(
(.25, .5, 1), (0, .25, .5),
[
(1, (0, 1, 1)),
]
),
#
# With gain:
#
# Case 1neg
pytest.param(
(.0, .5, 1), (0, .25, .5),
[
(.5, (-1, 0, 1)),
(.5, (0, 1, 1)),
(-.5, (-1, -1, 0)),
]
),
# Case 2neg
pytest.param(
(.05, .55, 1), (0, .25, .5),
[
(.4, (-1, 0, 1)),
(.5, (0, 1, 1)),
(-.4, (-1, -.8, 0)),
(-.4, (-1, -1, -.8)),
]
),
],
)
def test_rebaseTent(self, tent, axisRange, expected):
sol = solver.rebaseTent(tent, axisRange)
assert sol == expected