From cff162579db14072655354ec212ef21516de3088 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 8 Aug 2022 13:42:30 -0600 Subject: [PATCH] [instancer] Fix a few more tests --- Lib/fontTools/varLib/instancer/__init__.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Lib/fontTools/varLib/instancer/__init__.py b/Lib/fontTools/varLib/instancer/__init__.py index cccfed899..900188d2d 100644 --- a/Lib/fontTools/varLib/instancer/__init__.py +++ b/Lib/fontTools/varLib/instancer/__init__.py @@ -101,7 +101,6 @@ import re log = logging.getLogger("fontTools.varLib.instancer") -# This just exists to make some tests happy. def _expand(v): if not isinstance(v, tuple): return (v, v, v) @@ -229,9 +228,9 @@ def changeTupleVariationsAxisLimits(variations, axisLimits): 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) - if isinstance(axisLimit, NormalizedAxisRange): # Just to make tests happy + if isinstance(axisLimit, NormalizedAxisRange): axisLimit = NormalizedAxisTent(axisLimit[0], 0, axisLimit[1]) assert isinstance(axisLimit, NormalizedAxisTent) @@ -1279,7 +1278,16 @@ def parseLimits(limits): assert lbound <= ubound else: 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