Remove responsibility from OpenTypeBuilder for creating layers for CO…

…LR fonts.
FontStruct · Jan 9, 2025 · d4de5b6 · d4de5b6
1 parent 53eb5a6
commit d4de5b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/fonthx/examples/pixelfonter/PixelFonter.hx b/src/fonthx/examples/pixelfonter/PixelFonter.hx
@@ -10,6 +10,7 @@ import fonthx.opentype.BuildOptions;
 import fonthx.services.FeatureSpecParser;
 import fonthx.opentype.OpenTypeBuilder;
 import fonthx.model.color.RGBAColor;
+import fonthx.model.font.IContourGlyph;
 using StringTools;
 using Lambda;
 
@@ -88,7 +89,13 @@ class PixelFonter {
         font.addDefaultGlyphs();
 
         if (opts.includeCOLR) {
-
+            for (i in 0...font.glyphs.length) {
+                var g:IContourGlyph = font.glyphs[i];
+                var layers = g.getLayers();
+                for (l in layers) {
+                    font.glyphs.push(l);
+                }
+            }
         }
 
         if (opts.useComposites) {

diff --git a/src/fonthx/opentype/OpenTypeBuilder.hx b/src/fonthx/opentype/OpenTypeBuilder.hx
@@ -68,16 +68,6 @@ class OpenTypeBuilder {
             return null;
         }
 
-        if (options.includeCOLR) {
-            for (i in 0...font.glyphs.length) {
-                var g:IContourGlyph = font.glyphs[i];
-                var layers = g.getLayers();
-                for (l in layers) {
-                    font.glyphs.push(l);
-                }
-            }
-        }
-
         if (options.sortGlyphs) {
             font.sortGlyphs();
         }