tooling: adjust include? filter for glyphs, after upgrading 3rd party libraries which changed behavior

2 files changed, 8 insertions, 2 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)
 
diff --git a/misc/glyphs-scripts/assign-fallback-codepoints.py b/misc/glyphs-scripts/assign-fallback-codepoints.py
index 35b67a39a..e70b10c24 100644
--- a/misc/glyphs-scripts/assign-fallback-codepoints.py
+++ b/misc/glyphs-scripts/assign-fallback-codepoints.py
@@ -30,9 +30,9 @@ def isEmpty(g):
 def includeGlyph(g):
   if not g.export:
     return False
-  if g.name[0] == '.':
+  if g.name[0] == '.' or g.name[0] == '_':
     return False
-  if g.name.endswith(".case"):
+  if g.name.endswith(".case") or g.name.endswith(".cn"):
     return False
   # finally, return true if the glyph has no codepoint assigned
   return g.unicodes is None or len(g.unicodes) == 0