Update setupAvar to also support avar-2, fixing _add_avar() call site

This commit is contained in:
Just van Rossum 2023-06-25 15:31:08 +02:00
parent 978decb3a2
commit d59291a9c5

View File

@ -707,7 +707,7 @@ class FontBuilder(object):
addFvar(self.font, axes, instances)
def setupAvar(self, axes):
def setupAvar(self, axes, mappings=None):
"""Adds an axis variations table to the font.
Args:
@ -715,7 +715,11 @@ class FontBuilder(object):
"""
from .varLib import _add_avar
_add_avar(self.font, OrderedDict(enumerate(axes))) # Only values are used
if "fvar" not in self.font:
raise KeyError("'fvar' table is missing; can't add FeatureVariations.")
axisTags = [axis.axisTag for axis in self.font["fvar"].axes]
axes = OrderedDict(enumerate(axes)) # Only values are used
_add_avar(self.font, axes, mappings, axisTags)
def setupGvar(self, variations):
gvar = self.font["gvar"] = newTable("gvar")