[instancer/avar2] Experiment with limiting axes

fonttools · Apr 18, 2024 · 0b52637 · 0b52637
1 parent 486a1f6
commit 0b52637
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Lib/fontTools/varLib/instancer/avar.py b/Lib/fontTools/varLib/instancer/avar.py
@@ -1,6 +1,7 @@
 from fontTools.varLib.varStore import VarStoreInstancer, NO_VARIATION_INDEX
 from fontTools.ttLib.tables.otTables import VarStore
 from fontTools.ttLib.tables._f_v_a_r import Axis
+from fontTools.varLib import instancer
 
 
 def VarStore_getExtremes(self, varIdx, nullAxes=set(), cache=None):
@@ -48,8 +49,8 @@ def VarStore_getExtremes(self, varIdx, nullAxes=set(), cache=None):
             location[str(i)] = peak
         if skip:
             continue
-        instancer = VarStoreInstancer(varStore, fvar_axes, location)
-        v = instancer[varIdx]
+        varStoreInstancer = VarStoreInstancer(varStore, fvar_axes, location)
+        v = varStoreInstancer[varIdx]
 
         assert thisAxes, "Empty region in VarStore!"
         minOther, maxOther = self.getExtremes(varIdx, nullAxes | thisAxes, cache)
@@ -70,12 +71,21 @@ def VarStore_getExtremes(self, varIdx, nullAxes=set(), cache=None):
     from fontTools.ttLib import TTFont
 
     font = TTFont(sys.argv[1])
+
+    limits = sys.argv[2:]
+    limits = instancer.parseLimits(limits)
+    limits = instancer.AxisLimits(limits).limitAxesAndPopulateDefaults(font)
+    limits = limits.normalize(font, usingAvar=True)
+    print(limits)
+
     fvar = font["fvar"]
     avar = font["avar"]
 
     varIdxMap = avar.table.VarIdxMap
     varStore = avar.table.VarStore
 
+    defaultDeltas = instancer.instantiateItemVariationStore(varStore, fvar.axes, limits)
+
     for axisIdx, axis in enumerate(fvar.axes):
         varIdx = axisIdx
         if varIdxMap is not None: