Skip to content

Commit 19dc330

Browse files
skip disabled custom parameters when glyphs=>ufo and minimal=True
Fixes #905
1 parent b331e2e commit 19dc330

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

Lib/glyphsLib/builder/custom_params.py

+13-9
Original file line numberDiff line numberDiff line change
@@ -929,15 +929,19 @@ def to_glyphs(self, glyphs, ufo):
929929

930930
def to_ufo(self, builder, glyphs, ufo):
931931
if isinstance(glyphs._owner, GSFont):
932-
glyphs_glyphOrder = glyphs[self.glyphs_name]
933-
if glyphs_glyphOrder:
934-
ufo_glyphOrder = ufo.get_lib_value(self.ufo_name)
935-
# If the custom parameter provides partial coverage we want to
936-
# append the original glyph order for uncovered glyphs.
937-
glyphs_glyphOrder += [
938-
g for g in ufo_glyphOrder if g not in glyphs_glyphOrder
939-
]
940-
ufo.set_lib_value(self.ufo_name, glyphs_glyphOrder)
932+
glyphs_glyphOrder_parameter = glyphs._get_by_name(self.glyphs_name)
933+
if not glyphs_glyphOrder_parameter:
934+
return
935+
if builder.minimal and not glyphs_glyphOrder_parameter.active:
936+
return
937+
glyphs_glyphOrder = glyphs_glyphOrder_parameter.value
938+
ufo_glyphOrder = ufo.get_lib_value(self.ufo_name)
939+
# If the custom parameter provides partial coverage we want to
940+
# append the original glyph order for uncovered glyphs.
941+
glyphs_glyphOrder += [
942+
g for g in ufo_glyphOrder if g not in glyphs_glyphOrder
943+
]
944+
ufo.set_lib_value(self.ufo_name, glyphs_glyphOrder)
941945

942946

943947
register_parameter_handler(GlyphOrderParamHandler())

0 commit comments

Comments
 (0)