From ae563ebc21543a17633ee66772617b0cd1162f36 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 May 2013 22:05:47 +0000 Subject: amiri (28may13) git-svn-id: svn://tug.org/texlive/trunk@30781 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/amiri/tools/build.py | 19 ++++--------------- Master/texmf-dist/doc/fonts/amiri/tools/runtest.py | 13 +++++++++---- 2 files changed, 13 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/doc/fonts/amiri/tools') diff --git a/Master/texmf-dist/doc/fonts/amiri/tools/build.py b/Master/texmf-dist/doc/fonts/amiri/tools/build.py index 0b46ef547db..58d37a2d107 100755 --- a/Master/texmf-dist/doc/fonts/amiri/tools/build.py +++ b/Master/texmf-dist/doc/fonts/amiri/tools/build.py @@ -186,7 +186,7 @@ def makeCss(infiles, outfile): out.write(css) out.close() -def generateFont(font, outfile, hack=False): +def generateFont(font, outfile): flags = ("opentype", "dummy-dsig", "round", "omit-instructions") font.selection.all() @@ -196,18 +196,7 @@ def generateFont(font, outfile, hack=False): # fix some common font issues validateGlyphs(font) - if hack: - # ff takes long to write the file, so generate to tmp file then rename - # it to keep fontview happy - import subprocess - tmpout = mkstemp(dir=".", suffix=os.path.basename(outfile))[1] - font.generate(tmpout, flags=flags) - #os.rename(tmpout, outfile) # file monitor will not see this, why? - p = subprocess.Popen("cat %s > %s" %(tmpout, outfile), shell=True) - p.wait() - os.remove(tmpout) - else: - font.generate(outfile, flags=flags) + font.generate(outfile, flags=flags) font.close() def drawOverUnderline(font, name, uni, glyphclass, pos, thickness, width): @@ -257,7 +246,7 @@ def makeOverUnderline(font, over=True, under=True, o_pos=None, u_pos=None): markset = "%s %s" %(over and o_base.glyphname or "", under and u_base.glyphname or "") - font.addMarkSet("OverUnderSet", markset) + font.addMarkClass("OverUnderSet", markset) context_lookup_name = 'OverUnderLine' font.addLookup(context_lookup_name, 'gsub_contextchain', ('OverUnderSet'), (('mark', script_lang),), font.gsub_lookups[-1]) @@ -816,7 +805,7 @@ def makeDesktop(infile, outfile, feafile, version, latin=True, generate=True): mergeFeatures(font, feafile) if generate: - generateFont(font, outfile, True) + generateFont(font, outfile) else: return font diff --git a/Master/texmf-dist/doc/fonts/amiri/tools/runtest.py b/Master/texmf-dist/doc/fonts/amiri/tools/runtest.py index d2f6e2c888f..86e663246cf 100755 --- a/Master/texmf-dist/doc/fonts/amiri/tools/runtest.py +++ b/Master/texmf-dist/doc/fonts/amiri/tools/runtest.py @@ -33,12 +33,12 @@ def runTest(test, font, positions): return passed, failed -def initTest(test, font): +def initTest(test, font, positions): out = "" for row in test: text = row[4] row[4] = ('\\' in row[4]) and row[4].decode('unicode-escape') or row[4] - result = runHB(row, font) + result = runHB(row, font, positions) out += "%s;%s;%s\n" %(";".join(row[:4]), text, result) return out @@ -69,11 +69,16 @@ if __name__ == '__main__': fontname = 'amiri-regular.ttf' outname = testname+".test" outfd = open(outname, "w") - outfd.write(initTest(test, fontname)) + outfd.write(initTest(test, fontname, positions)) outfd.close() sys.exit(0) - for style in ('regular', 'bold', 'slanted', 'boldslanted'): + if positions: + styles = ('regular', ) + else: + styles = ('regular', 'bold', 'slanted', 'boldslanted') + + for style in styles: fontname = 'amiri-%s.ttf' % style passed, failed = runTest(test, fontname, positions) message = "%s: font '%s', %d passed, %d failed" %(os.path.basename(testname), -- cgit v1.2.3