Rename Pipeline to Sequence

[libs/gl.git] / scripts / makefont.py

diff --git a/scripts/makefont.py b/scripts/makefont.py
index eb2c997a9e7921509a50772faa1d74c13497d30f..aab4e19da83b6074f9f3430148dee0673c54eade 100755 (executable)
--- a/scripts/makefont.py
+++ b/scripts/makefont.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 caps = [ord(c) for c in "ABCDEFGHIKLMNOPRSTUVWXYZ"]
 xchars = [ord(c) for c in "acemnorsuvwxz"]
 
 def convert_def(fn):
-       src = file(fn)
+       src = open(fn)
 
        result = ""
        glyphs = {}
@@ -19,15 +19,15 @@ def convert_def(fn):
                        continue
 
                parts = line.split()
-               values = map(int, parts[1:])
+               values = tuple(map(int, parts[1:]))
 
                if parts[0]=="font":
                        tw, th, fh, fa, fd = map(int, parts[1:])
-                       result += "native_size %d;\n"%fh
-                       result += "ascent %.3f;\n"%(float(fa)/fh)
-                       result += "descent %.3f;\n"%(float(fd)/fh)
+                       result += "native_size {};\n".format(fh)
+                       result += "ascent {:.3f};\n".format(float(fa)/fh)
+                       result += "descent {:.3f};\n".format(float(fd)/fh)
                elif parts[0]=="code":
-                       c, n = map(int, parts[1:])
+                       c, n = tuple(map(int, parts[1:]))
                        codes[c] = n
                elif parts[0]=="metrics":
                        metrics[values[0]] = values[1:]
@@ -36,7 +36,7 @@ def convert_def(fn):
                elif parts[0]=="kern":
                        kerning.append(values)
 
-       for c, n in codes.iteritems():
+       for c, n in codes.items():
                h = metrics[n][1]
                if c in caps:
                        cap_height.append(h)
@@ -45,43 +45,44 @@ def convert_def(fn):
 
        if cap_height:
                cap_height.sort()
-               result += "cap_height %.3f;\n"%(float(cap_height[len(cap_height)*2/3])/fh)
+               result += "cap_height {:.3f};\n".format(float(cap_height[len(cap_height)*2//3])/fh)
        if x_height:
                x_height.sort()
-               result += "x_height %.3f;\n"%(float(x_height[len(x_height)*2/3])/fh)
+               result += "x_height {:.3f};\n".format(float(x_height[len(x_height)*2//3])/fh)
 
-       for c, n in codes.iteritems():
+       for c, n in codes.items():
                _, _, ox, oy, a = metrics[n]
                x, y, w, h, b = glyphs[n]
-               result += "glyph %d\n{\n"%c
-               result += "\ttexcoords %f %f %f %f;\n"%(float(x)/tw, float(th-y-h)/th, float(x+w)/tw, float(th-y)/th)
-               result += "\tsize %.3f %.3f;\n"%(float(w)/fh, float(h)/fh)
-               result += "\toffset %.3f %.3f;\n"%(float(ox-b)/fh, float(oy-b)/fh)
-               result += "\tadvance %.3f;\n"%(float(a)/fh)
+               result += "glyph {}\n{{\n".format(c)
+               result += "\ttexcoords {} {} {} {};\n".format(float(x)/tw, float(th-y-h)/th, float(x+w)/tw, float(th-y)/th)
+               result += "\tsize {:.3f} {:.3f};\n".format(float(w)/fh, float(h)/fh)
+               result += "\toffset {:.3f} {:.3f};\n".format(float(ox-b)/fh, float(oy-b)/fh)
+               result += "\tadvance {:.3f};\n".format(float(a)/fh)
                result += "};\n"
 
        for k in kerning:
                l, r, d = k
-               result += "kerning %d %d %.3f;\n"%(l, r, float(d)/fh)
+               result += "kerning {} {} {:.3f};\n".format(l, r, float(d)/fh)
 
        return result
 
-def make_font(fn, size, ch_range, autohinter, margin, padding, distfield):
+def make_font(fn, size, ch_ranges, autohinter, margin, padding, distfield):
        import maketex
        import os
 
-       cmd = "ttf2png \"%s\" -o makefont-tmp.png -d makefont-tmp.def -t -p -s %d -m %d -n %d -g"%(fn, size, margin, padding)
-       if ch_range:
-               cmd += " -r %d,%d"%ch_range
+       cmd = "ttf2png \"{}\" -o makefont-tmp.png -d makefont-tmp.def -t -p -s {} -m {} -n {} -g".format(fn, size, margin, padding)
+       if ch_ranges:
+               for r in ch_ranges:
+                       cmd += " -r {},{}".format(*r)
        if autohinter:
                cmd += " -a"
        if distfield:
-               cmd += " -f %d"%distfield
+               cmd += " -f {}".format(distfield)
        if os.system(cmd):
                raise Exception("Could not execute ttf2png")
 
        result = "texture\n{\n"
-       result += maketex.make_tex("makefont-tmp.png", wrap="CLAMP_TO_EDGE")
+       result += maketex.make_tex("makefont-tmp.png")
        result += "};\n"
        result += convert_def("makefont-tmp.def")
 
@@ -102,12 +103,12 @@ if __name__=="__main__":
        parser.add_argument("-a", "--autohinter", action="store_const", const=True, default=False, help="Force autohinter")
        parser.add_argument("-m", "--margin", default=0, type=int, metavar="NUM", help="Margin around image edge in pixels")
        parser.add_argument("-n", "--padding", default=1, type=int, metavar="NUM", help="Padding between glyphs in pixels")
-       parser.add_argument("-r", "--range", type=parse_range, metavar="START,END", help="Range of code points to include")
+       parser.add_argument("-r", "--range", action="append", type=parse_range, metavar="START,END", help="Range of code points to include")
        parser.add_argument("-f", "--distfield", default=0, type=int, metavar="NUM", help="Produce a distance field texture")
        parser.add_argument("ttf", metavar="font.ttf", help="TrueType file to read")
        parser.add_argument("outfile", help="MspGL font file to write")
 
        args = parser.parse_args()
 
-       out = file(args.outfile, "w")
+       out = open(args.outfile, "w")
        out.write(make_font(args.ttf, args.size, args.range, args.autohinter, args.margin, args.padding, args.distfield))