[designspaceLib/avar2] Add AxisMappingDescriptor

Lib/fontTools/designspaceLib/__init__.py

@@ -446,6 +446,18 @@ def processRules(rules, location, glyphNames):
     return glyphNames
 
 
+class AxisMappingDescriptor(SimpleDescriptor):
+    """XXX TODO"""
+
+    _attrs = ["inputLocation", "outputLocation"]  # what do we need here
+
+    def __init__(self, *, inputLocation=None, outputLocation=None):
+        self.inputLocation = inputLocation or {}
+        """XXX TODO"""
+        self.outputLocation = outputLocation or {}
+        """XXX TODO"""
+
+
 AnisotropicLocationDict = Dict[str, Union[float, Tuple[float, float]]]
 SimpleLocationDict = Dict[str, float]
 
@@ -1323,6 +1335,7 @@ def __init__(self, *, name, userValue):
 class BaseDocWriter(object):
     _whiteSpace = "    "
     axisDescriptorClass = AxisDescriptor
+    axisMappingDescriptorClass = AxisMappingDescriptor
     discreteAxisDescriptorClass = DiscreteAxisDescriptor
     axisLabelDescriptorClass = AxisLabelDescriptor
     locationLabelDescriptorClass = LocationLabelDescriptor
@@ -1852,6 +1865,7 @@ def _writeGlyphElement(self, instanceElement, instanceObject, glyphName, data):
 
 class BaseDocReader(LogMixin):
     axisDescriptorClass = AxisDescriptor
+    axisMappingDescriptorClass = AxisMappingDescriptor
     discreteAxisDescriptorClass = DiscreteAxisDescriptor
     axisLabelDescriptorClass = AxisLabelDescriptor
     locationLabelDescriptorClass = LocationLabelDescriptor
@@ -2021,7 +2035,10 @@ def readAxes(self):
                     tag = dimElement.attrib["tag"]
                     value = float(dimElement.attrib["xvalue"])
                     outputLoc[tag] = value
-                self.documentObject.axisMappings.append([inputLoc, outputLoc])
+                axisMappingObject = self.axisMappingDescriptorClass(
+                    inputLocation=inputLoc, outputLocation=outputLoc
+                )
+                self.documentObject.axisMappings.append(axisMappingObject)
 
     def readAxisLabel(self, element: ET.Element):
         xml_attrs = {
@@ -2528,6 +2545,7 @@ class DesignSpaceDocument(LogMixin, AsDictMixin):
         doc.formatVersion
         doc.elidedFallbackName
         doc.axes
+        doc.axisMappings
         doc.locationLabels
         doc.rules
         doc.rulesProcessingLast
@@ -2566,7 +2584,7 @@ def __init__(self, readerClass=None, writerClass=None):
         self.axes: List[Union[AxisDescriptor, DiscreteAxisDescriptor]] = []
         """List of this document's axes."""
 
-        self.axisMappings: List = []
+        self.axisMappings: List[AxisMappingDescriptor] = []
         """List of this document's axis mappings."""
 
         self.locationLabels: List[LocationLabelDescriptor] = []

Lib/fontTools/designspaceLib/split.py

@@ -345,7 +345,7 @@ def maybeExpandDesignLocation(object):
             )
 
     subDoc.lib = doc.lib
-    subDoc.axisMappings = doc.axisMappings  # TODO
+    subDoc.axisMappings = doc.axisMappings  #  XXX TODO
 
     return subDoc
 

Lib/fontTools/varLib/__init__.py

@@ -131,7 +131,7 @@ def _add_fvar(font, axes, instances: List[InstanceDescriptor]):
     return fvar
 
 
-def _add_avar(font, axes, mapping, axisTags):
+def _add_avar(font, axes, mappings, axisTags):
     """
     Add 'avar' table to font.
 
@@ -212,22 +212,22 @@ def _add_avar(font, axes, mapping, axisTags):
         assert +1.0 not in curve or curve[+1.0] == +1.0
         # curve.update({-1.0: -1.0, 0.0: 0.0, 1.0: 1.0})
 
-    if mapping:
+    if mappings:
         interesting = True
 
         derived = [
             {
                 tag: models.normalizeValue(v, vals_triples[tag])
-                for tag, v in inputLoc.items()
+                for tag, v in mapping.inputLocation.items()
             }
-            for inputLoc, outputLoc in mapping
+            for mapping in mappings
         ]
         source = [
             {
                 tag: models.normalizeValue(v, vals_triples[tag])
-                for tag, v in outputLoc.items()
+                for tag, v in mapping.outputLocation.items()
             }
-            for inputLoc, outputLoc in mapping
+            for mapping in mappings
         ]
 
         model = models.VariationModel(derived, axisTags)