WIP layers

googlefonts · Oct 31, 2017 · e29cc36 · e29cc36
1 parent 973db18
commit e29cc36
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Lib/glyphsLib/builder/builders.py b/Lib/glyphsLib/builder/builders.py
@@ -123,6 +123,8 @@ def masters(self):
 
                 assoc_id = layer.associatedMasterId
                 if assoc_id != layer.layerId:
+                    # FIXME: (jany) is it allowed to have a layer with no name?
+                    #        why is it not exported?
                     if layer_name is not None:
                         supplementary_layer_data.append(
                             (assoc_id, glyph_name, layer_name, layer))

diff --git a/Lib/glyphsLib/builder/layers.py b/Lib/glyphsLib/builder/layers.py
@@ -38,7 +38,9 @@ def to_glyphs_layer(self, ufo_layer, glyph, master):
         # TODO: (jany) add lib attribute to find foreground by layer id
         foreground_name = ufo_layer.name[:-len('.background')]
         foreground = next(
-            (l for l in glyph.layers if l.name == foreground_name), None)
+            (l for l in glyph.layers
+             if l.name == foreground_name and l.associatedMasterId == master.id
+             ), None)
         if foreground is None:
             foreground = self.glyphs_module.GSLayer()
             foreground.name = foreground_name
@@ -47,8 +49,10 @@ def to_glyphs_layer(self, ufo_layer, glyph, master):
         # Background layers don't have an associated master id nor a name nor an id
         foreground.background = layer
     else:
-        layer = next(
-            (l for l in glyph.layers if l.name == ufo_layer.name), None)
+        layer = next((
+            l for l in glyph.layers
+            if l.name == ufo_layer.name and l.associatedMasterId == master.id),
+                     None)
         if layer is None:
             layer = self.glyphs_module.GSLayer()
         layer.associatedMasterId = master.id