From 8f6779d67e9bcb0ed2b73ab3cd0330af3d43392c Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 9 Aug 2022 15:02:21 -0600 Subject: [PATCH] [instancer] Fix the rest of tests --- Lib/fontTools/varLib/instancer/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/fontTools/varLib/instancer/__init__.py b/Lib/fontTools/varLib/instancer/__init__.py index 1ca1ece32..102166989 100644 --- a/Lib/fontTools/varLib/instancer/__init__.py +++ b/Lib/fontTools/varLib/instancer/__init__.py @@ -408,13 +408,14 @@ def _remapVarIdxMap(table, attrName, varIndexMapping, glyphOrder): # TODO(anthrotype) Add support for HVAR/VVAR in CFF2 def _instantiateVHVAR(varfont, axisLimits, tableFields): + location, axisRanges = splitAxisLocationAndRanges( + axisLimits, rangeType=NormalizedAxisRange + ) tableTag = tableFields.tableTag fvarAxes = varfont["fvar"].axes # Deltas from gvar table have already been applied to the hmtx/vmtx. For full # instances (i.e. all axes pinned), we can simply drop HVAR/VVAR and return - if set( - axisTag for axisTag, value in axisLimits.items() if not isinstance(value, tuple) - ).issuperset(axis.axisTag for axis in fvarAxes): + if set(location).issuperset(axis.axisTag for axis in fvarAxes): log.info("Dropping %s table", tableTag) del varfont[tableTag] return