1 files changed, 30 insertions, 44 deletions

diff --git a/scripts/lib/fontbuild/Build.py b/scripts/lib/fontbuild/Build.py
index f29c727..34a672e 100644
--- a/scripts/lib/fontbuild/Build.py
+++ b/scripts/lib/fontbuild/Build.py
@@ -18,20 +18,19 @@ import os
 import sys
 
 from booleanOperations import BooleanOperationManager
+from convert_curves import fonts_to_quadratic
 from fontTools.misc.transform import Transform
 from robofab.world import OpenFont
+from ufo2ft import compileOTF, compileTTF
 
-from fontbuild.convertCurves import glyphCurvesToQuadratic
 from fontbuild.decomposeGlyph import decomposeGlyph
 from fontbuild.features import readFeatureFile, writeFeatureFile
 from fontbuild.generateGlyph import generateGlyph
 from fontbuild.instanceNames import setNamesRF
 from fontbuild.italics import italicizeGlyph
-from fontbuild.kerning import makeKernFeature
-from fontbuild.markFeature import GenerateFeature_mark
+from fontbuild.markFeature import RobotoFeatureCompiler
 from fontbuild.mitreGlyph import mitreGlyph
 from fontbuild.mix import Mix,Master,narrowFLGlyph
-from fontbuild.mkmkFeature import GenerateFeature_mkmk
 
 
 class FontProject:
@@ -68,8 +67,8 @@ class FontProject:
         self.buildnumber = self.loadBuildNumber()
         
         self.buildOTF = False
-        self.autohintOTF = False
-        self.buildTTF = False
+        self.compatible = False
+        self.generatedFonts = []
         
         
     def loadBuildNumber(self):
@@ -155,33 +154,38 @@ class FontProject:
 
         setNamesRF(f, n, foundry=self.config.get('main', 'foundry'),
                          version=self.config.get('main', 'version'))
-        cleanCurves(f)
+        if not self.compatible:
+            cleanCurves(f)
         deleteGlyphs(f, self.deleteList)
 
         if kern:
             log(">> Generating kern classes")
             readFeatureFile(f, self.ot_kerningclasses)
-            makeKernFeature(f, self.ot_kerningclasses)
 
         log(">> Generating font files")
-        GenerateFeature_mark(f)
-        GenerateFeature_mkmk(f)
         ufoName = self.generateOutputPath(f, "ufo")
         f.save(ufoName)
+        self.generatedFonts.append(ufoName)
 
         if self.buildOTF:
             log(">> Generating OTF file")
             newFont = OpenFont(ufoName)
             otfName = self.generateOutputPath(f, "otf")
-            builtSuccessfully = saveOTF(newFont, otfName, autohint=self.autohintOTF)
-            if not builtSuccessfully:
-                sys.exit(1)
+            saveOTF(newFont, otfName)
 
-            if self.buildTTF:
-                log(">> Generating TTF file")
-                import fontforge
-                otFont = fontforge.open(otfName)
-                otFont.generate(self.generateOutputPath(f, "ttf"))
+    def generateTTFs(self):
+        """Build TTF for each font generated since last call to generateTTFs."""
+
+        fonts = [OpenFont(ufo) for ufo in self.generatedFonts]
+        log(">> Converting curves to quadratic")
+        fonts_to_quadratic(fonts, self.compatible)
+
+        log(">> Generating TTF files")
+        for font in fonts:
+            ttfName = self.generateOutputPath(font, "ttf")
+            log(os.path.basename(ttfName))
+            saveOTF(font, ttfName, truetype=True)
+        self.generatedFonts = []
 
 
 def transformGlyphMembers(g, m):
@@ -266,30 +270,12 @@ def removeGlyphOverlap(glyph):
     manager.union(contours, glyph.getPointPen())
 
 
-def saveOTF(font, destFile, autohint=False):
-    """Save a RoboFab font as an OTF binary using ufo2fdk.
-
-    Returns True on success, False otherwise.
-    """
-
-    from ufo2fdk import OTFCompiler
-
-    # glyphs with multiple unicode values must be split up, due to FontTool's
-    # use of a name -> UV dictionary during cmap compilation
-    for glyph in font:
-        if len(glyph.unicodes) > 1:
-            newUV = glyph.unicodes.pop()
-            newGlyph = font.newGlyph("uni%04X" % newUV)
-            newGlyph.appendComponent(glyph.name)
-            newGlyph.unicode = newUV
-            newGlyph.width = glyph.width
-
-    compiler = OTFCompiler()
-    reports = compiler.compile(font, destFile, autohint=autohint)
-    if autohint:
-        print reports["autohint"]
-    print reports["makeotf"]
+def saveOTF(font, destFile, truetype=False):
+    """Save a RoboFab font as an OTF binary using ufo2fdk."""
 
-    successMsg = ("makeotfexe [NOTE] Wrote new font file '%s'." %
-                  os.path.basename(destFile))
-    return successMsg in reports["makeotf"]
+    if truetype:
+        compiler = compileTTF
+    else:
+        compiler = compileOTF
+    otf = compiler(font, featureCompilerClass=RobotoFeatureCompiler)
+    otf.save(destFile)