From 175c54a9d1022db3755cbc1f76033ba0467c4eda Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 13 Aug 2014 18:29:11 -0400
Subject: [PATCH] [subset] allow for unicode-based name with suffixes in the
 subset list

Fixes https://github.com/behdad/fonttools/issues/133

That part of the code is becoming really messy, but I want to get
all the features in first, then clean up.
---
 Lib/fontTools/subset.py | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/Lib/fontTools/subset.py b/Lib/fontTools/subset.py
index 01ceb7301..2117b6024 100644
--- a/Lib/fontTools/subset.py
+++ b/Lib/fontTools/subset.py
@@ -2493,22 +2493,30 @@ def main(args):
       continue
     if g.startswith('uni') or g.startswith('U+'):
       if g.startswith('uni') and len(g) > 3:
-        g = g[3:]
+        n = g[3:]
       elif g.startswith('U+') and len(g) > 2:
-        g = g[2:]
-      u = int(g, 16)
-      unicodes.append(u)
-      continue
+        n = g[2:]
+      try:
+        u = int(n, 16)
+        unicodes.append(u)
+        continue
+      except ValueError: # int() failed, not hex
+        pass
     if g.startswith('gid') or g.startswith('glyph'):
       if g.startswith('gid') and len(g) > 3:
-        g = g[3:]
+        n = g[3:]
       elif g.startswith('glyph') and len(g) > 5:
-        g = g[5:]
+        n = g[5:]
       try:
-        glyphs.append(font.getGlyphName(int(g), requireReal=True))
-      except ValueError:
-        raise Exception("Invalid glyph identifier: %s" % g)
-      continue
+        try:
+          n = int(n)
+          glyphs.append(font.getGlyphName(n, requireReal=True))
+        except ValueError:
+          raise Exception("Invalid glyph identifier: %s" % g)
+        continue
+      except ValueError: # int() failed, not decimal
+        pass
+    # No way to interpret this.
     raise Exception("Invalid glyph identifier: %s" % g)
   if '' in glyphs:
     glyphs.remove([''])