[dehinter.font] modify handling of glyf table instruction set removal in composite glyphs

Author: chrissimpkins

lib/dehinter/font.py

@@ -131,8 +131,12 @@ def remove_glyf_instructions(tt):
     for glyph in tt["glyf"].glyphs.values():
         glyph.expand(tt["glyf"])
         if hasattr(glyph, "program") and glyph.program.bytecode != array.array("B", []):
-            glyph.program.bytecode = array.array("B", [])
-            glyph_number += 1
+            if glyph.isComposite():
+                del glyph.program
+                glyph_number += 1
+            else:
+                glyph.program.bytecode = array.array("B", [])
+                glyph_number += 1
     return glyph_number
 
 

tests/test_main.py

@@ -24,6 +24,8 @@ def font_validator(filepath):
     assert "TTFA" not in tt
     for glyph in tt["glyf"].glyphs.values():
         glyph.expand(tt["glyf"])
+        if glyph.isComposite():
+            assert not hasattr(glyph, "program")
         if hasattr(glyph, "program"):
             assert glyph.program.bytecode == array.array("B", [])
     assert tt["gasp"].gaspRange == {65535: 15}