From cfd5c2b4f83887f36398553de3cb11216b7e0079 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Sun, 20 Mar 2011 08:29:53 +0100 Subject: [PATCH] More font improvements --- libol/laserfont.svg | 331 +++++++++++++++++++++++++++++++++++++++++++- tools/genfont.py | 6 +- 2 files changed, 333 insertions(+), 4 deletions(-) diff --git a/libol/laserfont.svg b/libol/laserfont.svg index 49153f0..d48f523 100644 --- a/libol/laserfont.svg +++ b/libol/laserfont.svg @@ -369,13 +369,13 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" - inkscape:cx="312.11336" - inkscape:cy="357.34944" + inkscape:cx="393.02163" + inkscape:cy="181.37638" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1912" - inkscape:window-height="1005" + inkscape:window-height="1003" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -1475,5 +1475,330 @@ d="m 670,804.99998 c 0,19.32996 -8.95431,35 -20,35 -11.04569,0 -20,-15.67004 -20,-35 0,-19.32996 8.95431,-35 20,-35 11.04569,0 20,15.67004 20,35 z" id="path4951" inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/genfont.py b/tools/genfont.py index 92557cd..5785e95 100644 --- a/tools/genfont.py +++ b/tools/genfont.py @@ -426,7 +426,11 @@ for id, x, y, w, h in handler.rects: output += "\nstatic const FontChar font_chars[256] = {\n" for chrval, width, sym in cdefs: - output += "\t['%s'] = {%8.4f, %s},\n"%(chr(chrval),width,sym) + if chrval < 0x7f and chrval != 0x27: + cv = "'%s'"%chr(chrval) + else: + cv = "0x%02x"%chrval + output += "\t[%s] = {%8.4f, %s},\n"%(cv,width,sym) output += "};\n\n" -- 2.52.0