Allow classify_glyphs to handle its classifying function returning mo…

…re than one category
googlefonts · Nov 2, 2022 · 9b50177 · 9b50177
1 parent 236096c
commit 9b50177
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Lib/ufo2ft/util.py b/Lib/ufo2ft/util.py
@@ -294,11 +294,14 @@ def classifyGlyphs(unicodeFunc, cmap, gsub=None):
     glyphSets = {}
     neutralGlyphs = set()
     for uv, glyphName in cmap.items():
-        key = unicodeFunc(uv)
-        if key is None:
+        key_or_keys = unicodeFunc(uv)
+        if key_or_keys is None:
             neutralGlyphs.add(glyphName)
+        elif isinstance(key_or_keys, (list, set)):
+            for key in key_or_keys:
+                glyphSets.setdefault(key, set()).add(glyphName)
         else:
-            glyphSets.setdefault(key, set()).add(glyphName)
+            glyphSets.setdefault(key_or_keys, set()).add(glyphName)
 
     if gsub is not None:
         if neutralGlyphs: