Merge pull request #1117 from googlefonts/color-postscript-names

Author: anthrotype

Lib/glyphsLib/builder/color_layers.py

@@ -36,10 +36,7 @@ def _to_ufo_color_palette_layers(builder, master, layerMapping):
                 layerGlyphName = f"{glyph.name}.color{i}"
                 ufo_layer = builder.to_ufo_layer(glyph, masterLayer)
                 ufo_glyph = ufo_layer.newGlyph(layerGlyphName)
-                builder.to_ufo_glyph(ufo_glyph, layer, glyph)
-                # Remove Unicode mapping from each color layer to avoid
-                # duplicate entries.
-                ufo_glyph.unicodes = []
+                builder.to_ufo_glyph(ufo_glyph, layer, glyph, is_color_layer_glyph=True)
             colorLayers.append((layerGlyphName, colorId))
         layerMapping[glyph.name] = colorLayers
 
@@ -194,10 +191,13 @@ def _to_ufo_color_layers(builder, ufo, master, layerMapping):
                 layerGlyphName = f"{glyph.name}.color{i}"
                 ufo_layer = builder.to_ufo_layer(glyph, masterLayer)
                 ufo_glyph = ufo_layer.newGlyph(layerGlyphName)
-                builder.to_ufo_glyph(ufo_glyph, layer, glyph, do_color_layers=False)
-                # Remove Unicode mapping from each color layer to avoid
-                # duplicate entries.
-                ufo_glyph.unicodes = []
+                builder.to_ufo_glyph(
+                    ufo_glyph,
+                    layer,
+                    glyph,
+                    do_color_layers=False,
+                    is_color_layer_glyph=True,
+                )
 
             attributes = layer.paths[0].attributes if layer.paths else {}
             if "gradient" in attributes:

Lib/glyphsLib/builder/glyph.py

@@ -69,14 +69,19 @@ def _clone_layer(layer, paths=None, components=None):
 USV_EXTENSIONS = tuple(USV_MAP.keys())
 
 
-def to_ufo_glyph(self, ufo_glyph, layer, glyph, do_color_layers=True):  # noqa: C901
+def to_ufo_glyph(  # noqa: C901
+    self, ufo_glyph, layer, glyph, do_color_layers=True, is_color_layer_glyph=False
+):
     """Add .glyphs metadata, paths, components, and anchors to a glyph."""
     ufo_font = self._sources[layer.associatedMasterId or layer.layerId].font
 
     if layer.layerId == layer.associatedMasterId and do_color_layers:
         self.to_ufo_glyph_color(ufo_glyph, layer, glyph)
 
-    ufo_glyph.unicodes = [int(uval, 16) for uval in glyph.unicodes]
+    # Color layer glyphs (e.g., "Acaron.color0") should not get unicode values
+    # from their parent glyph to avoid duplicate unicode mappings.
+    if not is_color_layer_glyph:
+        ufo_glyph.unicodes = [int(uval, 16) for uval in glyph.unicodes]
 
     export = glyph.export
     if not export:

tests/builder/builder_test.py

@@ -1238,6 +1238,48 @@ def test_glyph_color_palette_layers_no_unicode_mapping(ufo_module):
     assert ufo["a.color1"].unicode is None
 
 
+def test_glyph_color_palette_layers_postscript_names(ufo_module):
+    """Test that color layer glyphs get unique postscript names with .colorN suffix."""
+    font = generate_minimal_font(format_version=3)
+    # Add a glyph with unicode (production name will be auto-generated)
+    glyph_with_unicode = add_glyph(font, "Acaron")
+    glyph_with_unicode.unicode = "01CD"
+
+    # Add a glyph without unicode but with suffix
+    glyph_with_suffix = add_glyph(font, "caroncomb.alt")
+
+    # Add color palette layers
+    for glyph in [glyph_with_unicode, glyph_with_suffix]:
+        color0 = GSLayer()
+        color1 = GSLayer()
+        color0.attributes["colorPalette"] = 0
+        color1.attributes["colorPalette"] = 1
+        glyph.layers.append(color0)
+        glyph.layers.append(color1)
+
+    ds = to_designspace(font, ufo_module=ufo_module, minimal=True)
+    ufo = ds.sources[0].font
+
+    postscriptNames = ufo.lib.get("public.postscriptNames", {})
+
+    # Color layer glyphs should have unique postscript names with .colorN suffix
+    assert postscriptNames.get("Acaron") == "uni01CD"
+    assert postscriptNames.get("Acaron.color0") == "uni01CD.color0"
+    assert postscriptNames.get("Acaron.color1") == "uni01CD.color1"
+
+    assert postscriptNames.get("caroncomb.alt") == "uni030C.alt"
+    assert postscriptNames.get("caroncomb.alt.color0") == "uni030C.alt.color0"
+    assert postscriptNames.get("caroncomb.alt.color1") == "uni030C.alt.color1"
+
+    # Color layer glyphs should not have unicode values
+    assert ufo["Acaron"].unicode == 0x01CD
+    assert ufo["Acaron.color0"].unicode is None
+    assert ufo["Acaron.color1"].unicode is None
+    assert ufo["caroncomb.alt"].unicode is None
+    assert ufo["caroncomb.alt.color0"].unicode is None
+    assert ufo["caroncomb.alt.color1"].unicode is None
+
+
 def test_glyph_color_layers_components_2(ufo_module):
     filename = os.path.join(
         os.path.dirname(__file__), "..", "data", "ColorComponents.glyphs"