X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=scripts%2Fmakefont.py;h=1d7a4332906a55e02dc0df2f8009648b4ee6408b;hb=5b539e1264a2a1342ee955ca0da978e48faf6f8f;hp=9a23957130da6920c50bff9cc06e25e63dc89a96;hpb=89d3d10b75a42f86b224feb00b20283af66c0b01;p=libs%2Fgl.git

diff --git a/scripts/makefont.py b/scripts/makefont.py
index 9a239571..1d7a4332 100755
--- a/scripts/makefont.py
+++ b/scripts/makefont.py
@@ -1,8 +1,15 @@
 #!/usr/bin/python
 
+caps = list(range(ord("A"), ord("Z")+1))
+xchars = [ord(c) for c in "acemnorsuvwxz"]
+
 def convert_def(fn):
 	src = file(fn)
 
+	result = ""
+	header = ""
+	cap_height = []
+	x_height = []
 	for line in src.readlines():
 		line = line.strip()
 		if not line or line[0]=='#':
@@ -12,9 +19,9 @@ def convert_def(fn):
 
 		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)
+			header += "native_size %d;\n"%fh
+			header += "ascent %.3f;\n"%(float(fa)/fh)
+			header += "descent %.3f;\n"%(float(fd)/fh)
 		elif parts[0]=="glyph":
 			g, x, y, w, h, ox, oy, a = map(int, parts[1:])
 			result += "glyph %d\n{\n"%g
@@ -23,17 +30,29 @@ def convert_def(fn):
 			result += "\toffset %.3f %.3f;\n"%(float(ox)/fh, float(oy)/fh)
 			result += "\tadvance %.3f;\n"%(float(a)/fh)
 			result += "};\n"
+
+			if g in caps:
+				cap_height.append(h)
+			elif g in xchars:
+				x_height.append(h)
 		elif parts[0]=="kern":
 			l, r, d = map(int, parts[1:])
 			result += "kerning %d %d %.3f;\n"%(l, r, float(d)/fh)
 
-	return result
+	if cap_height:
+		header += "cap_height %.3f;\n"%(float(cap_height[len(cap_height)*2/3])/fh)
+	if x_height:
+		header += "x_height %.3f;\n"%(float(x_height[len(x_height)*2/3])/fh)
 
-def make_font(fn, size, autohinter, margin, padding):
+	return header+result
+
+def make_font(fn, size, ch_range, autohinter, margin, padding):
 	import maketex
 	import os
 
 	cmd = "ttf2png \"%s\" -o makefont-tmp.png -d makefont-tmp.def -t -p -s %d -m %d -n %d"%(fn, size, margin, padding)
+	if ch_range:
+		cmd += " -r %d,%d"%ch_range
 	if autohinter:
 		cmd += " -a"
 	if os.system(cmd):
@@ -49,6 +68,9 @@ def make_font(fn, size, autohinter, margin, padding):
 
 	return result
 
+def parse_range(s):
+	return tuple(map(int, s.split(',', 1)))
+
 if __name__=="__main__":
 	import sys
 	import argparse
@@ -58,10 +80,11 @@ 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("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.write(make_font(args.ttf, args.size, args.autohinter, args.margin, args.padding))
+	out.write(make_font(args.ttf, args.size, args.range, args.autohinter, args.margin, args.padding))