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

[instancer] Fix a few more tests

Browse Source
This commit is contained in:
Behdad Esfahbod 2022-08-08 13:42:30 -06:00
parent 272e4e8999
commit cff162579d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/fontTools/varLib/instancer/__init__.py
View File

@ -101,7 +101,6 @@ import re
log = logging.getLogger("fontTools.varLib.instancer") log = logging.getLogger("fontTools.varLib.instancer")
# This just exists to make some tests happy.
def _expand(v): def _expand(v):
if not isinstance(v, tuple): if not isinstance(v, tuple):
return (v, v, v) return (v, v, v)
@ -229,9 +228,9 @@ def changeTupleVariationsAxisLimits(variations, axisLimits):
def changeTupleVariationAxisLimit(var, axisTag, axisLimit): def changeTupleVariationAxisLimit(var, axisTag, axisLimit):
if not isinstance(axisLimit, tuple): # Just to make tests happy if not isinstance(axisLimit, tuple):
axisLimit = NormalizedAxisTent(axisLimit, axisLimit, axisLimit) axisLimit = NormalizedAxisTent(axisLimit, axisLimit, axisLimit)
if isinstance(axisLimit, NormalizedAxisRange): # Just to make tests happy if isinstance(axisLimit, NormalizedAxisRange):
axisLimit = NormalizedAxisTent(axisLimit[0], 0, axisLimit[1]) axisLimit = NormalizedAxisTent(axisLimit[0], 0, axisLimit[1])
assert isinstance(axisLimit, NormalizedAxisTent) assert isinstance(axisLimit, NormalizedAxisTent)
@ -1279,7 +1278,16 @@ def parseLimits(limits):
assert lbound <= ubound assert lbound <= ubound
else: else:
assert lbound <= default <= ubound assert lbound <= default <= ubound
result[tag] = (lbound, default, ubound)
if lbound == default == ubound:
result[tag] = lbound
continue
elif default is None:
result[tag] = AxisRange(lbound, ubound)
continue
result[tag] = AxisTent(lbound, default, ubound)
return result return result