diff options
| author | Rasmus Andersson <rasmus@notion.se> | 2020-03-24 20:51:46 +0300 |
|---|---|---|
| committer | Rasmus Andersson <rasmus@notion.se> | 2020-03-24 20:51:46 +0300 |
| commit | b8de6487c8da4809e5d093ee5af7d1f77a4c0a19 (patch) | |
| tree | dcaecc451289d90a6eea79f9b49206a75e7f547b | |
| parent | b6188f053bc49fa47b79decd5217cc42dcf5e255 (diff) | |
| download | inter-b8de6487c8da4809e5d093ee5af7d1f77a4c0a19.tar.xz | |
fixes merge issue with fontbuild
| -rwxr-xr-x | misc/fontbuild | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/misc/fontbuild b/misc/fontbuild index f26e8e845..e3556f3a1 100755 --- a/misc/fontbuild +++ b/misc/fontbuild @@ -353,7 +353,8 @@ class Main(object): # files master_dir = outdir glyphsfile = args.glyphsfile - designspace_file = pjoin(outdir, 'Inter.designspace') + name = os.path.splitext(basename(glyphsfile))[0] # e.g. "Inter" + designspace_file = pjoin(outdir, name + '.designspace') instance_dir = pjoin(BASEDIR, 'build', 'ufo') # load glyphs project file @@ -392,17 +393,17 @@ class Main(object): # Workaround for Glyphs limitation # (Base italic master can't be called just Italic, so it's called # "Italic Italic" which is converted here to just "Italic") - ufo_path = pjoin(master_dir, 'Inter-Italic.ufo') + ufo_path = pjoin(master_dir, name + '-Italic.ufo') source.styleName = "Italic" source.name = "italic" source.font.info.styleName = source.styleName elif source.styleName == "Black Italic Italic": - ufo_path = pjoin(master_dir, 'Inter-BlackItalic.ufo') + ufo_path = pjoin(master_dir, name + '-BlackItalic.ufo') source.styleName = "Black Italic" source.name = "blackitalic" source.font.info.styleName = source.styleName elif source.styleName == "Thin Italic Italic": - ufo_path = pjoin(master_dir, 'Inter-ThinItalic.ufo') + ufo_path = pjoin(master_dir, name + '-ThinItalic.ufo') source.styleName = "Thin Italic" source.name = "thinitalic" source.font.info.styleName = source.styleName @@ -429,7 +430,7 @@ class Main(object): designspace.write(designspace_file) # roman designspace - roman_designspace_file = pjoin(outdir, 'Inter-roman.designspace') + roman_designspace_file = pjoin(outdir, name + '-roman.designspace') p = Process( target=self._genSubsetDesignSpace, args=(designspace, 'roman', roman_designspace_file) @@ -438,7 +439,7 @@ class Main(object): procs.append(p) # italic designspace - italic_designspace_file = pjoin(outdir, 'Inter-italic.designspace') + italic_designspace_file = pjoin(outdir, name + '-italic.designspace') p = Process( target=self._genSubsetDesignSpace, args=(designspace, 'italic', italic_designspace_file) |