1 files changed, 6 insertions, 0 deletions
diff --git a/misc/fontbuild b/misc/fontbuild
index c649fc5e1..d51bb48df 100755
--- a/misc/fontbuild
+++ b/misc/fontbuild
@@ -286,16 +286,22 @@ class Main(object):
 
     # process glyphs
     glyphOrder = OrderedDict([(k,None) for k in font.lib['public.glyphOrder']])
+    rmglyphs = []
     for g in font:
       if not g.lib.get('com.schriftgestaltung.Glyphs.Export', True):
         if g.name in glyphOrder:
           del(glyphOrder[g.name])
+        rmglyphs.append(g.name)
         g.unicodes = []
+        continue
       if EXCLUDE_ANCHORS:
         g.clearAnchors()
       if 'com.schriftgestaltung.Glyphs.lastChange' in g.lib:
         del(g.lib['com.schriftgestaltung.Glyphs.lastChange'])
 
+    for gname in rmglyphs:
+      del(font[gname])
+
     # update possibly modified glyphorder
     font.lib['public.glyphOrder'] = list(glyphOrder)