From 4ee04b9735ff0d252124816c3413d37eddf204fe Mon Sep 17 00:00:00 2001 From: James Godfrey-Kittle Date: Sun, 25 Jan 2015 16:07:18 -0800 Subject: Remove references to FL (stub out missing methods) --- scripts/build-v2.py | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) (limited to 'scripts/build-v2.py') diff --git a/scripts/build-v2.py b/scripts/build-v2.py index 7002c8b..e1fdf78 100644 --- a/scripts/build-v2.py +++ b/scripts/build-v2.py @@ -2,7 +2,7 @@ import sys sys.path.insert(0,"%s/scripts/lib"%BASEDIR) -from robofab.world import RFont +from robofab.objects.objectsRF import RFont, RPoint from fontTools.misc.transform import Transform from fontbuild.Build import FontProject,swapGlyphs,transformGlyphMembers from fontbuild.mix import Mix,Master @@ -10,14 +10,12 @@ from fontbuild.italics import condenseGlyph, transformFLGlyphMembers # Masters -rg = Master("%s/src/v2/Roboto_Regular.vfb"%BASEDIR) -bd = Master("%s/src/v2/Roboto_Bold.vfb"%BASEDIR) -th = Master("%s/src/v2/Roboto_Thin.vfb"%BASEDIR) +rg = Master("%s/src/v2/Roboto_Regular.ufo"%BASEDIR) +bd = Master("%s/src/v2/Roboto_Bold.ufo"%BASEDIR) +th = Master("%s/src/v2/Roboto_Thin.ufo"%BASEDIR) # build condensed masters -condensed = Font(th.font) - lessCondensed = "plusminus \ bracketleft bracketright dieresis \ macron percent \ @@ -29,9 +27,7 @@ dotbelow colon semicolon uniFFFC uniFFFD uni0488 uni0489 ringbelow estimated".sp moreCondensed = "z Z M W A V".split() -def condenseFont(font, scale=.8, stemWidth=185): - f = RFont(font) - +def condenseFont(f, scale=.8, stemWidth=185): xscale = scale CAPS = "A B C.cn D.cn E F G.cn H I J K L M N O.cn P Q.cn R S T U.cn V W X Y Z one two three four five six seven eight nine zero".split() LC = "a.cn b.cn c.cn d.cn e.cn f g.cn h i j k l m n o.cn p.cn q.cn r s t u v w x y z".split() @@ -56,40 +52,41 @@ def condenseFont(font, scale=.8, stemWidth=185): proj = FontProject(rg.font, BASEDIR, "res/roboto.cfg", th.ffont) +''' proj.incrementBuildNumber() +''' # FAMILYNAME = "Roboto 2 DRAFT" # FAMILYNAME = "Roboto2" FAMILYNAME = "Roboto" +''' proj.buldVFBandFEA = True +''' proj.generateFont(th.font,"%s/Thin/Regular/Th"%FAMILYNAME) proj.generateFont(Mix([th,rg], 0.45),"%s/Light/Regular/Lt"%FAMILYNAME) -proj.generateFont(Mix([th,rg], Point(0.90, 0.92)),"%s/Regular/Regular/Rg"%FAMILYNAME) +proj.generateFont(Mix([th,rg], RPoint(0.90, 0.92)),"%s/Regular/Regular/Rg"%FAMILYNAME) proj.generateFont(Mix([rg,bd], 0.35),"%s/Medium/Regular/Lt"%FAMILYNAME) -proj.generateFont(Mix([rg,bd], Point(0.73, 0.73)),"%s/Bold/Bold/Rg"%FAMILYNAME) -proj.generateFont(Mix([rg,bd], Point(1.125, 1.0)),"%s/Black/Bold/Bk"%FAMILYNAME) +proj.generateFont(Mix([rg,bd], RPoint(0.73, 0.73)),"%s/Bold/Bold/Rg"%FAMILYNAME) +proj.generateFont(Mix([rg,bd], RPoint(1.125, 1.0)),"%s/Black/Bold/Bk"%FAMILYNAME) proj.generateFont(th.font,"%s/Thin Italic/Italic/Th"%FAMILYNAME, italic=True, stemWidth=80) proj.generateFont(Mix([th,rg], 0.45),"%s/Light Italic/Italic/Lt"%FAMILYNAME, italic=True, stemWidth=120) -proj.generateFont(Mix([th,rg], Point(0.90, 0.92)),"%s/Italic/Italic/Rg"%FAMILYNAME, italic=True, stemWidth=185) +proj.generateFont(Mix([th,rg], RPoint(0.90, 0.92)),"%s/Italic/Italic/Rg"%FAMILYNAME, italic=True, stemWidth=185) proj.generateFont(Mix([rg,bd], 0.35),"%s/Medium Italic/Bold Italic/Lt"%FAMILYNAME, italic=True, stemWidth=230) -proj.generateFont(Mix([rg,bd], Point(0.73, 0.73)),"%s/Bold Italic/Bold Italic/Rg"%FAMILYNAME, italic=True, stemWidth=290) -proj.generateFont(Mix([rg,bd], Point(1.125, 1.0)),"%s/Black Italic/Bold Italic/Bk"%FAMILYNAME, italic=True, stemWidth=290) +proj.generateFont(Mix([rg,bd], RPoint(0.73, 0.73)),"%s/Bold Italic/Bold Italic/Rg"%FAMILYNAME, italic=True, stemWidth=290) +proj.generateFont(Mix([rg,bd], RPoint(1.125, 1.0)),"%s/Black Italic/Bold Italic/Bk"%FAMILYNAME, italic=True, stemWidth=290) -thcn1 = Master(condenseFont(Font(th.font), .84, 40).naked()) +thcn1 = Master(condenseFont(th.font, .84, 40)) cn1 = Master( rg.ffont.addDiff(thcn1.ffont, th.ffont)) bdcn1 = Master( bd.ffont.addDiff(thcn1.ffont, th.ffont)) -proj.generateFont(Mix([thcn1,cn1], Point(0.45, 0.47)), "%s Condensed/Light/Regular/Lt"%FAMILYNAME, swapSuffixes=[".cn"]) -proj.generateFont(Mix([thcn1,cn1], Point(0.9, 0.92)), "%s Condensed/Regular/Regular/Rg"%FAMILYNAME, swapSuffixes=[".cn"]) -proj.generateFont(Mix([cn1,bdcn1], Point(0.75, 0.75)), "%s Condensed/Bold/Bold/Rg"%FAMILYNAME, swapSuffixes=[".cn"]) +proj.generateFont(Mix([thcn1,cn1], RPoint(0.45, 0.47)), "%s Condensed/Light/Regular/Lt"%FAMILYNAME, swapSuffixes=[".cn"]) +proj.generateFont(Mix([thcn1,cn1], RPoint(0.9, 0.92)), "%s Condensed/Regular/Regular/Rg"%FAMILYNAME, swapSuffixes=[".cn"]) +proj.generateFont(Mix([cn1,bdcn1], RPoint(0.75, 0.75)), "%s Condensed/Bold/Bold/Rg"%FAMILYNAME, swapSuffixes=[".cn"]) -proj.generateFont(Mix([thcn1,cn1], Point(0.45, 0.47)), "%s Condensed/Light Italic/Italic/Lt"%FAMILYNAME, italic=True, swapSuffixes=[".cn"], stemWidth=120) -proj.generateFont(Mix([thcn1,cn1], Point(0.9, 0.92)), "%s Condensed/Italic/Italic/Rg"%FAMILYNAME, italic=True, swapSuffixes=[".cn"], stemWidth=185) -proj.generateFont(Mix([cn1,bdcn1], Point(0.75, 0.75)), "%s Condensed/Bold Italic/Bold Italic/Rg"%FAMILYNAME, italic=True, swapSuffixes=[".cn"], stemWidth=240) +proj.generateFont(Mix([thcn1,cn1], RPoint(0.45, 0.47)), "%s Condensed/Light Italic/Italic/Lt"%FAMILYNAME, italic=True, swapSuffixes=[".cn"], stemWidth=120) +proj.generateFont(Mix([thcn1,cn1], RPoint(0.9, 0.92)), "%s Condensed/Italic/Italic/Rg"%FAMILYNAME, italic=True, swapSuffixes=[".cn"], stemWidth=185) +proj.generateFont(Mix([cn1,bdcn1], RPoint(0.75, 0.75)), "%s Condensed/Bold Italic/Bold Italic/Rg"%FAMILYNAME, italic=True, swapSuffixes=[".cn"], stemWidth=240) -for i in range(len(fl)): - fl.Close(0) - sys.exit(0) -- cgit v1.2.3