[varc] Use multiVarStore instead of GDEF varStore

That's what we agreed upon.
fonttools · Apr 23, 2024 · 8166168 · 8166168
1 parent 3c9ce87
commit 8166168
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/Lib/fontTools/ttLib/ttGlyphSet.py b/Lib/fontTools/ttLib/ttGlyphSet.py
@@ -288,7 +288,7 @@ def _evaluateCondition(condition, fvarAxes, location, instancer):
     elif condition.Format == 2:
         # ConditionValue
         value = condition.DefaultValue
-        value += instancer[condition.VarIdx]
+        value += instancer[condition.VarIdx][0]
         return value > 0
     elif condition.Format == 3:
         # ConditionAnd
@@ -333,19 +333,13 @@ def _draw(self, pen, isPointPen):
         instancer = MultiVarStoreInstancer(
             varc.MultiVarStore, fvarAxes, self.glyphSet.location
         )
-        gdef = glyphSet.font.get("GDEF") if "GDEF" in glyphSet.font else None
-        gdefInstancer = VarStoreInstancer(
-            getattr(gdef.table, "VarStore") if gdef is not None else None,
-            fvarAxes,
-            self.glyphSet.location,
-        )
 
         for comp in glyph.components:
 
             if comp.flags & VarComponentFlags.HAVE_CONDITION:
                 condition = varc.ConditionList.ConditionTable[comp.conditionIndex]
                 if not _evaluateCondition(
-                    condition, fvarAxes, self.glyphSet.location, gdefInstancer
+                    condition, fvarAxes, self.glyphSet.location, instancer
                 ):
                     continue