X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=scripts%2Fmakefont.py;h=24ae15a450bc50c4c4f3c37a356f533398c2ad19;hp=11d83794205cebad76b5526e088aa16d0d022df5;hb=6a832fe1771f8c7bca0faa0d383fbbab062a1c56;hpb=355e3a068ea4ad6a7d3ab9318b3ce74b7f0b0b15

diff --git a/scripts/makefont.py b/scripts/makefont.py
index 11d83794..24ae15a4 100755
--- a/scripts/makefont.py
+++ b/scripts/makefont.py
@@ -1,44 +1,87 @@
 #!/usr/bin/python
 
+caps = [ord(c) for c in "ABCDEFGHIKLMNOPRSTUVWXYZ"]
+xchars = [ord(c) for c in "acemnorsuvwxz"]
+
 def convert_def(fn):
 	src = file(fn)
 
+	result = ""
+	glyphs = {}
+	metrics = {}
+	kerning = []
+	codes = {}
+	cap_height = []
+	x_height = []
 	for line in src.readlines():
 		line = line.strip()
 		if not line or line[0]=='#':
 			continue
 
 		parts = line.split()
+		values = map(int, parts[1:])
 
 		if parts[0]=="font":
 			tw, th, fh, fa, fd = map(int, parts[1:])
-			result = "native_size %d;\n"%fh
+			result += "native_size %d;\n"%fh
 			result += "ascent %.3f;\n"%(float(fa)/fh)
 			result += "descent %.3f;\n"%(float(fd)/fh)
+		elif parts[0]=="code":
+			c, n = map(int, parts[1:])
+			codes[c] = n
+		elif parts[0]=="metrics":
+			metrics[values[0]] = values[1:]
 		elif parts[0]=="glyph":
-			g, x, y, w, h, ox, oy, a = map(int, parts[1:])
-			result += "glyph %d\n{\n"%g
-			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)/fh, float(oy)/fh)
-			result += "\tadvance %.3f;\n"%(float(a)/fh)
-			result += "};\n"
+			glyphs[values[0]] = values[1:]
 		elif parts[0]=="kern":
-			l, r, d = map(int, parts[1:])
-			result += "kerning %d %d %.3f;\n"%(l, r, float(d)/fh)
+			kerning.append(values)
+
+	for c, n in codes.iteritems():
+		h = metrics[n][1]
+		if c in caps:
+			cap_height.append(h)
+		elif c in xchars:
+			x_height.append(h)
+
+	if cap_height:
+		cap_height.sort()
+		result += "cap_height %.3f;\n"%(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)
+
+	for c, n in codes.iteritems():
+		_, _, 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 += "};\n"
+
+	for k in kerning:
+		l, r, d = k
+		result += "kerning %d %d %.3f;\n"%(l, r, float(d)/fh)
 
 	return result
 
-def make_font(fn, size):
+def make_font(fn, size, ch_ranges, autohinter, margin, padding, distfield):
 	import maketex
 	import os
 
-	if os.system("ttf2png \"%s\" -o makefont-tmp.png -d makefont-tmp.def -t -p -s %d"%(fn, size)):
+	cmd = "ttf2png \"%s\" -o makefont-tmp.png -d makefont-tmp.def -t -p -s %d -m %d -n %d -g"%(fn, size, margin, padding)
+	for r in ch_ranges:
+		cmd += " -r %d,%d"%r
+	if autohinter:
+		cmd += " -a"
+	if distfield:
+		cmd += " -f %d"%distfield
+	if os.system(cmd):
 		raise Exception("Could not execute ttf2png")
 
 	result = "texture\n{\n"
-	result += "wrap CLAMP_TO_EDGE;\n"
-	result += maketex.make_tex("makefont-tmp.png")
+	result += maketex.make_tex("makefont-tmp.png", wrap="CLAMP_TO_EDGE")
 	result += "};\n"
 	result += convert_def("makefont-tmp.def")
 
@@ -47,12 +90,24 @@ def make_font(fn, size):
 
 	return result
 
+def parse_range(s):
+	return tuple(map(int, s.split(',', 1)))
+
 if __name__=="__main__":
 	import sys
+	import argparse
+
+	parser = argparse.ArgumentParser()
+	parser.add_argument("-s", "--size", default=10, type=int, metavar="NUM", help="Font size in pixels")
+	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", 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()
 
-	if len(sys.argv)<4:
-		import os
-		print "Usage: %s <font.ttf> <outfile> <size>"%os.path.basename(sys.argv[0])
-	else:
-		out = file(sys.argv[2], "w")
-		out.write(make_font(sys.argv[1], int(sys.argv[3])))
+	out = file(args.outfile, "w")
+	out.write(make_font(args.ttf, args.size, args.range, args.autohinter, args.margin, args.padding, args.distfield))