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

build: minor performance optimization of fontbuild

Browse source
This commit is contained in:
Rasmus Andersson 2017-11-26 14:50:06 -08:00
parent 00815d1b99
commit b57ca872d0
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
misc/pylib/fontbuild/Build.pyx
View file

@ -62,9 +62,9 @@ class FontProject:
self.builddir = "out" self.builddir = "out"
self.decompose = self.config.get("glyphs","decompose").split() self.decompose = self.config.get("glyphs","decompose").split()
self.predecompose = self.config.get("glyphs","predecompose").split() self.predecompose = self.config.get("glyphs","predecompose").split()
self.lessItalic = self.config.get("glyphs","lessitalic").split() self.lessItalic = set(self.config.get("glyphs","lessitalic").split())
self.deleteList = self.config.get("glyphs","delete").split() self.deleteList = set(self.config.get("glyphs","delete").split())
self.noItalic = self.config.get("glyphs","noitalic").split() self.noItalic = set(self.config.get("glyphs","noitalic").split())
self.buildOTF = False self.buildOTF = False
self.compatible = False self.compatible = False
@ -89,11 +89,13 @@ class FontProject:
n = names.split("/") n = names.split("/")
log("---------------------\n%s %s\n----------------------" %(n[0],n[1])) log("---------------------\n%s %s\n----------------------" %(n[0],n[1]))
if isinstance( mix, Mix): if isinstance( mix, Mix):
log(">> Mixing masters") log(">> Mixing masters")
f = mix.generateFont(self.basefont) f = mix.generateFont(self.basefont, self.deleteList)
else: else:
f = mix.copy() f = mix.copy()
deleteGlyphs(f, self.deleteList)
if italic == True: if italic == True:
log(">> Italicizing") log(">> Italicizing")
@ -166,7 +168,7 @@ class FontProject:
if not self.compatible: if not self.compatible:
cleanCurves(f) cleanCurves(f)
deleteGlyphs(f, self.deleteList) # deleteGlyphs(f, self.deleteList)
log(">> Generating font files") log(">> Generating font files")
ufoName = self.generateOutputPath(f, "ufo") ufoName = self.generateOutputPath(f, "ufo")

17
misc/pylib/fontbuild/mix.pyx
View file

@ -284,17 +284,18 @@ class Mix:
ffont.kerning = self.mixKerns() ffont.kerning = self.mixKerns()
return ffont return ffont
def generateFont(self, baseFont): def generateFont(self, baseFont, ignoreGlyphs=None):
newFont = baseFont.copy() newFont = baseFont.copy()
#self.mixStems(newFont) todo _ fix stems code #self.mixStems(newFont) todo _ fix stems code
for g in newFont: for g in newFont:
gF = self.mixGlyphs(g.name) if not ignoreGlyphs or g.name not in ignoreGlyphs:
if gF == None: gF = self.mixGlyphs(g.name)
g.mark = True if gF == None:
elif isinstance(gF, RGlyph): g.mark = True
newFont[g.name] = gF.copy() elif isinstance(gF, RGlyph):
else: newFont[g.name] = gF.copy()
gF.copyToGlyph(g) else:
gF.copyToGlyph(g)
newFont.kerning.clear() newFont.kerning.clear()
newFont.kerning.update(self.mixKerns() or {}) newFont.kerning.update(self.mixKerns() or {})