From 0f86ce99399d4d9ca4ac3b337a25dd5c9404a0d7 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 22 Jul 2013 17:30:31 -0400 Subject: [PATCH] Minor --- pyotlss.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pyotlss.py b/pyotlss.py index e09f94d6a..f2d534066 100755 --- a/pyotlss.py +++ b/pyotlss.py @@ -391,6 +391,7 @@ def subset (self, glyphs): # TODO OS/2 ulUnicodeRange / ulCodePageRange? # TODO Drop unnecessary cmap subtables # TODO Drop unnecessary name entries +# TODO Drop glyph names if __name__ == '__main__': @@ -413,10 +414,10 @@ if __name__ == '__main__': glyphs = sys.argv[2:] # Always include .notdef; anything else? - if '.notdef' not in glyphs: - glyphs.append ('.notdef') + glyphs.append ('.notdef') font = fontTools.ttx.TTFont (fontfile) + font.disassembleInstructions = False names = font.getGlyphNames() # Convert to glyph names @@ -470,12 +471,6 @@ if __name__ == '__main__': if verbose: print tag, "subset empty; dropped." else: - if xml: - writer.begintag (tag) - writer.newline () - font[tag].toXML(writer, font) - writer.endtag (tag) - writer.newline () if verbose: print tag, "subsetted." @@ -484,4 +479,12 @@ if __name__ == '__main__': font.setGlyphOrder (glyphOrder) font._buildReverseGlyphOrderDict () + if xml: + for tag in font.keys(): + writer.begintag (tag) + writer.newline () + font[tag].toXML(writer, font) + writer.endtag (tag) + writer.newline () + font.save (fontfile + '.subset')