archive/inter-font
Archived
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes merge issue with fontbuild

Browse source
This commit is contained in:
Rasmus Andersson 2020-03-24 10:51:46 -07:00
parent b6188f053b
commit b8de6487c8
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
misc/fontbuild
View file

@ -353,7 +353,8 @@ class Main(object):
# files # files
master_dir = outdir master_dir = outdir
glyphsfile = args.glyphsfile 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') instance_dir = pjoin(BASEDIR, 'build', 'ufo')
# load glyphs project file # load glyphs project file
@ -392,17 +393,17 @@ class Main(object):
# Workaround for Glyphs limitation # Workaround for Glyphs limitation
# (Base italic master can't be called just Italic, so it's called # (Base italic master can't be called just Italic, so it's called
# "Italic Italic" which is converted here to just "Italic") # "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.styleName = "Italic"
source.name = "italic" source.name = "italic"
source.font.info.styleName = source.styleName source.font.info.styleName = source.styleName
elif source.styleName == "Black Italic Italic": 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.styleName = "Black Italic"
source.name = "blackitalic" source.name = "blackitalic"
source.font.info.styleName = source.styleName source.font.info.styleName = source.styleName
elif source.styleName == "Thin Italic Italic": 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.styleName = "Thin Italic"
source.name = "thinitalic" source.name = "thinitalic"
source.font.info.styleName = source.styleName source.font.info.styleName = source.styleName
@ -429,7 +430,7 @@ class Main(object):
designspace.write(designspace_file) designspace.write(designspace_file)
# roman designspace # roman designspace
roman_designspace_file = pjoin(outdir, 'Inter-roman.designspace') roman_designspace_file = pjoin(outdir, name + '-roman.designspace')
p = Process( p = Process(
target=self._genSubsetDesignSpace, target=self._genSubsetDesignSpace,
args=(designspace, 'roman', roman_designspace_file) args=(designspace, 'roman', roman_designspace_file)
@ -438,7 +439,7 @@ class Main(object):
procs.append(p) procs.append(p)
# italic designspace # italic designspace
italic_designspace_file = pjoin(outdir, 'Inter-italic.designspace') italic_designspace_file = pjoin(outdir, name + '-italic.designspace')
p = Process( p = Process(
target=self._genSubsetDesignSpace, target=self._genSubsetDesignSpace,
args=(designspace, 'italic', italic_designspace_file) args=(designspace, 'italic', italic_designspace_file)