Merge pull request #774 from googlefonts/fix-non-default-local-source

[designspace] Fix non default local source UFO choice when reading
googlefonts · Sep 4, 2023 · 8ecddfc · 8ecddfc
2 parents 2f2f370 + d340ede
commit 8ecddfc
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 7 deletions.
diff --git a/src/fontra/backends/designspace.py b/src/fontra/backends/designspace.py
@@ -224,7 +224,7 @@ async def getGlyph(self, glyphName):
                 localDS = ufoGlyph.lib.get(GLYPH_DESIGNSPACE_LIB_KEY)
                 if localDS is not None:
                     axes, localSources = self._unpackLocalDesignSpace(
-                        localDS, ufoLayer.path, ufoLayer.name
+                        localDS, ufoLayer.name
                     )
                     sources.extend(localSources)
                 sourceNameMapping = ufoGlyph.lib.get(SOURCE_NAME_MAPPING_LIB_KEY, {})
@@ -247,7 +247,7 @@ async def getGlyph(self, glyphName):
 
         return VariableGlyph(glyphName, axes=axes, sources=sources, layers=layers)
 
-    def _unpackLocalDesignSpace(self, dsDict, ufoPath, defaultLayerName):
+    def _unpackLocalDesignSpace(self, dsDict, defaultLayerName):
         axes = [
             LocalAxis(
                 name=axis["name"],
@@ -257,14 +257,26 @@ def _unpackLocalDesignSpace(self, dsDict, ufoPath, defaultLayerName):
             )
             for axis in dsDict["axes"]
         ]
+        localAxisNames = {axis.name for axis in axes}
+
         sources = []
         for source in dsDict.get("sources", ()):
             ufoLayerName = source.get("layername", defaultLayerName)
             sourceName = source.get(
                 "name",
                 ufoLayerName if ufoLayerName != defaultLayerName else "<default>",
             )
+
+            sourceLocation = {**self.defaultLocation, **source["location"]}
+            globalLocation = getGlobalPortionOfLocation(sourceLocation, localAxisNames)
+            dsSource = self.dsSources.findItem(
+                locationTuple=tuplifyLocation(globalLocation)
+            )
+            assert dsSource is not None
+            ufoPath = dsSource.layer.path
+
             ufoLayer = self.ufoLayers.findItem(path=ufoPath, name=ufoLayerName)
+            assert ufoLayer is not None
             sources.append(
                 Source(
                     name=sourceName,
@@ -373,11 +385,7 @@ async def putGlyph(self, glyphName, glyph, unicodes):
 
     def _prepareUFOSourceLayer(self, source, localAxisNames, revLayerNameMapping):
         sourceLocation = {**self.defaultLocation, **source.location}
-        globalLocation = {
-            name: value
-            for name, value in sourceLocation.items()
-            if name not in localAxisNames
-        }
+        globalLocation = getGlobalPortionOfLocation(sourceLocation, localAxisNames)
 
         dsSource = self.dsSources.findItem(
             locationTuple=tuplifyLocation(globalLocation)
@@ -928,3 +936,9 @@ def glyphHasVariableComponents(glyph):
         for layer in glyph.layers.values()
         for compo in layer.glyph.components
     )
+
+
+def getGlobalPortionOfLocation(location, localAxisNames):
+    return {
+        name: value for name, value in location.items() if name not in localAxisNames
+    }
diff --git a/...y/data/mutatorsans/MutatorSansBoldCondensed.ufo/glyphs.weight=850,flip=100/contents.plist b/...y/data/mutatorsans/MutatorSansBoldCondensed.ufo/glyphs.weight=850,flip=100/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>varcotest2</key>
+    <string>varcotest2.glif</string>
+  </dict>
+</plist>
diff --git a/.../data/mutatorsans/MutatorSansBoldCondensed.ufo/glyphs.weight=850,flip=100/varcotest2.glif b/.../data/mutatorsans/MutatorSansBoldCondensed.ufo/glyphs.weight=850,flip=100/varcotest2.glif
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="varcotest2" format="2">
+  <advance width="500"/>
+  <unicode hex="E001"/>
+  <outline>
+    <contour>
+      <point x="70" y="278" type="line"/>
+      <point x="452" y="278" type="line"/>
+      <point x="522" y="278" type="line"/>
+      <point x="522" y="380" type="line"/>
+      <point x="522" y="664" type="line"/>
+      <point x="204" y="664" type="line"/>
+      <point x="204" y="588" type="line"/>
+      <point x="70" y="588" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/test-py/data/mutatorsans/MutatorSansBoldCondensed.ufo/layercontents.plist b/test-py/data/mutatorsans/MutatorSansBoldCondensed.ufo/layercontents.plist
@@ -10,5 +10,9 @@
       <string>background</string>
       <string>glyphs.background</string>
     </array>
+    <array>
+      <string>weight=850,flip=100</string>
+      <string>glyphs.weight=850,flip=100</string>
+    </array>
   </array>
 </plist>
diff --git a/test-py/data/mutatorsans/MutatorSansLightCondensed.ufo/glyphs/varcotest2.glif b/test-py/data/mutatorsans/MutatorSansLightCondensed.ufo/glyphs/varcotest2.glif
@@ -65,8 +65,24 @@
               <integer>100</integer>
             </dict>
           </dict>
+          <dict>
+            <key>layername</key>
+            <string>weight=850,flip=100</string>
+            <key>location</key>
+            <dict>
+              <key>flip</key>
+              <integer>100</integer>
+              <key>weight</key>
+              <integer>850</integer>
+            </dict>
+          </dict>
         </array>
       </dict>
+      <key>xyz.fontra.layer-names</key>
+      <dict>
+        <key>MutatorSansBoldCondensed/weight=850,flip=100</key>
+        <string>weight=850,flip=100</string>
+      </dict>
     </dict>
   </lib>
 </glyph>
diff --git a/test-py/test_font.py b/test-py/test_font.py
@@ -446,6 +446,13 @@
                     "location": {"flip": 0, "flop": 100},
                     "name": "varco_flop",
                 },
+                {
+                    "name": "weight=850,flip=100",
+                    "layerName": "weight=850,flip=100",
+                    "location": {"flip": 100, "weight": 850},
+                    "inactive": False,
+                    "customData": {},
+                },
             ],
             "layers": {
                 "MutatorSansLightCondensed/foreground": {
@@ -529,6 +536,37 @@
                         "xAdvance": 500,
                     },
                 },
+                "weight=850,flip=100": {
+                    "glyph": {
+                        "path": {
+                            "coordinates": [
+                                70,
+                                278,
+                                452,
+                                278,
+                                522,
+                                278,
+                                522,
+                                380,
+                                522,
+                                664,
+                                204,
+                                664,
+                                204,
+                                588,
+                                70,
+                                588,
+                            ],
+                            "pointTypes": [0, 0, 0, 0, 0, 0, 0, 0],
+                            "contourInfo": [{"endPoint": 7, "isClosed": True}],
+                        },
+                        "components": [],
+                        "xAdvance": 500,
+                        "yAdvance": None,
+                        "verticalOrigin": None,
+                    },
+                    "customData": {},
+                },
             },
         },
     ),