From 53ddf6da91536bfe4f09778a31c77c7d30f6ee35 Mon Sep 17 00:00:00 2001 From: James Godfrey-Kittle Date: Mon, 21 Sep 2015 11:24:06 -0700 Subject: Rename decomposeGlyph's recursive helper function. --- scripts/lib/fontbuild/decomposeGlyph.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'scripts/lib/fontbuild') diff --git a/scripts/lib/fontbuild/decomposeGlyph.py b/scripts/lib/fontbuild/decomposeGlyph.py index 94b9404..8cab1b4 100644 --- a/scripts/lib/fontbuild/decomposeGlyph.py +++ b/scripts/lib/fontbuild/decomposeGlyph.py @@ -2,17 +2,18 @@ def decomposeGlyph(font, glyphName): """Moves the components of a glyph to its outline.""" glyph = font[glyphName] - decompose(font, glyph, glyph, (0, 0), (1, 1)) + deepCopyContours(font, glyph, glyph, (0, 0), (1, 1)) glyph.clearComponents() -def decompose(font, parent, component, offset, scale): +def deepCopyContours(font, parent, component, offset, scale): """Copy contours to parent from component, including nested components.""" for nested in component.components: - decompose(font, parent, font[nested.baseGlyph], - (offset[0] + nested.offset[0], offset[1] + nested.offset[1]), - (scale[0] * nested.scale[0], scale[1] * nested.scale[1])) + deepCopyContours( + font, parent, font[nested.baseGlyph], + (offset[0] + nested.offset[0], offset[1] + nested.offset[1]), + (scale[0] * nested.scale[0], scale[1] * nested.scale[1])) if component == parent: return -- cgit v1.2.3