Fix color component layers

[simoncozens]

This is a tiny fix for #973. In components.py we gather a list of color layers and take the index to get the new component name, like so:

glyphsLib/Lib/glyphsLib/builder/components.py

Lines 59 to 68 in ed02363

	color_layers = [
	l for l in component_glyph.layers if l._is_color_palette_layer()
	]
	for i, l in enumerate(color_layers):
	if l._color_palette_index() == layer._color_palette_index():
	if l.layerId != l.associatedMasterId:
	# If it is not a master layer, we rename it in
	# _to_ufo_color_palette_layers(), so we reference the
	# same name here.
	component_name += f".color{i}"

We do this because we do the same operation in _to_ufo_color_palette_layers to rename the glyphs:

glyphsLib/Lib/glyphsLib/builder/color_layers.py

Lines 184 to 194 in ed02363

	for i, layer in enumerate(layers):
	if layer.components and layer.attributes:
	colorLayers.append(_to_component_paint(layer.components[0]))
	continue
	if layer.layerId == master.id:
	# This is master layer, we can re-use its UFO glyph.
	layerGlyphName = glyph.name
	else:
	# Not the master layer, create a new UFO glyph for it.
	layerGlyphName = f"{glyph.name}.color{i}"

However, the list which we take the index from there is actually built here:

glyphsLib/Lib/glyphsLib/builder/glyph.py

Lines 257 to 262 in ed02363

	layerMapping = [
	(l.layerId, l._color_palette_index())
	for l in glyph.layers
	if l._is_color_palette_layer()
	and l.associatedMasterId == layer.associatedMasterId
	]

So in components.py we need to make sure we are building the same list by also testing for l.associatedMasterId == layer.associatedMasterId.

[anthrotype]

AH! thanks!!

[anthrotype]

would be nice if we could also add that test file of yours to the test suite. Maybe just parsing it and converting to_designspace and asserting that the component names are as expected with the correct .color{i} suffix, perhaps inside tests/builder/components_test.py. Could you please add that?