shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

subset: write default file extension based on --flavor or sfntVersion

Browse Source 
Fixes https://github.com/fonttools/fonttools/issues/1298
This commit is contained in:
Cosimo Lupo 2018-07-21 18:28:33 +01:00
parent a526b7170c
commit d7ac0ad359
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/fontTools/subset/__init__.py
View File

@ -3137,8 +3137,6 @@ def load_font(fontFile,
@timer("compile and save font")
def save_font(font, outfile, options):
if options.flavor and not hasattr(font, 'flavor'):
raise Exception("fonttools version does not support flavors.")
if options.with_zopfli and options.flavor == "woff":
from fontTools.ttLib import sfnt
sfnt.USE_ZOPFLI = True
@ -3215,8 +3213,7 @@ def main(args=None):
args = args[1:]
subsetter = Subsetter(options=options)
basename, extension = splitext(fontfile)
outfile = basename + '.subset' + extension
outfile = None
glyphs = []
gids = []
unicodes = []
@ -3268,6 +3265,14 @@ def main(args=None):
dontLoadGlyphNames = not options.glyph_names and not glyphs
font = load_font(fontfile, options, dontLoadGlyphNames=dontLoadGlyphNames)
if outfile is None:
basename, _ = splitext(fontfile)
if options.flavor is not None:
ext = "." + options.flavor.lower()
else:
ext = ".ttf" if font.sfntVersion == "\0\1\0\0" else ".otf"
outfile = basename + ".subset" + ext
with timer("compile glyph list"):
if wildcard_glyphs:
glyphs.extend(font.getGlyphOrder())