Directly use FOP fonts to lay out SVG images for PDF, PS and AFP outputs.

The metrics are now taken from FOP configured fonts and no longer from AWT equivalents. That avoids discrepancies in case AWT and FOP use slightly different fonts, or if the font is not installed on the system. That actually also avoids having to install the font on the system. FOP is also used for the primary layout of text (prior to SVG-specific transforms like translation or rotation) for consistency between SVG and XSL-FO. This is a joint work from Peter Hancock and myself. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_FopFontsForSVG@1508208 13f79535-47bb-0310-9956-ffa450edef68
author: Vincent Hennebert <vhennebert@apache.org> 2013-07-29 21:45:20 +0000
committer: Vincent Hennebert <vhennebert@apache.org> 2013-07-29 21:45:20 +0000
commit: f8e822efe1de8bd8192dbb8ff035b9a79f876614 (patch)
tree: 8d38f873dd101e6ed0c2ba3b4dfa29e1eb0fdc60 /src/codegen
parent: c0b99ad44d0e1409008886e2f687c46f4ac05d9d (diff)
download: xmlgraphics-fop-f8e822efe1de8bd8192dbb8ff035b9a79f876614.tar.gz
xmlgraphics-fop-f8e822efe1de8bd8192dbb8ff035b9a79f876614.zip
15 files changed, 3233 insertions, 3318 deletions
diff --git a/src/codegen/fonts/Courier.xml b/src/codegen/fonts/Courier.xml
index be977e22e..075699427 100644
--- a/src/codegen/fonts/Courier.xml
+++ b/src/codegen/fonts/Courier.xml
@@ -22,275 +22,246 @@
    <family-name>Courier</family-name>
    <class-name>Courier</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>562</cap-height>
    <x-height>426</x-height>
    <ascender>629</ascender>
    <descender>-157</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="600"/>
-      <char name="AE" width="600"/>
-      <char name="Aacute" width="600"/>
-      <char name="Acircumflex" width="600"/>
-      <char name="Adieresis" width="600"/>
-      <char name="Agrave" width="600"/>
-      <char name="Aring" width="600"/>
-      <char name="Atilde" width="600"/>
-      <char name="B" width="600"/>
-      <char name="C" width="600"/>
-      <char name="Ccedilla" width="600"/>
-      <char name="D" width="600"/>
-      <char name="E" width="600"/>
-      <char name="Eacute" width="600"/>
-      <char name="Ecircumflex" width="600"/>
-      <char name="Edieresis" width="600"/>
-      <char name="Egrave" width="600"/>
-      <char name="Eth" width="600"/>
-      <char name="Euro" width="600"/>
-      <char name="F" width="600"/>
-      <char name="G" width="600"/>
-      <char name="Gcaron" width="600"/>
-      <char name="H" width="600"/>
-      <char name="I" width="600"/>
-      <char name="IJ" width="600"/>
-      <char name="Iacute" width="600"/>
-      <char name="Icircumflex" width="600"/>
-      <char name="Idieresis" width="600"/>
-      <char name="Idot" width="600"/>
-      <char name="Igrave" width="600"/>
-      <char name="J" width="600"/>
-      <char name="K" width="600"/>
-      <char name="L" width="600"/>
-      <char name="LL" width="600"/>
-      <char name="Lslash" width="600"/>
-      <char name="M" width="600"/>
-      <char name="N" width="600"/>
-      <char name="Ntilde" width="600"/>
-      <char name="O" width="600"/>
-      <char name="OE" width="600"/>
-      <char name="Oacute" width="600"/>
-      <char name="Ocircumflex" width="600"/>
-      <char name="Odieresis" width="600"/>
-      <char name="Ograve" width="600"/>
-      <char name="Oslash" width="600"/>
-      <char name="Otilde" width="600"/>
-      <char name="P" width="600"/>
-      <char name="Q" width="600"/>
-      <char name="R" width="600"/>
-      <char name="S" width="600"/>
-      <char name="Scaron" width="600"/>
-      <char name="Scedilla" width="600"/>
-      <char name="T" width="600"/>
-      <char name="Thorn" width="600"/>
-      <char name="U" width="600"/>
-      <char name="Uacute" width="600"/>
-      <char name="Ucircumflex" width="600"/>
-      <char name="Udieresis" width="600"/>
-      <char name="Ugrave" width="600"/>
-      <char name="V" width="600"/>
-      <char name="W" width="600"/>
-      <char name="X" width="600"/>
-      <char name="Y" width="600"/>
-      <char name="Yacute" width="600"/>
-      <char name="Ydieresis" width="600"/>
-      <char name="Z" width="600"/>
-      <char name="Zcaron" width="600"/>
-      <char name="a" width="600"/>
-      <char name="aacute" width="600"/>
-      <char name="acircumflex" width="600"/>
-      <char name="acute" width="600"/>
-      <char name="adieresis" width="600"/>
-      <char name="ae" width="600"/>
-      <char name="agrave" width="600"/>
-      <char name="ampersand" width="600"/>
-      <char name="aring" width="600"/>
-      <char name="arrowboth" width="600"/>
-      <char name="arrowdown" width="600"/>
-      <char name="arrowleft" width="600"/>
-      <char name="arrowright" width="600"/>
-      <char name="arrowup" width="600"/>
-      <char name="asciicircum" width="600"/>
-      <char name="asciitilde" width="600"/>
-      <char name="asterisk" width="600"/>
-      <char name="at" width="600"/>
-      <char name="atilde" width="600"/>
-      <char name="b" width="600"/>
-      <char name="backslash" width="600"/>
-      <char name="bar" width="600"/>
-      <char name="braceleft" width="600"/>
-      <char name="braceright" width="600"/>
-      <char name="bracketleft" width="600"/>
-      <char name="bracketright" width="600"/>
-      <char name="breve" width="600"/>
-      <char name="brokenbar" width="600"/>
-      <char name="bullet" width="600"/>
-      <char name="c" width="600"/>
-      <char name="caron" width="600"/>
-      <char name="ccedilla" width="600"/>
-      <char name="cedilla" width="600"/>
-      <char name="cent" width="600"/>
-      <char name="center" width="600"/>
-      <char name="circumflex" width="600"/>
-      <char name="colon" width="600"/>
-      <char name="comma" width="600"/>
-      <char name="copyright" width="600"/>
-      <char name="currency" width="600"/>
-      <char name="d" width="600"/>
-      <char name="dagger" width="600"/>
-      <char name="daggerdbl" width="600"/>
-      <char name="dectab" width="600"/>
-      <char name="degree" width="600"/>
-      <char name="dieresis" width="600"/>
-      <char name="divide" width="600"/>
-      <char name="dollar" width="600"/>
-      <char name="dotaccent" width="600"/>
-      <char name="dotlessi" width="600"/>
-      <char name="down" width="600"/>
-      <char name="e" width="600"/>
-      <char name="eacute" width="600"/>
-      <char name="ecircumflex" width="600"/>
-      <char name="edieresis" width="600"/>
-      <char name="egrave" width="600"/>
-      <char name="eight" width="600"/>
-      <char name="ellipsis" width="600"/>
-      <char name="emdash" width="600"/>
-      <char name="endash" width="600"/>
-      <char name="equal" width="600"/>
-      <char name="eth" width="600"/>
-      <char name="exclam" width="600"/>
-      <char name="exclamdown" width="600"/>
-      <char name="f" width="600"/>
-      <char name="fi" width="600"/>
-      <char name="five" width="600"/>
-      <char name="fl" width="600"/>
-      <char name="florin" width="600"/>
-      <char name="format" width="600"/>
-      <char name="four" width="600"/>
-      <char name="fraction" width="600"/>
-      <char name="g" width="600"/>
-      <char name="gcaron" width="600"/>
-      <char name="germandbls" width="600"/>
-      <char name="grave" width="600"/>
-      <char name="graybox" width="600"/>
-      <char name="greater" width="600"/>
-      <char name="guillemotleft" width="600"/>
-      <char name="guillemotright" width="600"/>
-      <char name="guilsinglleft" width="600"/>
-      <char name="guilsinglright" width="600"/>
-      <char name="h" width="600"/>
-      <char name="hungarumlaut" width="600"/>
-      <char name="hyphen" width="600"/>
-      <char name="i" width="600"/>
-      <char name="iacute" width="600"/>
-      <char name="icircumflex" width="600"/>
-      <char name="idieresis" width="600"/>
-      <char name="igrave" width="600"/>
-      <char name="ij" width="600"/>
-      <char name="indent" width="600"/>
-      <char name="j" width="600"/>
-      <char name="k" width="600"/>
-      <char name="l" width="600"/>
-      <char name="largebullet" width="600"/>
-      <char name="left" width="600"/>
-      <char name="less" width="600"/>
-      <char name="lira" width="600"/>
-      <char name="ll" width="600"/>
-      <char name="logicalnot" width="600"/>
-      <char name="lslash" width="600"/>
-      <char name="m" width="600"/>
-      <char name="macron" width="600"/>
-      <char name="merge" width="600"/>
-      <char name="minus" width="600"/>
-      <char name="mu" width="600"/>
-      <char name="multiply" width="600"/>
-      <char name="n" width="600"/>
-      <char name="nine" width="600"/>
-      <char name="notegraphic" width="600"/>
-      <char name="ntilde" width="600"/>
-      <char name="numbersign" width="600"/>
-      <char name="o" width="600"/>
-      <char name="oacute" width="600"/>
-      <char name="ocircumflex" width="600"/>
-      <char name="odieresis" width="600"/>
-      <char name="oe" width="600"/>
-      <char name="ogonek" width="600"/>
-      <char name="ograve" width="600"/>
-      <char name="one" width="600"/>
-      <char name="onehalf" width="600"/>
-      <char name="onequarter" width="600"/>
-      <char name="onesuperior" width="600"/>
-      <char name="ordfeminine" width="600"/>
-      <char name="ordmasculine" width="600"/>
-      <char name="oslash" width="600"/>
-      <char name="otilde" width="600"/>
-      <char name="overscore" width="600"/>
-      <char name="p" width="600"/>
-      <char name="paragraph" width="600"/>
-      <char name="parenleft" width="600"/>
-      <char name="parenright" width="600"/>
-      <char name="percent" width="600"/>
-      <char name="period" width="600"/>
-      <char name="periodcentered" width="600"/>
-      <char name="perthousand" width="600"/>
-      <char name="plus" width="600"/>
-      <char name="plusminus" width="600"/>
-      <char name="prescription" width="600"/>
-      <char name="q" width="600"/>
-      <char name="question" width="600"/>
-      <char name="questiondown" width="600"/>
-      <char name="quotedbl" width="600"/>
-      <char name="quotedblbase" width="600"/>
-      <char name="quotedblleft" width="600"/>
-      <char name="quotedblright" width="600"/>
-      <char name="quoteleft" width="600"/>
-      <char name="quoteright" width="600"/>
-      <char name="quotesinglbase" width="600"/>
-      <char name="quotesingle" width="600"/>
-      <char name="r" width="600"/>
-      <char name="registered" width="600"/>
-      <char name="return" width="600"/>
-      <char name="ring" width="600"/>
-      <char name="s" width="600"/>
-      <char name="scaron" width="600"/>
-      <char name="scedilla" width="600"/>
-      <char name="section" width="600"/>
-      <char name="semicolon" width="600"/>
-      <char name="seven" width="600"/>
-      <char name="six" width="600"/>
-      <char name="slash" width="600"/>
-      <char name="space" width="600"/>
+    <char-metrics>
+      <char name="A" width="600" llx="3" lly="0" urx="597" ury="562"/>
+      <char name="AE" width="600" llx="3" lly="0" urx="550" ury="562"/>
+      <char name="Aacute" width="600" llx="3" lly="0" urx="597" ury="805"/>
+      <char name="Acircumflex" width="600" llx="3" lly="0" urx="597" ury="787"/>
+      <char name="Adieresis" width="600" llx="3" lly="0" urx="597" ury="753"/>
+      <char name="Agrave" width="600" llx="3" lly="0" urx="597" ury="805"/>
+      <char name="Aring" width="600" llx="3" lly="0" urx="597" ury="750"/>
+      <char name="Atilde" width="600" llx="3" lly="0" urx="597" ury="729"/>
+      <char name="B" width="600" llx="43" lly="0" urx="559" ury="562"/>
+      <char name="C" width="600" llx="41" lly="-18" urx="540" ury="580"/>
+      <char name="Ccedilla" width="600" llx="41" lly="-151" urx="540" ury="580"/>
+      <char name="D" width="600" llx="43" lly="0" urx="574" ury="562"/>
+      <char name="E" width="600" llx="53" lly="0" urx="550" ury="562"/>
+      <char name="Eacute" width="600" llx="53" lly="0" urx="550" ury="805"/>
+      <char name="Ecircumflex" width="600" llx="53" lly="0" urx="550" ury="787"/>
+      <char name="Edieresis" width="600" llx="53" lly="0" urx="550" ury="753"/>
+      <char name="Egrave" width="600" llx="53" lly="0" urx="550" ury="805"/>
+      <char name="Eth" width="600" llx="30" lly="0" urx="574" ury="562"/>
+      <char name="Euro" width="600" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="600" llx="53" lly="0" urx="545" ury="562"/>
+      <char name="G" width="600" llx="31" lly="-18" urx="575" ury="580"/>
+      <char name="H" width="600" llx="32" lly="0" urx="568" ury="562"/>
+      <char name="I" width="600" llx="96" lly="0" urx="504" ury="562"/>
+      <char name="Iacute" width="600" llx="96" lly="0" urx="504" ury="805"/>
+      <char name="Icircumflex" width="600" llx="96" lly="0" urx="504" ury="787"/>
+      <char name="Idieresis" width="600" llx="96" lly="0" urx="504" ury="753"/>
+      <char name="Igrave" width="600" llx="96" lly="0" urx="504" ury="805"/>
+      <char name="J" width="600" llx="34" lly="-18" urx="566" ury="562"/>
+      <char name="K" width="600" llx="38" lly="0" urx="582" ury="562"/>
+      <char name="L" width="600" llx="47" lly="0" urx="554" ury="562"/>
+      <char name="Lslash" width="600" llx="47" lly="0" urx="554" ury="562"/>
+      <char name="M" width="600" llx="4" lly="0" urx="596" ury="562"/>
+      <char name="N" width="600" llx="7" lly="-13" urx="593" ury="562"/>
+      <char name="Ntilde" width="600" llx="7" lly="-13" urx="593" ury="729"/>
+      <char name="O" width="600" llx="43" lly="-18" urx="557" ury="580"/>
+      <char name="OE" width="600" llx="7" lly="0" urx="567" ury="562"/>
+      <char name="Oacute" width="600" llx="43" lly="-18" urx="557" ury="805"/>
+      <char name="Ocircumflex" width="600" llx="43" lly="-18" urx="557" ury="787"/>
+      <char name="Odieresis" width="600" llx="43" lly="-18" urx="557" ury="753"/>
+      <char name="Ograve" width="600" llx="43" lly="-18" urx="557" ury="805"/>
+      <char name="Oslash" width="600" llx="43" lly="-80" urx="557" ury="629"/>
+      <char name="Otilde" width="600" llx="43" lly="-18" urx="557" ury="729"/>
+      <char name="P" width="600" llx="79" lly="0" urx="558" ury="562"/>
+      <char name="Q" width="600" llx="43" lly="-138" urx="557" ury="580"/>
+      <char name="R" width="600" llx="38" lly="0" urx="588" ury="562"/>
+      <char name="S" width="600" llx="72" lly="-20" urx="529" ury="580"/>
+      <char name="Scaron" width="600" llx="72" lly="-20" urx="529" ury="802"/>
+      <char name="Scedilla" width="600" llx="72" lly="-151" urx="529" ury="580"/>
+      <char name="T" width="600" llx="38" lly="0" urx="563" ury="562"/>
+      <char name="Thorn" width="600" llx="79" lly="0" urx="538" ury="562"/>
+      <char name="U" width="600" llx="17" lly="-18" urx="583" ury="562"/>
+      <char name="Uacute" width="600" llx="17" lly="-18" urx="583" ury="805"/>
+      <char name="Ucircumflex" width="600" llx="17" lly="-18" urx="583" ury="787"/>
+      <char name="Udieresis" width="600" llx="17" lly="-18" urx="583" ury="753"/>
+      <char name="Ugrave" width="600" llx="17" lly="-18" urx="583" ury="805"/>
+      <char name="V" width="600" llx="-4" lly="-13" urx="604" ury="562"/>
+      <char name="W" width="600" llx="-3" lly="-13" urx="603" ury="562"/>
+      <char name="X" width="600" llx="23" lly="0" urx="577" ury="562"/>
+      <char name="Y" width="600" llx="24" lly="0" urx="576" ury="562"/>
+      <char name="Yacute" width="600" llx="24" lly="0" urx="576" ury="805"/>
+      <char name="Ydieresis" width="600" llx="24" lly="0" urx="576" ury="753"/>
+      <char name="Z" width="600" llx="86" lly="0" urx="514" ury="562"/>
+      <char name="Zcaron" width="600" llx="86" lly="0" urx="514" ury="802"/>
+      <char name="a" width="600" llx="53" lly="-15" urx="559" ury="441"/>
+      <char name="aacute" width="600" llx="53" lly="-15" urx="559" ury="672"/>
+      <char name="acircumflex" width="600" llx="53" lly="-15" urx="559" ury="654"/>
+      <char name="acute" width="600" llx="242" lly="497" urx="469" ury="672"/>
+      <char name="adieresis" width="600" llx="53" lly="-15" urx="559" ury="620"/>
+      <char name="ae" width="600" llx="19" lly="-15" urx="570" ury="441"/>
+      <char name="agrave" width="600" llx="53" lly="-15" urx="559" ury="672"/>
+      <char name="ampersand" width="600" llx="63" lly="-15" urx="538" ury="543"/>
+      <char name="aring" width="600" llx="53" lly="-15" urx="559" ury="627"/>
+      <char name="asciicircum" width="600" llx="94" lly="354" urx="506" ury="622"/>
+      <char name="asciitilde" width="600" llx="63" lly="197" urx="540" ury="320"/>
+      <char name="asterisk" width="600" llx="116" lly="257" urx="484" ury="607"/>
+      <char name="at" width="600" llx="77" lly="-15" urx="533" ury="622"/>
+      <char name="atilde" width="600" llx="53" lly="-15" urx="559" ury="606"/>
+      <char name="b" width="600" llx="14" lly="-15" urx="575" ury="629"/>
+      <char name="backslash" width="600" llx="118" lly="-80" urx="482" ury="629"/>
+      <char name="bar" width="600" llx="275" lly="-250" urx="326" ury="750"/>
+      <char name="braceleft" width="600" llx="182" lly="-108" urx="437" ury="622"/>
+      <char name="braceright" width="600" llx="163" lly="-108" urx="418" ury="622"/>
+      <char name="bracketleft" width="600" llx="269" lly="-108" urx="442" ury="622"/>
+      <char name="bracketright" width="600" llx="158" lly="-108" urx="331" ury="622"/>
+      <char name="breve" width="600" llx="153" lly="501" urx="447" ury="609"/>
+      <char name="brokenbar" width="600" llx="275" lly="-175" urx="326" ury="675"/>
+      <char name="bullet" width="600" llx="172" lly="130" urx="428" ury="383"/>
+      <char name="c" width="600" llx="66" lly="-15" urx="529" ury="441"/>
+      <char name="caron" width="600" llx="124" lly="492" urx="476" ury="669"/>
+      <char name="ccedilla" width="600" llx="66" lly="-151" urx="529" ury="441"/>
+      <char name="cedilla" width="600" llx="224" lly="-151" urx="362" ury="10"/>
+      <char name="cent" width="600" llx="96" lly="-49" urx="500" ury="614"/>
+      <char name="circumflex" width="600" llx="124" lly="477" urx="476" ury="654"/>
+      <char name="colon" width="600" llx="229" lly="-15" urx="371" ury="385"/>
+      <char name="comma" width="600" llx="181" lly="-112" urx="344" ury="122"/>
+      <char name="copyright" width="600" llx="0" lly="-18" urx="600" ury="580"/>
+      <char name="currency" width="600" llx="73" lly="58" urx="527" ury="506"/>
+      <char name="d" width="600" llx="45" lly="-15" urx="591" ury="629"/>
+      <char name="dagger" width="600" llx="141" lly="-78" urx="459" ury="580"/>
+      <char name="daggerdbl" width="600" llx="141" lly="-78" urx="459" ury="580"/>
+      <char name="degree" width="600" llx="123" lly="269" urx="477" ury="622"/>
+      <char name="dieresis" width="600" llx="148" lly="537" urx="453" ury="640"/>
+      <char name="divide" width="600" llx="87" lly="48" urx="513" ury="467"/>
+      <char name="dollar" width="600" llx="105" lly="-126" urx="496" ury="662"/>
+      <char name="dotaccent" width="600" llx="249" lly="537" urx="352" ury="640"/>
+      <char name="dotlessi" width="600" llx="95" lly="0" urx="505" ury="426"/>
+      <char name="e" width="600" llx="66" lly="-15" urx="548" ury="441"/>
+      <char name="eacute" width="600" llx="66" lly="-15" urx="548" ury="672"/>
+      <char name="ecircumflex" width="600" llx="66" lly="-15" urx="548" ury="654"/>
+      <char name="edieresis" width="600" llx="66" lly="-15" urx="548" ury="620"/>
+      <char name="egrave" width="600" llx="66" lly="-15" urx="548" ury="672"/>
+      <char name="eight" width="600" llx="102" lly="-15" urx="498" ury="622"/>
+      <char name="ellipsis" width="600" llx="37" lly="-15" urx="563" ury="111"/>
+      <char name="emdash" width="600" llx="0" lly="231" urx="600" ury="285"/>
+      <char name="endash" width="600" llx="75" lly="231" urx="525" ury="285"/>
+      <char name="equal" width="600" llx="80" lly="138" urx="520" ury="376"/>
+      <char name="eth" width="600" llx="62" lly="-15" urx="538" ury="629"/>
+      <char name="exclam" width="600" llx="236" lly="-15" urx="364" ury="572"/>
+      <char name="exclamdown" width="600" llx="236" lly="-157" urx="364" ury="430"/>
+      <char name="f" width="600" llx="114" lly="0" urx="531" ury="629"/>
+      <char name="fi" width="600" llx="3" lly="0" urx="597" ury="629"/>
+      <char name="five" width="600" llx="92" lly="-15" urx="497" ury="607"/>
+      <char name="fl" width="600" llx="3" lly="0" urx="597" ury="629"/>
+      <char name="florin" width="600" llx="4" lly="-143" urx="539" ury="622"/>
+      <char name="four" width="600" llx="78" lly="0" urx="500" ury="622"/>
+      <char name="fraction" width="600" llx="92" lly="-57" urx="509" ury="665"/>
+      <char name="g" width="600" llx="45" lly="-157" urx="566" ury="441"/>
+      <char name="germandbls" width="600" llx="48" lly="-15" urx="588" ury="629"/>
+      <char name="grave" width="600" llx="151" lly="497" urx="378" ury="672"/>
+      <char name="greater" width="600" llx="66" lly="42" urx="544" ury="472"/>
+      <char name="guillemotleft" width="600" llx="37" lly="70" urx="563" ury="446"/>
+      <char name="guillemotright" width="600" llx="37" lly="70" urx="563" ury="446"/>
+      <char name="guilsinglleft" width="600" llx="149" lly="70" urx="451" ury="446"/>
+      <char name="guilsinglright" width="600" llx="149" lly="70" urx="451" ury="446"/>
+      <char name="h" width="600" llx="18" lly="0" urx="582" ury="629"/>
+      <char name="hungarumlaut" width="600" llx="133" lly="497" urx="540" ury="672"/>
+      <char name="hyphen" width="600" llx="103" lly="231" urx="497" ury="285"/>
+      <char name="i" width="600" llx="95" lly="0" urx="505" ury="657"/>
+      <char name="iacute" width="600" llx="95" lly="0" urx="505" ury="672"/>
+      <char name="icircumflex" width="600" llx="94" lly="0" urx="505" ury="654"/>
+      <char name="idieresis" width="600" llx="95" lly="0" urx="505" ury="620"/>
+      <char name="igrave" width="600" llx="95" lly="0" urx="505" ury="672"/>
+      <char name="j" width="600" llx="82" lly="-157" urx="410" ury="657"/>
+      <char name="k" width="600" llx="43" lly="0" urx="580" ury="629"/>
+      <char name="l" width="600" llx="95" lly="0" urx="505" ury="629"/>
+      <char name="less" width="600" llx="41" lly="42" urx="519" ury="472"/>
+      <char name="logicalnot" width="600" llx="87" lly="108" urx="513" ury="369"/>
+      <char name="lslash" width="600" llx="95" lly="0" urx="505" ury="629"/>
+      <char name="m" width="600" llx="-5" lly="0" urx="605" ury="441"/>
+      <char name="macron" width="600" llx="120" lly="525" urx="480" ury="565"/>
+      <char name="minus" width="600" llx="80" lly="232" urx="520" ury="283"/>
+      <char name="mu" width="600" llx="21" lly="-157" urx="562" ury="426"/>
+      <char name="multiply" width="600" llx="87" lly="43" urx="515" ury="470"/>
+      <char name="n" width="600" llx="26" lly="0" urx="575" ury="441"/>
+      <char name="nine" width="600" llx="96" lly="-15" urx="489" ury="622"/>
+      <char name="ntilde" width="600" llx="26" lly="0" urx="575" ury="606"/>
+      <char name="numbersign" width="600" llx="93" lly="-32" urx="507" ury="639"/>
+      <char name="o" width="600" llx="62" lly="-15" urx="538" ury="441"/>
+      <char name="oacute" width="600" llx="62" lly="-15" urx="538" ury="672"/>
+      <char name="ocircumflex" width="600" llx="62" lly="-15" urx="538" ury="654"/>
+      <char name="odieresis" width="600" llx="62" lly="-15" urx="538" ury="620"/>
+      <char name="oe" width="600" llx="19" lly="-15" urx="559" ury="441"/>
+      <char name="ogonek" width="600" llx="211" lly="-172" urx="407" ury="4"/>
+      <char name="ograve" width="600" llx="62" lly="-15" urx="538" ury="672"/>
+      <char name="one" width="600" llx="96" lly="0" urx="505" ury="622"/>
+      <char name="onehalf" width="600" llx="0" lly="-57" urx="611" ury="665"/>
+      <char name="onequarter" width="600" llx="0" lly="-57" urx="600" ury="665"/>
+      <char name="onesuperior" width="600" llx="172" lly="249" urx="428" ury="622"/>
+      <char name="ordfeminine" width="600" llx="156" lly="249" urx="442" ury="580"/>
+      <char name="ordmasculine" width="600" llx="157" lly="249" urx="443" ury="580"/>
+      <char name="oslash" width="600" llx="62" lly="-80" urx="538" ury="506"/>
+      <char name="otilde" width="600" llx="62" lly="-15" urx="538" ury="606"/>
+      <char name="p" width="600" llx="9" lly="-157" urx="555" ury="441"/>
+      <char name="paragraph" width="600" llx="50" lly="-78" urx="511" ury="562"/>
+      <char name="parenleft" width="600" llx="269" lly="-108" urx="440" ury="622"/>
+      <char name="parenright" width="600" llx="160" lly="-108" urx="331" ury="622"/>
+      <char name="percent" width="600" llx="81" lly="-15" urx="518" ury="622"/>
+      <char name="period" width="600" llx="229" lly="-15" urx="371" ury="109"/>
+      <char name="periodcentered" width="600" llx="222" lly="189" urx="378" ury="327"/>
+      <char name="perthousand" width="600" llx="3" lly="-15" urx="600" ury="622"/>
+      <char name="plus" width="600" llx="80" lly="44" urx="520" ury="470"/>
+      <char name="plusminus" width="600" llx="87" lly="44" urx="513" ury="558"/>
+      <char name="q" width="600" llx="45" lly="-157" urx="591" ury="441"/>
+      <char name="question" width="600" llx="129" lly="-15" urx="492" ury="572"/>
+      <char name="questiondown" width="600" llx="108" lly="-157" urx="471" ury="430"/>
+      <char name="quotedbl" width="600" llx="187" lly="328" urx="413" ury="562"/>
+      <char name="quotedblbase" width="600" llx="143" lly="-134" urx="457" ury="100"/>
+      <char name="quotedblleft" width="600" llx="143" lly="328" urx="471" ury="562"/>
+      <char name="quotedblright" width="600" llx="143" lly="328" urx="457" ury="562"/>
+      <char name="quoteleft" width="600" llx="224" lly="328" urx="387" ury="562"/>
+      <char name="quoteright" width="600" llx="213" lly="328" urx="376" ury="562"/>
+      <char name="quotesinglbase" width="600" llx="213" lly="-134" urx="376" ury="100"/>
+      <char name="quotesingle" width="600" llx="259" lly="328" urx="341" ury="562"/>
+      <char name="r" width="600" llx="60" lly="0" urx="559" ury="441"/>
+      <char name="registered" width="600" llx="0" lly="-18" urx="600" ury="580"/>
+      <char name="ring" width="600" llx="218" lly="463" urx="382" ury="627"/>
+      <char name="s" width="600" llx="80" lly="-15" urx="513" ury="441"/>
+      <char name="scaron" width="600" llx="80" lly="-15" urx="513" ury="669"/>
+      <char name="scedilla" width="600" llx="80" lly="-151" urx="513" ury="441"/>
+      <char name="section" width="600" llx="113" lly="-78" urx="488" ury="580"/>
+      <char name="semicolon" width="600" llx="181" lly="-112" urx="371" ury="385"/>
+      <char name="seven" width="600" llx="82" lly="0" urx="483" ury="607"/>
+      <char name="six" width="600" llx="111" lly="-15" urx="497" ury="622"/>
+      <char name="slash" width="600" llx="125" lly="-80" urx="475" ury="629"/>
+      <char name="space" width="600" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="600"/>
-      <char name="square" width="600"/>
-      <char name="sterling" width="600"/>
-      <char name="stop" width="600"/>
-      <char name="t" width="600"/>
-      <char name="tab" width="600"/>
-      <char name="thorn" width="600"/>
-      <char name="three" width="600"/>
-      <char name="threequarters" width="600"/>
-      <char name="threesuperior" width="600"/>
-      <char name="tilde" width="600"/>
-      <char name="trademark" width="600"/>
-      <char name="two" width="600"/>
-      <char name="twosuperior" width="600"/>
-      <char name="u" width="600"/>
-      <char name="uacute" width="600"/>
-      <char name="ucircumflex" width="600"/>
-      <char name="udieresis" width="600"/>
-      <char name="ugrave" width="600"/>
-      <char name="underscore" width="600"/>
-      <char name="up" width="600"/>
-      <char name="v" width="600"/>
-      <char name="w" width="600"/>
-      <char name="x" width="600"/>
-      <char name="y" width="600"/>
-      <char name="yacute" width="600"/>
-      <char name="ydieresis" width="600"/>
-      <char name="yen" width="600"/>
-      <char name="z" width="600"/>
-      <char name="zcaron" width="600"/>
-      <char name="zero" width="600"/>
-   </widths>
-</font-metrics>
-\ No newline at end of file
+      <char name="sterling" width="600" llx="84" lly="-21" urx="521" ury="611"/>
+      <char name="t" width="600" llx="87" lly="-15" urx="530" ury="561"/>
+      <char name="thorn" width="600" llx="-6" lly="-157" urx="555" ury="629"/>
+      <char name="three" width="600" llx="75" lly="-15" urx="466" ury="622"/>
+      <char name="threequarters" width="600" llx="8" lly="-56" urx="593" ury="666"/>
+      <char name="threesuperior" width="600" llx="155" lly="240" urx="406" ury="622"/>
+      <char name="tilde" width="600" llx="105" lly="489" urx="503" ury="606"/>
+      <char name="trademark" width="600" llx="-23" lly="263" urx="623" ury="562"/>
+      <char name="two" width="600" llx="70" lly="0" urx="471" ury="622"/>
+      <char name="twosuperior" width="600" llx="177" lly="249" urx="424" ury="622"/>
+      <char name="u" width="600" llx="21" lly="-15" urx="562" ury="426"/>
+      <char name="uacute" width="600" llx="21" lly="-15" urx="562" ury="672"/>
+      <char name="ucircumflex" width="600" llx="21" lly="-15" urx="562" ury="654"/>
+      <char name="udieresis" width="600" llx="21" lly="-15" urx="562" ury="620"/>
+      <char name="ugrave" width="600" llx="21" lly="-15" urx="562" ury="672"/>
+      <char name="underscore" width="600" llx="0" lly="-125" urx="600" ury="-75"/>
+      <char name="v" width="600" llx="10" lly="-10" urx="590" ury="426"/>
+      <char name="w" width="600" llx="-4" lly="-10" urx="604" ury="426"/>
+      <char name="x" width="600" llx="20" lly="0" urx="580" ury="426"/>
+      <char name="y" width="600" llx="7" lly="-157" urx="592" ury="426"/>
+      <char name="yacute" width="600" llx="7" lly="-157" urx="592" ury="672"/>
+      <char name="ydieresis" width="600" llx="7" lly="-157" urx="592" ury="620"/>
+      <char name="yen" width="600" llx="26" lly="0" urx="574" ury="562"/>
+      <char name="z" width="600" llx="99" lly="0" urx="502" ury="426"/>
+      <char name="zcaron" width="600" llx="99" lly="0" urx="502" ury="669"/>
+      <char name="zero" width="600" llx="106" lly="-15" urx="494" ury="622"/>
+    </char-metrics>
+</font-metrics>
diff --git a/src/codegen/fonts/CourierBold.xml b/src/codegen/fonts/CourierBold.xml
index fa8bed196..c06ef5f23 100644
--- a/src/codegen/fonts/CourierBold.xml
+++ b/src/codegen/fonts/CourierBold.xml
@@ -22,275 +22,246 @@
    <family-name>Courier</family-name>
    <class-name>CourierBold</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>562</cap-height>
    <x-height>439</x-height>
    <ascender>626</ascender>
    <descender>-142</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="600"/>
-      <char name="AE" width="600"/>
-      <char name="Aacute" width="600"/>
-      <char name="Acircumflex" width="600"/>
-      <char name="Adieresis" width="600"/>
-      <char name="Agrave" width="600"/>
-      <char name="Aring" width="600"/>
-      <char name="Atilde" width="600"/>
-      <char name="B" width="600"/>
-      <char name="C" width="600"/>
-      <char name="Ccedilla" width="600"/>
-      <char name="D" width="600"/>
-      <char name="E" width="600"/>
-      <char name="Eacute" width="600"/>
-      <char name="Ecircumflex" width="600"/>
-      <char name="Edieresis" width="600"/>
-      <char name="Egrave" width="600"/>
-      <char name="Eth" width="600"/>
-      <char name="Euro" width="600"/>
-      <char name="F" width="600"/>
-      <char name="G" width="600"/>
-      <char name="Gcaron" width="600"/>
-      <char name="H" width="600"/>
-      <char name="I" width="600"/>
-      <char name="IJ" width="600"/>
-      <char name="Iacute" width="600"/>
-      <char name="Icircumflex" width="600"/>
-      <char name="Idieresis" width="600"/>
-      <char name="Idot" width="600"/>
-      <char name="Igrave" width="600"/>
-      <char name="J" width="600"/>
-      <char name="K" width="600"/>
-      <char name="L" width="600"/>
-      <char name="LL" width="600"/>
-      <char name="Lslash" width="600"/>
-      <char name="M" width="600"/>
-      <char name="N" width="600"/>
-      <char name="Ntilde" width="600"/>
-      <char name="O" width="600"/>
-      <char name="OE" width="600"/>
-      <char name="Oacute" width="600"/>
-      <char name="Ocircumflex" width="600"/>
-      <char name="Odieresis" width="600"/>
-      <char name="Ograve" width="600"/>
-      <char name="Oslash" width="600"/>
-      <char name="Otilde" width="600"/>
-      <char name="P" width="600"/>
-      <char name="Q" width="600"/>
-      <char name="R" width="600"/>
-      <char name="S" width="600"/>
-      <char name="Scaron" width="600"/>
-      <char name="Scedilla" width="600"/>
-      <char name="T" width="600"/>
-      <char name="Thorn" width="600"/>
-      <char name="U" width="600"/>
-      <char name="Uacute" width="600"/>
-      <char name="Ucircumflex" width="600"/>
-      <char name="Udieresis" width="600"/>
-      <char name="Ugrave" width="600"/>
-      <char name="V" width="600"/>
-      <char name="W" width="600"/>
-      <char name="X" width="600"/>
-      <char name="Y" width="600"/>
-      <char name="Yacute" width="600"/>
-      <char name="Ydieresis" width="600"/>
-      <char name="Z" width="600"/>
-      <char name="Zcaron" width="600"/>
-      <char name="a" width="600"/>
-      <char name="aacute" width="600"/>
-      <char name="acircumflex" width="600"/>
-      <char name="acute" width="600"/>
-      <char name="adieresis" width="600"/>
-      <char name="ae" width="600"/>
-      <char name="agrave" width="600"/>
-      <char name="ampersand" width="600"/>
-      <char name="aring" width="600"/>
-      <char name="arrowboth" width="600"/>
-      <char name="arrowdown" width="600"/>
-      <char name="arrowleft" width="600"/>
-      <char name="arrowright" width="600"/>
-      <char name="arrowup" width="600"/>
-      <char name="asciicircum" width="600"/>
-      <char name="asciitilde" width="600"/>
-      <char name="asterisk" width="600"/>
-      <char name="at" width="600"/>
-      <char name="atilde" width="600"/>
-      <char name="b" width="600"/>
-      <char name="backslash" width="600"/>
-      <char name="bar" width="600"/>
-      <char name="braceleft" width="600"/>
-      <char name="braceright" width="600"/>
-      <char name="bracketleft" width="600"/>
-      <char name="bracketright" width="600"/>
-      <char name="breve" width="600"/>
-      <char name="brokenbar" width="600"/>
-      <char name="bullet" width="600"/>
-      <char name="c" width="600"/>
-      <char name="caron" width="600"/>
-      <char name="ccedilla" width="600"/>
-      <char name="cedilla" width="600"/>
-      <char name="cent" width="600"/>
-      <char name="center" width="600"/>
-      <char name="circumflex" width="600"/>
-      <char name="colon" width="600"/>
-      <char name="comma" width="600"/>
-      <char name="copyright" width="600"/>
-      <char name="currency" width="600"/>
-      <char name="d" width="600"/>
-      <char name="dagger" width="600"/>
-      <char name="daggerdbl" width="600"/>
-      <char name="dectab" width="600"/>
-      <char name="degree" width="600"/>
-      <char name="dieresis" width="600"/>
-      <char name="divide" width="600"/>
-      <char name="dollar" width="600"/>
-      <char name="dotaccent" width="600"/>
-      <char name="dotlessi" width="600"/>
-      <char name="down" width="600"/>
-      <char name="e" width="600"/>
-      <char name="eacute" width="600"/>
-      <char name="ecircumflex" width="600"/>
-      <char name="edieresis" width="600"/>
-      <char name="egrave" width="600"/>
-      <char name="eight" width="600"/>
-      <char name="ellipsis" width="600"/>
-      <char name="emdash" width="600"/>
-      <char name="endash" width="600"/>
-      <char name="equal" width="600"/>
-      <char name="eth" width="600"/>
-      <char name="exclam" width="600"/>
-      <char name="exclamdown" width="600"/>
-      <char name="f" width="600"/>
-      <char name="fi" width="600"/>
-      <char name="five" width="600"/>
-      <char name="fl" width="600"/>
-      <char name="florin" width="600"/>
-      <char name="format" width="600"/>
-      <char name="four" width="600"/>
-      <char name="fraction" width="600"/>
-      <char name="g" width="600"/>
-      <char name="gcaron" width="600"/>
-      <char name="germandbls" width="600"/>
-      <char name="grave" width="600"/>
-      <char name="graybox" width="600"/>
-      <char name="greater" width="600"/>
-      <char name="guillemotleft" width="600"/>
-      <char name="guillemotright" width="600"/>
-      <char name="guilsinglleft" width="600"/>
-      <char name="guilsinglright" width="600"/>
-      <char name="h" width="600"/>
-      <char name="hungarumlaut" width="600"/>
-      <char name="hyphen" width="600"/>
-      <char name="i" width="600"/>
-      <char name="iacute" width="600"/>
-      <char name="icircumflex" width="600"/>
-      <char name="idieresis" width="600"/>
-      <char name="igrave" width="600"/>
-      <char name="ij" width="600"/>
-      <char name="indent" width="600"/>
-      <char name="j" width="600"/>
-      <char name="k" width="600"/>
-      <char name="l" width="600"/>
-      <char name="largebullet" width="600"/>
-      <char name="left" width="600"/>
-      <char name="less" width="600"/>
-      <char name="lira" width="600"/>
-      <char name="ll" width="600"/>
-      <char name="logicalnot" width="600"/>
-      <char name="lslash" width="600"/>
-      <char name="m" width="600"/>
-      <char name="macron" width="600"/>
-      <char name="merge" width="600"/>
-      <char name="minus" width="600"/>
-      <char name="mu" width="600"/>
-      <char name="multiply" width="600"/>
-      <char name="n" width="600"/>
-      <char name="nine" width="600"/>
-      <char name="notegraphic" width="600"/>
-      <char name="ntilde" width="600"/>
-      <char name="numbersign" width="600"/>
-      <char name="o" width="600"/>
-      <char name="oacute" width="600"/>
-      <char name="ocircumflex" width="600"/>
-      <char name="odieresis" width="600"/>
-      <char name="oe" width="600"/>
-      <char name="ogonek" width="600"/>
-      <char name="ograve" width="600"/>
-      <char name="one" width="600"/>
-      <char name="onehalf" width="600"/>
-      <char name="onequarter" width="600"/>
-      <char name="onesuperior" width="600"/>
-      <char name="ordfeminine" width="600"/>
-      <char name="ordmasculine" width="600"/>
-      <char name="oslash" width="600"/>
-      <char name="otilde" width="600"/>
-      <char name="overscore" width="600"/>
-      <char name="p" width="600"/>
-      <char name="paragraph" width="600"/>
-      <char name="parenleft" width="600"/>
-      <char name="parenright" width="600"/>
-      <char name="percent" width="600"/>
-      <char name="period" width="600"/>
-      <char name="periodcentered" width="600"/>
-      <char name="perthousand" width="600"/>
-      <char name="plus" width="600"/>
-      <char name="plusminus" width="600"/>
-      <char name="prescription" width="600"/>
-      <char name="q" width="600"/>
-      <char name="question" width="600"/>
-      <char name="questiondown" width="600"/>
-      <char name="quotedbl" width="600"/>
-      <char name="quotedblbase" width="600"/>
-      <char name="quotedblleft" width="600"/>
-      <char name="quotedblright" width="600"/>
-      <char name="quoteleft" width="600"/>
-      <char name="quoteright" width="600"/>
-      <char name="quotesinglbase" width="600"/>
-      <char name="quotesingle" width="600"/>
-      <char name="r" width="600"/>
-      <char name="registered" width="600"/>
-      <char name="return" width="600"/>
-      <char name="ring" width="600"/>
-      <char name="s" width="600"/>
-      <char name="scaron" width="600"/>
-      <char name="scedilla" width="600"/>
-      <char name="section" width="600"/>
-      <char name="semicolon" width="600"/>
-      <char name="seven" width="600"/>
-      <char name="six" width="600"/>
-      <char name="slash" width="600"/>
-      <char name="space" width="600"/>
+    <char-metrics>
+      <char name="A" width="600" llx="-9" lly="0" urx="609" ury="562"/>
+      <char name="AE" width="600" llx="-29" lly="0" urx="602" ury="562"/>
+      <char name="Aacute" width="600" llx="-9" lly="0" urx="609" ury="784"/>
+      <char name="Acircumflex" width="600" llx="-9" lly="0" urx="609" ury="780"/>
+      <char name="Adieresis" width="600" llx="-9" lly="0" urx="609" ury="761"/>
+      <char name="Agrave" width="600" llx="-9" lly="0" urx="609" ury="784"/>
+      <char name="Aring" width="600" llx="-9" lly="0" urx="609" ury="801"/>
+      <char name="Atilde" width="600" llx="-9" lly="0" urx="609" ury="759"/>
+      <char name="B" width="600" llx="30" lly="0" urx="573" ury="562"/>
+      <char name="C" width="600" llx="22" lly="-18" urx="560" ury="580"/>
+      <char name="Ccedilla" width="600" llx="22" lly="-206" urx="560" ury="580"/>
+      <char name="D" width="600" llx="30" lly="0" urx="594" ury="562"/>
+      <char name="E" width="600" llx="25" lly="0" urx="560" ury="562"/>
+      <char name="Eacute" width="600" llx="25" lly="0" urx="560" ury="784"/>
+      <char name="Ecircumflex" width="600" llx="25" lly="0" urx="560" ury="780"/>
+      <char name="Edieresis" width="600" llx="25" lly="0" urx="560" ury="761"/>
+      <char name="Egrave" width="600" llx="25" lly="0" urx="560" ury="784"/>
+      <char name="Eth" width="600" llx="30" lly="0" urx="594" ury="562"/>
+      <char name="Euro" width="600" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="600" llx="39" lly="0" urx="570" ury="562"/>
+      <char name="G" width="600" llx="22" lly="-18" urx="594" ury="580"/>
+      <char name="H" width="600" llx="20" lly="0" urx="580" ury="562"/>
+      <char name="I" width="600" llx="77" lly="0" urx="523" ury="562"/>
+      <char name="Iacute" width="600" llx="77" lly="0" urx="523" ury="784"/>
+      <char name="Icircumflex" width="600" llx="77" lly="0" urx="523" ury="780"/>
+      <char name="Idieresis" width="600" llx="77" lly="0" urx="523" ury="761"/>
+      <char name="Igrave" width="600" llx="77" lly="0" urx="523" ury="784"/>
+      <char name="J" width="600" llx="37" lly="-18" urx="601" ury="562"/>
+      <char name="K" width="600" llx="21" lly="0" urx="599" ury="562"/>
+      <char name="L" width="600" llx="39" lly="0" urx="578" ury="562"/>
+      <char name="Lslash" width="600" llx="39" lly="0" urx="578" ury="562"/>
+      <char name="M" width="600" llx="-2" lly="0" urx="602" ury="562"/>
+      <char name="N" width="600" llx="8" lly="-12" urx="610" ury="562"/>
+      <char name="Ntilde" width="600" llx="8" lly="-12" urx="610" ury="759"/>
+      <char name="O" width="600" llx="22" lly="-18" urx="578" ury="580"/>
+      <char name="OE" width="600" llx="-25" lly="0" urx="595" ury="562"/>
+      <char name="Oacute" width="600" llx="22" lly="-18" urx="578" ury="784"/>
+      <char name="Ocircumflex" width="600" llx="22" lly="-18" urx="578" ury="780"/>
+      <char name="Odieresis" width="600" llx="22" lly="-18" urx="578" ury="761"/>
+      <char name="Ograve" width="600" llx="22" lly="-18" urx="578" ury="784"/>
+      <char name="Oslash" width="600" llx="22" lly="-22" urx="578" ury="584"/>
+      <char name="Otilde" width="600" llx="22" lly="-18" urx="578" ury="759"/>
+      <char name="P" width="600" llx="48" lly="0" urx="559" ury="562"/>
+      <char name="Q" width="600" llx="32" lly="-138" urx="578" ury="580"/>
+      <char name="R" width="600" llx="24" lly="0" urx="599" ury="562"/>
+      <char name="S" width="600" llx="47" lly="-22" urx="553" ury="582"/>
+      <char name="Scaron" width="600" llx="47" lly="-22" urx="553" ury="790"/>
+      <char name="Scedilla" width="600" llx="47" lly="-206" urx="553" ury="582"/>
+      <char name="T" width="600" llx="21" lly="0" urx="579" ury="562"/>
+      <char name="Thorn" width="600" llx="48" lly="0" urx="557" ury="562"/>
+      <char name="U" width="600" llx="4" lly="-18" urx="596" ury="562"/>
+      <char name="Uacute" width="600" llx="4" lly="-18" urx="596" ury="784"/>
+      <char name="Ucircumflex" width="600" llx="4" lly="-18" urx="596" ury="780"/>
+      <char name="Udieresis" width="600" llx="4" lly="-18" urx="596" ury="761"/>
+      <char name="Ugrave" width="600" llx="4" lly="-18" urx="596" ury="784"/>
+      <char name="V" width="600" llx="-13" lly="0" urx="613" ury="562"/>
+      <char name="W" width="600" llx="-18" lly="0" urx="618" ury="562"/>
+      <char name="X" width="600" llx="12" lly="0" urx="588" ury="562"/>
+      <char name="Y" width="600" llx="12" lly="0" urx="589" ury="562"/>
+      <char name="Yacute" width="600" llx="12" lly="0" urx="589" ury="784"/>
+      <char name="Ydieresis" width="600" llx="12" lly="0" urx="589" ury="761"/>
+      <char name="Z" width="600" llx="62" lly="0" urx="539" ury="562"/>
+      <char name="Zcaron" width="600" llx="62" lly="0" urx="539" ury="790"/>
+      <char name="a" width="600" llx="35" lly="-15" urx="570" ury="454"/>
+      <char name="aacute" width="600" llx="35" lly="-15" urx="570" ury="661"/>
+      <char name="acircumflex" width="600" llx="35" lly="-15" urx="570" ury="657"/>
+      <char name="acute" width="600" llx="205" lly="508" urx="468" ury="661"/>
+      <char name="adieresis" width="600" llx="35" lly="-15" urx="570" ury="638"/>
+      <char name="ae" width="600" llx="-4" lly="-15" urx="601" ury="454"/>
+      <char name="agrave" width="600" llx="35" lly="-15" urx="570" ury="661"/>
+      <char name="ampersand" width="600" llx="36" lly="-15" urx="546" ury="543"/>
+      <char name="aring" width="600" llx="35" lly="-15" urx="570" ury="678"/>
+      <char name="asciicircum" width="600" llx="108" lly="250" urx="492" ury="616"/>
+      <char name="asciitilde" width="600" llx="71" lly="153" urx="530" ury="356"/>
+      <char name="asterisk" width="600" llx="91" lly="219" urx="509" ury="601"/>
+      <char name="at" width="600" llx="16" lly="-15" urx="584" ury="616"/>
+      <char name="atilde" width="600" llx="35" lly="-15" urx="570" ury="636"/>
+      <char name="b" width="600" llx="0" lly="-15" urx="584" ury="626"/>
+      <char name="backslash" width="600" llx="99" lly="-77" urx="503" ury="626"/>
+      <char name="bar" width="600" llx="255" lly="-250" urx="345" ury="750"/>
+      <char name="braceleft" width="600" llx="160" lly="-102" urx="464" ury="616"/>
+      <char name="braceright" width="600" llx="136" lly="-102" urx="440" ury="616"/>
+      <char name="bracketleft" width="600" llx="245" lly="-102" urx="475" ury="616"/>
+      <char name="bracketright" width="600" llx="125" lly="-102" urx="355" ury="616"/>
+      <char name="breve" width="600" llx="83" lly="468" urx="517" ury="631"/>
+      <char name="brokenbar" width="600" llx="255" lly="-175" urx="345" ury="675"/>
+      <char name="bullet" width="600" llx="140" lly="132" urx="460" ury="430"/>
+      <char name="c" width="600" llx="40" lly="-15" urx="545" ury="459"/>
+      <char name="caron" width="600" llx="103" lly="493" urx="497" ury="667"/>
+      <char name="ccedilla" width="600" llx="40" lly="-206" urx="545" ury="459"/>
+      <char name="cedilla" width="600" llx="205" lly="-206" urx="387" ury="0"/>
+      <char name="cent" width="600" llx="66" lly="-49" urx="518" ury="614"/>
+      <char name="circumflex" width="600" llx="103" lly="483" urx="497" ury="657"/>
+      <char name="colon" width="600" llx="191" lly="-15" urx="407" ury="425"/>
+      <char name="comma" width="600" llx="123" lly="-111" urx="393" ury="174"/>
+      <char name="copyright" width="600" llx="0" lly="-18" urx="600" ury="580"/>
+      <char name="currency" width="600" llx="54" lly="49" urx="546" ury="517"/>
+      <char name="d" width="600" llx="20" lly="-15" urx="591" ury="626"/>
+      <char name="dagger" width="600" llx="106" lly="-70" urx="494" ury="580"/>
+      <char name="daggerdbl" width="600" llx="106" lly="-70" urx="494" ury="580"/>
+      <char name="degree" width="600" llx="86" lly="243" urx="474" ury="616"/>
+      <char name="dieresis" width="600" llx="128" lly="498" urx="472" ury="638"/>
+      <char name="divide" width="600" llx="71" lly="16" urx="529" ury="500"/>
+      <char name="dollar" width="600" llx="82" lly="-126" urx="519" ury="666"/>
+      <char name="dotaccent" width="600" llx="230" lly="498" urx="370" ury="638"/>
+      <char name="dotlessi" width="600" llx="77" lly="0" urx="523" ury="439"/>
+      <char name="e" width="600" llx="40" lly="-15" urx="563" ury="454"/>
+      <char name="eacute" width="600" llx="40" lly="-15" urx="563" ury="661"/>
+      <char name="ecircumflex" width="600" llx="40" lly="-15" urx="563" ury="657"/>
+      <char name="edieresis" width="600" llx="40" lly="-15" urx="563" ury="638"/>
+      <char name="egrave" width="600" llx="40" lly="-15" urx="563" ury="661"/>
+      <char name="eight" width="600" llx="83" lly="-15" urx="517" ury="616"/>
+      <char name="ellipsis" width="600" llx="26" lly="-15" urx="574" ury="116"/>
+      <char name="emdash" width="600" llx="-10" lly="203" urx="610" ury="313"/>
+      <char name="endash" width="600" llx="65" lly="203" urx="535" ury="313"/>
+      <char name="equal" width="600" llx="71" lly="118" urx="529" ury="398"/>
+      <char name="eth" width="600" llx="58" lly="-27" urx="543" ury="626"/>
+      <char name="exclam" width="600" llx="202" lly="-15" urx="398" ury="572"/>
+      <char name="exclamdown" width="600" llx="202" lly="-146" urx="398" ury="449"/>
+      <char name="f" width="600" llx="83" lly="0" urx="547" ury="626"/>
+      <char name="fi" width="600" llx="12" lly="0" urx="593" ury="626"/>
+      <char name="five" width="600" llx="70" lly="-15" urx="521" ury="601"/>
+      <char name="fl" width="600" llx="12" lly="0" urx="593" ury="626"/>
+      <char name="florin" width="600" llx="-30" lly="-131" urx="572" ury="616"/>
+      <char name="four" width="600" llx="53" lly="0" urx="507" ury="616"/>
+      <char name="fraction" width="600" llx="25" lly="-60" urx="576" ury="661"/>
+      <char name="g" width="600" llx="30" lly="-146" urx="580" ury="454"/>
+      <char name="germandbls" width="600" llx="22" lly="-15" urx="596" ury="626"/>
+      <char name="grave" width="600" llx="132" lly="508" urx="395" ury="661"/>
+      <char name="greater" width="600" llx="77" lly="15" urx="534" ury="501"/>
+      <char name="guillemotleft" width="600" llx="8" lly="70" urx="553" ury="446"/>
+      <char name="guillemotright" width="600" llx="47" lly="70" urx="592" ury="446"/>
+      <char name="guilsinglleft" width="600" llx="141" lly="70" urx="459" ury="446"/>
+      <char name="guilsinglright" width="600" llx="141" lly="70" urx="459" ury="446"/>
+      <char name="h" width="600" llx="5" lly="0" urx="592" ury="626"/>
+      <char name="hungarumlaut" width="600" llx="68" lly="488" urx="588" ury="661"/>
+      <char name="hyphen" width="600" llx="100" lly="203" urx="500" ury="313"/>
+      <char name="i" width="600" llx="77" lly="0" urx="523" ury="658"/>
+      <char name="iacute" width="600" llx="77" lly="0" urx="523" ury="661"/>
+      <char name="icircumflex" width="600" llx="73" lly="0" urx="523" ury="657"/>
+      <char name="idieresis" width="600" llx="77" lly="0" urx="523" ury="618"/>
+      <char name="igrave" width="600" llx="77" lly="0" urx="523" ury="661"/>
+      <char name="j" width="600" llx="63" lly="-146" urx="440" ury="658"/>
+      <char name="k" width="600" llx="20" lly="0" urx="585" ury="626"/>
+      <char name="l" width="600" llx="77" lly="0" urx="523" ury="626"/>
+      <char name="less" width="600" llx="66" lly="15" urx="523" ury="501"/>
+      <char name="logicalnot" width="600" llx="71" lly="103" urx="529" ury="413"/>
+      <char name="lslash" width="600" llx="77" lly="0" urx="523" ury="626"/>
+      <char name="m" width="600" llx="-22" lly="0" urx="626" ury="454"/>
+      <char name="macron" width="600" llx="88" lly="505" urx="512" ury="585"/>
+      <char name="minus" width="600" llx="71" lly="203" urx="529" ury="313"/>
+      <char name="mu" width="600" llx="-1" lly="-142" urx="569" ury="439"/>
+      <char name="multiply" width="600" llx="81" lly="39" urx="520" ury="478"/>
+      <char name="n" width="600" llx="18" lly="0" urx="592" ury="454"/>
+      <char name="nine" width="600" llx="79" lly="-15" urx="510" ury="616"/>
+      <char name="ntilde" width="600" llx="18" lly="0" urx="592" ury="636"/>
+      <char name="numbersign" width="600" llx="56" lly="-45" urx="544" ury="651"/>
+      <char name="o" width="600" llx="30" lly="-15" urx="570" ury="454"/>
+      <char name="oacute" width="600" llx="30" lly="-15" urx="570" ury="661"/>
+      <char name="ocircumflex" width="600" llx="30" lly="-15" urx="570" ury="657"/>
+      <char name="odieresis" width="600" llx="30" lly="-15" urx="570" ury="638"/>
+      <char name="oe" width="600" llx="-18" lly="-15" urx="611" ury="454"/>
+      <char name="ogonek" width="600" llx="169" lly="-199" urx="400" ury="0"/>
+      <char name="ograve" width="600" llx="30" lly="-15" urx="570" ury="661"/>
+      <char name="one" width="600" llx="81" lly="0" urx="539" ury="616"/>
+      <char name="onehalf" width="600" llx="-47" lly="-60" urx="648" ury="661"/>
+      <char name="onequarter" width="600" llx="-56" lly="-60" urx="656" ury="661"/>
+      <char name="onesuperior" width="600" llx="153" lly="230" urx="447" ury="616"/>
+      <char name="ordfeminine" width="600" llx="147" lly="196" urx="453" ury="580"/>
+      <char name="ordmasculine" width="600" llx="147" lly="196" urx="453" ury="580"/>
+      <char name="oslash" width="600" llx="30" lly="-24" urx="570" ury="463"/>
+      <char name="otilde" width="600" llx="30" lly="-15" urx="570" ury="636"/>
+      <char name="p" width="600" llx="-1" lly="-142" urx="570" ury="454"/>
+      <char name="paragraph" width="600" llx="6" lly="-70" urx="576" ury="580"/>
+      <char name="parenleft" width="600" llx="219" lly="-102" urx="461" ury="616"/>
+      <char name="parenright" width="600" llx="139" lly="-102" urx="381" ury="616"/>
+      <char name="percent" width="600" llx="5" lly="-15" urx="595" ury="616"/>
+      <char name="period" width="600" llx="192" lly="-15" urx="408" ury="171"/>
+      <char name="periodcentered" width="600" llx="196" lly="165" urx="404" ury="351"/>
+      <char name="perthousand" width="600" llx="-113" lly="-15" urx="713" ury="616"/>
+      <char name="plus" width="600" llx="71" lly="39" urx="529" ury="478"/>
+      <char name="plusminus" width="600" llx="71" lly="24" urx="529" ury="515"/>
+      <char name="q" width="600" llx="20" lly="-142" urx="591" ury="454"/>
+      <char name="question" width="600" llx="98" lly="-14" urx="501" ury="580"/>
+      <char name="questiondown" width="600" llx="99" lly="-146" urx="502" ury="449"/>
+      <char name="quotedbl" width="600" llx="135" lly="277" urx="465" ury="562"/>
+      <char name="quotedblbase" width="600" llx="65" lly="-142" urx="529" ury="143"/>
+      <char name="quotedblleft" width="600" llx="71" lly="277" urx="535" ury="562"/>
+      <char name="quotedblright" width="600" llx="61" lly="277" urx="525" ury="562"/>
+      <char name="quoteleft" width="600" llx="178" lly="277" urx="428" ury="562"/>
+      <char name="quoteright" width="600" llx="171" lly="277" urx="423" ury="562"/>
+      <char name="quotesinglbase" width="600" llx="175" lly="-142" urx="427" ury="143"/>
+      <char name="quotesingle" width="600" llx="227" lly="277" urx="373" ury="562"/>
+      <char name="r" width="600" llx="47" lly="0" urx="580" ury="454"/>
+      <char name="registered" width="600" llx="0" lly="-18" urx="600" ury="580"/>
+      <char name="ring" width="600" llx="198" lly="481" urx="402" ury="678"/>
+      <char name="s" width="600" llx="68" lly="-17" urx="535" ury="459"/>
+      <char name="scaron" width="600" llx="68" lly="-17" urx="535" ury="667"/>
+      <char name="scedilla" width="600" llx="68" lly="-206" urx="535" ury="459"/>
+      <char name="section" width="600" llx="83" lly="-70" urx="517" ury="580"/>
+      <char name="semicolon" width="600" llx="123" lly="-111" urx="408" ury="425"/>
+      <char name="seven" width="600" llx="55" lly="0" urx="494" ury="601"/>
+      <char name="six" width="600" llx="90" lly="-15" urx="521" ury="616"/>
+      <char name="slash" width="600" llx="98" lly="-77" urx="502" ury="626"/>
+      <char name="space" width="600" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="600"/>
-      <char name="square" width="600"/>
-      <char name="sterling" width="600"/>
-      <char name="stop" width="600"/>
-      <char name="t" width="600"/>
-      <char name="tab" width="600"/>
-      <char name="thorn" width="600"/>
-      <char name="three" width="600"/>
-      <char name="threequarters" width="600"/>
-      <char name="threesuperior" width="600"/>
-      <char name="tilde" width="600"/>
-      <char name="trademark" width="600"/>
-      <char name="two" width="600"/>
-      <char name="twosuperior" width="600"/>
-      <char name="u" width="600"/>
-      <char name="uacute" width="600"/>
-      <char name="ucircumflex" width="600"/>
-      <char name="udieresis" width="600"/>
-      <char name="ugrave" width="600"/>
-      <char name="underscore" width="600"/>
-      <char name="up" width="600"/>
-      <char name="v" width="600"/>
-      <char name="w" width="600"/>
-      <char name="x" width="600"/>
-      <char name="y" width="600"/>
-      <char name="yacute" width="600"/>
-      <char name="ydieresis" width="600"/>
-      <char name="yen" width="600"/>
-      <char name="z" width="600"/>
-      <char name="zcaron" width="600"/>
-      <char name="zero" width="600"/>
-   </widths>
-</font-metrics>
-\ No newline at end of file
+      <char name="sterling" width="600" llx="72" lly="-28" urx="558" ury="611"/>
+      <char name="t" width="600" llx="47" lly="-15" urx="532" ury="562"/>
+      <char name="thorn" width="600" llx="-14" lly="-142" urx="570" ury="626"/>
+      <char name="three" width="600" llx="63" lly="-15" urx="501" ury="616"/>
+      <char name="threequarters" width="600" llx="-47" lly="-60" urx="648" ury="661"/>
+      <char name="threesuperior" width="600" llx="138" lly="222" urx="433" ury="616"/>
+      <char name="tilde" width="600" llx="89" lly="493" urx="512" ury="636"/>
+      <char name="trademark" width="600" llx="-9" lly="230" urx="749" ury="562"/>
+      <char name="two" width="600" llx="61" lly="0" urx="499" ury="616"/>
+      <char name="twosuperior" width="600" llx="143" lly="230" urx="436" ury="616"/>
+      <char name="u" width="600" llx="-1" lly="-15" urx="569" ury="439"/>
+      <char name="uacute" width="600" llx="-1" lly="-15" urx="569" ury="661"/>
+      <char name="ucircumflex" width="600" llx="-1" lly="-15" urx="569" ury="657"/>
+      <char name="udieresis" width="600" llx="-1" lly="-15" urx="569" ury="638"/>
+      <char name="ugrave" width="600" llx="-1" lly="-15" urx="569" ury="661"/>
+      <char name="underscore" width="600" llx="0" lly="-125" urx="600" ury="-75"/>
+      <char name="v" width="600" llx="-1" lly="0" urx="601" ury="439"/>
+      <char name="w" width="600" llx="-18" lly="0" urx="618" ury="439"/>
+      <char name="x" width="600" llx="6" lly="0" urx="594" ury="439"/>
+      <char name="y" width="600" llx="-4" lly="-142" urx="601" ury="439"/>
+      <char name="yacute" width="600" llx="-4" lly="-142" urx="601" ury="661"/>
+      <char name="ydieresis" width="600" llx="-4" lly="-142" urx="601" ury="638"/>
+      <char name="yen" width="600" llx="10" lly="0" urx="590" ury="562"/>
+      <char name="z" width="600" llx="81" lly="0" urx="520" ury="439"/>
+      <char name="zcaron" width="600" llx="81" lly="0" urx="520" ury="667"/>
+      <char name="zero" width="600" llx="87" lly="-15" urx="513" ury="616"/>
+    </char-metrics>
+</font-metrics>
diff --git a/src/codegen/fonts/CourierBoldOblique.xml b/src/codegen/fonts/CourierBoldOblique.xml
index 5bd26092e..a82a75ad2 100644
--- a/src/codegen/fonts/CourierBoldOblique.xml
+++ b/src/codegen/fonts/CourierBoldOblique.xml
@@ -22,275 +22,246 @@
    <family-name>Courier</family-name>
    <class-name>CourierBoldOblique</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>562</cap-height>
    <x-height>439</x-height>
    <ascender>626</ascender>
    <descender>-142</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="600"/>
-      <char name="AE" width="600"/>
-      <char name="Aacute" width="600"/>
-      <char name="Acircumflex" width="600"/>
-      <char name="Adieresis" width="600"/>
-      <char name="Agrave" width="600"/>
-      <char name="Aring" width="600"/>
-      <char name="Atilde" width="600"/>
-      <char name="B" width="600"/>
-      <char name="C" width="600"/>
-      <char name="Ccedilla" width="600"/>
-      <char name="D" width="600"/>
-      <char name="E" width="600"/>
-      <char name="Eacute" width="600"/>
-      <char name="Ecircumflex" width="600"/>
-      <char name="Edieresis" width="600"/>
-      <char name="Egrave" width="600"/>
-      <char name="Eth" width="600"/>
-      <char name="Euro" width="600"/>
-      <char name="F" width="600"/>
-      <char name="G" width="600"/>
-      <char name="Gcaron" width="600"/>
-      <char name="H" width="600"/>
-      <char name="I" width="600"/>
-      <char name="IJ" width="600"/>
-      <char name="Iacute" width="600"/>
-      <char name="Icircumflex" width="600"/>
-      <char name="Idieresis" width="600"/>
-      <char name="Idot" width="600"/>
-      <char name="Igrave" width="600"/>
-      <char name="J" width="600"/>
-      <char name="K" width="600"/>
-      <char name="L" width="600"/>
-      <char name="LL" width="600"/>
-      <char name="Lslash" width="600"/>
-      <char name="M" width="600"/>
-      <char name="N" width="600"/>
-      <char name="Ntilde" width="600"/>
-      <char name="O" width="600"/>
-      <char name="OE" width="600"/>
-      <char name="Oacute" width="600"/>
-      <char name="Ocircumflex" width="600"/>
-      <char name="Odieresis" width="600"/>
-      <char name="Ograve" width="600"/>
-      <char name="Oslash" width="600"/>
-      <char name="Otilde" width="600"/>
-      <char name="P" width="600"/>
-      <char name="Q" width="600"/>
-      <char name="R" width="600"/>
-      <char name="S" width="600"/>
-      <char name="Scaron" width="600"/>
-      <char name="Scedilla" width="600"/>
-      <char name="T" width="600"/>
-      <char name="Thorn" width="600"/>
-      <char name="U" width="600"/>
-      <char name="Uacute" width="600"/>
-      <char name="Ucircumflex" width="600"/>
-      <char name="Udieresis" width="600"/>
-      <char name="Ugrave" width="600"/>
-      <char name="V" width="600"/>
-      <char name="W" width="600"/>
-      <char name="X" width="600"/>
-      <char name="Y" width="600"/>
-      <char name="Yacute" width="600"/>
-      <char name="Ydieresis" width="600"/>
-      <char name="Z" width="600"/>
-      <char name="Zcaron" width="600"/>
-      <char name="a" width="600"/>
-      <char name="aacute" width="600"/>
-      <char name="acircumflex" width="600"/>
-      <char name="acute" width="600"/>
-      <char name="adieresis" width="600"/>
-      <char name="ae" width="600"/>
-      <char name="agrave" width="600"/>
-      <char name="ampersand" width="600"/>
-      <char name="aring" width="600"/>
-      <char name="arrowboth" width="600"/>
-      <char name="arrowdown" width="600"/>
-      <char name="arrowleft" width="600"/>
-      <char name="arrowright" width="600"/>
-      <char name="arrowup" width="600"/>
-      <char name="asciicircum" width="600"/>
-      <char name="asciitilde" width="600"/>
-      <char name="asterisk" width="600"/>
-      <char name="at" width="600"/>
-      <char name="atilde" width="600"/>
-      <char name="b" width="600"/>
-      <char name="backslash" width="600"/>
-      <char name="bar" width="600"/>
-      <char name="braceleft" width="600"/>
-      <char name="braceright" width="600"/>
-      <char name="bracketleft" width="600"/>
-      <char name="bracketright" width="600"/>
-      <char name="breve" width="600"/>
-      <char name="brokenbar" width="600"/>
-      <char name="bullet" width="600"/>
-      <char name="c" width="600"/>
-      <char name="caron" width="600"/>
-      <char name="ccedilla" width="600"/>
-      <char name="cedilla" width="600"/>
-      <char name="cent" width="600"/>
-      <char name="center" width="600"/>
-      <char name="circumflex" width="600"/>
-      <char name="colon" width="600"/>
-      <char name="comma" width="600"/>
-      <char name="copyright" width="600"/>
-      <char name="currency" width="600"/>
-      <char name="d" width="600"/>
-      <char name="dagger" width="600"/>
-      <char name="daggerdbl" width="600"/>
-      <char name="dectab" width="600"/>
-      <char name="degree" width="600"/>
-      <char name="dieresis" width="600"/>
-      <char name="divide" width="600"/>
-      <char name="dollar" width="600"/>
-      <char name="dotaccent" width="600"/>
-      <char name="dotlessi" width="600"/>
-      <char name="down" width="600"/>
-      <char name="e" width="600"/>
-      <char name="eacute" width="600"/>
-      <char name="ecircumflex" width="600"/>
-      <char name="edieresis" width="600"/>
-      <char name="egrave" width="600"/>
-      <char name="eight" width="600"/>
-      <char name="ellipsis" width="600"/>
-      <char name="emdash" width="600"/>
-      <char name="endash" width="600"/>
-      <char name="equal" width="600"/>
-      <char name="eth" width="600"/>
-      <char name="exclam" width="600"/>
-      <char name="exclamdown" width="600"/>
-      <char name="f" width="600"/>
-      <char name="fi" width="600"/>
-      <char name="five" width="600"/>
-      <char name="fl" width="600"/>
-      <char name="florin" width="600"/>
-      <char name="format" width="600"/>
-      <char name="four" width="600"/>
-      <char name="fraction" width="600"/>
-      <char name="g" width="600"/>
-      <char name="gcaron" width="600"/>
-      <char name="germandbls" width="600"/>
-      <char name="grave" width="600"/>
-      <char name="graybox" width="600"/>
-      <char name="greater" width="600"/>
-      <char name="guillemotleft" width="600"/>
-      <char name="guillemotright" width="600"/>
-      <char name="guilsinglleft" width="600"/>
-      <char name="guilsinglright" width="600"/>
-      <char name="h" width="600"/>
-      <char name="hungarumlaut" width="600"/>
-      <char name="hyphen" width="600"/>
-      <char name="i" width="600"/>
-      <char name="iacute" width="600"/>
-      <char name="icircumflex" width="600"/>
-      <char name="idieresis" width="600"/>
-      <char name="igrave" width="600"/>
-      <char name="ij" width="600"/>
-      <char name="indent" width="600"/>
-      <char name="j" width="600"/>
-      <char name="k" width="600"/>
-      <char name="l" width="600"/>
-      <char name="largebullet" width="600"/>
-      <char name="left" width="600"/>
-      <char name="less" width="600"/>
-      <char name="lira" width="600"/>
-      <char name="ll" width="600"/>
-      <char name="logicalnot" width="600"/>
-      <char name="lslash" width="600"/>
-      <char name="m" width="600"/>
-      <char name="macron" width="600"/>
-      <char name="merge" width="600"/>
-      <char name="minus" width="600"/>
-      <char name="mu" width="600"/>
-      <char name="multiply" width="600"/>
-      <char name="n" width="600"/>
-      <char name="nine" width="600"/>
-      <char name="notegraphic" width="600"/>
-      <char name="ntilde" width="600"/>
-      <char name="numbersign" width="600"/>
-      <char name="o" width="600"/>
-      <char name="oacute" width="600"/>
-      <char name="ocircumflex" width="600"/>
-      <char name="odieresis" width="600"/>
-      <char name="oe" width="600"/>
-      <char name="ogonek" width="600"/>
-      <char name="ograve" width="600"/>
-      <char name="one" width="600"/>
-      <char name="onehalf" width="600"/>
-      <char name="onequarter" width="600"/>
-      <char name="onesuperior" width="600"/>
-      <char name="ordfeminine" width="600"/>
-      <char name="ordmasculine" width="600"/>
-      <char name="oslash" width="600"/>
-      <char name="otilde" width="600"/>
-      <char name="overscore" width="600"/>
-      <char name="p" width="600"/>
-      <char name="paragraph" width="600"/>
-      <char name="parenleft" width="600"/>
-      <char name="parenright" width="600"/>
-      <char name="percent" width="600"/>
-      <char name="period" width="600"/>
-      <char name="periodcentered" width="600"/>
-      <char name="perthousand" width="600"/>
-      <char name="plus" width="600"/>
-      <char name="plusminus" width="600"/>
-      <char name="prescription" width="600"/>
-      <char name="q" width="600"/>
-      <char name="question" width="600"/>
-      <char name="questiondown" width="600"/>
-      <char name="quotedbl" width="600"/>
-      <char name="quotedblbase" width="600"/>
-      <char name="quotedblleft" width="600"/>
-      <char name="quotedblright" width="600"/>
-      <char name="quoteleft" width="600"/>
-      <char name="quoteright" width="600"/>
-      <char name="quotesinglbase" width="600"/>
-      <char name="quotesingle" width="600"/>
-      <char name="r" width="600"/>
-      <char name="registered" width="600"/>
-      <char name="return" width="600"/>
-      <char name="ring" width="600"/>
-      <char name="s" width="600"/>
-      <char name="scaron" width="600"/>
-      <char name="scedilla" width="600"/>
-      <char name="section" width="600"/>
-      <char name="semicolon" width="600"/>
-      <char name="seven" width="600"/>
-      <char name="six" width="600"/>
-      <char name="slash" width="600"/>
-      <char name="space" width="600"/>
+    <char-metrics>
+      <char name="A" width="600" llx="-9" lly="0" urx="632" ury="562"/>
+      <char name="AE" width="600" llx="-29" lly="0" urx="708" ury="562"/>
+      <char name="Aacute" width="600" llx="-9" lly="0" urx="655" ury="784"/>
+      <char name="Acircumflex" width="600" llx="-9" lly="0" urx="632" ury="780"/>
+      <char name="Adieresis" width="600" llx="-9" lly="0" urx="632" ury="761"/>
+      <char name="Agrave" width="600" llx="-9" lly="0" urx="632" ury="784"/>
+      <char name="Aring" width="600" llx="-9" lly="0" urx="632" ury="801"/>
+      <char name="Atilde" width="600" llx="-9" lly="0" urx="669" ury="759"/>
+      <char name="B" width="600" llx="30" lly="0" urx="630" ury="562"/>
+      <char name="C" width="600" llx="74" lly="-18" urx="675" ury="580"/>
+      <char name="Ccedilla" width="600" llx="74" lly="-206" urx="675" ury="580"/>
+      <char name="D" width="600" llx="30" lly="0" urx="664" ury="562"/>
+      <char name="E" width="600" llx="25" lly="0" urx="670" ury="562"/>
+      <char name="Eacute" width="600" llx="25" lly="0" urx="670" ury="784"/>
+      <char name="Ecircumflex" width="600" llx="25" lly="0" urx="670" ury="780"/>
+      <char name="Edieresis" width="600" llx="25" lly="0" urx="670" ury="761"/>
+      <char name="Egrave" width="600" llx="25" lly="0" urx="670" ury="784"/>
+      <char name="Eth" width="600" llx="30" lly="0" urx="664" ury="562"/>
+      <char name="Euro" width="600" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="600" llx="39" lly="0" urx="684" ury="562"/>
+      <char name="G" width="600" llx="74" lly="-18" urx="675" ury="580"/>
+      <char name="H" width="600" llx="20" lly="0" urx="700" ury="562"/>
+      <char name="I" width="600" llx="77" lly="0" urx="643" ury="562"/>
+      <char name="Iacute" width="600" llx="77" lly="0" urx="643" ury="784"/>
+      <char name="Icircumflex" width="600" llx="77" lly="0" urx="643" ury="780"/>
+      <char name="Idieresis" width="600" llx="77" lly="0" urx="643" ury="761"/>
+      <char name="Igrave" width="600" llx="77" lly="0" urx="643" ury="784"/>
+      <char name="J" width="600" llx="58" lly="-18" urx="721" ury="562"/>
+      <char name="K" width="600" llx="21" lly="0" urx="692" ury="562"/>
+      <char name="L" width="600" llx="39" lly="0" urx="636" ury="562"/>
+      <char name="Lslash" width="600" llx="39" lly="0" urx="636" ury="562"/>
+      <char name="M" width="600" llx="-2" lly="0" urx="722" ury="562"/>
+      <char name="N" width="600" llx="8" lly="-12" urx="730" ury="562"/>
+      <char name="Ntilde" width="600" llx="8" lly="-12" urx="730" ury="759"/>
+      <char name="O" width="600" llx="74" lly="-18" urx="645" ury="580"/>
+      <char name="OE" width="600" llx="26" lly="0" urx="701" ury="562"/>
+      <char name="Oacute" width="600" llx="74" lly="-18" urx="645" ury="784"/>
+      <char name="Ocircumflex" width="600" llx="74" lly="-18" urx="645" ury="780"/>
+      <char name="Odieresis" width="600" llx="74" lly="-18" urx="645" ury="761"/>
+      <char name="Ograve" width="600" llx="74" lly="-18" urx="645" ury="784"/>
+      <char name="Oslash" width="600" llx="48" lly="-22" urx="673" ury="584"/>
+      <char name="Otilde" width="600" llx="74" lly="-18" urx="669" ury="759"/>
+      <char name="P" width="600" llx="48" lly="0" urx="643" ury="562"/>
+      <char name="Q" width="600" llx="83" lly="-138" urx="636" ury="580"/>
+      <char name="R" width="600" llx="24" lly="0" urx="617" ury="562"/>
+      <char name="S" width="600" llx="54" lly="-22" urx="673" ury="582"/>
+      <char name="Scaron" width="600" llx="54" lly="-22" urx="689" ury="790"/>
+      <char name="Scedilla" width="600" llx="54" lly="-206" urx="673" ury="582"/>
+      <char name="T" width="600" llx="86" lly="0" urx="679" ury="562"/>
+      <char name="Thorn" width="600" llx="48" lly="0" urx="620" ury="562"/>
+      <char name="U" width="600" llx="101" lly="-18" urx="716" ury="562"/>
+      <char name="Uacute" width="600" llx="101" lly="-18" urx="716" ury="784"/>
+      <char name="Ucircumflex" width="600" llx="101" lly="-18" urx="716" ury="780"/>
+      <char name="Udieresis" width="600" llx="101" lly="-18" urx="716" ury="761"/>
+      <char name="Ugrave" width="600" llx="101" lly="-18" urx="716" ury="784"/>
+      <char name="V" width="600" llx="84" lly="0" urx="733" ury="562"/>
+      <char name="W" width="600" llx="79" lly="0" urx="738" ury="562"/>
+      <char name="X" width="600" llx="12" lly="0" urx="690" ury="562"/>
+      <char name="Y" width="600" llx="109" lly="0" urx="709" ury="562"/>
+      <char name="Yacute" width="600" llx="109" lly="0" urx="709" ury="784"/>
+      <char name="Ydieresis" width="600" llx="109" lly="0" urx="709" ury="761"/>
+      <char name="Z" width="600" llx="62" lly="0" urx="637" ury="562"/>
+      <char name="Zcaron" width="600" llx="62" lly="0" urx="659" ury="790"/>
+      <char name="a" width="600" llx="61" lly="-15" urx="593" ury="454"/>
+      <char name="aacute" width="600" llx="61" lly="-15" urx="609" ury="661"/>
+      <char name="acircumflex" width="600" llx="61" lly="-15" urx="607" ury="657"/>
+      <char name="acute" width="600" llx="312" lly="508" urx="609" ury="661"/>
+      <char name="adieresis" width="600" llx="61" lly="-15" urx="595" ury="638"/>
+      <char name="ae" width="600" llx="21" lly="-15" urx="652" ury="454"/>
+      <char name="agrave" width="600" llx="61" lly="-15" urx="593" ury="661"/>
+      <char name="ampersand" width="600" llx="61" lly="-15" urx="595" ury="543"/>
+      <char name="aring" width="600" llx="61" lly="-15" urx="593" ury="678"/>
+      <char name="asciicircum" width="600" llx="171" lly="250" urx="556" ury="616"/>
+      <char name="asciitilde" width="600" llx="120" lly="153" urx="590" ury="356"/>
+      <char name="asterisk" width="600" llx="179" lly="219" urx="598" ury="601"/>
+      <char name="at" width="600" llx="65" lly="-15" urx="642" ury="616"/>
+      <char name="atilde" width="600" llx="61" lly="-15" urx="643" ury="636"/>
+      <char name="b" width="600" llx="13" lly="-15" urx="636" ury="626"/>
+      <char name="backslash" width="600" llx="222" lly="-77" urx="496" ury="626"/>
+      <char name="bar" width="600" llx="201" lly="-250" urx="505" ury="750"/>
+      <char name="braceleft" width="600" llx="203" lly="-102" urx="595" ury="616"/>
+      <char name="braceright" width="600" llx="114" lly="-102" urx="506" ury="616"/>
+      <char name="bracketleft" width="600" llx="223" lly="-102" urx="606" ury="616"/>
+      <char name="bracketright" width="600" llx="103" lly="-102" urx="486" ury="616"/>
+      <char name="breve" width="600" llx="217" lly="468" urx="652" ury="631"/>
+      <char name="brokenbar" width="600" llx="217" lly="-175" urx="489" ury="675"/>
+      <char name="bullet" width="600" llx="196" lly="132" urx="523" ury="430"/>
+      <char name="c" width="600" llx="81" lly="-15" urx="631" ury="459"/>
+      <char name="caron" width="600" llx="238" lly="493" urx="633" ury="667"/>
+      <char name="ccedilla" width="600" llx="81" lly="-206" urx="631" ury="459"/>
+      <char name="cedilla" width="600" llx="168" lly="-206" urx="368" ury="0"/>
+      <char name="cent" width="600" llx="121" lly="-49" urx="605" ury="614"/>
+      <char name="circumflex" width="600" llx="212" lly="483" urx="607" ury="657"/>
+      <char name="colon" width="600" llx="205" lly="-15" urx="480" ury="425"/>
+      <char name="comma" width="600" llx="99" lly="-111" urx="430" ury="174"/>
+      <char name="copyright" width="600" llx="53" lly="-18" urx="667" ury="580"/>
+      <char name="currency" width="600" llx="77" lly="49" urx="644" ury="517"/>
+      <char name="d" width="600" llx="60" lly="-15" urx="645" ury="626"/>
+      <char name="dagger" width="600" llx="175" lly="-70" urx="586" ury="580"/>
+      <char name="daggerdbl" width="600" llx="121" lly="-70" urx="587" ury="580"/>
+      <char name="degree" width="600" llx="173" lly="243" urx="570" ury="616"/>
+      <char name="dieresis" width="600" llx="246" lly="498" urx="595" ury="638"/>
+      <char name="divide" width="600" llx="114" lly="16" urx="596" ury="500"/>
+      <char name="dollar" width="600" llx="87" lly="-126" urx="630" ury="666"/>
+      <char name="dotaccent" width="600" llx="348" lly="498" urx="493" ury="638"/>
+      <char name="dotlessi" width="600" llx="77" lly="0" urx="546" ury="439"/>
+      <char name="e" width="600" llx="81" lly="-15" urx="605" ury="454"/>
+      <char name="eacute" width="600" llx="81" lly="-15" urx="609" ury="661"/>
+      <char name="ecircumflex" width="600" llx="81" lly="-15" urx="607" ury="657"/>
+      <char name="edieresis" width="600" llx="81" lly="-15" urx="605" ury="638"/>
+      <char name="egrave" width="600" llx="81" lly="-15" urx="605" ury="661"/>
+      <char name="eight" width="600" llx="115" lly="-15" urx="604" ury="616"/>
+      <char name="ellipsis" width="600" llx="35" lly="-15" urx="587" ury="116"/>
+      <char name="emdash" width="600" llx="33" lly="203" urx="677" ury="313"/>
+      <char name="endash" width="600" llx="108" lly="203" urx="602" ury="313"/>
+      <char name="equal" width="600" llx="96" lly="118" urx="614" ury="398"/>
+      <char name="eth" width="600" llx="93" lly="-27" urx="661" ury="626"/>
+      <char name="exclam" width="600" llx="215" lly="-15" urx="495" ury="572"/>
+      <char name="exclamdown" width="600" llx="196" lly="-146" urx="477" ury="449"/>
+      <char name="f" width="600" llx="83" lly="0" urx="677" ury="626"/>
+      <char name="fi" width="600" llx="12" lly="0" urx="644" ury="626"/>
+      <char name="five" width="600" llx="77" lly="-15" urx="621" ury="601"/>
+      <char name="fl" width="600" llx="12" lly="0" urx="644" ury="626"/>
+      <char name="florin" width="600" llx="-57" lly="-131" urx="702" ury="616"/>
+      <char name="four" width="600" llx="81" lly="0" urx="559" ury="616"/>
+      <char name="fraction" width="600" llx="22" lly="-60" urx="708" ury="661"/>
+      <char name="g" width="600" llx="40" lly="-146" urx="674" ury="454"/>
+      <char name="germandbls" width="600" llx="22" lly="-15" urx="629" ury="626"/>
+      <char name="grave" width="600" llx="272" lly="508" urx="503" ury="661"/>
+      <char name="greater" width="600" llx="97" lly="15" urx="589" ury="501"/>
+      <char name="guillemotleft" width="600" llx="62" lly="70" urx="639" ury="446"/>
+      <char name="guillemotright" width="600" llx="71" lly="70" urx="647" ury="446"/>
+      <char name="guilsinglleft" width="600" llx="195" lly="70" urx="545" ury="446"/>
+      <char name="guilsinglright" width="600" llx="165" lly="70" urx="514" ury="446"/>
+      <char name="h" width="600" llx="18" lly="0" urx="615" ury="626"/>
+      <char name="hungarumlaut" width="600" llx="171" lly="488" urx="729" ury="661"/>
+      <char name="hyphen" width="600" llx="143" lly="203" urx="567" ury="313"/>
+      <char name="i" width="600" llx="77" lly="0" urx="546" ury="658"/>
+      <char name="iacute" width="600" llx="77" lly="0" urx="609" ury="661"/>
+      <char name="icircumflex" width="600" llx="77" lly="0" urx="577" ury="657"/>
+      <char name="idieresis" width="600" llx="77" lly="0" urx="561" ury="618"/>
+      <char name="igrave" width="600" llx="77" lly="0" urx="546" ury="661"/>
+      <char name="j" width="600" llx="36" lly="-146" urx="580" ury="658"/>
+      <char name="k" width="600" llx="33" lly="0" urx="643" ury="626"/>
+      <char name="l" width="600" llx="77" lly="0" urx="546" ury="626"/>
+      <char name="less" width="600" llx="120" lly="15" urx="613" ury="501"/>
+      <char name="logicalnot" width="600" llx="135" lly="103" urx="617" ury="413"/>
+      <char name="lslash" width="600" llx="77" lly="0" urx="587" ury="626"/>
+      <char name="m" width="600" llx="-22" lly="0" urx="649" ury="454"/>
+      <char name="macron" width="600" llx="195" lly="505" urx="637" ury="585"/>
+      <char name="minus" width="600" llx="114" lly="203" urx="596" ury="313"/>
+      <char name="mu" width="600" llx="49" lly="-142" urx="592" ury="439"/>
+      <char name="multiply" width="600" llx="104" lly="39" urx="606" ury="478"/>
+      <char name="n" width="600" llx="18" lly="0" urx="615" ury="454"/>
+      <char name="nine" width="600" llx="75" lly="-15" urx="592" ury="616"/>
+      <char name="ntilde" width="600" llx="18" lly="0" urx="643" ury="636"/>
+      <char name="numbersign" width="600" llx="88" lly="-45" urx="641" ury="651"/>
+      <char name="o" width="600" llx="71" lly="-15" urx="622" ury="454"/>
+      <char name="oacute" width="600" llx="71" lly="-15" urx="649" ury="661"/>
+      <char name="ocircumflex" width="600" llx="71" lly="-15" urx="622" ury="657"/>
+      <char name="odieresis" width="600" llx="71" lly="-15" urx="622" ury="638"/>
+      <char name="oe" width="600" llx="18" lly="-15" urx="662" ury="454"/>
+      <char name="ogonek" width="600" llx="143" lly="-199" urx="367" ury="0"/>
+      <char name="ograve" width="600" llx="71" lly="-15" urx="622" ury="661"/>
+      <char name="one" width="600" llx="93" lly="0" urx="562" ury="616"/>
+      <char name="onehalf" width="600" llx="22" lly="-60" urx="716" ury="661"/>
+      <char name="onequarter" width="600" llx="13" lly="-60" urx="707" ury="661"/>
+      <char name="onesuperior" width="600" llx="212" lly="230" urx="514" ury="616"/>
+      <char name="ordfeminine" width="600" llx="188" lly="196" urx="526" ury="580"/>
+      <char name="ordmasculine" width="600" llx="188" lly="196" urx="543" ury="580"/>
+      <char name="oslash" width="600" llx="54" lly="-24" urx="638" ury="463"/>
+      <char name="otilde" width="600" llx="71" lly="-15" urx="643" ury="636"/>
+      <char name="p" width="600" llx="-32" lly="-142" urx="622" ury="454"/>
+      <char name="paragraph" width="600" llx="61" lly="-70" urx="700" ury="580"/>
+      <char name="parenleft" width="600" llx="265" lly="-102" urx="592" ury="616"/>
+      <char name="parenright" width="600" llx="117" lly="-102" urx="444" ury="616"/>
+      <char name="percent" width="600" llx="101" lly="-15" urx="625" ury="616"/>
+      <char name="period" width="600" llx="206" lly="-15" urx="427" ury="171"/>
+      <char name="periodcentered" width="600" llx="248" lly="165" urx="461" ury="351"/>
+      <char name="perthousand" width="600" llx="-45" lly="-15" urx="743" ury="616"/>
+      <char name="plus" width="600" llx="114" lly="39" urx="596" ury="478"/>
+      <char name="plusminus" width="600" llx="76" lly="24" urx="614" ury="515"/>
+      <char name="q" width="600" llx="60" lly="-142" urx="685" ury="454"/>
+      <char name="question" width="600" llx="183" lly="-14" urx="592" ury="580"/>
+      <char name="questiondown" width="600" llx="100" lly="-146" urx="509" ury="449"/>
+      <char name="quotedbl" width="600" llx="211" lly="277" urx="585" ury="562"/>
+      <char name="quotedblbase" width="600" llx="34" lly="-142" urx="560" ury="143"/>
+      <char name="quotedblleft" width="600" llx="190" lly="277" urx="594" ury="562"/>
+      <char name="quotedblright" width="600" llx="119" lly="277" urx="645" ury="562"/>
+      <char name="quoteleft" width="600" llx="297" lly="277" urx="487" ury="562"/>
+      <char name="quoteright" width="600" llx="229" lly="277" urx="543" ury="562"/>
+      <char name="quotesinglbase" width="600" llx="144" lly="-142" urx="458" ury="143"/>
+      <char name="quotesingle" width="600" llx="303" lly="277" urx="493" ury="562"/>
+      <char name="r" width="600" llx="47" lly="0" urx="655" ury="454"/>
+      <char name="registered" width="600" llx="53" lly="-18" urx="667" ury="580"/>
+      <char name="ring" width="600" llx="319" lly="481" urx="528" ury="678"/>
+      <char name="s" width="600" llx="66" lly="-17" urx="608" ury="459"/>
+      <char name="scaron" width="600" llx="66" lly="-17" urx="633" ury="667"/>
+      <char name="scedilla" width="600" llx="66" lly="-206" urx="608" ury="459"/>
+      <char name="section" width="600" llx="74" lly="-70" urx="620" ury="580"/>
+      <char name="semicolon" width="600" llx="99" lly="-111" urx="481" ury="425"/>
+      <char name="seven" width="600" llx="147" lly="0" urx="622" ury="601"/>
+      <char name="six" width="600" llx="135" lly="-15" urx="652" ury="616"/>
+      <char name="slash" width="600" llx="90" lly="-77" urx="626" ury="626"/>
+      <char name="space" width="600" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="600"/>
-      <char name="square" width="600"/>
-      <char name="sterling" width="600"/>
-      <char name="stop" width="600"/>
-      <char name="t" width="600"/>
-      <char name="tab" width="600"/>
-      <char name="thorn" width="600"/>
-      <char name="three" width="600"/>
-      <char name="threequarters" width="600"/>
-      <char name="threesuperior" width="600"/>
-      <char name="tilde" width="600"/>
-      <char name="trademark" width="600"/>
-      <char name="two" width="600"/>
-      <char name="twosuperior" width="600"/>
-      <char name="u" width="600"/>
-      <char name="uacute" width="600"/>
-      <char name="ucircumflex" width="600"/>
-      <char name="udieresis" width="600"/>
-      <char name="ugrave" width="600"/>
-      <char name="underscore" width="600"/>
-      <char name="up" width="600"/>
-      <char name="v" width="600"/>
-      <char name="w" width="600"/>
-      <char name="x" width="600"/>
-      <char name="y" width="600"/>
-      <char name="yacute" width="600"/>
-      <char name="ydieresis" width="600"/>
-      <char name="yen" width="600"/>
-      <char name="z" width="600"/>
-      <char name="zcaron" width="600"/>
-      <char name="zero" width="600"/>
-   </widths>
+      <char name="sterling" width="600" llx="106" lly="-28" urx="650" ury="611"/>
+      <char name="t" width="600" llx="118" lly="-15" urx="567" ury="562"/>
+      <char name="thorn" width="600" llx="-32" lly="-142" urx="622" ury="626"/>
+      <char name="three" width="600" llx="71" lly="-15" urx="571" ury="616"/>
+      <char name="threequarters" width="600" llx="8" lly="-60" urx="699" ury="661"/>
+      <char name="threesuperior" width="600" llx="193" lly="222" urx="526" ury="616"/>
+      <char name="tilde" width="600" llx="199" lly="493" urx="643" ury="636"/>
+      <char name="trademark" width="600" llx="86" lly="230" urx="869" ury="562"/>
+      <char name="two" width="600" llx="61" lly="0" urx="594" ury="616"/>
+      <char name="twosuperior" width="600" llx="191" lly="230" urx="542" ury="616"/>
+      <char name="u" width="600" llx="70" lly="-15" urx="592" ury="439"/>
+      <char name="uacute" width="600" llx="70" lly="-15" urx="599" ury="661"/>
+      <char name="ucircumflex" width="600" llx="70" lly="-15" urx="597" ury="657"/>
+      <char name="udieresis" width="600" llx="70" lly="-15" urx="595" ury="638"/>
+      <char name="ugrave" width="600" llx="70" lly="-15" urx="592" ury="661"/>
+      <char name="underscore" width="600" llx="-27" lly="-125" urx="585" ury="-75"/>
+      <char name="v" width="600" llx="70" lly="0" urx="695" ury="439"/>
+      <char name="w" width="600" llx="53" lly="0" urx="712" ury="439"/>
+      <char name="x" width="600" llx="6" lly="0" urx="671" ury="439"/>
+      <char name="y" width="600" llx="-21" lly="-142" urx="695" ury="439"/>
+      <char name="yacute" width="600" llx="-21" lly="-142" urx="695" ury="661"/>
+      <char name="ydieresis" width="600" llx="-21" lly="-142" urx="695" ury="638"/>
+      <char name="yen" width="600" llx="98" lly="0" urx="710" ury="562"/>
+      <char name="z" width="600" llx="81" lly="0" urx="614" ury="439"/>
+      <char name="zcaron" width="600" llx="81" lly="0" urx="643" ury="667"/>
+      <char name="zero" width="600" llx="135" lly="-15" urx="593" ury="616"/>
+    </char-metrics>
 </font-metrics>
diff --git a/src/codegen/fonts/CourierOblique.xml b/src/codegen/fonts/CourierOblique.xml
index 2dc300645..e08fa9b9b 100644
--- a/src/codegen/fonts/CourierOblique.xml
+++ b/src/codegen/fonts/CourierOblique.xml
@@ -22,275 +22,246 @@
    <family-name>Courier</family-name>
    <class-name>CourierOblique</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>562</cap-height>
    <x-height>426</x-height>
    <ascender>629</ascender>
    <descender>-157</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="600"/>
-      <char name="AE" width="600"/>
-      <char name="Aacute" width="600"/>
-      <char name="Acircumflex" width="600"/>
-      <char name="Adieresis" width="600"/>
-      <char name="Agrave" width="600"/>
-      <char name="Aring" width="600"/>
-      <char name="Atilde" width="600"/>
-      <char name="B" width="600"/>
-      <char name="C" width="600"/>
-      <char name="Ccedilla" width="600"/>
-      <char name="D" width="600"/>
-      <char name="E" width="600"/>
-      <char name="Eacute" width="600"/>
-      <char name="Ecircumflex" width="600"/>
-      <char name="Edieresis" width="600"/>
-      <char name="Egrave" width="600"/>
-      <char name="Eth" width="600"/>
-      <char name="Euro" width="600"/>
-      <char name="F" width="600"/>
-      <char name="G" width="600"/>
-      <char name="Gcaron" width="600"/>
-      <char name="H" width="600"/>
-      <char name="I" width="600"/>
-      <char name="IJ" width="600"/>
-      <char name="Iacute" width="600"/>
-      <char name="Icircumflex" width="600"/>
-      <char name="Idieresis" width="600"/>
-      <char name="Idot" width="600"/>
-      <char name="Igrave" width="600"/>
-      <char name="J" width="600"/>
-      <char name="K" width="600"/>
-      <char name="L" width="600"/>
-      <char name="LL" width="600"/>
-      <char name="Lslash" width="600"/>
-      <char name="M" width="600"/>
-      <char name="N" width="600"/>
-      <char name="Ntilde" width="600"/>
-      <char name="O" width="600"/>
-      <char name="OE" width="600"/>
-      <char name="Oacute" width="600"/>
-      <char name="Ocircumflex" width="600"/>
-      <char name="Odieresis" width="600"/>
-      <char name="Ograve" width="600"/>
-      <char name="Oslash" width="600"/>
-      <char name="Otilde" width="600"/>
-      <char name="P" width="600"/>
-      <char name="Q" width="600"/>
-      <char name="R" width="600"/>
-      <char name="S" width="600"/>
-      <char name="Scaron" width="600"/>
-      <char name="Scedilla" width="600"/>
-      <char name="T" width="600"/>
-      <char name="Thorn" width="600"/>
-      <char name="U" width="600"/>
-      <char name="Uacute" width="600"/>
-      <char name="Ucircumflex" width="600"/>
-      <char name="Udieresis" width="600"/>
-      <char name="Ugrave" width="600"/>
-      <char name="V" width="600"/>
-      <char name="W" width="600"/>
-      <char name="X" width="600"/>
-      <char name="Y" width="600"/>
-      <char name="Yacute" width="600"/>
-      <char name="Ydieresis" width="600"/>
-      <char name="Z" width="600"/>
-      <char name="Zcaron" width="600"/>
-      <char name="a" width="600"/>
-      <char name="aacute" width="600"/>
-      <char name="acircumflex" width="600"/>
-      <char name="acute" width="600"/>
-      <char name="adieresis" width="600"/>
-      <char name="ae" width="600"/>
-      <char name="agrave" width="600"/>
-      <char name="ampersand" width="600"/>
-      <char name="aring" width="600"/>
-      <char name="arrowboth" width="600"/>
-      <char name="arrowdown" width="600"/>
-      <char name="arrowleft" width="600"/>
-      <char name="arrowright" width="600"/>
-      <char name="arrowup" width="600"/>
-      <char name="asciicircum" width="600"/>
-      <char name="asciitilde" width="600"/>
-      <char name="asterisk" width="600"/>
-      <char name="at" width="600"/>
-      <char name="atilde" width="600"/>
-      <char name="b" width="600"/>
-      <char name="backslash" width="600"/>
-      <char name="bar" width="600"/>
-      <char name="braceleft" width="600"/>
-      <char name="braceright" width="600"/>
-      <char name="bracketleft" width="600"/>
-      <char name="bracketright" width="600"/>
-      <char name="breve" width="600"/>
-      <char name="brokenbar" width="600"/>
-      <char name="bullet" width="600"/>
-      <char name="c" width="600"/>
-      <char name="caron" width="600"/>
-      <char name="ccedilla" width="600"/>
-      <char name="cedilla" width="600"/>
-      <char name="cent" width="600"/>
-      <char name="center" width="600"/>
-      <char name="circumflex" width="600"/>
-      <char name="colon" width="600"/>
-      <char name="comma" width="600"/>
-      <char name="copyright" width="600"/>
-      <char name="currency" width="600"/>
-      <char name="d" width="600"/>
-      <char name="dagger" width="600"/>
-      <char name="daggerdbl" width="600"/>
-      <char name="dectab" width="600"/>
-      <char name="degree" width="600"/>
-      <char name="dieresis" width="600"/>
-      <char name="divide" width="600"/>
-      <char name="dollar" width="600"/>
-      <char name="dotaccent" width="600"/>
-      <char name="dotlessi" width="600"/>
-      <char name="down" width="600"/>
-      <char name="e" width="600"/>
-      <char name="eacute" width="600"/>
-      <char name="ecircumflex" width="600"/>
-      <char name="edieresis" width="600"/>
-      <char name="egrave" width="600"/>
-      <char name="eight" width="600"/>
-      <char name="ellipsis" width="600"/>
-      <char name="emdash" width="600"/>
-      <char name="endash" width="600"/>
-      <char name="equal" width="600"/>
-      <char name="eth" width="600"/>
-      <char name="exclam" width="600"/>
-      <char name="exclamdown" width="600"/>
-      <char name="f" width="600"/>
-      <char name="fi" width="600"/>
-      <char name="five" width="600"/>
-      <char name="fl" width="600"/>
-      <char name="florin" width="600"/>
-      <char name="format" width="600"/>
-      <char name="four" width="600"/>
-      <char name="fraction" width="600"/>
-      <char name="g" width="600"/>
-      <char name="gcaron" width="600"/>
-      <char name="germandbls" width="600"/>
-      <char name="grave" width="600"/>
-      <char name="graybox" width="600"/>
-      <char name="greater" width="600"/>
-      <char name="guillemotleft" width="600"/>
-      <char name="guillemotright" width="600"/>
-      <char name="guilsinglleft" width="600"/>
-      <char name="guilsinglright" width="600"/>
-      <char name="h" width="600"/>
-      <char name="hungarumlaut" width="600"/>
-      <char name="hyphen" width="600"/>
-      <char name="i" width="600"/>
-      <char name="iacute" width="600"/>
-      <char name="icircumflex" width="600"/>
-      <char name="idieresis" width="600"/>
-      <char name="igrave" width="600"/>
-      <char name="ij" width="600"/>
-      <char name="indent" width="600"/>
-      <char name="j" width="600"/>
-      <char name="k" width="600"/>
-      <char name="l" width="600"/>
-      <char name="largebullet" width="600"/>
-      <char name="left" width="600"/>
-      <char name="less" width="600"/>
-      <char name="lira" width="600"/>
-      <char name="ll" width="600"/>
-      <char name="logicalnot" width="600"/>
-      <char name="lslash" width="600"/>
-      <char name="m" width="600"/>
-      <char name="macron" width="600"/>
-      <char name="merge" width="600"/>
-      <char name="minus" width="600"/>
-      <char name="mu" width="600"/>
-      <char name="multiply" width="600"/>
-      <char name="n" width="600"/>
-      <char name="nine" width="600"/>
-      <char name="notegraphic" width="600"/>
-      <char name="ntilde" width="600"/>
-      <char name="numbersign" width="600"/>
-      <char name="o" width="600"/>
-      <char name="oacute" width="600"/>
-      <char name="ocircumflex" width="600"/>
-      <char name="odieresis" width="600"/>
-      <char name="oe" width="600"/>
-      <char name="ogonek" width="600"/>
-      <char name="ograve" width="600"/>
-      <char name="one" width="600"/>
-      <char name="onehalf" width="600"/>
-      <char name="onequarter" width="600"/>
-      <char name="onesuperior" width="600"/>
-      <char name="ordfeminine" width="600"/>
-      <char name="ordmasculine" width="600"/>
-      <char name="oslash" width="600"/>
-      <char name="otilde" width="600"/>
-      <char name="overscore" width="600"/>
-      <char name="p" width="600"/>
-      <char name="paragraph" width="600"/>
-      <char name="parenleft" width="600"/>
-      <char name="parenright" width="600"/>
-      <char name="percent" width="600"/>
-      <char name="period" width="600"/>
-      <char name="periodcentered" width="600"/>
-      <char name="perthousand" width="600"/>
-      <char name="plus" width="600"/>
-      <char name="plusminus" width="600"/>
-      <char name="prescription" width="600"/>
-      <char name="q" width="600"/>
-      <char name="question" width="600"/>
-      <char name="questiondown" width="600"/>
-      <char name="quotedbl" width="600"/>
-      <char name="quotedblbase" width="600"/>
-      <char name="quotedblleft" width="600"/>
-      <char name="quotedblright" width="600"/>
-      <char name="quoteleft" width="600"/>
-      <char name="quoteright" width="600"/>
-      <char name="quotesinglbase" width="600"/>
-      <char name="quotesingle" width="600"/>
-      <char name="r" width="600"/>
-      <char name="registered" width="600"/>
-      <char name="return" width="600"/>
-      <char name="ring" width="600"/>
-      <char name="s" width="600"/>
-      <char name="scaron" width="600"/>
-      <char name="scedilla" width="600"/>
-      <char name="section" width="600"/>
-      <char name="semicolon" width="600"/>
-      <char name="seven" width="600"/>
-      <char name="six" width="600"/>
-      <char name="slash" width="600"/>
-      <char name="space" width="600"/>
+    <char-metrics>
+      <char name="A" width="600" llx="3" lly="0" urx="607" ury="562"/>
+      <char name="AE" width="600" llx="3" lly="0" urx="655" ury="562"/>
+      <char name="Aacute" width="600" llx="3" lly="0" urx="660" ury="805"/>
+      <char name="Acircumflex" width="600" llx="3" lly="0" urx="607" ury="787"/>
+      <char name="Adieresis" width="600" llx="3" lly="0" urx="607" ury="753"/>
+      <char name="Agrave" width="600" llx="3" lly="0" urx="607" ury="805"/>
+      <char name="Aring" width="600" llx="3" lly="0" urx="607" ury="750"/>
+      <char name="Atilde" width="600" llx="3" lly="0" urx="655" ury="729"/>
+      <char name="B" width="600" llx="43" lly="0" urx="616" ury="562"/>
+      <char name="C" width="600" llx="93" lly="-18" urx="655" ury="580"/>
+      <char name="Ccedilla" width="600" llx="93" lly="-151" urx="658" ury="580"/>
+      <char name="D" width="600" llx="43" lly="0" urx="645" ury="562"/>
+      <char name="E" width="600" llx="53" lly="0" urx="660" ury="562"/>
+      <char name="Eacute" width="600" llx="53" lly="0" urx="670" ury="805"/>
+      <char name="Ecircumflex" width="600" llx="53" lly="0" urx="660" ury="787"/>
+      <char name="Edieresis" width="600" llx="53" lly="0" urx="660" ury="753"/>
+      <char name="Egrave" width="600" llx="53" lly="0" urx="660" ury="805"/>
+      <char name="Eth" width="600" llx="43" lly="0" urx="645" ury="562"/>
+      <char name="Euro" width="600" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="600" llx="53" lly="0" urx="660" ury="562"/>
+      <char name="G" width="600" llx="83" lly="-18" urx="645" ury="580"/>
+      <char name="H" width="600" llx="32" lly="0" urx="687" ury="562"/>
+      <char name="I" width="600" llx="96" lly="0" urx="623" ury="562"/>
+      <char name="Iacute" width="600" llx="96" lly="0" urx="640" ury="805"/>
+      <char name="Icircumflex" width="600" llx="96" lly="0" urx="623" ury="787"/>
+      <char name="Idieresis" width="600" llx="96" lly="0" urx="623" ury="753"/>
+      <char name="Igrave" width="600" llx="96" lly="0" urx="623" ury="805"/>
+      <char name="J" width="600" llx="52" lly="-18" urx="685" ury="562"/>
+      <char name="K" width="600" llx="38" lly="0" urx="671" ury="562"/>
+      <char name="L" width="600" llx="47" lly="0" urx="607" ury="562"/>
+      <char name="Lslash" width="600" llx="47" lly="0" urx="607" ury="562"/>
+      <char name="M" width="600" llx="4" lly="0" urx="715" ury="562"/>
+      <char name="N" width="600" llx="7" lly="-13" urx="712" ury="562"/>
+      <char name="Ntilde" width="600" llx="7" lly="-13" urx="712" ury="729"/>
+      <char name="O" width="600" llx="94" lly="-18" urx="625" ury="580"/>
+      <char name="OE" width="600" llx="59" lly="0" urx="672" ury="562"/>
+      <char name="Oacute" width="600" llx="94" lly="-18" urx="640" ury="805"/>
+      <char name="Ocircumflex" width="600" llx="94" lly="-18" urx="625" ury="787"/>
+      <char name="Odieresis" width="600" llx="94" lly="-18" urx="625" ury="753"/>
+      <char name="Ograve" width="600" llx="94" lly="-18" urx="625" ury="805"/>
+      <char name="Oslash" width="600" llx="94" lly="-80" urx="625" ury="629"/>
+      <char name="Otilde" width="600" llx="94" lly="-18" urx="655" ury="729"/>
+      <char name="P" width="600" llx="79" lly="0" urx="644" ury="562"/>
+      <char name="Q" width="600" llx="95" lly="-138" urx="625" ury="580"/>
+      <char name="R" width="600" llx="38" lly="0" urx="598" ury="562"/>
+      <char name="S" width="600" llx="76" lly="-20" urx="650" ury="580"/>
+      <char name="Scaron" width="600" llx="76" lly="-20" urx="672" ury="802"/>
+      <char name="Scedilla" width="600" llx="76" lly="-151" urx="650" ury="580"/>
+      <char name="T" width="600" llx="108" lly="0" urx="665" ury="562"/>
+      <char name="Thorn" width="600" llx="79" lly="0" urx="606" ury="562"/>
+      <char name="U" width="600" llx="125" lly="-18" urx="702" ury="562"/>
+      <char name="Uacute" width="600" llx="125" lly="-18" urx="702" ury="805"/>
+      <char name="Ucircumflex" width="600" llx="125" lly="-18" urx="702" ury="787"/>
+      <char name="Udieresis" width="600" llx="125" lly="-18" urx="702" ury="753"/>
+      <char name="Ugrave" width="600" llx="125" lly="-18" urx="702" ury="805"/>
+      <char name="V" width="600" llx="105" lly="-13" urx="723" ury="562"/>
+      <char name="W" width="600" llx="106" lly="-13" urx="722" ury="562"/>
+      <char name="X" width="600" llx="23" lly="0" urx="675" ury="562"/>
+      <char name="Y" width="600" llx="133" lly="0" urx="695" ury="562"/>
+      <char name="Yacute" width="600" llx="133" lly="0" urx="695" ury="805"/>
+      <char name="Ydieresis" width="600" llx="133" lly="0" urx="695" ury="753"/>
+      <char name="Z" width="600" llx="86" lly="0" urx="610" ury="562"/>
+      <char name="Zcaron" width="600" llx="86" lly="0" urx="642" ury="802"/>
+      <char name="a" width="600" llx="76" lly="-15" urx="569" ury="441"/>
+      <char name="aacute" width="600" llx="76" lly="-15" urx="612" ury="672"/>
+      <char name="acircumflex" width="600" llx="76" lly="-15" urx="581" ury="654"/>
+      <char name="acute" width="600" llx="348" lly="497" urx="612" ury="672"/>
+      <char name="adieresis" width="600" llx="76" lly="-15" urx="575" ury="620"/>
+      <char name="ae" width="600" llx="41" lly="-15" urx="626" ury="441"/>
+      <char name="agrave" width="600" llx="76" lly="-15" urx="569" ury="672"/>
+      <char name="ampersand" width="600" llx="87" lly="-15" urx="580" ury="543"/>
+      <char name="aring" width="600" llx="76" lly="-15" urx="569" ury="627"/>
+      <char name="asciicircum" width="600" llx="175" lly="354" urx="587" ury="622"/>
+      <char name="asciitilde" width="600" llx="116" lly="197" urx="600" ury="320"/>
+      <char name="asterisk" width="600" llx="212" lly="257" urx="580" ury="607"/>
+      <char name="at" width="600" llx="127" lly="-15" urx="582" ury="622"/>
+      <char name="atilde" width="600" llx="76" lly="-15" urx="629" ury="606"/>
+      <char name="b" width="600" llx="29" lly="-15" urx="625" ury="629"/>
+      <char name="backslash" width="600" llx="249" lly="-80" urx="468" ury="629"/>
+      <char name="bar" width="600" llx="222" lly="-250" urx="485" ury="750"/>
+      <char name="braceleft" width="600" llx="233" lly="-108" urx="569" ury="622"/>
+      <char name="braceright" width="600" llx="140" lly="-108" urx="477" ury="622"/>
+      <char name="bracketleft" width="600" llx="246" lly="-108" urx="574" ury="622"/>
+      <char name="bracketright" width="600" llx="135" lly="-108" urx="463" ury="622"/>
+      <char name="breve" width="600" llx="279" lly="501" urx="576" ury="609"/>
+      <char name="brokenbar" width="600" llx="238" lly="-175" urx="469" ury="675"/>
+      <char name="bullet" width="600" llx="224" lly="130" urx="485" ury="383"/>
+      <char name="c" width="600" llx="106" lly="-15" urx="608" ury="441"/>
+      <char name="caron" width="600" llx="262" lly="492" urx="614" ury="669"/>
+      <char name="ccedilla" width="600" llx="106" lly="-151" urx="614" ury="441"/>
+      <char name="cedilla" width="600" llx="197" lly="-151" urx="344" ury="10"/>
+      <char name="cent" width="600" llx="151" lly="-49" urx="588" ury="614"/>
+      <char name="circumflex" width="600" llx="229" lly="477" urx="581" ury="654"/>
+      <char name="colon" width="600" llx="238" lly="-15" urx="441" ury="385"/>
+      <char name="comma" width="600" llx="157" lly="-112" urx="370" ury="122"/>
+      <char name="copyright" width="600" llx="53" lly="-18" urx="667" ury="580"/>
+      <char name="currency" width="600" llx="94" lly="58" urx="628" ury="506"/>
+      <char name="d" width="600" llx="85" lly="-15" urx="640" ury="629"/>
+      <char name="dagger" width="600" llx="217" lly="-78" urx="546" ury="580"/>
+      <char name="daggerdbl" width="600" llx="163" lly="-78" urx="546" ury="580"/>
+      <char name="degree" width="600" llx="214" lly="269" urx="576" ury="622"/>
+      <char name="dieresis" width="600" llx="272" lly="537" urx="579" ury="640"/>
+      <char name="divide" width="600" llx="136" lly="48" urx="573" ury="467"/>
+      <char name="dollar" width="600" llx="108" lly="-126" urx="596" ury="662"/>
+      <char name="dotaccent" width="600" llx="373" lly="537" urx="478" ury="640"/>
+      <char name="dotlessi" width="600" llx="95" lly="0" urx="515" ury="426"/>
+      <char name="e" width="600" llx="106" lly="-15" urx="598" ury="441"/>
+      <char name="eacute" width="600" llx="106" lly="-15" urx="612" ury="672"/>
+      <char name="ecircumflex" width="600" llx="106" lly="-15" urx="598" ury="654"/>
+      <char name="edieresis" width="600" llx="106" lly="-15" urx="598" ury="620"/>
+      <char name="egrave" width="600" llx="106" lly="-15" urx="598" ury="672"/>
+      <char name="eight" width="600" llx="132" lly="-15" urx="588" ury="622"/>
+      <char name="ellipsis" width="600" llx="46" lly="-15" urx="575" ury="111"/>
+      <char name="emdash" width="600" llx="49" lly="231" urx="661" ury="285"/>
+      <char name="endash" width="600" llx="124" lly="231" urx="586" ury="285"/>
+      <char name="equal" width="600" llx="109" lly="138" urx="600" ury="376"/>
+      <char name="eth" width="600" llx="102" lly="-15" urx="639" ury="629"/>
+      <char name="exclam" width="600" llx="243" lly="-15" urx="464" ury="572"/>
+      <char name="exclamdown" width="600" llx="225" lly="-157" urx="445" ury="430"/>
+      <char name="f" width="600" llx="114" lly="0" urx="662" ury="629"/>
+      <char name="fi" width="600" llx="3" lly="0" urx="619" ury="629"/>
+      <char name="five" width="600" llx="99" lly="-15" urx="589" ury="607"/>
+      <char name="fl" width="600" llx="3" lly="0" urx="619" ury="629"/>
+      <char name="florin" width="600" llx="-26" lly="-143" urx="671" ury="622"/>
+      <char name="four" width="600" llx="108" lly="0" urx="541" ury="622"/>
+      <char name="fraction" width="600" llx="84" lly="-57" urx="646" ury="665"/>
+      <char name="g" width="600" llx="61" lly="-157" urx="657" ury="441"/>
+      <char name="germandbls" width="600" llx="48" lly="-15" urx="617" ury="629"/>
+      <char name="grave" width="600" llx="294" lly="497" urx="484" ury="672"/>
+      <char name="greater" width="600" llx="85" lly="42" urx="599" ury="472"/>
+      <char name="guillemotleft" width="600" llx="92" lly="70" urx="652" ury="446"/>
+      <char name="guillemotright" width="600" llx="58" lly="70" urx="618" ury="446"/>
+      <char name="guilsinglleft" width="600" llx="204" lly="70" urx="540" ury="446"/>
+      <char name="guilsinglright" width="600" llx="170" lly="70" urx="506" ury="446"/>
+      <char name="h" width="600" llx="33" lly="0" urx="592" ury="629"/>
+      <char name="hungarumlaut" width="600" llx="239" lly="497" urx="683" ury="672"/>
+      <char name="hyphen" width="600" llx="152" lly="231" urx="558" ury="285"/>
+      <char name="i" width="600" llx="95" lly="0" urx="515" ury="657"/>
+      <char name="iacute" width="600" llx="95" lly="0" urx="612" ury="672"/>
+      <char name="icircumflex" width="600" llx="95" lly="0" urx="551" ury="654"/>
+      <char name="idieresis" width="600" llx="95" lly="0" urx="545" ury="620"/>
+      <char name="igrave" width="600" llx="95" lly="0" urx="515" ury="672"/>
+      <char name="j" width="600" llx="52" lly="-157" urx="550" ury="657"/>
+      <char name="k" width="600" llx="58" lly="0" urx="633" ury="629"/>
+      <char name="l" width="600" llx="95" lly="0" urx="515" ury="629"/>
+      <char name="less" width="600" llx="96" lly="42" urx="610" ury="472"/>
+      <char name="logicalnot" width="600" llx="155" lly="108" urx="591" ury="369"/>
+      <char name="lslash" width="600" llx="95" lly="0" urx="587" ury="629"/>
+      <char name="m" width="600" llx="-5" lly="0" urx="615" ury="441"/>
+      <char name="macron" width="600" llx="232" lly="525" urx="600" ury="565"/>
+      <char name="minus" width="600" llx="129" lly="232" urx="580" ury="283"/>
+      <char name="mu" width="600" llx="72" lly="-157" urx="572" ury="426"/>
+      <char name="multiply" width="600" llx="103" lly="43" urx="607" ury="470"/>
+      <char name="n" width="600" llx="26" lly="0" urx="585" ury="441"/>
+      <char name="nine" width="600" llx="93" lly="-15" urx="574" ury="622"/>
+      <char name="ntilde" width="600" llx="26" lly="0" urx="629" ury="606"/>
+      <char name="numbersign" width="600" llx="133" lly="-32" urx="596" ury="639"/>
+      <char name="o" width="600" llx="102" lly="-15" urx="588" ury="441"/>
+      <char name="oacute" width="600" llx="102" lly="-15" urx="612" ury="672"/>
+      <char name="ocircumflex" width="600" llx="102" lly="-15" urx="588" ury="654"/>
+      <char name="odieresis" width="600" llx="102" lly="-15" urx="588" ury="620"/>
+      <char name="oe" width="600" llx="54" lly="-15" urx="615" ury="441"/>
+      <char name="ogonek" width="600" llx="189" lly="-172" urx="377" ury="4"/>
+      <char name="ograve" width="600" llx="102" lly="-15" urx="588" ury="672"/>
+      <char name="one" width="600" llx="98" lly="0" urx="515" ury="622"/>
+      <char name="onehalf" width="600" llx="65" lly="-57" urx="669" ury="665"/>
+      <char name="onequarter" width="600" llx="65" lly="-57" urx="674" ury="665"/>
+      <char name="onesuperior" width="600" llx="231" lly="249" urx="491" ury="622"/>
+      <char name="ordfeminine" width="600" llx="209" lly="249" urx="512" ury="580"/>
+      <char name="ordmasculine" width="600" llx="210" lly="249" urx="535" ury="580"/>
+      <char name="oslash" width="600" llx="102" lly="-80" urx="588" ury="506"/>
+      <char name="otilde" width="600" llx="102" lly="-15" urx="629" ury="606"/>
+      <char name="p" width="600" llx="-24" lly="-157" urx="605" ury="441"/>
+      <char name="paragraph" width="600" llx="100" lly="-78" urx="630" ury="562"/>
+      <char name="parenleft" width="600" llx="313" lly="-108" urx="572" ury="622"/>
+      <char name="parenright" width="600" llx="137" lly="-108" urx="396" ury="622"/>
+      <char name="percent" width="600" llx="134" lly="-15" urx="599" ury="622"/>
+      <char name="period" width="600" llx="238" lly="-15" urx="382" ury="109"/>
+      <char name="periodcentered" width="600" llx="275" lly="189" urx="434" ury="327"/>
+      <char name="perthousand" width="600" llx="59" lly="-15" urx="627" ury="622"/>
+      <char name="plus" width="600" llx="129" lly="44" urx="580" ury="470"/>
+      <char name="plusminus" width="600" llx="96" lly="44" urx="594" ury="558"/>
+      <char name="q" width="600" llx="85" lly="-157" urx="682" ury="441"/>
+      <char name="question" width="600" llx="222" lly="-15" urx="583" ury="572"/>
+      <char name="questiondown" width="600" llx="105" lly="-157" urx="466" ury="430"/>
+      <char name="quotedbl" width="600" llx="273" lly="328" urx="532" ury="562"/>
+      <char name="quotedblbase" width="600" llx="115" lly="-134" urx="478" ury="100"/>
+      <char name="quotedblleft" width="600" llx="262" lly="328" urx="541" ury="562"/>
+      <char name="quotedblright" width="600" llx="213" lly="328" urx="576" ury="562"/>
+      <char name="quoteleft" width="600" llx="343" lly="328" urx="457" ury="562"/>
+      <char name="quoteright" width="600" llx="283" lly="328" urx="495" ury="562"/>
+      <char name="quotesinglbase" width="600" llx="185" lly="-134" urx="397" ury="100"/>
+      <char name="quotesingle" width="600" llx="345" lly="328" urx="460" ury="562"/>
+      <char name="r" width="600" llx="60" lly="0" urx="636" ury="441"/>
+      <char name="registered" width="600" llx="53" lly="-18" urx="667" ury="580"/>
+      <char name="ring" width="600" llx="332" lly="463" urx="500" ury="627"/>
+      <char name="s" width="600" llx="78" lly="-15" urx="584" ury="441"/>
+      <char name="scaron" width="600" llx="78" lly="-15" urx="614" ury="669"/>
+      <char name="scedilla" width="600" llx="78" lly="-151" urx="584" ury="441"/>
+      <char name="section" width="600" llx="104" lly="-78" urx="590" ury="580"/>
+      <char name="semicolon" width="600" llx="157" lly="-112" urx="441" ury="385"/>
+      <char name="seven" width="600" llx="182" lly="0" urx="612" ury="607"/>
+      <char name="six" width="600" llx="155" lly="-15" urx="629" ury="622"/>
+      <char name="slash" width="600" llx="112" lly="-80" urx="604" ury="629"/>
+      <char name="space" width="600" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="600"/>
-      <char name="square" width="600"/>
-      <char name="sterling" width="600"/>
-      <char name="stop" width="600"/>
-      <char name="t" width="600"/>
-      <char name="tab" width="600"/>
-      <char name="thorn" width="600"/>
-      <char name="three" width="600"/>
-      <char name="threequarters" width="600"/>
-      <char name="threesuperior" width="600"/>
-      <char name="tilde" width="600"/>
-      <char name="trademark" width="600"/>
-      <char name="two" width="600"/>
-      <char name="twosuperior" width="600"/>
-      <char name="u" width="600"/>
-      <char name="uacute" width="600"/>
-      <char name="ucircumflex" width="600"/>
-      <char name="udieresis" width="600"/>
-      <char name="ugrave" width="600"/>
-      <char name="underscore" width="600"/>
-      <char name="up" width="600"/>
-      <char name="v" width="600"/>
-      <char name="w" width="600"/>
-      <char name="x" width="600"/>
-      <char name="y" width="600"/>
-      <char name="yacute" width="600"/>
-      <char name="ydieresis" width="600"/>
-      <char name="yen" width="600"/>
-      <char name="z" width="600"/>
-      <char name="zcaron" width="600"/>
-      <char name="zero" width="600"/>
-   </widths>
-</font-metrics>
-\ No newline at end of file
+      <char name="sterling" width="600" llx="124" lly="-21" urx="621" ury="611"/>
+      <char name="t" width="600" llx="167" lly="-15" urx="561" ury="561"/>
+      <char name="thorn" width="600" llx="-24" lly="-157" urx="605" ury="629"/>
+      <char name="three" width="600" llx="82" lly="-15" urx="538" ury="622"/>
+      <char name="threequarters" width="600" llx="73" lly="-56" urx="659" ury="666"/>
+      <char name="threesuperior" width="600" llx="213" lly="240" urx="501" ury="622"/>
+      <char name="tilde" width="600" llx="212" lly="489" urx="629" ury="606"/>
+      <char name="trademark" width="600" llx="75" lly="263" urx="742" ury="562"/>
+      <char name="two" width="600" llx="70" lly="0" urx="568" ury="622"/>
+      <char name="twosuperior" width="600" llx="230" lly="249" urx="535" ury="622"/>
+      <char name="u" width="600" llx="101" lly="-15" urx="572" ury="426"/>
+      <char name="uacute" width="600" llx="101" lly="-15" urx="602" ury="672"/>
+      <char name="ucircumflex" width="600" llx="101" lly="-15" urx="572" ury="654"/>
+      <char name="udieresis" width="600" llx="101" lly="-15" urx="575" ury="620"/>
+      <char name="ugrave" width="600" llx="101" lly="-15" urx="572" ury="672"/>
+      <char name="underscore" width="600" llx="-27" lly="-125" urx="584" ury="-75"/>
+      <char name="v" width="600" llx="90" lly="-10" urx="681" ury="426"/>
+      <char name="w" width="600" llx="76" lly="-10" urx="695" ury="426"/>
+      <char name="x" width="600" llx="20" lly="0" urx="655" ury="426"/>
+      <char name="y" width="600" llx="-4" lly="-157" urx="683" ury="426"/>
+      <char name="yacute" width="600" llx="-4" lly="-157" urx="683" ury="672"/>
+      <char name="ydieresis" width="600" llx="-4" lly="-157" urx="683" ury="620"/>
+      <char name="yen" width="600" llx="120" lly="0" urx="693" ury="562"/>
+      <char name="z" width="600" llx="99" lly="0" urx="593" ury="426"/>
+      <char name="zcaron" width="600" llx="99" lly="0" urx="624" ury="669"/>
+      <char name="zero" width="600" llx="154" lly="-15" urx="575" ury="622"/>
+    </char-metrics>
+</font-metrics>
diff --git a/src/codegen/fonts/Helvetica.xml b/src/codegen/fonts/Helvetica.xml
index 38ae23055..b6e11a72b 100644
--- a/src/codegen/fonts/Helvetica.xml
+++ b/src/codegen/fonts/Helvetica.xml
@@ -22,245 +22,246 @@
    <family-name>Helvetica</family-name>
    <class-name>Helvetica</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>718</cap-height>
    <x-height>523</x-height>
    <ascender>718</ascender>
    <descender>-207</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="667"/>
-      <char name="AE" width="1000"/>
-      <char name="Aacute" width="667"/>
-      <char name="Acircumflex" width="667"/>
-      <char name="Adieresis" width="667"/>
-      <char name="Agrave" width="667"/>
-      <char name="Aring" width="667"/>
-      <char name="Atilde" width="667"/>
-      <char name="B" width="667"/>
-      <char name="C" width="722"/>
-      <char name="Ccedilla" width="722"/>
-      <char name="D" width="722"/>
-      <char name="E" width="667"/>
-      <char name="Eacute" width="667"/>
-      <char name="Ecircumflex" width="667"/>
-      <char name="Edieresis" width="667"/>
-      <char name="Egrave" width="667"/>
-      <char name="Eth" width="722"/>
-      <char name="Euro" width="556"/>
-      <char name="F" width="611"/>
-      <char name="G" width="778"/>
-      <char name="H" width="722"/>
-      <char name="I" width="278"/>
-      <char name="Iacute" width="278"/>
-      <char name="Icircumflex" width="278"/>
-      <char name="Idieresis" width="278"/>
-      <char name="Igrave" width="278"/>
-      <char name="J" width="500"/>
-      <char name="K" width="667"/>
-      <char name="L" width="556"/>
-      <char name="Lslash" width="556"/>
-      <char name="M" width="833"/>
-      <char name="N" width="722"/>
-      <char name="Ntilde" width="722"/>
-      <char name="O" width="778"/>
-      <char name="OE" width="1000"/>
-      <char name="Oacute" width="778"/>
-      <char name="Ocircumflex" width="778"/>
-      <char name="Odieresis" width="778"/>
-      <char name="Ograve" width="778"/>
-      <char name="Oslash" width="778"/>
-      <char name="Otilde" width="778"/>
-      <char name="P" width="667"/>
-      <char name="Q" width="778"/>
-      <char name="R" width="722"/>
-      <char name="S" width="667"/>
-      <char name="Scaron" width="667"/>
-      <char name="T" width="611"/>
-      <char name="Thorn" width="667"/>
-      <char name="U" width="722"/>
-      <char name="Uacute" width="722"/>
-      <char name="Ucircumflex" width="722"/>
-      <char name="Udieresis" width="722"/>
-      <char name="Ugrave" width="722"/>
-      <char name="V" width="667"/>
-      <char name="W" width="944"/>
-      <char name="X" width="667"/>
-      <char name="Y" width="667"/>
-      <char name="Yacute" width="667"/>
-      <char name="Ydieresis" width="667"/>
-      <char name="Z" width="611"/>
-      <char name="Zcaron" width="611"/>
-      <char name="a" width="556"/>
-      <char name="aacute" width="556"/>
-      <char name="acircumflex" width="556"/>
-      <char name="acute" width="333"/>
-      <char name="adieresis" width="556"/>
-      <char name="ae" width="889"/>
-      <char name="agrave" width="556"/>
-      <char name="ampersand" width="667"/>
-      <char name="aring" width="556"/>
-      <char name="asciicircum" width="469"/>
-      <char name="asciitilde" width="584"/>
-      <char name="asterisk" width="389"/>
-      <char name="at" width="1015"/>
-      <char name="atilde" width="556"/>
-      <char name="b" width="556"/>
-      <char name="backslash" width="278"/>
-      <char name="bar" width="260"/>
-      <char name="braceleft" width="334"/>
-      <char name="braceright" width="334"/>
-      <char name="bracketleft" width="278"/>
-      <char name="bracketright" width="278"/>
-      <char name="breve" width="333"/>
-      <char name="brokenbar" width="260"/>
-      <char name="bullet" width="350"/>
-      <char name="c" width="500"/>
-      <char name="caron" width="333"/>
-      <char name="ccedilla" width="500"/>
-      <char name="cedilla" width="333"/>
-      <char name="cent" width="556"/>
-      <char name="circumflex" width="333"/>
-      <char name="colon" width="278"/>
-      <char name="comma" width="278"/>
-      <char name="copyright" width="737"/>
-      <char name="currency" width="556"/>
-      <char name="d" width="556"/>
-      <char name="dagger" width="556"/>
-      <char name="daggerdbl" width="556"/>
-      <char name="degree" width="400"/>
-      <char name="dieresis" width="333"/>
-      <char name="divide" width="584"/>
-      <char name="dollar" width="556"/>
-      <char name="dotaccent" width="333"/>
-      <char name="dotlessi" width="278"/>
-      <char name="e" width="556"/>
-      <char name="eacute" width="556"/>
-      <char name="ecircumflex" width="556"/>
-      <char name="edieresis" width="556"/>
-      <char name="egrave" width="556"/>
-      <char name="eight" width="556"/>
-      <char name="ellipsis" width="1000"/>
-      <char name="emdash" width="1000"/>
-      <char name="endash" width="556"/>
-      <char name="equal" width="584"/>
-      <char name="eth" width="556"/>
-      <char name="exclam" width="278"/>
-      <char name="exclamdown" width="333"/>
-      <char name="f" width="278"/>
-      <char name="fi" width="500"/>
-      <char name="five" width="556"/>
-      <char name="fl" width="500"/>
-      <char name="florin" width="556"/>
-      <char name="four" width="556"/>
-      <char name="fraction" width="167"/>
-      <char name="g" width="556"/>
-      <char name="germandbls" width="611"/>
-      <char name="grave" width="333"/>
-      <char name="greater" width="584"/>
-      <char name="guillemotleft" width="556"/>
-      <char name="guillemotright" width="556"/>
-      <char name="guilsinglleft" width="333"/>
-      <char name="guilsinglright" width="333"/>
-      <char name="h" width="556"/>
-      <char name="hungarumlaut" width="333"/>
-      <char name="hyphen" width="333"/>
-      <char name="i" width="222"/>
-      <char name="iacute" width="278"/>
-      <char name="icircumflex" width="278"/>
-      <char name="idieresis" width="278"/>
-      <char name="igrave" width="278"/>
-      <char name="j" width="222"/>
-      <char name="k" width="500"/>
-      <char name="l" width="222"/>
-      <char name="less" width="584"/>
-      <char name="logicalnot" width="584"/>
-      <char name="lslash" width="222"/>
-      <char name="m" width="833"/>
-      <char name="macron" width="333"/>
-      <char name="minus" width="324"/>
-      <char name="mu" width="556"/>
-      <char name="multiply" width="584"/>
-      <char name="n" width="556"/>
-      <char name="nine" width="556"/>
-      <char name="ntilde" width="556"/>
-      <char name="numbersign" width="556"/>
-      <char name="o" width="556"/>
-      <char name="oacute" width="556"/>
-      <char name="ocircumflex" width="556"/>
-      <char name="odieresis" width="556"/>
-      <char name="oe" width="944"/>
-      <char name="ogonek" width="333"/>
-      <char name="ograve" width="556"/>
-      <char name="one" width="556"/>
-      <char name="onehalf" width="834"/>
-      <char name="onequarter" width="834"/>
-      <char name="onesuperior" width="333"/>
-      <char name="ordfeminine" width="370"/>
-      <char name="ordmasculine" width="365"/>
-      <char name="oslash" width="611"/>
-      <char name="otilde" width="556"/>
-      <char name="p" width="556"/>
-      <char name="paragraph" width="537"/>
-      <char name="parenleft" width="333"/>
-      <char name="parenright" width="333"/>
-      <char name="percent" width="889"/>
-      <char name="period" width="278"/>
-      <char name="periodcentered" width="278"/>
-      <char name="perthousand" width="1000"/>
-      <char name="plus" width="584"/>
-      <char name="plusminus" width="584"/>
-      <char name="q" width="556"/>
-      <char name="question" width="556"/>
-      <char name="questiondown" width="611"/>
-      <char name="quotedbl" width="355"/>
-      <char name="quotedblbase" width="333"/>
-      <char name="quotedblleft" width="333"/>
-      <char name="quotedblright" width="333"/>
-      <char name="quoteleft" width="222"/>
-      <char name="quoteright" width="222"/>
-      <char name="quotesinglbase" width="222"/>
-      <char name="quotesingle" width="191"/>
-      <char name="r" width="333"/>
-      <char name="registered" width="737"/>
-      <char name="ring" width="333"/>
-      <char name="s" width="500"/>
-      <char name="scaron" width="500"/>
-      <char name="section" width="556"/>
-      <char name="semicolon" width="278"/>
-      <char name="seven" width="556"/>
-      <char name="six" width="556"/>
-      <char name="slash" width="278"/>
-      <char name="space" width="278"/>
+    <char-metrics>
+      <char name="A" width="667" llx="14" lly="0" urx="654" ury="718"/>
+      <char name="AE" width="1000" llx="8" lly="0" urx="951" ury="718"/>
+      <char name="Aacute" width="667" llx="14" lly="0" urx="654" ury="929"/>
+      <char name="Acircumflex" width="667" llx="14" lly="0" urx="654" ury="929"/>
+      <char name="Adieresis" width="667" llx="14" lly="0" urx="654" ury="901"/>
+      <char name="Agrave" width="667" llx="14" lly="0" urx="654" ury="929"/>
+      <char name="Aring" width="667" llx="14" lly="0" urx="654" ury="931"/>
+      <char name="Atilde" width="667" llx="14" lly="0" urx="654" ury="917"/>
+      <char name="B" width="667" llx="74" lly="0" urx="627" ury="718"/>
+      <char name="C" width="722" llx="44" lly="-19" urx="681" ury="737"/>
+      <char name="Ccedilla" width="722" llx="44" lly="-225" urx="681" ury="737"/>
+      <char name="D" width="722" llx="81" lly="0" urx="674" ury="718"/>
+      <char name="E" width="667" llx="86" lly="0" urx="616" ury="718"/>
+      <char name="Eacute" width="667" llx="86" lly="0" urx="616" ury="929"/>
+      <char name="Ecircumflex" width="667" llx="86" lly="0" urx="616" ury="929"/>
+      <char name="Edieresis" width="667" llx="86" lly="0" urx="616" ury="901"/>
+      <char name="Egrave" width="667" llx="86" lly="0" urx="616" ury="929"/>
+      <char name="Eth" width="722" llx="0" lly="0" urx="674" ury="718"/>
+      <char name="Euro" width="556" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="611" llx="86" lly="0" urx="583" ury="718"/>
+      <char name="G" width="778" llx="48" lly="-19" urx="704" ury="737"/>
+      <char name="H" width="722" llx="77" lly="0" urx="646" ury="718"/>
+      <char name="I" width="278" llx="91" lly="0" urx="188" ury="718"/>
+      <char name="Iacute" width="278" llx="91" lly="0" urx="292" ury="929"/>
+      <char name="Icircumflex" width="278" llx="-6" lly="0" urx="285" ury="929"/>
+      <char name="Idieresis" width="278" llx="13" lly="0" urx="266" ury="901"/>
+      <char name="Igrave" width="278" llx="-13" lly="0" urx="188" ury="929"/>
+      <char name="J" width="500" llx="17" lly="-19" urx="428" ury="718"/>
+      <char name="K" width="667" llx="76" lly="0" urx="663" ury="718"/>
+      <char name="L" width="556" llx="76" lly="0" urx="537" ury="718"/>
+      <char name="Lslash" width="556" llx="-20" lly="0" urx="537" ury="718"/>
+      <char name="M" width="833" llx="73" lly="0" urx="761" ury="718"/>
+      <char name="N" width="722" llx="76" lly="0" urx="646" ury="718"/>
+      <char name="Ntilde" width="722" llx="76" lly="0" urx="646" ury="917"/>
+      <char name="O" width="778" llx="39" lly="-19" urx="739" ury="737"/>
+      <char name="OE" width="1000" llx="36" lly="-19" urx="965" ury="737"/>
+      <char name="Oacute" width="778" llx="39" lly="-19" urx="739" ury="929"/>
+      <char name="Ocircumflex" width="778" llx="39" lly="-19" urx="739" ury="929"/>
+      <char name="Odieresis" width="778" llx="39" lly="-19" urx="739" ury="901"/>
+      <char name="Ograve" width="778" llx="39" lly="-19" urx="739" ury="929"/>
+      <char name="Oslash" width="778" llx="39" lly="-19" urx="740" ury="737"/>
+      <char name="Otilde" width="778" llx="39" lly="-19" urx="739" ury="917"/>
+      <char name="P" width="667" llx="86" lly="0" urx="622" ury="718"/>
+      <char name="Q" width="778" llx="39" lly="-56" urx="739" ury="737"/>
+      <char name="R" width="722" llx="88" lly="0" urx="684" ury="718"/>
+      <char name="S" width="667" llx="49" lly="-19" urx="620" ury="737"/>
+      <char name="Scaron" width="667" llx="49" lly="-19" urx="620" ury="929"/>
+      <char name="T" width="611" llx="14" lly="0" urx="597" ury="718"/>
+      <char name="Thorn" width="667" llx="86" lly="0" urx="622" ury="718"/>
+      <char name="U" width="722" llx="79" lly="-19" urx="644" ury="718"/>
+      <char name="Uacute" width="722" llx="79" lly="-19" urx="644" ury="929"/>
+      <char name="Ucircumflex" width="722" llx="79" lly="-19" urx="644" ury="929"/>
+      <char name="Udieresis" width="722" llx="79" lly="-19" urx="644" ury="901"/>
+      <char name="Ugrave" width="722" llx="79" lly="-19" urx="644" ury="929"/>
+      <char name="V" width="667" llx="20" lly="0" urx="647" ury="718"/>
+      <char name="W" width="944" llx="16" lly="0" urx="928" ury="718"/>
+      <char name="X" width="667" llx="19" lly="0" urx="648" ury="718"/>
+      <char name="Y" width="667" llx="14" lly="0" urx="653" ury="718"/>
+      <char name="Yacute" width="667" llx="14" lly="0" urx="653" ury="929"/>
+      <char name="Ydieresis" width="667" llx="14" lly="0" urx="653" ury="901"/>
+      <char name="Z" width="611" llx="23" lly="0" urx="588" ury="718"/>
+      <char name="Zcaron" width="611" llx="23" lly="0" urx="588" ury="929"/>
+      <char name="a" width="556" llx="36" lly="-15" urx="530" ury="538"/>
+      <char name="aacute" width="556" llx="36" lly="-15" urx="530" ury="734"/>
+      <char name="acircumflex" width="556" llx="36" lly="-15" urx="530" ury="734"/>
+      <char name="acute" width="333" llx="122" lly="593" urx="319" ury="734"/>
+      <char name="adieresis" width="556" llx="36" lly="-15" urx="530" ury="706"/>
+      <char name="ae" width="889" llx="36" lly="-15" urx="847" ury="538"/>
+      <char name="agrave" width="556" llx="36" lly="-15" urx="530" ury="734"/>
+      <char name="ampersand" width="667" llx="44" lly="-15" urx="645" ury="718"/>
+      <char name="aring" width="556" llx="36" lly="-15" urx="530" ury="756"/>
+      <char name="asciicircum" width="469" llx="-14" lly="264" urx="483" ury="688"/>
+      <char name="asciitilde" width="584" llx="61" lly="180" urx="523" ury="326"/>
+      <char name="asterisk" width="389" llx="39" lly="431" urx="349" ury="718"/>
+      <char name="at" width="1015" llx="147" lly="-19" urx="868" ury="737"/>
+      <char name="atilde" width="556" llx="36" lly="-15" urx="530" ury="722"/>
+      <char name="b" width="556" llx="58" lly="-15" urx="517" ury="718"/>
+      <char name="backslash" width="278" llx="-17" lly="-19" urx="295" ury="737"/>
+      <char name="bar" width="260" llx="94" lly="-225" urx="167" ury="775"/>
+      <char name="braceleft" width="334" llx="42" lly="-196" urx="292" ury="722"/>
+      <char name="braceright" width="334" llx="42" lly="-196" urx="292" ury="722"/>
+      <char name="bracketleft" width="278" llx="63" lly="-196" urx="250" ury="722"/>
+      <char name="bracketright" width="278" llx="28" lly="-196" urx="215" ury="722"/>
+      <char name="breve" width="333" llx="13" lly="595" urx="321" ury="731"/>
+      <char name="brokenbar" width="260" llx="94" lly="-150" urx="167" ury="700"/>
+      <char name="bullet" width="350" llx="18" lly="202" urx="333" ury="517"/>
+      <char name="c" width="500" llx="30" lly="-15" urx="477" ury="538"/>
+      <char name="caron" width="333" llx="21" lly="593" urx="312" ury="734"/>
+      <char name="ccedilla" width="500" llx="30" lly="-225" urx="477" ury="538"/>
+      <char name="cedilla" width="333" llx="45" lly="-225" urx="259" ury="0"/>
+      <char name="cent" width="556" llx="51" lly="-115" urx="513" ury="623"/>
+      <char name="circumflex" width="333" llx="21" lly="593" urx="312" ury="734"/>
+      <char name="colon" width="278" llx="87" lly="0" urx="191" ury="516"/>
+      <char name="comma" width="278" llx="87" lly="-147" urx="191" ury="106"/>
+      <char name="copyright" width="737" llx="-14" lly="-19" urx="752" ury="737"/>
+      <char name="currency" width="556" llx="28" lly="99" urx="528" ury="603"/>
+      <char name="d" width="556" llx="35" lly="-15" urx="499" ury="718"/>
+      <char name="dagger" width="556" llx="43" lly="-159" urx="514" ury="718"/>
+      <char name="daggerdbl" width="556" llx="43" lly="-159" urx="514" ury="718"/>
+      <char name="degree" width="400" llx="54" lly="411" urx="346" ury="703"/>
+      <char name="dieresis" width="333" llx="40" lly="604" urx="293" ury="706"/>
+      <char name="divide" width="584" llx="39" lly="-19" urx="545" ury="524"/>
+      <char name="dollar" width="556" llx="32" lly="-115" urx="520" ury="775"/>
+      <char name="dotaccent" width="333" llx="121" lly="604" urx="212" ury="706"/>
+      <char name="dotlessi" width="278" llx="95" lly="0" urx="183" ury="523"/>
+      <char name="e" width="556" llx="40" lly="-15" urx="516" ury="538"/>
+      <char name="eacute" width="556" llx="40" lly="-15" urx="516" ury="734"/>
+      <char name="ecircumflex" width="556" llx="40" lly="-15" urx="516" ury="734"/>
+      <char name="edieresis" width="556" llx="40" lly="-15" urx="516" ury="706"/>
+      <char name="egrave" width="556" llx="40" lly="-15" urx="516" ury="734"/>
+      <char name="eight" width="556" llx="38" lly="-19" urx="517" ury="703"/>
+      <char name="ellipsis" width="1000" llx="115" lly="0" urx="885" ury="106"/>
+      <char name="emdash" width="1000" llx="0" lly="240" urx="1000" ury="313"/>
+      <char name="endash" width="556" llx="0" lly="240" urx="556" ury="313"/>
+      <char name="equal" width="584" llx="39" lly="115" urx="545" ury="390"/>
+      <char name="eth" width="556" llx="35" lly="-15" urx="522" ury="737"/>
+      <char name="exclam" width="278" llx="90" lly="0" urx="187" ury="718"/>
+      <char name="exclamdown" width="333" llx="118" lly="-195" urx="215" ury="523"/>
+      <char name="f" width="278" llx="14" lly="0" urx="262" ury="728"/>
+      <char name="fi" width="500" llx="14" lly="0" urx="434" ury="728"/>
+      <char name="five" width="556" llx="32" lly="-19" urx="514" ury="688"/>
+      <char name="fl" width="500" llx="14" lly="0" urx="432" ury="728"/>
+      <char name="florin" width="556" llx="-11" lly="-207" urx="501" ury="737"/>
+      <char name="four" width="556" llx="25" lly="0" urx="523" ury="703"/>
+      <char name="fraction" width="167" llx="-166" lly="-19" urx="333" ury="703"/>
+      <char name="g" width="556" llx="40" lly="-220" urx="499" ury="538"/>
+      <char name="germandbls" width="611" llx="67" lly="-15" urx="571" ury="728"/>
+      <char name="grave" width="333" llx="14" lly="593" urx="211" ury="734"/>
+      <char name="greater" width="584" llx="48" lly="11" urx="536" ury="495"/>
+      <char name="guillemotleft" width="556" llx="97" lly="108" urx="459" ury="446"/>
+      <char name="guillemotright" width="556" llx="97" lly="108" urx="459" ury="446"/>
+      <char name="guilsinglleft" width="333" llx="88" lly="108" urx="245" ury="446"/>
+      <char name="guilsinglright" width="333" llx="88" lly="108" urx="245" ury="446"/>
+      <char name="h" width="556" llx="65" lly="0" urx="491" ury="718"/>
+      <char name="hungarumlaut" width="333" llx="31" lly="593" urx="409" ury="734"/>
+      <char name="hyphen" width="333" llx="44" lly="232" urx="289" ury="322"/>
+      <char name="i" width="222" llx="67" lly="0" urx="155" ury="718"/>
+      <char name="iacute" width="278" llx="95" lly="0" urx="292" ury="734"/>
+      <char name="icircumflex" width="278" llx="-6" lly="0" urx="285" ury="734"/>
+      <char name="idieresis" width="278" llx="13" lly="0" urx="266" ury="706"/>
+      <char name="igrave" width="278" llx="-13" lly="0" urx="184" ury="734"/>
+      <char name="j" width="222" llx="-16" lly="-210" urx="155" ury="718"/>
+      <char name="k" width="500" llx="67" lly="0" urx="501" ury="718"/>
+      <char name="l" width="222" llx="67" lly="0" urx="155" ury="718"/>
+      <char name="less" width="584" llx="48" lly="11" urx="536" ury="495"/>
+      <char name="logicalnot" width="584" llx="39" lly="108" urx="545" ury="390"/>
+      <char name="lslash" width="222" llx="-20" lly="0" urx="242" ury="718"/>
+      <char name="m" width="833" llx="65" lly="0" urx="769" ury="538"/>
+      <char name="macron" width="333" llx="10" lly="627" urx="323" ury="684"/>
+      <char name="minus" width="324" llx="39" lly="216" urx="545" ury="289"/>
+      <char name="mu" width="556" llx="68" lly="-207" urx="489" ury="523"/>
+      <char name="multiply" width="584" llx="39" lly="0" urx="545" ury="506"/>
+      <char name="n" width="556" llx="65" lly="0" urx="491" ury="538"/>
+      <char name="nine" width="556" llx="42" lly="-19" urx="514" ury="703"/>
+      <char name="ntilde" width="556" llx="65" lly="0" urx="491" ury="722"/>
+      <char name="numbersign" width="556" llx="28" lly="0" urx="529" ury="688"/>
+      <char name="o" width="556" llx="35" lly="-14" urx="521" ury="538"/>
+      <char name="oacute" width="556" llx="35" lly="-14" urx="521" ury="734"/>
+      <char name="ocircumflex" width="556" llx="35" lly="-14" urx="521" ury="734"/>
+      <char name="odieresis" width="556" llx="35" lly="-14" urx="521" ury="706"/>
+      <char name="oe" width="944" llx="35" lly="-15" urx="902" ury="538"/>
+      <char name="ogonek" width="333" llx="73" lly="-225" urx="287" ury="0"/>
+      <char name="ograve" width="556" llx="35" lly="-14" urx="521" ury="734"/>
+      <char name="one" width="556" llx="101" lly="0" urx="359" ury="703"/>
+      <char name="onehalf" width="834" llx="43" lly="-19" urx="773" ury="703"/>
+      <char name="onequarter" width="834" llx="73" lly="-19" urx="756" ury="703"/>
+      <char name="onesuperior" width="333" llx="43" lly="281" urx="222" ury="703"/>
+      <char name="ordfeminine" width="370" llx="24" lly="405" urx="346" ury="737"/>
+      <char name="ordmasculine" width="365" llx="25" lly="405" urx="341" ury="737"/>
+      <char name="oslash" width="611" llx="28" lly="-22" urx="537" ury="545"/>
+      <char name="otilde" width="556" llx="35" lly="-14" urx="521" ury="722"/>
+      <char name="p" width="556" llx="58" lly="-207" urx="517" ury="538"/>
+      <char name="paragraph" width="537" llx="18" lly="-173" urx="497" ury="718"/>
+      <char name="parenleft" width="333" llx="68" lly="-207" urx="299" ury="733"/>
+      <char name="parenright" width="333" llx="34" lly="-207" urx="265" ury="733"/>
+      <char name="percent" width="889" llx="39" lly="-19" urx="850" ury="703"/>
+      <char name="period" width="278" llx="87" lly="0" urx="191" ury="106"/>
+      <char name="periodcentered" width="278" llx="77" lly="190" urx="202" ury="315"/>
+      <char name="perthousand" width="1000" llx="7" lly="-19" urx="994" ury="703"/>
+      <char name="plus" width="584" llx="39" lly="0" urx="545" ury="505"/>
+      <char name="plusminus" width="584" llx="39" lly="0" urx="545" ury="506"/>
+      <char name="q" width="556" llx="35" lly="-207" urx="494" ury="538"/>
+      <char name="question" width="556" llx="56" lly="0" urx="492" ury="727"/>
+      <char name="questiondown" width="611" llx="91" lly="-201" urx="527" ury="525"/>
+      <char name="quotedbl" width="355" llx="70" lly="463" urx="285" ury="718"/>
+      <char name="quotedblbase" width="333" llx="26" lly="-149" urx="295" ury="106"/>
+      <char name="quotedblleft" width="333" llx="38" lly="470" urx="307" ury="725"/>
+      <char name="quotedblright" width="333" llx="26" lly="463" urx="295" ury="718"/>
+      <char name="quoteleft" width="222" llx="65" lly="470" urx="169" ury="725"/>
+      <char name="quoteright" width="222" llx="53" lly="463" urx="157" ury="718"/>
+      <char name="quotesinglbase" width="222" llx="53" lly="-149" urx="157" ury="106"/>
+      <char name="quotesingle" width="191" llx="59" lly="463" urx="132" ury="718"/>
+      <char name="r" width="333" llx="77" lly="0" urx="332" ury="538"/>
+      <char name="registered" width="737" llx="-14" lly="-19" urx="752" ury="737"/>
+      <char name="ring" width="333" llx="75" lly="572" urx="259" ury="756"/>
+      <char name="s" width="500" llx="32" lly="-15" urx="464" ury="538"/>
+      <char name="scaron" width="500" llx="32" lly="-15" urx="464" ury="734"/>
+      <char name="section" width="556" llx="43" lly="-191" urx="512" ury="737"/>
+      <char name="semicolon" width="278" llx="87" lly="-147" urx="191" ury="516"/>
+      <char name="seven" width="556" llx="37" lly="0" urx="523" ury="688"/>
+      <char name="six" width="556" llx="38" lly="-19" urx="518" ury="703"/>
+      <char name="slash" width="278" llx="-17" lly="-19" urx="295" ury="737"/>
+      <char name="space" width="278" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="278"/>
-      <char name="sterling" width="556"/>
-      <char name="t" width="278"/>
-      <char name="thorn" width="556"/>
-      <char name="three" width="556"/>
-      <char name="threequarters" width="834"/>
-      <char name="threesuperior" width="333"/>
-      <char name="tilde" width="333"/>
-      <char name="trademark" width="1000"/>
-      <char name="two" width="556"/>
-      <char name="twosuperior" width="333"/>
-      <char name="u" width="556"/>
-      <char name="uacute" width="556"/>
-      <char name="ucircumflex" width="556"/>
-      <char name="udieresis" width="556"/>
-      <char name="ugrave" width="556"/>
-      <char name="underscore" width="556"/>
-      <char name="v" width="500"/>
-      <char name="w" width="722"/>
-      <char name="x" width="500"/>
-      <char name="y" width="500"/>
-      <char name="yacute" width="500"/>
-      <char name="ydieresis" width="500"/>
-      <char name="yen" width="556"/>
-      <char name="z" width="500"/>
-      <char name="zcaron" width="500"/>
-      <char name="zero" width="556"/>
-   </widths>
+      <char name="sterling" width="556" llx="33" lly="-16" urx="539" ury="718"/>
+      <char name="t" width="278" llx="14" lly="-7" urx="257" ury="669"/>
+      <char name="thorn" width="556" llx="58" lly="-207" urx="517" ury="718"/>
+      <char name="three" width="556" llx="34" lly="-19" urx="522" ury="703"/>
+      <char name="threequarters" width="834" llx="45" lly="-19" urx="810" ury="703"/>
+      <char name="threesuperior" width="333" llx="5" lly="270" urx="325" ury="703"/>
+      <char name="tilde" width="333" llx="-4" lly="606" urx="337" ury="722"/>
+      <char name="trademark" width="1000" llx="46" lly="306" urx="903" ury="718"/>
+      <char name="two" width="556" llx="26" lly="0" urx="507" ury="703"/>
+      <char name="twosuperior" width="333" llx="4" lly="281" urx="323" ury="703"/>
+      <char name="u" width="556" llx="68" lly="-15" urx="489" ury="523"/>
+      <char name="uacute" width="556" llx="68" lly="-15" urx="489" ury="734"/>
+      <char name="ucircumflex" width="556" llx="68" lly="-15" urx="489" ury="734"/>
+      <char name="udieresis" width="556" llx="68" lly="-15" urx="489" ury="706"/>
+      <char name="ugrave" width="556" llx="68" lly="-15" urx="489" ury="734"/>
+      <char name="underscore" width="556" llx="0" lly="-125" urx="556" ury="-75"/>
+      <char name="v" width="500" llx="8" lly="0" urx="492" ury="523"/>
+      <char name="w" width="722" llx="14" lly="0" urx="709" ury="523"/>
+      <char name="x" width="500" llx="11" lly="0" urx="490" ury="523"/>
+      <char name="y" width="500" llx="11" lly="-214" urx="489" ury="523"/>
+      <char name="yacute" width="500" llx="11" lly="-214" urx="489" ury="734"/>
+      <char name="ydieresis" width="500" llx="11" lly="-214" urx="489" ury="706"/>
+      <char name="yen" width="556" llx="3" lly="0" urx="553" ury="688"/>
+      <char name="z" width="500" llx="31" lly="0" urx="469" ury="523"/>
+      <char name="zcaron" width="500" llx="31" lly="0" urx="469" ury="734"/>
+      <char name="zero" width="556" llx="37" lly="-19" urx="519" ury="703"/>
+    </char-metrics>
   <kerning kpx1="107">
     <pair kern="-20" kpx2="111"/>
     <pair kern="-20" kpx2="101"/>
diff --git a/src/codegen/fonts/HelveticaBold.xml b/src/codegen/fonts/HelveticaBold.xml
index 2620a128e..4efd01f22 100644
--- a/src/codegen/fonts/HelveticaBold.xml
+++ b/src/codegen/fonts/HelveticaBold.xml
@@ -22,245 +22,246 @@
    <family-name>Helvetica</family-name>
    <class-name>HelveticaBold</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>718</cap-height>
    <x-height>532</x-height>
    <ascender>718</ascender>
    <descender>-207</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="722"/>
-      <char name="AE" width="1000"/>
-      <char name="Aacute" width="722"/>
-      <char name="Acircumflex" width="722"/>
-      <char name="Adieresis" width="722"/>
-      <char name="Agrave" width="722"/>
-      <char name="Aring" width="722"/>
-      <char name="Atilde" width="722"/>
-      <char name="B" width="722"/>
-      <char name="C" width="722"/>
-      <char name="Ccedilla" width="722"/>
-      <char name="D" width="722"/>
-      <char name="E" width="667"/>
-      <char name="Eacute" width="667"/>
-      <char name="Ecircumflex" width="667"/>
-      <char name="Edieresis" width="667"/>
-      <char name="Egrave" width="667"/>
-      <char name="Eth" width="722"/>
-      <char name="Euro" width="556"/>
-      <char name="F" width="611"/>
-      <char name="G" width="778"/>
-      <char name="H" width="722"/>
-      <char name="I" width="278"/>
-      <char name="Iacute" width="278"/>
-      <char name="Icircumflex" width="278"/>
-      <char name="Idieresis" width="278"/>
-      <char name="Igrave" width="278"/>
-      <char name="J" width="556"/>
-      <char name="K" width="722"/>
-      <char name="L" width="611"/>
-      <char name="Lslash" width="611"/>
-      <char name="M" width="833"/>
-      <char name="N" width="722"/>
-      <char name="Ntilde" width="722"/>
-      <char name="O" width="778"/>
-      <char name="OE" width="1000"/>
-      <char name="Oacute" width="778"/>
-      <char name="Ocircumflex" width="778"/>
-      <char name="Odieresis" width="778"/>
-      <char name="Ograve" width="778"/>
-      <char name="Oslash" width="778"/>
-      <char name="Otilde" width="778"/>
-      <char name="P" width="667"/>
-      <char name="Q" width="778"/>
-      <char name="R" width="722"/>
-      <char name="S" width="667"/>
-      <char name="Scaron" width="667"/>
-      <char name="T" width="611"/>
-      <char name="Thorn" width="667"/>
-      <char name="U" width="722"/>
-      <char name="Uacute" width="722"/>
-      <char name="Ucircumflex" width="722"/>
-      <char name="Udieresis" width="722"/>
-      <char name="Ugrave" width="722"/>
-      <char name="V" width="667"/>
-      <char name="W" width="944"/>
-      <char name="X" width="667"/>
-      <char name="Y" width="667"/>
-      <char name="Yacute" width="667"/>
-      <char name="Ydieresis" width="667"/>
-      <char name="Z" width="611"/>
-      <char name="Zcaron" width="611"/>
-      <char name="a" width="556"/>
-      <char name="aacute" width="556"/>
-      <char name="acircumflex" width="556"/>
-      <char name="acute" width="333"/>
-      <char name="adieresis" width="556"/>
-      <char name="ae" width="889"/>
-      <char name="agrave" width="556"/>
-      <char name="ampersand" width="722"/>
-      <char name="aring" width="556"/>
-      <char name="asciicircum" width="584"/>
-      <char name="asciitilde" width="584"/>
-      <char name="asterisk" width="389"/>
-      <char name="at" width="975"/>
-      <char name="atilde" width="556"/>
-      <char name="b" width="611"/>
-      <char name="backslash" width="278"/>
-      <char name="bar" width="280"/>
-      <char name="braceleft" width="389"/>
-      <char name="braceright" width="389"/>
-      <char name="bracketleft" width="333"/>
-      <char name="bracketright" width="333"/>
-      <char name="breve" width="333"/>
-      <char name="brokenbar" width="280"/>
-      <char name="bullet" width="350"/>
-      <char name="c" width="556"/>
-      <char name="caron" width="333"/>
-      <char name="ccedilla" width="556"/>
-      <char name="cedilla" width="333"/>
-      <char name="cent" width="556"/>
-      <char name="circumflex" width="333"/>
-      <char name="colon" width="333"/>
-      <char name="comma" width="278"/>
-      <char name="copyright" width="737"/>
-      <char name="currency" width="556"/>
-      <char name="d" width="611"/>
-      <char name="dagger" width="556"/>
-      <char name="daggerdbl" width="556"/>
-      <char name="degree" width="400"/>
-      <char name="dieresis" width="333"/>
-      <char name="divide" width="584"/>
-      <char name="dollar" width="556"/>
-      <char name="dotaccent" width="333"/>
-      <char name="dotlessi" width="278"/>
-      <char name="e" width="556"/>
-      <char name="eacute" width="556"/>
-      <char name="ecircumflex" width="556"/>
-      <char name="edieresis" width="556"/>
-      <char name="egrave" width="556"/>
-      <char name="eight" width="556"/>
-      <char name="ellipsis" width="1000"/>
-      <char name="emdash" width="1000"/>
-      <char name="endash" width="556"/>
-      <char name="equal" width="584"/>
-      <char name="eth" width="611"/>
-      <char name="exclam" width="333"/>
-      <char name="exclamdown" width="333"/>
-      <char name="f" width="333"/>
-      <char name="fi" width="611"/>
-      <char name="five" width="556"/>
-      <char name="fl" width="611"/>
-      <char name="florin" width="556"/>
-      <char name="four" width="556"/>
-      <char name="fraction" width="167"/>
-      <char name="g" width="611"/>
-      <char name="germandbls" width="611"/>
-      <char name="grave" width="333"/>
-      <char name="greater" width="584"/>
-      <char name="guillemotleft" width="556"/>
-      <char name="guillemotright" width="556"/>
-      <char name="guilsinglleft" width="333"/>
-      <char name="guilsinglright" width="333"/>
-      <char name="h" width="611"/>
-      <char name="hungarumlaut" width="333"/>
-      <char name="hyphen" width="333"/>
-      <char name="i" width="278"/>
-      <char name="iacute" width="278"/>
-      <char name="icircumflex" width="278"/>
-      <char name="idieresis" width="278"/>
-      <char name="igrave" width="278"/>
-      <char name="j" width="278"/>
-      <char name="k" width="556"/>
-      <char name="l" width="278"/>
-      <char name="less" width="584"/>
-      <char name="logicalnot" width="584"/>
-      <char name="lslash" width="278"/>
-      <char name="m" width="889"/>
-      <char name="macron" width="333"/>
-      <char name="minus" width="324"/>
-      <char name="mu" width="611"/>
-      <char name="multiply" width="584"/>
-      <char name="n" width="611"/>
-      <char name="nine" width="556"/>
-      <char name="ntilde" width="611"/>
-      <char name="numbersign" width="556"/>
-      <char name="o" width="611"/>
-      <char name="oacute" width="611"/>
-      <char name="ocircumflex" width="611"/>
-      <char name="odieresis" width="611"/>
-      <char name="oe" width="944"/>
-      <char name="ogonek" width="333"/>
-      <char name="ograve" width="611"/>
-      <char name="one" width="556"/>
-      <char name="onehalf" width="834"/>
-      <char name="onequarter" width="834"/>
-      <char name="onesuperior" width="333"/>
-      <char name="ordfeminine" width="370"/>
-      <char name="ordmasculine" width="365"/>
-      <char name="oslash" width="611"/>
-      <char name="otilde" width="611"/>
-      <char name="p" width="611"/>
-      <char name="paragraph" width="556"/>
-      <char name="parenleft" width="333"/>
-      <char name="parenright" width="333"/>
-      <char name="percent" width="889"/>
-      <char name="period" width="278"/>
-      <char name="periodcentered" width="278"/>
-      <char name="perthousand" width="1000"/>
-      <char name="plus" width="584"/>
-      <char name="plusminus" width="584"/>
-      <char name="q" width="611"/>
-      <char name="question" width="611"/>
-      <char name="questiondown" width="611"/>
-      <char name="quotedbl" width="474"/>
-      <char name="quotedblbase" width="500"/>
-      <char name="quotedblleft" width="500"/>
-      <char name="quotedblright" width="500"/>
-      <char name="quoteleft" width="278"/>
-      <char name="quoteright" width="278"/>
-      <char name="quotesinglbase" width="278"/>
-      <char name="quotesingle" width="238"/>
-      <char name="r" width="389"/>
-      <char name="registered" width="737"/>
-      <char name="ring" width="333"/>
-      <char name="s" width="556"/>
-      <char name="scaron" width="556"/>
-      <char name="section" width="556"/>
-      <char name="semicolon" width="333"/>
-      <char name="seven" width="556"/>
-      <char name="six" width="556"/>
-      <char name="slash" width="278"/>
-      <char name="space" width="278"/>
+    <char-metrics>
+      <char name="A" width="722" llx="20" lly="0" urx="702" ury="718"/>
+      <char name="AE" width="1000" llx="5" lly="0" urx="954" ury="718"/>
+      <char name="Aacute" width="722" llx="20" lly="0" urx="702" ury="936"/>
+      <char name="Acircumflex" width="722" llx="20" lly="0" urx="702" ury="936"/>
+      <char name="Adieresis" width="722" llx="20" lly="0" urx="702" ury="915"/>
+      <char name="Agrave" width="722" llx="20" lly="0" urx="702" ury="936"/>
+      <char name="Aring" width="722" llx="20" lly="0" urx="702" ury="962"/>
+      <char name="Atilde" width="722" llx="20" lly="0" urx="702" ury="923"/>
+      <char name="B" width="722" llx="76" lly="0" urx="669" ury="718"/>
+      <char name="C" width="722" llx="44" lly="-19" urx="684" ury="737"/>
+      <char name="Ccedilla" width="722" llx="44" lly="-228" urx="684" ury="737"/>
+      <char name="D" width="722" llx="76" lly="0" urx="685" ury="718"/>
+      <char name="E" width="667" llx="76" lly="0" urx="621" ury="718"/>
+      <char name="Eacute" width="667" llx="76" lly="0" urx="621" ury="936"/>
+      <char name="Ecircumflex" width="667" llx="76" lly="0" urx="621" ury="936"/>
+      <char name="Edieresis" width="667" llx="76" lly="0" urx="621" ury="915"/>
+      <char name="Egrave" width="667" llx="76" lly="0" urx="621" ury="936"/>
+      <char name="Eth" width="722" llx="-5" lly="0" urx="685" ury="718"/>
+      <char name="Euro" width="556" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="611" llx="76" lly="0" urx="587" ury="718"/>
+      <char name="G" width="778" llx="44" lly="-19" urx="713" ury="737"/>
+      <char name="H" width="722" llx="71" lly="0" urx="651" ury="718"/>
+      <char name="I" width="278" llx="64" lly="0" urx="214" ury="718"/>
+      <char name="Iacute" width="278" llx="64" lly="0" urx="329" ury="936"/>
+      <char name="Icircumflex" width="278" llx="-37" lly="0" urx="316" ury="936"/>
+      <char name="Idieresis" width="278" llx="-21" lly="0" urx="300" ury="915"/>
+      <char name="Igrave" width="278" llx="-50" lly="0" urx="214" ury="936"/>
+      <char name="J" width="556" llx="22" lly="-18" urx="484" ury="718"/>
+      <char name="K" width="722" llx="87" lly="0" urx="722" ury="718"/>
+      <char name="L" width="611" llx="76" lly="0" urx="583" ury="718"/>
+      <char name="Lslash" width="611" llx="-20" lly="0" urx="583" ury="718"/>
+      <char name="M" width="833" llx="69" lly="0" urx="765" ury="718"/>
+      <char name="N" width="722" llx="69" lly="0" urx="654" ury="718"/>
+      <char name="Ntilde" width="722" llx="69" lly="0" urx="654" ury="923"/>
+      <char name="O" width="778" llx="44" lly="-19" urx="734" ury="737"/>
+      <char name="OE" width="1000" llx="37" lly="-19" urx="961" ury="737"/>
+      <char name="Oacute" width="778" llx="44" lly="-19" urx="734" ury="936"/>
+      <char name="Ocircumflex" width="778" llx="44" lly="-19" urx="734" ury="936"/>
+      <char name="Odieresis" width="778" llx="44" lly="-19" urx="734" ury="915"/>
+      <char name="Ograve" width="778" llx="44" lly="-19" urx="734" ury="936"/>
+      <char name="Oslash" width="778" llx="33" lly="-27" urx="744" ury="745"/>
+      <char name="Otilde" width="778" llx="44" lly="-19" urx="734" ury="923"/>
+      <char name="P" width="667" llx="76" lly="0" urx="627" ury="718"/>
+      <char name="Q" width="778" llx="44" lly="-52" urx="737" ury="737"/>
+      <char name="R" width="722" llx="76" lly="0" urx="677" ury="718"/>
+      <char name="S" width="667" llx="39" lly="-19" urx="629" ury="737"/>
+      <char name="Scaron" width="667" llx="39" lly="-19" urx="629" ury="936"/>
+      <char name="T" width="611" llx="14" lly="0" urx="598" ury="718"/>
+      <char name="Thorn" width="667" llx="76" lly="0" urx="627" ury="718"/>
+      <char name="U" width="722" llx="72" lly="-19" urx="651" ury="718"/>
+      <char name="Uacute" width="722" llx="72" lly="-19" urx="651" ury="936"/>
+      <char name="Ucircumflex" width="722" llx="72" lly="-19" urx="651" ury="936"/>
+      <char name="Udieresis" width="722" llx="72" lly="-19" urx="651" ury="915"/>
+      <char name="Ugrave" width="722" llx="72" lly="-19" urx="651" ury="936"/>
+      <char name="V" width="667" llx="19" lly="0" urx="648" ury="718"/>
+      <char name="W" width="944" llx="16" lly="0" urx="929" ury="718"/>
+      <char name="X" width="667" llx="14" lly="0" urx="653" ury="718"/>
+      <char name="Y" width="667" llx="15" lly="0" urx="653" ury="718"/>
+      <char name="Yacute" width="667" llx="15" lly="0" urx="653" ury="936"/>
+      <char name="Ydieresis" width="667" llx="15" lly="0" urx="653" ury="915"/>
+      <char name="Z" width="611" llx="25" lly="0" urx="586" ury="718"/>
+      <char name="Zcaron" width="611" llx="25" lly="0" urx="586" ury="936"/>
+      <char name="a" width="556" llx="29" lly="-14" urx="527" ury="546"/>
+      <char name="aacute" width="556" llx="29" lly="-14" urx="527" ury="750"/>
+      <char name="acircumflex" width="556" llx="29" lly="-14" urx="527" ury="750"/>
+      <char name="acute" width="333" llx="108" lly="604" urx="356" ury="750"/>
+      <char name="adieresis" width="556" llx="29" lly="-14" urx="527" ury="729"/>
+      <char name="ae" width="889" llx="29" lly="-14" urx="858" ury="546"/>
+      <char name="agrave" width="556" llx="29" lly="-14" urx="527" ury="750"/>
+      <char name="ampersand" width="722" llx="54" lly="-19" urx="701" ury="718"/>
+      <char name="aring" width="556" llx="29" lly="-14" urx="527" ury="776"/>
+      <char name="asciicircum" width="584" llx="62" lly="323" urx="522" ury="698"/>
+      <char name="asciitilde" width="584" llx="61" lly="163" urx="523" ury="343"/>
+      <char name="asterisk" width="389" llx="27" lly="387" urx="362" ury="718"/>
+      <char name="at" width="975" llx="118" lly="-19" urx="856" ury="737"/>
+      <char name="atilde" width="556" llx="29" lly="-14" urx="527" ury="737"/>
+      <char name="b" width="611" llx="61" lly="-14" urx="578" ury="718"/>
+      <char name="backslash" width="278" llx="-33" lly="-19" urx="311" ury="737"/>
+      <char name="bar" width="280" llx="84" lly="-225" urx="196" ury="775"/>
+      <char name="braceleft" width="389" llx="48" lly="-196" urx="365" ury="722"/>
+      <char name="braceright" width="389" llx="24" lly="-196" urx="341" ury="722"/>
+      <char name="bracketleft" width="333" llx="63" lly="-196" urx="309" ury="722"/>
+      <char name="bracketright" width="333" llx="24" lly="-196" urx="270" ury="722"/>
+      <char name="breve" width="333" llx="-2" lly="604" urx="335" ury="750"/>
+      <char name="brokenbar" width="280" llx="84" lly="-150" urx="196" ury="700"/>
+      <char name="bullet" width="350" llx="10" lly="194" urx="340" ury="524"/>
+      <char name="c" width="556" llx="34" lly="-14" urx="524" ury="546"/>
+      <char name="caron" width="333" llx="-10" lly="604" urx="343" ury="750"/>
+      <char name="ccedilla" width="556" llx="34" lly="-228" urx="524" ury="546"/>
+      <char name="cedilla" width="333" llx="6" lly="-228" urx="245" ury="0"/>
+      <char name="cent" width="556" llx="34" lly="-118" urx="524" ury="628"/>
+      <char name="circumflex" width="333" llx="-10" lly="604" urx="343" ury="750"/>
+      <char name="colon" width="333" llx="92" lly="0" urx="242" ury="512"/>
+      <char name="comma" width="278" llx="64" lly="-168" urx="214" ury="146"/>
+      <char name="copyright" width="737" llx="-11" lly="-19" urx="749" ury="737"/>
+      <char name="currency" width="556" llx="-3" lly="76" urx="559" ury="636"/>
+      <char name="d" width="611" llx="34" lly="-14" urx="551" ury="718"/>
+      <char name="dagger" width="556" llx="36" lly="-171" urx="520" ury="718"/>
+      <char name="daggerdbl" width="556" llx="36" lly="-171" urx="520" ury="718"/>
+      <char name="degree" width="400" llx="57" lly="426" urx="343" ury="712"/>
+      <char name="dieresis" width="333" llx="6" lly="614" urx="327" ury="729"/>
+      <char name="divide" width="584" llx="40" lly="-42" urx="544" ury="548"/>
+      <char name="dollar" width="556" llx="30" lly="-115" urx="523" ury="775"/>
+      <char name="dotaccent" width="333" llx="104" lly="614" urx="230" ury="729"/>
+      <char name="dotlessi" width="278" llx="69" lly="0" urx="209" ury="532"/>
+      <char name="e" width="556" llx="23" lly="-14" urx="528" ury="546"/>
+      <char name="eacute" width="556" llx="23" lly="-14" urx="528" ury="750"/>
+      <char name="ecircumflex" width="556" llx="23" lly="-14" urx="528" ury="750"/>
+      <char name="edieresis" width="556" llx="23" lly="-14" urx="528" ury="729"/>
+      <char name="egrave" width="556" llx="23" lly="-14" urx="528" ury="750"/>
+      <char name="eight" width="556" llx="32" lly="-19" urx="524" ury="710"/>
+      <char name="ellipsis" width="1000" llx="92" lly="0" urx="908" ury="146"/>
+      <char name="emdash" width="1000" llx="0" lly="227" urx="1000" ury="333"/>
+      <char name="endash" width="556" llx="0" lly="227" urx="556" ury="333"/>
+      <char name="equal" width="584" llx="40" lly="87" urx="544" ury="419"/>
+      <char name="eth" width="611" llx="34" lly="-14" urx="578" ury="737"/>
+      <char name="exclam" width="333" llx="90" lly="0" urx="244" ury="718"/>
+      <char name="exclamdown" width="333" llx="90" lly="-186" urx="244" ury="532"/>
+      <char name="f" width="333" llx="10" lly="0" urx="318" ury="727"/>
+      <char name="fi" width="611" llx="10" lly="0" urx="542" ury="727"/>
+      <char name="five" width="556" llx="27" lly="-19" urx="516" ury="698"/>
+      <char name="fl" width="611" llx="10" lly="0" urx="542" ury="727"/>
+      <char name="florin" width="556" llx="-10" lly="-210" urx="516" ury="737"/>
+      <char name="four" width="556" llx="27" lly="0" urx="526" ury="710"/>
+      <char name="fraction" width="167" llx="-170" lly="-19" urx="336" ury="710"/>
+      <char name="g" width="611" llx="40" lly="-217" urx="553" ury="546"/>
+      <char name="germandbls" width="611" llx="69" lly="-14" urx="579" ury="731"/>
+      <char name="grave" width="333" llx="-23" lly="604" urx="225" ury="750"/>
+      <char name="greater" width="584" llx="38" lly="-8" urx="546" ury="514"/>
+      <char name="guillemotleft" width="556" llx="88" lly="76" urx="468" ury="484"/>
+      <char name="guillemotright" width="556" llx="88" lly="76" urx="468" ury="484"/>
+      <char name="guilsinglleft" width="333" llx="83" lly="76" urx="250" ury="484"/>
+      <char name="guilsinglright" width="333" llx="83" lly="76" urx="250" ury="484"/>
+      <char name="h" width="611" llx="65" lly="0" urx="546" ury="718"/>
+      <char name="hungarumlaut" width="333" llx="9" lly="604" urx="486" ury="750"/>
+      <char name="hyphen" width="333" llx="27" lly="215" urx="306" ury="345"/>
+      <char name="i" width="278" llx="69" lly="0" urx="209" ury="725"/>
+      <char name="iacute" width="278" llx="69" lly="0" urx="329" ury="750"/>
+      <char name="icircumflex" width="278" llx="-37" lly="0" urx="316" ury="750"/>
+      <char name="idieresis" width="278" llx="-21" lly="0" urx="300" ury="729"/>
+      <char name="igrave" width="278" llx="-50" lly="0" urx="209" ury="750"/>
+      <char name="j" width="278" llx="3" lly="-214" urx="209" ury="725"/>
+      <char name="k" width="556" llx="69" lly="0" urx="562" ury="718"/>
+      <char name="l" width="278" llx="69" lly="0" urx="209" ury="718"/>
+      <char name="less" width="584" llx="38" lly="-8" urx="546" ury="514"/>
+      <char name="logicalnot" width="584" llx="40" lly="108" urx="544" ury="419"/>
+      <char name="lslash" width="278" llx="-18" lly="0" urx="296" ury="718"/>
+      <char name="m" width="889" llx="64" lly="0" urx="826" ury="546"/>
+      <char name="macron" width="333" llx="-6" lly="604" urx="339" ury="678"/>
+      <char name="minus" width="324" llx="40" lly="197" urx="544" ury="309"/>
+      <char name="mu" width="611" llx="66" lly="-207" urx="545" ury="532"/>
+      <char name="multiply" width="584" llx="40" lly="1" urx="545" ury="505"/>
+      <char name="n" width="611" llx="65" lly="0" urx="546" ury="546"/>
+      <char name="nine" width="556" llx="30" lly="-19" urx="522" ury="710"/>
+      <char name="ntilde" width="611" llx="65" lly="0" urx="546" ury="737"/>
+      <char name="numbersign" width="556" llx="18" lly="0" urx="538" ury="698"/>
+      <char name="o" width="611" llx="34" lly="-14" urx="578" ury="546"/>
+      <char name="oacute" width="611" llx="34" lly="-14" urx="578" ury="750"/>
+      <char name="ocircumflex" width="611" llx="34" lly="-14" urx="578" ury="750"/>
+      <char name="odieresis" width="611" llx="34" lly="-14" urx="578" ury="729"/>
+      <char name="oe" width="944" llx="34" lly="-14" urx="912" ury="546"/>
+      <char name="ogonek" width="333" llx="71" lly="-228" urx="304" ury="0"/>
+      <char name="ograve" width="611" llx="34" lly="-14" urx="578" ury="750"/>
+      <char name="one" width="556" llx="69" lly="0" urx="378" ury="710"/>
+      <char name="onehalf" width="834" llx="26" lly="-19" urx="794" ury="710"/>
+      <char name="onequarter" width="834" llx="26" lly="-19" urx="766" ury="710"/>
+      <char name="onesuperior" width="333" llx="26" lly="283" urx="237" ury="710"/>
+      <char name="ordfeminine" width="370" llx="22" lly="401" urx="347" ury="737"/>
+      <char name="ordmasculine" width="365" llx="6" lly="401" urx="360" ury="737"/>
+      <char name="oslash" width="611" llx="22" lly="-29" urx="589" ury="560"/>
+      <char name="otilde" width="611" llx="34" lly="-14" urx="578" ury="737"/>
+      <char name="p" width="611" llx="62" lly="-207" urx="578" ury="546"/>
+      <char name="paragraph" width="556" llx="-8" lly="-191" urx="539" ury="700"/>
+      <char name="parenleft" width="333" llx="35" lly="-208" urx="314" ury="734"/>
+      <char name="parenright" width="333" llx="19" lly="-208" urx="298" ury="734"/>
+      <char name="percent" width="889" llx="28" lly="-19" urx="861" ury="710"/>
+      <char name="period" width="278" llx="64" lly="0" urx="214" ury="146"/>
+      <char name="periodcentered" width="278" llx="58" lly="172" urx="220" ury="334"/>
+      <char name="perthousand" width="1000" llx="-3" lly="-19" urx="1003" ury="710"/>
+      <char name="plus" width="584" llx="40" lly="0" urx="544" ury="506"/>
+      <char name="plusminus" width="584" llx="40" lly="0" urx="544" ury="506"/>
+      <char name="q" width="611" llx="34" lly="-207" urx="552" ury="546"/>
+      <char name="question" width="611" llx="60" lly="0" urx="556" ury="727"/>
+      <char name="questiondown" width="611" llx="55" lly="-195" urx="551" ury="532"/>
+      <char name="quotedbl" width="474" llx="98" lly="447" urx="376" ury="718"/>
+      <char name="quotedblbase" width="500" llx="64" lly="-146" urx="436" ury="127"/>
+      <char name="quotedblleft" width="500" llx="64" lly="454" urx="436" ury="727"/>
+      <char name="quotedblright" width="500" llx="64" lly="445" urx="436" ury="718"/>
+      <char name="quoteleft" width="278" llx="69" lly="454" urx="209" ury="727"/>
+      <char name="quoteright" width="278" llx="69" lly="445" urx="209" ury="718"/>
+      <char name="quotesinglbase" width="278" llx="69" lly="-146" urx="209" ury="127"/>
+      <char name="quotesingle" width="238" llx="70" lly="447" urx="168" ury="718"/>
+      <char name="r" width="389" llx="64" lly="0" urx="373" ury="546"/>
+      <char name="registered" width="737" llx="-11" lly="-19" urx="748" ury="737"/>
+      <char name="ring" width="333" llx="59" lly="568" urx="275" ury="776"/>
+      <char name="s" width="556" llx="30" lly="-14" urx="519" ury="546"/>
+      <char name="scaron" width="556" llx="30" lly="-14" urx="519" ury="750"/>
+      <char name="section" width="556" llx="34" lly="-184" urx="522" ury="727"/>
+      <char name="semicolon" width="333" llx="92" lly="-168" urx="242" ury="512"/>
+      <char name="seven" width="556" llx="25" lly="0" urx="528" ury="698"/>
+      <char name="six" width="556" llx="31" lly="-19" urx="520" ury="710"/>
+      <char name="slash" width="278" llx="-33" lly="-19" urx="311" ury="737"/>
+      <char name="space" width="278" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="278"/>
-      <char name="sterling" width="556"/>
-      <char name="t" width="333"/>
-      <char name="thorn" width="611"/>
-      <char name="three" width="556"/>
-      <char name="threequarters" width="834"/>
-      <char name="threesuperior" width="333"/>
-      <char name="tilde" width="333"/>
-      <char name="trademark" width="1000"/>
-      <char name="two" width="556"/>
-      <char name="twosuperior" width="333"/>
-      <char name="u" width="611"/>
-      <char name="uacute" width="611"/>
-      <char name="ucircumflex" width="611"/>
-      <char name="udieresis" width="611"/>
-      <char name="ugrave" width="611"/>
-      <char name="underscore" width="556"/>
-      <char name="v" width="556"/>
-      <char name="w" width="778"/>
-      <char name="x" width="556"/>
-      <char name="y" width="556"/>
-      <char name="yacute" width="556"/>
-      <char name="ydieresis" width="556"/>
-      <char name="yen" width="556"/>
-      <char name="z" width="500"/>
-      <char name="zcaron" width="500"/>
-      <char name="zero" width="556"/>
-   </widths>
+      <char name="sterling" width="556" llx="28" lly="-16" urx="541" ury="718"/>
+      <char name="t" width="333" llx="10" lly="-6" urx="309" ury="676"/>
+      <char name="thorn" width="611" llx="62" lly="-208" urx="578" ury="718"/>
+      <char name="three" width="556" llx="27" lly="-19" urx="516" ury="710"/>
+      <char name="threequarters" width="834" llx="16" lly="-19" urx="799" ury="710"/>
+      <char name="threesuperior" width="333" llx="8" lly="271" urx="326" ury="710"/>
+      <char name="tilde" width="333" llx="-17" lly="610" urx="350" ury="737"/>
+      <char name="trademark" width="1000" llx="44" lly="306" urx="956" ury="718"/>
+      <char name="two" width="556" llx="26" lly="0" urx="511" ury="710"/>
+      <char name="twosuperior" width="333" llx="9" lly="283" urx="324" ury="710"/>
+      <char name="u" width="611" llx="66" lly="-14" urx="545" ury="532"/>
+      <char name="uacute" width="611" llx="66" lly="-14" urx="545" ury="750"/>
+      <char name="ucircumflex" width="611" llx="66" lly="-14" urx="545" ury="750"/>
+      <char name="udieresis" width="611" llx="66" lly="-14" urx="545" ury="729"/>
+      <char name="ugrave" width="611" llx="66" lly="-14" urx="545" ury="750"/>
+      <char name="underscore" width="556" llx="0" lly="-125" urx="556" ury="-75"/>
+      <char name="v" width="556" llx="13" lly="0" urx="543" ury="532"/>
+      <char name="w" width="778" llx="10" lly="0" urx="769" ury="532"/>
+      <char name="x" width="556" llx="15" lly="0" urx="541" ury="532"/>
+      <char name="y" width="556" llx="10" lly="-214" urx="539" ury="532"/>
+      <char name="yacute" width="556" llx="10" lly="-214" urx="539" ury="750"/>
+      <char name="ydieresis" width="556" llx="10" lly="-214" urx="539" ury="729"/>
+      <char name="yen" width="556" llx="-9" lly="0" urx="565" ury="698"/>
+      <char name="z" width="500" llx="20" lly="0" urx="480" ury="532"/>
+      <char name="zcaron" width="500" llx="20" lly="0" urx="480" ury="750"/>
+      <char name="zero" width="556" llx="32" lly="-19" urx="524" ury="710"/>
+    </char-metrics>
   <kerning kpx1="107">
     <pair kern="-15" kpx2="111"/>
   </kerning>
diff --git a/src/codegen/fonts/HelveticaBoldOblique.xml b/src/codegen/fonts/HelveticaBoldOblique.xml
index c11e0ba18..e1d0fd294 100644
--- a/src/codegen/fonts/HelveticaBoldOblique.xml
+++ b/src/codegen/fonts/HelveticaBoldOblique.xml
@@ -22,245 +22,246 @@
    <family-name>Helvetica</family-name>
    <class-name>HelveticaBoldOblique</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>718</cap-height>
    <x-height>532</x-height>
    <ascender>718</ascender>
    <descender>-207</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="722"/>
-      <char name="AE" width="1000"/>
-      <char name="Aacute" width="722"/>
-      <char name="Acircumflex" width="722"/>
-      <char name="Adieresis" width="722"/>
-      <char name="Agrave" width="722"/>
-      <char name="Aring" width="722"/>
-      <char name="Atilde" width="722"/>
-      <char name="B" width="722"/>
-      <char name="C" width="722"/>
-      <char name="Ccedilla" width="722"/>
-      <char name="D" width="722"/>
-      <char name="E" width="667"/>
-      <char name="Eacute" width="667"/>
-      <char name="Ecircumflex" width="667"/>
-      <char name="Edieresis" width="667"/>
-      <char name="Egrave" width="667"/>
-      <char name="Eth" width="722"/>
-      <char name="Euro" width="556"/>
-      <char name="F" width="611"/>
-      <char name="G" width="778"/>
-      <char name="H" width="722"/>
-      <char name="I" width="278"/>
-      <char name="Iacute" width="278"/>
-      <char name="Icircumflex" width="278"/>
-      <char name="Idieresis" width="278"/>
-      <char name="Igrave" width="278"/>
-      <char name="J" width="556"/>
-      <char name="K" width="722"/>
-      <char name="L" width="611"/>
-      <char name="Lslash" width="611"/>
-      <char name="M" width="833"/>
-      <char name="N" width="722"/>
-      <char name="Ntilde" width="722"/>
-      <char name="O" width="778"/>
-      <char name="OE" width="1000"/>
-      <char name="Oacute" width="778"/>
-      <char name="Ocircumflex" width="778"/>
-      <char name="Odieresis" width="778"/>
-      <char name="Ograve" width="778"/>
-      <char name="Oslash" width="778"/>
-      <char name="Otilde" width="778"/>
-      <char name="P" width="667"/>
-      <char name="Q" width="778"/>
-      <char name="R" width="722"/>
-      <char name="S" width="667"/>
-      <char name="Scaron" width="667"/>
-      <char name="T" width="611"/>
-      <char name="Thorn" width="667"/>
-      <char name="U" width="722"/>
-      <char name="Uacute" width="722"/>
-      <char name="Ucircumflex" width="722"/>
-      <char name="Udieresis" width="722"/>
-      <char name="Ugrave" width="722"/>
-      <char name="V" width="667"/>
-      <char name="W" width="944"/>
-      <char name="X" width="667"/>
-      <char name="Y" width="667"/>
-      <char name="Yacute" width="667"/>
-      <char name="Ydieresis" width="667"/>
-      <char name="Z" width="611"/>
-      <char name="Zcaron" width="611"/>
-      <char name="a" width="556"/>
-      <char name="aacute" width="556"/>
-      <char name="acircumflex" width="556"/>
-      <char name="acute" width="333"/>
-      <char name="adieresis" width="556"/>
-      <char name="ae" width="889"/>
-      <char name="agrave" width="556"/>
-      <char name="ampersand" width="722"/>
-      <char name="aring" width="556"/>
-      <char name="asciicircum" width="584"/>
-      <char name="asciitilde" width="584"/>
-      <char name="asterisk" width="389"/>
-      <char name="at" width="975"/>
-      <char name="atilde" width="556"/>
-      <char name="b" width="611"/>
-      <char name="backslash" width="278"/>
-      <char name="bar" width="280"/>
-      <char name="braceleft" width="389"/>
-      <char name="braceright" width="389"/>
-      <char name="bracketleft" width="333"/>
-      <char name="bracketright" width="333"/>
-      <char name="breve" width="333"/>
-      <char name="brokenbar" width="280"/>
-      <char name="bullet" width="350"/>
-      <char name="c" width="556"/>
-      <char name="caron" width="333"/>
-      <char name="ccedilla" width="556"/>
-      <char name="cedilla" width="333"/>
-      <char name="cent" width="556"/>
-      <char name="circumflex" width="333"/>
-      <char name="colon" width="333"/>
-      <char name="comma" width="278"/>
-      <char name="copyright" width="737"/>
-      <char name="currency" width="556"/>
-      <char name="d" width="611"/>
-      <char name="dagger" width="556"/>
-      <char name="daggerdbl" width="556"/>
-      <char name="degree" width="400"/>
-      <char name="dieresis" width="333"/>
-      <char name="divide" width="584"/>
-      <char name="dollar" width="556"/>
-      <char name="dotaccent" width="333"/>
-      <char name="dotlessi" width="278"/>
-      <char name="e" width="556"/>
-      <char name="eacute" width="556"/>
-      <char name="ecircumflex" width="556"/>
-      <char name="edieresis" width="556"/>
-      <char name="egrave" width="556"/>
-      <char name="eight" width="556"/>
-      <char name="ellipsis" width="1000"/>
-      <char name="emdash" width="1000"/>
-      <char name="endash" width="556"/>
-      <char name="equal" width="584"/>
-      <char name="eth" width="611"/>
-      <char name="exclam" width="333"/>
-      <char name="exclamdown" width="333"/>
-      <char name="f" width="333"/>
-      <char name="fi" width="611"/>
-      <char name="five" width="556"/>
-      <char name="fl" width="611"/>
-      <char name="florin" width="556"/>
-      <char name="four" width="556"/>
-      <char name="fraction" width="167"/>
-      <char name="g" width="611"/>
-      <char name="germandbls" width="611"/>
-      <char name="grave" width="333"/>
-      <char name="greater" width="584"/>
-      <char name="guillemotleft" width="556"/>
-      <char name="guillemotright" width="556"/>
-      <char name="guilsinglleft" width="333"/>
-      <char name="guilsinglright" width="333"/>
-      <char name="h" width="611"/>
-      <char name="hungarumlaut" width="333"/>
-      <char name="hyphen" width="333"/>
-      <char name="i" width="278"/>
-      <char name="iacute" width="278"/>
-      <char name="icircumflex" width="278"/>
-      <char name="idieresis" width="278"/>
-      <char name="igrave" width="278"/>
-      <char name="j" width="278"/>
-      <char name="k" width="556"/>
-      <char name="l" width="278"/>
-      <char name="less" width="584"/>
-      <char name="logicalnot" width="584"/>
-      <char name="lslash" width="278"/>
-      <char name="m" width="889"/>
-      <char name="macron" width="333"/>
-      <char name="minus" width="324"/>
-      <char name="mu" width="611"/>
-      <char name="multiply" width="584"/>
-      <char name="n" width="611"/>
-      <char name="nine" width="556"/>
-      <char name="ntilde" width="611"/>
-      <char name="numbersign" width="556"/>
-      <char name="o" width="611"/>
-      <char name="oacute" width="611"/>
-      <char name="ocircumflex" width="611"/>
-      <char name="odieresis" width="611"/>
-      <char name="oe" width="944"/>
-      <char name="ogonek" width="333"/>
-      <char name="ograve" width="611"/>
-      <char name="one" width="556"/>
-      <char name="onehalf" width="834"/>
-      <char name="onequarter" width="834"/>
-      <char name="onesuperior" width="333"/>
-      <char name="ordfeminine" width="370"/>
-      <char name="ordmasculine" width="365"/>
-      <char name="oslash" width="611"/>
-      <char name="otilde" width="611"/>
-      <char name="p" width="611"/>
-      <char name="paragraph" width="556"/>
-      <char name="parenleft" width="333"/>
-      <char name="parenright" width="333"/>
-      <char name="percent" width="889"/>
-      <char name="period" width="278"/>
-      <char name="periodcentered" width="278"/>
-      <char name="perthousand" width="1000"/>
-      <char name="plus" width="584"/>
-      <char name="plusminus" width="584"/>
-      <char name="q" width="611"/>
-      <char name="question" width="611"/>
-      <char name="questiondown" width="611"/>
-      <char name="quotedbl" width="474"/>
-      <char name="quotedblbase" width="500"/>
-      <char name="quotedblleft" width="500"/>
-      <char name="quotedblright" width="500"/>
-      <char name="quoteleft" width="278"/>
-      <char name="quoteright" width="278"/>
-      <char name="quotesinglbase" width="278"/>
-      <char name="quotesingle" width="238"/>
-      <char name="r" width="389"/>
-      <char name="registered" width="737"/>
-      <char name="ring" width="333"/>
-      <char name="s" width="556"/>
-      <char name="scaron" width="556"/>
-      <char name="section" width="556"/>
-      <char name="semicolon" width="333"/>
-      <char name="seven" width="556"/>
-      <char name="six" width="556"/>
-      <char name="slash" width="278"/>
-      <char name="space" width="278"/>
+    <char-metrics>
+      <char name="A" width="722" llx="20" lly="0" urx="702" ury="718"/>
+      <char name="AE" width="1000" llx="5" lly="0" urx="1100" ury="718"/>
+      <char name="Aacute" width="722" llx="20" lly="0" urx="750" ury="936"/>
+      <char name="Acircumflex" width="722" llx="20" lly="0" urx="706" ury="936"/>
+      <char name="Adieresis" width="722" llx="20" lly="0" urx="716" ury="915"/>
+      <char name="Agrave" width="722" llx="20" lly="0" urx="702" ury="936"/>
+      <char name="Aring" width="722" llx="20" lly="0" urx="702" ury="962"/>
+      <char name="Atilde" width="722" llx="20" lly="0" urx="741" ury="923"/>
+      <char name="B" width="722" llx="76" lly="0" urx="764" ury="718"/>
+      <char name="C" width="722" llx="107" lly="-19" urx="789" ury="737"/>
+      <char name="Ccedilla" width="722" llx="107" lly="-228" urx="789" ury="737"/>
+      <char name="D" width="722" llx="76" lly="0" urx="777" ury="718"/>
+      <char name="E" width="667" llx="76" lly="0" urx="757" ury="718"/>
+      <char name="Eacute" width="667" llx="76" lly="0" urx="757" ury="936"/>
+      <char name="Ecircumflex" width="667" llx="76" lly="0" urx="757" ury="936"/>
+      <char name="Edieresis" width="667" llx="76" lly="0" urx="757" ury="915"/>
+      <char name="Egrave" width="667" llx="76" lly="0" urx="757" ury="936"/>
+      <char name="Eth" width="722" llx="62" lly="0" urx="777" ury="718"/>
+      <char name="Euro" width="556" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="611" llx="76" lly="0" urx="740" ury="718"/>
+      <char name="G" width="778" llx="108" lly="-19" urx="817" ury="737"/>
+      <char name="H" width="722" llx="71" lly="0" urx="804" ury="718"/>
+      <char name="I" width="278" llx="64" lly="0" urx="367" ury="718"/>
+      <char name="Iacute" width="278" llx="64" lly="0" urx="528" ury="936"/>
+      <char name="Icircumflex" width="278" llx="64" lly="0" urx="484" ury="936"/>
+      <char name="Idieresis" width="278" llx="64" lly="0" urx="494" ury="915"/>
+      <char name="Igrave" width="278" llx="64" lly="0" urx="367" ury="936"/>
+      <char name="J" width="556" llx="60" lly="-18" urx="637" ury="718"/>
+      <char name="K" width="722" llx="87" lly="0" urx="858" ury="718"/>
+      <char name="L" width="611" llx="76" lly="0" urx="611" ury="718"/>
+      <char name="Lslash" width="611" llx="34" lly="0" urx="611" ury="718"/>
+      <char name="M" width="833" llx="69" lly="0" urx="918" ury="718"/>
+      <char name="N" width="722" llx="69" lly="0" urx="807" ury="718"/>
+      <char name="Ntilde" width="722" llx="69" lly="0" urx="807" ury="923"/>
+      <char name="O" width="778" llx="107" lly="-19" urx="823" ury="737"/>
+      <char name="OE" width="1000" llx="99" lly="-19" urx="1114" ury="737"/>
+      <char name="Oacute" width="778" llx="107" lly="-19" urx="823" ury="936"/>
+      <char name="Ocircumflex" width="778" llx="107" lly="-19" urx="823" ury="936"/>
+      <char name="Odieresis" width="778" llx="107" lly="-19" urx="823" ury="915"/>
+      <char name="Ograve" width="778" llx="107" lly="-19" urx="823" ury="936"/>
+      <char name="Oslash" width="778" llx="35" lly="-27" urx="894" ury="745"/>
+      <char name="Otilde" width="778" llx="107" lly="-19" urx="823" ury="923"/>
+      <char name="P" width="667" llx="76" lly="0" urx="738" ury="718"/>
+      <char name="Q" width="778" llx="107" lly="-52" urx="823" ury="737"/>
+      <char name="R" width="722" llx="76" lly="0" urx="778" ury="718"/>
+      <char name="S" width="667" llx="81" lly="-19" urx="718" ury="737"/>
+      <char name="Scaron" width="667" llx="81" lly="-19" urx="718" ury="936"/>
+      <char name="T" width="611" llx="140" lly="0" urx="751" ury="718"/>
+      <char name="Thorn" width="667" llx="76" lly="0" urx="716" ury="718"/>
+      <char name="U" width="722" llx="116" lly="-19" urx="804" ury="718"/>
+      <char name="Uacute" width="722" llx="116" lly="-19" urx="804" ury="936"/>
+      <char name="Ucircumflex" width="722" llx="116" lly="-19" urx="804" ury="936"/>
+      <char name="Udieresis" width="722" llx="116" lly="-19" urx="804" ury="915"/>
+      <char name="Ugrave" width="722" llx="116" lly="-19" urx="804" ury="936"/>
+      <char name="V" width="667" llx="172" lly="0" urx="801" ury="718"/>
+      <char name="W" width="944" llx="169" lly="0" urx="1082" ury="718"/>
+      <char name="X" width="667" llx="14" lly="0" urx="791" ury="718"/>
+      <char name="Y" width="667" llx="168" lly="0" urx="806" ury="718"/>
+      <char name="Yacute" width="667" llx="168" lly="0" urx="806" ury="936"/>
+      <char name="Ydieresis" width="667" llx="168" lly="0" urx="806" ury="915"/>
+      <char name="Z" width="611" llx="25" lly="0" urx="737" ury="718"/>
+      <char name="Zcaron" width="611" llx="25" lly="0" urx="737" ury="936"/>
+      <char name="a" width="556" llx="55" lly="-14" urx="583" ury="546"/>
+      <char name="aacute" width="556" llx="55" lly="-14" urx="627" ury="750"/>
+      <char name="acircumflex" width="556" llx="55" lly="-14" urx="583" ury="750"/>
+      <char name="acute" width="333" llx="236" lly="604" urx="515" ury="750"/>
+      <char name="adieresis" width="556" llx="55" lly="-14" urx="594" ury="729"/>
+      <char name="ae" width="889" llx="56" lly="-14" urx="923" ury="546"/>
+      <char name="agrave" width="556" llx="55" lly="-14" urx="583" ury="750"/>
+      <char name="ampersand" width="722" llx="89" lly="-19" urx="732" ury="718"/>
+      <char name="aring" width="556" llx="55" lly="-14" urx="583" ury="776"/>
+      <char name="asciicircum" width="584" llx="131" lly="323" urx="591" ury="698"/>
+      <char name="asciitilde" width="584" llx="115" lly="163" urx="577" ury="343"/>
+      <char name="asterisk" width="389" llx="146" lly="387" urx="481" ury="718"/>
+      <char name="at" width="975" llx="186" lly="-19" urx="954" ury="737"/>
+      <char name="atilde" width="556" llx="55" lly="-14" urx="619" ury="737"/>
+      <char name="b" width="611" llx="61" lly="-14" urx="645" ury="718"/>
+      <char name="backslash" width="278" llx="124" lly="-19" urx="307" ury="737"/>
+      <char name="bar" width="280" llx="36" lly="-225" urx="361" ury="775"/>
+      <char name="braceleft" width="389" llx="94" lly="-196" urx="518" ury="722"/>
+      <char name="braceright" width="389" llx="-18" lly="-196" urx="407" ury="722"/>
+      <char name="bracketleft" width="333" llx="21" lly="-196" urx="462" ury="722"/>
+      <char name="bracketright" width="333" llx="-18" lly="-196" urx="423" ury="722"/>
+      <char name="breve" width="333" llx="156" lly="604" urx="494" ury="750"/>
+      <char name="brokenbar" width="280" llx="52" lly="-150" urx="345" ury="700"/>
+      <char name="bullet" width="350" llx="83" lly="194" urx="420" ury="524"/>
+      <char name="c" width="556" llx="79" lly="-14" urx="599" ury="546"/>
+      <char name="caron" width="333" llx="149" lly="604" urx="502" ury="750"/>
+      <char name="ccedilla" width="556" llx="79" lly="-228" urx="599" ury="546"/>
+      <char name="cedilla" width="333" llx="-37" lly="-228" urx="220" ury="0"/>
+      <char name="cent" width="556" llx="79" lly="-118" urx="599" ury="628"/>
+      <char name="circumflex" width="333" llx="118" lly="604" urx="471" ury="750"/>
+      <char name="colon" width="333" llx="92" lly="0" urx="351" ury="512"/>
+      <char name="comma" width="278" llx="28" lly="-168" urx="245" ury="146"/>
+      <char name="copyright" width="737" llx="56" lly="-19" urx="835" ury="737"/>
+      <char name="currency" width="556" llx="27" lly="76" urx="680" ury="636"/>
+      <char name="d" width="611" llx="82" lly="-14" urx="704" ury="718"/>
+      <char name="dagger" width="556" llx="118" lly="-171" urx="626" ury="718"/>
+      <char name="daggerdbl" width="556" llx="46" lly="-171" urx="628" ury="718"/>
+      <char name="degree" width="400" llx="175" lly="426" urx="467" ury="712"/>
+      <char name="dieresis" width="333" llx="137" lly="614" urx="482" ury="729"/>
+      <char name="divide" width="584" llx="82" lly="-42" urx="610" ury="548"/>
+      <char name="dollar" width="556" llx="67" lly="-115" urx="622" ury="775"/>
+      <char name="dotaccent" width="333" llx="235" lly="614" urx="385" ury="729"/>
+      <char name="dotlessi" width="278" llx="69" lly="0" urx="322" ury="532"/>
+      <char name="e" width="556" llx="70" lly="-14" urx="593" ury="546"/>
+      <char name="eacute" width="556" llx="70" lly="-14" urx="627" ury="750"/>
+      <char name="ecircumflex" width="556" llx="70" lly="-14" urx="593" ury="750"/>
+      <char name="edieresis" width="556" llx="70" lly="-14" urx="594" ury="729"/>
+      <char name="egrave" width="556" llx="70" lly="-14" urx="593" ury="750"/>
+      <char name="eight" width="556" llx="69" lly="-19" urx="616" ury="710"/>
+      <char name="ellipsis" width="1000" llx="92" lly="0" urx="939" ury="146"/>
+      <char name="emdash" width="1000" llx="48" lly="227" urx="1071" ury="333"/>
+      <char name="endash" width="556" llx="48" lly="227" urx="627" ury="333"/>
+      <char name="equal" width="584" llx="58" lly="87" urx="633" ury="419"/>
+      <char name="eth" width="611" llx="82" lly="-14" urx="670" ury="737"/>
+      <char name="exclam" width="333" llx="94" lly="0" urx="397" ury="718"/>
+      <char name="exclamdown" width="333" llx="50" lly="-186" urx="353" ury="532"/>
+      <char name="f" width="333" llx="87" lly="0" urx="469" ury="727"/>
+      <char name="fi" width="611" llx="87" lly="0" urx="696" ury="727"/>
+      <char name="five" width="556" llx="64" lly="-19" urx="636" ury="698"/>
+      <char name="fl" width="611" llx="87" lly="0" urx="695" ury="727"/>
+      <char name="florin" width="556" llx="-50" lly="-210" urx="669" ury="737"/>
+      <char name="four" width="556" llx="60" lly="0" urx="598" ury="710"/>
+      <char name="fraction" width="167" llx="-174" lly="-19" urx="487" ury="710"/>
+      <char name="g" width="611" llx="38" lly="-217" urx="666" ury="546"/>
+      <char name="germandbls" width="611" llx="69" lly="-14" urx="657" ury="731"/>
+      <char name="grave" width="333" llx="136" lly="604" urx="353" ury="750"/>
+      <char name="greater" width="584" llx="36" lly="-8" urx="609" ury="514"/>
+      <char name="guillemotleft" width="556" llx="135" lly="76" urx="571" ury="484"/>
+      <char name="guillemotright" width="556" llx="104" lly="76" urx="540" ury="484"/>
+      <char name="guilsinglleft" width="333" llx="130" lly="76" urx="353" ury="484"/>
+      <char name="guilsinglright" width="333" llx="99" lly="76" urx="322" ury="484"/>
+      <char name="h" width="611" llx="65" lly="0" urx="629" ury="718"/>
+      <char name="hungarumlaut" width="333" llx="137" lly="604" urx="645" ury="750"/>
+      <char name="hyphen" width="333" llx="73" lly="215" urx="379" ury="345"/>
+      <char name="i" width="278" llx="69" lly="0" urx="363" ury="725"/>
+      <char name="iacute" width="278" llx="69" lly="0" urx="488" ury="750"/>
+      <char name="icircumflex" width="278" llx="69" lly="0" urx="444" ury="750"/>
+      <char name="idieresis" width="278" llx="69" lly="0" urx="455" ury="729"/>
+      <char name="igrave" width="278" llx="69" lly="0" urx="326" ury="750"/>
+      <char name="j" width="278" llx="-42" lly="-214" urx="363" ury="725"/>
+      <char name="k" width="556" llx="69" lly="0" urx="670" ury="718"/>
+      <char name="l" width="278" llx="69" lly="0" urx="362" ury="718"/>
+      <char name="less" width="584" llx="82" lly="-8" urx="655" ury="514"/>
+      <char name="logicalnot" width="584" llx="105" lly="108" urx="633" ury="419"/>
+      <char name="lslash" width="278" llx="40" lly="0" urx="407" ury="718"/>
+      <char name="m" width="889" llx="64" lly="0" urx="909" ury="546"/>
+      <char name="macron" width="333" llx="122" lly="604" urx="483" ury="678"/>
+      <char name="minus" width="324" llx="82" lly="197" urx="610" ury="309"/>
+      <char name="mu" width="611" llx="22" lly="-207" urx="658" ury="532"/>
+      <char name="multiply" width="584" llx="57" lly="1" urx="635" ury="505"/>
+      <char name="n" width="611" llx="65" lly="0" urx="629" ury="546"/>
+      <char name="nine" width="556" llx="78" lly="-19" urx="615" ury="710"/>
+      <char name="ntilde" width="611" llx="65" lly="0" urx="646" ury="737"/>
+      <char name="numbersign" width="556" llx="60" lly="0" urx="644" ury="698"/>
+      <char name="o" width="611" llx="82" lly="-14" urx="643" ury="546"/>
+      <char name="oacute" width="611" llx="82" lly="-14" urx="654" ury="750"/>
+      <char name="ocircumflex" width="611" llx="82" lly="-14" urx="643" ury="750"/>
+      <char name="odieresis" width="611" llx="82" lly="-14" urx="643" ury="729"/>
+      <char name="oe" width="944" llx="82" lly="-14" urx="977" ury="546"/>
+      <char name="ogonek" width="333" llx="41" lly="-228" urx="264" ury="0"/>
+      <char name="ograve" width="611" llx="82" lly="-14" urx="643" ury="750"/>
+      <char name="one" width="556" llx="173" lly="0" urx="529" ury="710"/>
+      <char name="onehalf" width="834" llx="132" lly="-19" urx="858" ury="710"/>
+      <char name="onequarter" width="834" llx="132" lly="-19" urx="806" ury="710"/>
+      <char name="onesuperior" width="333" llx="148" lly="283" urx="388" ury="710"/>
+      <char name="ordfeminine" width="370" llx="125" lly="401" urx="465" ury="737"/>
+      <char name="ordmasculine" width="365" llx="123" lly="401" urx="485" ury="737"/>
+      <char name="oslash" width="611" llx="22" lly="-29" urx="701" ury="560"/>
+      <char name="otilde" width="611" llx="82" lly="-14" urx="646" ury="737"/>
+      <char name="p" width="611" llx="18" lly="-207" urx="645" ury="546"/>
+      <char name="paragraph" width="556" llx="98" lly="-191" urx="688" ury="700"/>
+      <char name="parenleft" width="333" llx="76" lly="-208" urx="470" ury="734"/>
+      <char name="parenright" width="333" llx="-25" lly="-208" urx="369" ury="734"/>
+      <char name="percent" width="889" llx="136" lly="-19" urx="901" ury="710"/>
+      <char name="period" width="278" llx="64" lly="0" urx="245" ury="146"/>
+      <char name="periodcentered" width="278" llx="110" lly="172" urx="276" ury="334"/>
+      <char name="perthousand" width="1000" llx="76" lly="-19" urx="1038" ury="710"/>
+      <char name="plus" width="584" llx="82" lly="0" urx="610" ury="506"/>
+      <char name="plusminus" width="584" llx="40" lly="0" urx="625" ury="506"/>
+      <char name="q" width="611" llx="80" lly="-207" urx="665" ury="546"/>
+      <char name="question" width="611" llx="165" lly="0" urx="671" ury="727"/>
+      <char name="questiondown" width="611" llx="53" lly="-195" urx="559" ury="532"/>
+      <char name="quotedbl" width="474" llx="193" lly="447" urx="529" ury="718"/>
+      <char name="quotedblbase" width="500" llx="36" lly="-146" urx="463" ury="127"/>
+      <char name="quotedblleft" width="500" llx="160" lly="454" urx="588" ury="727"/>
+      <char name="quotedblright" width="500" llx="162" lly="445" urx="589" ury="718"/>
+      <char name="quoteleft" width="278" llx="165" lly="454" urx="361" ury="727"/>
+      <char name="quoteright" width="278" llx="167" lly="445" urx="362" ury="718"/>
+      <char name="quotesinglbase" width="278" llx="41" lly="-146" urx="236" ury="127"/>
+      <char name="quotesingle" width="238" llx="165" lly="447" urx="321" ury="718"/>
+      <char name="r" width="389" llx="64" lly="0" urx="489" ury="546"/>
+      <char name="registered" width="737" llx="55" lly="-19" urx="834" ury="737"/>
+      <char name="ring" width="333" llx="200" lly="568" urx="420" ury="776"/>
+      <char name="s" width="556" llx="63" lly="-14" urx="584" ury="546"/>
+      <char name="scaron" width="556" llx="63" lly="-14" urx="614" ury="750"/>
+      <char name="section" width="556" llx="61" lly="-184" urx="598" ury="727"/>
+      <char name="semicolon" width="333" llx="56" lly="-168" urx="351" ury="512"/>
+      <char name="seven" width="556" llx="125" lly="0" urx="676" ury="698"/>
+      <char name="six" width="556" llx="85" lly="-19" urx="619" ury="710"/>
+      <char name="slash" width="278" llx="-37" lly="-19" urx="468" ury="737"/>
+      <char name="space" width="278" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="278"/>
-      <char name="sterling" width="556"/>
-      <char name="t" width="333"/>
-      <char name="thorn" width="611"/>
-      <char name="three" width="556"/>
-      <char name="threequarters" width="834"/>
-      <char name="threesuperior" width="333"/>
-      <char name="tilde" width="333"/>
-      <char name="trademark" width="1000"/>
-      <char name="two" width="556"/>
-      <char name="twosuperior" width="333"/>
-      <char name="u" width="611"/>
-      <char name="uacute" width="611"/>
-      <char name="ucircumflex" width="611"/>
-      <char name="udieresis" width="611"/>
-      <char name="ugrave" width="611"/>
-      <char name="underscore" width="556"/>
-      <char name="v" width="556"/>
-      <char name="w" width="778"/>
-      <char name="x" width="556"/>
-      <char name="y" width="556"/>
-      <char name="yacute" width="556"/>
-      <char name="ydieresis" width="556"/>
-      <char name="yen" width="556"/>
-      <char name="z" width="500"/>
-      <char name="zcaron" width="500"/>
-      <char name="zero" width="556"/>
-   </widths>
+      <char name="sterling" width="556" llx="50" lly="-16" urx="635" ury="718"/>
+      <char name="t" width="333" llx="100" lly="-6" urx="422" ury="676"/>
+      <char name="thorn" width="611" llx="18" lly="-208" urx="645" ury="718"/>
+      <char name="three" width="556" llx="65" lly="-19" urx="608" ury="710"/>
+      <char name="threequarters" width="834" llx="99" lly="-19" urx="839" ury="710"/>
+      <char name="threesuperior" width="333" llx="91" lly="271" urx="441" ury="710"/>
+      <char name="tilde" width="333" llx="113" lly="610" urx="507" ury="737"/>
+      <char name="trademark" width="1000" llx="179" lly="306" urx="1109" ury="718"/>
+      <char name="two" width="556" llx="26" lly="0" urx="619" ury="710"/>
+      <char name="twosuperior" width="333" llx="69" lly="283" urx="449" ury="710"/>
+      <char name="u" width="611" llx="98" lly="-14" urx="658" ury="532"/>
+      <char name="uacute" width="611" llx="98" lly="-14" urx="658" ury="750"/>
+      <char name="ucircumflex" width="611" llx="98" lly="-14" urx="658" ury="750"/>
+      <char name="udieresis" width="611" llx="98" lly="-14" urx="658" ury="729"/>
+      <char name="ugrave" width="611" llx="98" lly="-14" urx="658" ury="750"/>
+      <char name="underscore" width="556" llx="-27" lly="-125" urx="540" ury="-75"/>
+      <char name="v" width="556" llx="126" lly="0" urx="656" ury="532"/>
+      <char name="w" width="778" llx="123" lly="0" urx="882" ury="532"/>
+      <char name="x" width="556" llx="15" lly="0" urx="648" ury="532"/>
+      <char name="y" width="556" llx="42" lly="-214" urx="652" ury="532"/>
+      <char name="yacute" width="556" llx="42" lly="-214" urx="652" ury="750"/>
+      <char name="ydieresis" width="556" llx="42" lly="-214" urx="652" ury="729"/>
+      <char name="yen" width="556" llx="60" lly="0" urx="713" ury="698"/>
+      <char name="z" width="500" llx="20" lly="0" urx="583" ury="532"/>
+      <char name="zcaron" width="500" llx="20" lly="0" urx="586" ury="750"/>
+      <char name="zero" width="556" llx="86" lly="-19" urx="617" ury="710"/>
+    </char-metrics>
   <kerning kpx1="107">
     <pair kern="-15" kpx2="111"/>
   </kerning>
diff --git a/src/codegen/fonts/HelveticaOblique.xml b/src/codegen/fonts/HelveticaOblique.xml
index 7f651a5d9..efa1165f2 100644
--- a/src/codegen/fonts/HelveticaOblique.xml
+++ b/src/codegen/fonts/HelveticaOblique.xml
@@ -22,245 +22,246 @@
    <family-name>Helvetica</family-name>
    <class-name>HelveticaOblique</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>718</cap-height>
    <x-height>523</x-height>
    <ascender>718</ascender>
    <descender>-207</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="667"/>
-      <char name="AE" width="1000"/>
-      <char name="Aacute" width="667"/>
-      <char name="Acircumflex" width="667"/>
-      <char name="Adieresis" width="667"/>
-      <char name="Agrave" width="667"/>
-      <char name="Aring" width="667"/>
-      <char name="Atilde" width="667"/>
-      <char name="B" width="667"/>
-      <char name="C" width="722"/>
-      <char name="Ccedilla" width="722"/>
-      <char name="D" width="722"/>
-      <char name="E" width="667"/>
-      <char name="Eacute" width="667"/>
-      <char name="Ecircumflex" width="667"/>
-      <char name="Edieresis" width="667"/>
-      <char name="Egrave" width="667"/>
-      <char name="Eth" width="722"/>
-      <char name="Euro" width="556"/>
-      <char name="F" width="611"/>
-      <char name="G" width="778"/>
-      <char name="H" width="722"/>
-      <char name="I" width="278"/>
-      <char name="Iacute" width="278"/>
-      <char name="Icircumflex" width="278"/>
-      <char name="Idieresis" width="278"/>
-      <char name="Igrave" width="278"/>
-      <char name="J" width="500"/>
-      <char name="K" width="667"/>
-      <char name="L" width="556"/>
-      <char name="Lslash" width="556"/>
-      <char name="M" width="833"/>
-      <char name="N" width="722"/>
-      <char name="Ntilde" width="722"/>
-      <char name="O" width="778"/>
-      <char name="OE" width="1000"/>
-      <char name="Oacute" width="778"/>
-      <char name="Ocircumflex" width="778"/>
-      <char name="Odieresis" width="778"/>
-      <char name="Ograve" width="778"/>
-      <char name="Oslash" width="778"/>
-      <char name="Otilde" width="778"/>
-      <char name="P" width="667"/>
-      <char name="Q" width="778"/>
-      <char name="R" width="722"/>
-      <char name="S" width="667"/>
-      <char name="Scaron" width="667"/>
-      <char name="T" width="611"/>
-      <char name="Thorn" width="667"/>
-      <char name="U" width="722"/>
-      <char name="Uacute" width="722"/>
-      <char name="Ucircumflex" width="722"/>
-      <char name="Udieresis" width="722"/>
-      <char name="Ugrave" width="722"/>
-      <char name="V" width="667"/>
-      <char name="W" width="944"/>
-      <char name="X" width="667"/>
-      <char name="Y" width="667"/>
-      <char name="Yacute" width="667"/>
-      <char name="Ydieresis" width="667"/>
-      <char name="Z" width="611"/>
-      <char name="Zcaron" width="611"/>
-      <char name="a" width="556"/>
-      <char name="aacute" width="556"/>
-      <char name="acircumflex" width="556"/>
-      <char name="acute" width="333"/>
-      <char name="adieresis" width="556"/>
-      <char name="ae" width="889"/>
-      <char name="agrave" width="556"/>
-      <char name="ampersand" width="667"/>
-      <char name="aring" width="556"/>
-      <char name="asciicircum" width="469"/>
-      <char name="asciitilde" width="584"/>
-      <char name="asterisk" width="389"/>
-      <char name="at" width="1015"/>
-      <char name="atilde" width="556"/>
-      <char name="b" width="556"/>
-      <char name="backslash" width="278"/>
-      <char name="bar" width="260"/>
-      <char name="braceleft" width="334"/>
-      <char name="braceright" width="334"/>
-      <char name="bracketleft" width="278"/>
-      <char name="bracketright" width="278"/>
-      <char name="breve" width="333"/>
-      <char name="brokenbar" width="260"/>
-      <char name="bullet" width="350"/>
-      <char name="c" width="500"/>
-      <char name="caron" width="333"/>
-      <char name="ccedilla" width="500"/>
-      <char name="cedilla" width="333"/>
-      <char name="cent" width="556"/>
-      <char name="circumflex" width="333"/>
-      <char name="colon" width="278"/>
-      <char name="comma" width="278"/>
-      <char name="copyright" width="737"/>
-      <char name="currency" width="556"/>
-      <char name="d" width="556"/>
-      <char name="dagger" width="556"/>
-      <char name="daggerdbl" width="556"/>
-      <char name="degree" width="400"/>
-      <char name="dieresis" width="333"/>
-      <char name="divide" width="584"/>
-      <char name="dollar" width="556"/>
-      <char name="dotaccent" width="333"/>
-      <char name="dotlessi" width="278"/>
-      <char name="e" width="556"/>
-      <char name="eacute" width="556"/>
-      <char name="ecircumflex" width="556"/>
-      <char name="edieresis" width="556"/>
-      <char name="egrave" width="556"/>
-      <char name="eight" width="556"/>
-      <char name="ellipsis" width="1000"/>
-      <char name="emdash" width="1000"/>
-      <char name="endash" width="556"/>
-      <char name="equal" width="584"/>
-      <char name="eth" width="556"/>
-      <char name="exclam" width="278"/>
-      <char name="exclamdown" width="333"/>
-      <char name="f" width="278"/>
-      <char name="fi" width="500"/>
-      <char name="five" width="556"/>
-      <char name="fl" width="500"/>
-      <char name="florin" width="556"/>
-      <char name="four" width="556"/>
-      <char name="fraction" width="167"/>
-      <char name="g" width="556"/>
-      <char name="germandbls" width="611"/>
-      <char name="grave" width="333"/>
-      <char name="greater" width="584"/>
-      <char name="guillemotleft" width="556"/>
-      <char name="guillemotright" width="556"/>
-      <char name="guilsinglleft" width="333"/>
-      <char name="guilsinglright" width="333"/>
-      <char name="h" width="556"/>
-      <char name="hungarumlaut" width="333"/>
-      <char name="hyphen" width="333"/>
-      <char name="i" width="222"/>
-      <char name="iacute" width="278"/>
-      <char name="icircumflex" width="278"/>
-      <char name="idieresis" width="278"/>
-      <char name="igrave" width="278"/>
-      <char name="j" width="222"/>
-      <char name="k" width="500"/>
-      <char name="l" width="222"/>
-      <char name="less" width="584"/>
-      <char name="logicalnot" width="584"/>
-      <char name="lslash" width="222"/>
-      <char name="m" width="833"/>
-      <char name="macron" width="333"/>
-      <char name="minus" width="584"/>
-      <char name="mu" width="556"/>
-      <char name="multiply" width="584"/>
-      <char name="n" width="556"/>
-      <char name="nine" width="556"/>
-      <char name="ntilde" width="556"/>
-      <char name="numbersign" width="556"/>
-      <char name="o" width="556"/>
-      <char name="oacute" width="556"/>
-      <char name="ocircumflex" width="556"/>
-      <char name="odieresis" width="556"/>
-      <char name="oe" width="944"/>
-      <char name="ogonek" width="333"/>
-      <char name="ograve" width="556"/>
-      <char name="one" width="556"/>
-      <char name="onehalf" width="834"/>
-      <char name="onequarter" width="834"/>
-      <char name="onesuperior" width="333"/>
-      <char name="ordfeminine" width="370"/>
-      <char name="ordmasculine" width="365"/>
-      <char name="oslash" width="611"/>
-      <char name="otilde" width="556"/>
-      <char name="p" width="556"/>
-      <char name="paragraph" width="537"/>
-      <char name="parenleft" width="333"/>
-      <char name="parenright" width="333"/>
-      <char name="percent" width="889"/>
-      <char name="period" width="278"/>
-      <char name="periodcentered" width="278"/>
-      <char name="perthousand" width="1000"/>
-      <char name="plus" width="584"/>
-      <char name="plusminus" width="584"/>
-      <char name="q" width="556"/>
-      <char name="question" width="556"/>
-      <char name="questiondown" width="611"/>
-      <char name="quotedbl" width="355"/>
-      <char name="quotedblbase" width="333"/>
-      <char name="quotedblleft" width="333"/>
-      <char name="quotedblright" width="333"/>
-      <char name="quoteleft" width="222"/>
-      <char name="quoteright" width="222"/>
-      <char name="quotesinglbase" width="222"/>
-      <char name="quotesingle" width="191"/>
-      <char name="r" width="333"/>
-      <char name="registered" width="737"/>
-      <char name="ring" width="333"/>
-      <char name="s" width="500"/>
-      <char name="scaron" width="500"/>
-      <char name="section" width="556"/>
-      <char name="semicolon" width="278"/>
-      <char name="seven" width="556"/>
-      <char name="six" width="556"/>
-      <char name="slash" width="278"/>
-      <char name="space" width="278"/>
+    <char-metrics>
+      <char name="A" width="667" llx="14" lly="0" urx="654" ury="718"/>
+      <char name="AE" width="1000" llx="8" lly="0" urx="1097" ury="718"/>
+      <char name="Aacute" width="667" llx="14" lly="0" urx="683" ury="929"/>
+      <char name="Acircumflex" width="667" llx="14" lly="0" urx="654" ury="929"/>
+      <char name="Adieresis" width="667" llx="14" lly="0" urx="654" ury="901"/>
+      <char name="Agrave" width="667" llx="14" lly="0" urx="654" ury="929"/>
+      <char name="Aring" width="667" llx="14" lly="0" urx="654" ury="931"/>
+      <char name="Atilde" width="667" llx="14" lly="0" urx="699" ury="917"/>
+      <char name="B" width="667" llx="74" lly="0" urx="712" ury="718"/>
+      <char name="C" width="722" llx="108" lly="-19" urx="782" ury="737"/>
+      <char name="Ccedilla" width="722" llx="108" lly="-225" urx="782" ury="737"/>
+      <char name="D" width="722" llx="81" lly="0" urx="764" ury="718"/>
+      <char name="E" width="667" llx="86" lly="0" urx="762" ury="718"/>
+      <char name="Eacute" width="667" llx="86" lly="0" urx="762" ury="929"/>
+      <char name="Ecircumflex" width="667" llx="86" lly="0" urx="762" ury="929"/>
+      <char name="Edieresis" width="667" llx="86" lly="0" urx="762" ury="901"/>
+      <char name="Egrave" width="667" llx="86" lly="0" urx="762" ury="929"/>
+      <char name="Eth" width="722" llx="69" lly="0" urx="764" ury="718"/>
+      <char name="Euro" width="556" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="611" llx="86" lly="0" urx="736" ury="718"/>
+      <char name="G" width="778" llx="111" lly="-19" urx="799" ury="737"/>
+      <char name="H" width="722" llx="77" lly="0" urx="799" ury="718"/>
+      <char name="I" width="278" llx="91" lly="0" urx="341" ury="718"/>
+      <char name="Iacute" width="278" llx="91" lly="0" urx="489" ury="929"/>
+      <char name="Icircumflex" width="278" llx="91" lly="0" urx="452" ury="929"/>
+      <char name="Idieresis" width="278" llx="91" lly="0" urx="458" ury="901"/>
+      <char name="Igrave" width="278" llx="91" lly="0" urx="351" ury="929"/>
+      <char name="J" width="500" llx="47" lly="-19" urx="581" ury="718"/>
+      <char name="K" width="667" llx="76" lly="0" urx="808" ury="718"/>
+      <char name="L" width="556" llx="76" lly="0" urx="555" ury="718"/>
+      <char name="Lslash" width="556" llx="41" lly="0" urx="555" ury="718"/>
+      <char name="M" width="833" llx="73" lly="0" urx="914" ury="718"/>
+      <char name="N" width="722" llx="76" lly="0" urx="799" ury="718"/>
+      <char name="Ntilde" width="722" llx="76" lly="0" urx="799" ury="917"/>
+      <char name="O" width="778" llx="105" lly="-19" urx="826" ury="737"/>
+      <char name="OE" width="1000" llx="98" lly="-19" urx="1116" ury="737"/>
+      <char name="Oacute" width="778" llx="105" lly="-19" urx="826" ury="929"/>
+      <char name="Ocircumflex" width="778" llx="105" lly="-19" urx="826" ury="929"/>
+      <char name="Odieresis" width="778" llx="105" lly="-19" urx="826" ury="901"/>
+      <char name="Ograve" width="778" llx="105" lly="-19" urx="826" ury="929"/>
+      <char name="Oslash" width="778" llx="43" lly="-19" urx="890" ury="737"/>
+      <char name="Otilde" width="778" llx="105" lly="-19" urx="826" ury="917"/>
+      <char name="P" width="667" llx="86" lly="0" urx="737" ury="718"/>
+      <char name="Q" width="778" llx="105" lly="-56" urx="826" ury="737"/>
+      <char name="R" width="722" llx="88" lly="0" urx="773" ury="718"/>
+      <char name="S" width="667" llx="90" lly="-19" urx="713" ury="737"/>
+      <char name="Scaron" width="667" llx="90" lly="-19" urx="713" ury="929"/>
+      <char name="T" width="611" llx="148" lly="0" urx="750" ury="718"/>
+      <char name="Thorn" width="667" llx="86" lly="0" urx="712" ury="718"/>
+      <char name="U" width="722" llx="123" lly="-19" urx="797" ury="718"/>
+      <char name="Uacute" width="722" llx="123" lly="-19" urx="797" ury="929"/>
+      <char name="Ucircumflex" width="722" llx="123" lly="-19" urx="797" ury="929"/>
+      <char name="Udieresis" width="722" llx="123" lly="-19" urx="797" ury="901"/>
+      <char name="Ugrave" width="722" llx="123" lly="-19" urx="797" ury="929"/>
+      <char name="V" width="667" llx="173" lly="0" urx="800" ury="718"/>
+      <char name="W" width="944" llx="169" lly="0" urx="1081" ury="718"/>
+      <char name="X" width="667" llx="19" lly="0" urx="790" ury="718"/>
+      <char name="Y" width="667" llx="167" lly="0" urx="806" ury="718"/>
+      <char name="Yacute" width="667" llx="167" lly="0" urx="806" ury="929"/>
+      <char name="Ydieresis" width="667" llx="167" lly="0" urx="806" ury="901"/>
+      <char name="Z" width="611" llx="23" lly="0" urx="741" ury="718"/>
+      <char name="Zcaron" width="611" llx="23" lly="0" urx="741" ury="929"/>
+      <char name="a" width="556" llx="61" lly="-15" urx="559" ury="538"/>
+      <char name="aacute" width="556" llx="61" lly="-15" urx="587" ury="734"/>
+      <char name="acircumflex" width="556" llx="61" lly="-15" urx="559" ury="734"/>
+      <char name="acute" width="333" llx="248" lly="593" urx="475" ury="734"/>
+      <char name="adieresis" width="556" llx="61" lly="-15" urx="559" ury="706"/>
+      <char name="ae" width="889" llx="61" lly="-15" urx="909" ury="538"/>
+      <char name="agrave" width="556" llx="61" lly="-15" urx="559" ury="734"/>
+      <char name="ampersand" width="667" llx="77" lly="-15" urx="647" ury="718"/>
+      <char name="aring" width="556" llx="61" lly="-15" urx="559" ury="756"/>
+      <char name="asciicircum" width="469" llx="42" lly="264" urx="539" ury="688"/>
+      <char name="asciitilde" width="584" llx="111" lly="180" urx="580" ury="326"/>
+      <char name="asterisk" width="389" llx="165" lly="431" urx="475" ury="718"/>
+      <char name="at" width="1015" llx="215" lly="-19" urx="965" ury="737"/>
+      <char name="atilde" width="556" llx="61" lly="-15" urx="592" ury="722"/>
+      <char name="b" width="556" llx="58" lly="-15" urx="584" ury="718"/>
+      <char name="backslash" width="278" llx="140" lly="-19" urx="291" ury="737"/>
+      <char name="bar" width="260" llx="46" lly="-225" urx="332" ury="775"/>
+      <char name="braceleft" width="334" llx="92" lly="-196" urx="445" ury="722"/>
+      <char name="braceright" width="334" llx="0" lly="-196" urx="354" ury="722"/>
+      <char name="bracketleft" width="278" llx="21" lly="-196" urx="403" ury="722"/>
+      <char name="bracketright" width="278" llx="-14" lly="-196" urx="368" ury="722"/>
+      <char name="breve" width="333" llx="167" lly="595" urx="476" ury="731"/>
+      <char name="brokenbar" width="260" llx="62" lly="-150" urx="316" ury="700"/>
+      <char name="bullet" width="350" llx="91" lly="202" urx="413" ury="517"/>
+      <char name="c" width="500" llx="74" lly="-15" urx="553" ury="538"/>
+      <char name="caron" width="333" llx="177" lly="593" urx="468" ury="734"/>
+      <char name="ccedilla" width="500" llx="74" lly="-225" urx="553" ury="538"/>
+      <char name="cedilla" width="333" llx="2" lly="-225" urx="232" ury="0"/>
+      <char name="cent" width="556" llx="95" lly="-115" urx="584" ury="623"/>
+      <char name="circumflex" width="333" llx="147" lly="593" urx="438" ury="734"/>
+      <char name="colon" width="278" llx="87" lly="0" urx="301" ury="516"/>
+      <char name="comma" width="278" llx="56" lly="-147" urx="214" ury="106"/>
+      <char name="copyright" width="737" llx="54" lly="-19" urx="837" ury="737"/>
+      <char name="currency" width="556" llx="60" lly="99" urx="646" ury="603"/>
+      <char name="d" width="556" llx="84" lly="-15" urx="652" ury="718"/>
+      <char name="dagger" width="556" llx="135" lly="-159" urx="622" ury="718"/>
+      <char name="daggerdbl" width="556" llx="52" lly="-159" urx="623" ury="718"/>
+      <char name="degree" width="400" llx="169" lly="411" urx="468" ury="703"/>
+      <char name="dieresis" width="333" llx="168" lly="604" urx="443" ury="706"/>
+      <char name="divide" width="584" llx="85" lly="-19" urx="606" ury="524"/>
+      <char name="dollar" width="556" llx="69" lly="-115" urx="617" ury="775"/>
+      <char name="dotaccent" width="333" llx="249" lly="604" urx="362" ury="706"/>
+      <char name="dotlessi" width="278" llx="95" lly="0" urx="294" ury="523"/>
+      <char name="e" width="556" llx="84" lly="-15" urx="578" ury="538"/>
+      <char name="eacute" width="556" llx="84" lly="-15" urx="587" ury="734"/>
+      <char name="ecircumflex" width="556" llx="84" lly="-15" urx="578" ury="734"/>
+      <char name="edieresis" width="556" llx="84" lly="-15" urx="578" ury="706"/>
+      <char name="egrave" width="556" llx="84" lly="-15" urx="578" ury="734"/>
+      <char name="eight" width="556" llx="74" lly="-19" urx="607" ury="703"/>
+      <char name="ellipsis" width="1000" llx="115" lly="0" urx="908" ury="106"/>
+      <char name="emdash" width="1000" llx="51" lly="240" urx="1067" ury="313"/>
+      <char name="endash" width="556" llx="51" lly="240" urx="623" ury="313"/>
+      <char name="equal" width="584" llx="63" lly="115" urx="628" ury="390"/>
+      <char name="eth" width="556" llx="81" lly="-15" urx="617" ury="737"/>
+      <char name="exclam" width="278" llx="90" lly="0" urx="340" ury="718"/>
+      <char name="exclamdown" width="333" llx="77" lly="-195" urx="326" ury="523"/>
+      <char name="f" width="278" llx="86" lly="0" urx="416" ury="728"/>
+      <char name="fi" width="500" llx="86" lly="0" urx="587" ury="728"/>
+      <char name="five" width="556" llx="68" lly="-19" urx="621" ury="688"/>
+      <char name="fl" width="500" llx="86" lly="0" urx="585" ury="728"/>
+      <char name="florin" width="556" llx="-52" lly="-207" urx="654" ury="737"/>
+      <char name="four" width="556" llx="61" lly="0" urx="576" ury="703"/>
+      <char name="fraction" width="167" llx="-170" lly="-19" urx="482" ury="703"/>
+      <char name="g" width="556" llx="42" lly="-220" urx="610" ury="538"/>
+      <char name="germandbls" width="611" llx="67" lly="-15" urx="658" ury="728"/>
+      <char name="grave" width="333" llx="170" lly="593" urx="337" ury="734"/>
+      <char name="greater" width="584" llx="50" lly="11" urx="597" ury="495"/>
+      <char name="guillemotleft" width="556" llx="146" lly="108" urx="554" ury="446"/>
+      <char name="guillemotright" width="556" llx="120" lly="108" urx="528" ury="446"/>
+      <char name="guilsinglleft" width="333" llx="137" lly="108" urx="340" ury="446"/>
+      <char name="guilsinglright" width="333" llx="111" lly="108" urx="314" ury="446"/>
+      <char name="h" width="556" llx="65" lly="0" urx="573" ury="718"/>
+      <char name="hungarumlaut" width="333" llx="157" lly="593" urx="565" ury="734"/>
+      <char name="hyphen" width="333" llx="93" lly="232" urx="357" ury="322"/>
+      <char name="i" width="222" llx="67" lly="0" urx="308" ury="718"/>
+      <char name="iacute" width="278" llx="95" lly="0" urx="448" ury="734"/>
+      <char name="icircumflex" width="278" llx="95" lly="0" urx="411" ury="734"/>
+      <char name="idieresis" width="278" llx="95" lly="0" urx="416" ury="706"/>
+      <char name="igrave" width="278" llx="95" lly="0" urx="310" ury="734"/>
+      <char name="j" width="222" llx="-60" lly="-210" urx="308" ury="718"/>
+      <char name="k" width="500" llx="67" lly="0" urx="600" ury="718"/>
+      <char name="l" width="222" llx="67" lly="0" urx="308" ury="718"/>
+      <char name="less" width="584" llx="94" lly="11" urx="641" ury="495"/>
+      <char name="logicalnot" width="584" llx="106" lly="108" urx="628" ury="390"/>
+      <char name="lslash" width="222" llx="41" lly="0" urx="347" ury="718"/>
+      <char name="m" width="833" llx="65" lly="0" urx="852" ury="538"/>
+      <char name="macron" width="333" llx="143" lly="627" urx="468" ury="684"/>
+      <char name="minus" width="584" llx="85" lly="216" urx="606" ury="289"/>
+      <char name="mu" width="556" llx="24" lly="-207" urx="600" ury="523"/>
+      <char name="multiply" width="584" llx="50" lly="0" urx="642" ury="506"/>
+      <char name="n" width="556" llx="65" lly="0" urx="573" ury="538"/>
+      <char name="nine" width="556" llx="82" lly="-19" urx="609" ury="703"/>
+      <char name="ntilde" width="556" llx="65" lly="0" urx="592" ury="722"/>
+      <char name="numbersign" width="556" llx="73" lly="0" urx="631" ury="688"/>
+      <char name="o" width="556" llx="83" lly="-14" urx="585" ury="538"/>
+      <char name="oacute" width="556" llx="83" lly="-14" urx="587" ury="734"/>
+      <char name="ocircumflex" width="556" llx="83" lly="-14" urx="585" ury="734"/>
+      <char name="odieresis" width="556" llx="83" lly="-14" urx="585" ury="706"/>
+      <char name="oe" width="944" llx="83" lly="-15" urx="964" ury="538"/>
+      <char name="ogonek" width="333" llx="43" lly="-225" urx="249" ury="0"/>
+      <char name="ograve" width="556" llx="83" lly="-14" urx="585" ury="734"/>
+      <char name="one" width="556" llx="207" lly="0" urx="508" ury="703"/>
+      <char name="onehalf" width="834" llx="114" lly="-19" urx="839" ury="703"/>
+      <char name="onequarter" width="834" llx="150" lly="-19" urx="802" ury="703"/>
+      <char name="onesuperior" width="333" llx="166" lly="281" urx="371" ury="703"/>
+      <char name="ordfeminine" width="370" llx="127" lly="405" urx="449" ury="737"/>
+      <char name="ordmasculine" width="365" llx="141" lly="405" urx="468" ury="737"/>
+      <char name="oslash" width="611" llx="29" lly="-22" urx="647" ury="545"/>
+      <char name="otilde" width="556" llx="83" lly="-14" urx="602" ury="722"/>
+      <char name="p" width="556" llx="14" lly="-207" urx="584" ury="538"/>
+      <char name="paragraph" width="537" llx="126" lly="-173" urx="650" ury="718"/>
+      <char name="parenleft" width="333" llx="108" lly="-207" urx="454" ury="733"/>
+      <char name="parenright" width="333" llx="-9" lly="-207" urx="337" ury="733"/>
+      <char name="percent" width="889" llx="147" lly="-19" urx="889" ury="703"/>
+      <char name="period" width="278" llx="87" lly="0" urx="214" ury="106"/>
+      <char name="periodcentered" width="278" llx="129" lly="190" urx="257" ury="315"/>
+      <char name="perthousand" width="1000" llx="88" lly="-19" urx="1029" ury="703"/>
+      <char name="plus" width="584" llx="85" lly="0" urx="606" ury="505"/>
+      <char name="plusminus" width="584" llx="39" lly="0" urx="618" ury="506"/>
+      <char name="q" width="556" llx="84" lly="-207" urx="605" ury="538"/>
+      <char name="question" width="556" llx="161" lly="0" urx="610" ury="727"/>
+      <char name="questiondown" width="611" llx="85" lly="-201" urx="534" ury="525"/>
+      <char name="quotedbl" width="355" llx="168" lly="463" urx="438" ury="718"/>
+      <char name="quotedblbase" width="333" llx="-6" lly="-149" urx="318" ury="106"/>
+      <char name="quotedblleft" width="333" llx="138" lly="470" urx="461" ury="725"/>
+      <char name="quotedblright" width="333" llx="124" lly="463" urx="448" ury="718"/>
+      <char name="quoteleft" width="222" llx="165" lly="470" urx="323" ury="725"/>
+      <char name="quoteright" width="222" llx="151" lly="463" urx="310" ury="718"/>
+      <char name="quotesinglbase" width="222" llx="21" lly="-149" urx="180" ury="106"/>
+      <char name="quotesingle" width="191" llx="157" lly="463" urx="285" ury="718"/>
+      <char name="r" width="333" llx="77" lly="0" urx="446" ury="538"/>
+      <char name="registered" width="737" llx="54" lly="-19" urx="837" ury="737"/>
+      <char name="ring" width="333" llx="214" lly="572" urx="402" ury="756"/>
+      <char name="s" width="500" llx="63" lly="-15" urx="529" ury="538"/>
+      <char name="scaron" width="500" llx="63" lly="-15" urx="552" ury="734"/>
+      <char name="section" width="556" llx="76" lly="-191" urx="584" ury="737"/>
+      <char name="semicolon" width="278" llx="56" lly="-147" urx="301" ury="516"/>
+      <char name="seven" width="556" llx="137" lly="0" urx="669" ury="688"/>
+      <char name="six" width="556" llx="91" lly="-19" urx="615" ury="703"/>
+      <char name="slash" width="278" llx="-21" lly="-19" urx="452" ury="737"/>
+      <char name="space" width="278" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="278"/>
-      <char name="sterling" width="556"/>
-      <char name="t" width="278"/>
-      <char name="thorn" width="556"/>
-      <char name="three" width="556"/>
-      <char name="threequarters" width="834"/>
-      <char name="threesuperior" width="333"/>
-      <char name="tilde" width="333"/>
-      <char name="trademark" width="1000"/>
-      <char name="two" width="556"/>
-      <char name="twosuperior" width="333"/>
-      <char name="u" width="556"/>
-      <char name="uacute" width="556"/>
-      <char name="ucircumflex" width="556"/>
-      <char name="udieresis" width="556"/>
-      <char name="ugrave" width="556"/>
-      <char name="underscore" width="556"/>
-      <char name="v" width="500"/>
-      <char name="w" width="722"/>
-      <char name="x" width="500"/>
-      <char name="y" width="500"/>
-      <char name="yacute" width="500"/>
-      <char name="ydieresis" width="500"/>
-      <char name="yen" width="556"/>
-      <char name="z" width="500"/>
-      <char name="zcaron" width="500"/>
-      <char name="zero" width="556"/>
-   </widths>
+      <char name="sterling" width="556" llx="49" lly="-16" urx="634" ury="718"/>
+      <char name="t" width="278" llx="102" lly="-7" urx="368" ury="669"/>
+      <char name="thorn" width="556" llx="14" lly="-207" urx="584" ury="718"/>
+      <char name="three" width="556" llx="75" lly="-19" urx="610" ury="703"/>
+      <char name="threequarters" width="834" llx="130" lly="-19" urx="861" ury="703"/>
+      <char name="threesuperior" width="333" llx="90" lly="270" urx="436" ury="703"/>
+      <char name="tilde" width="333" llx="125" lly="606" urx="490" ury="722"/>
+      <char name="trademark" width="1000" llx="186" lly="306" urx="1056" ury="718"/>
+      <char name="two" width="556" llx="26" lly="0" urx="617" ury="703"/>
+      <char name="twosuperior" width="333" llx="64" lly="281" urx="449" ury="703"/>
+      <char name="u" width="556" llx="94" lly="-15" urx="600" ury="523"/>
+      <char name="uacute" width="556" llx="94" lly="-15" urx="600" ury="734"/>
+      <char name="ucircumflex" width="556" llx="94" lly="-15" urx="600" ury="734"/>
+      <char name="udieresis" width="556" llx="94" lly="-15" urx="600" ury="706"/>
+      <char name="ugrave" width="556" llx="94" lly="-15" urx="600" ury="734"/>
+      <char name="underscore" width="556" llx="-27" lly="-125" urx="540" ury="-75"/>
+      <char name="v" width="500" llx="119" lly="0" urx="603" ury="523"/>
+      <char name="w" width="722" llx="125" lly="0" urx="820" ury="523"/>
+      <char name="x" width="500" llx="11" lly="0" urx="594" ury="523"/>
+      <char name="y" width="500" llx="15" lly="-214" urx="600" ury="523"/>
+      <char name="yacute" width="500" llx="15" lly="-214" urx="600" ury="734"/>
+      <char name="ydieresis" width="500" llx="15" lly="-214" urx="600" ury="706"/>
+      <char name="yen" width="556" llx="81" lly="0" urx="699" ury="688"/>
+      <char name="z" width="500" llx="31" lly="0" urx="571" ury="523"/>
+      <char name="zcaron" width="500" llx="31" lly="0" urx="571" ury="734"/>
+      <char name="zero" width="556" llx="93" lly="-19" urx="608" ury="703"/>
+    </char-metrics>
   <kerning kpx1="107">
     <pair kern="-20" kpx2="111"/>
     <pair kern="-20" kpx2="101"/>
@@ -602,4 +603,4 @@
     <pair kern="-30" kpx2="118"/>
     <pair kern="-15" kpx2="44"/>
   </kerning>
-</font-metrics>
-\ No newline at end of file
+</font-metrics>
diff --git a/src/codegen/fonts/Symbol.xml b/src/codegen/fonts/Symbol.xml
index c0dce043a..7493b7e7f 100644
--- a/src/codegen/fonts/Symbol.xml
+++ b/src/codegen/fonts/Symbol.xml
@@ -21,203 +21,204 @@
   <family-name>Symbol</family-name>
   <class-name>Symbol</class-name>
   <encoding>SymbolEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
   <cap-height>1010</cap-height>
   <x-height>520</x-height>
   <ascender>1010</ascender>
   <descender>-293</descender>
   <first-char>32</first-char>
   <last-char>255</last-char>
-  <widths>
-    <char name="space" width="250"/>
-    <char name="exclam" width="333"/>
-    <char name="universal" width="713"/>
-    <char name="numbersign" width="500"/>
-    <char name="existential" width="549"/>
-    <char name="percent" width="833"/>
-    <char name="ampersand" width="778"/>
-    <char name="suchthat" width="439"/>
-    <char name="parenleft" width="333"/>
-    <char name="parenright" width="333"/>
-    <char name="asteriskmath" width="500"/>
-    <char name="plus" width="549"/>
-    <char name="comma" width="250"/>
-    <char name="minus" width="549"/>
-    <char name="period" width="250"/>
-    <char name="slash" width="278"/>
-    <char name="zero" width="500"/>
-    <char name="one" width="500"/>
-    <char name="two" width="500"/>
-    <char name="three" width="500"/>
-    <char name="four" width="500"/>
-    <char name="five" width="500"/>
-    <char name="six" width="500"/>
-    <char name="seven" width="500"/>
-    <char name="eight" width="500"/>
-    <char name="nine" width="500"/>
-    <char name="colon" width="278"/>
-    <char name="semicolon" width="278"/>
-    <char name="less" width="549"/>
-    <char name="equal" width="549"/>
-    <char name="greater" width="549"/>
-    <char name="question" width="444"/>
-    <char name="congruent" width="549"/>
-    <char name="Alpha" width="722"/>
-    <char name="Beta" width="667"/>
-    <char name="Chi" width="722"/>
-    <char name="Delta" width="612"/>
-    <char name="Epsilon" width="611"/>
-    <char name="Phi" width="763"/>
-    <char name="Gamma" width="603"/>
-    <char name="Eta" width="722"/>
-    <char name="Iota" width="333"/>
-    <char name="theta1" width="631"/>
-    <char name="Kappa" width="722"/>
-    <char name="Lambda" width="686"/>
-    <char name="Mu" width="889"/>
-    <char name="Nu" width="722"/>
-    <char name="Omicron" width="722"/>
-    <char name="Pi" width="768"/>
-    <char name="Theta" width="741"/>
-    <char name="Rho" width="556"/>
-    <char name="Sigma" width="592"/>
-    <char name="Tau" width="611"/>
-    <char name="Upsilon" width="690"/>
-    <char name="sigma1" width="439"/>
-    <char name="Omega" width="768"/>
-    <char name="Xi" width="645"/>
-    <char name="Psi" width="795"/>
-    <char name="Zeta" width="611"/>
-    <char name="bracketleft" width="333"/>
-    <char name="therefore" width="863"/>
-    <char name="bracketright" width="333"/>
-    <char name="perpendicular" width="658"/>
-    <char name="underscore" width="500"/>
-    <char name="radicalex" width="500"/>
-    <char name="alpha" width="631"/>
-    <char name="beta" width="549"/>
-    <char name="chi" width="549"/>
-    <char name="delta" width="494"/>
-    <char name="epsilon" width="439"/>
-    <char name="phi" width="521"/>
-    <char name="gamma" width="411"/>
-    <char name="eta" width="603"/>
-    <char name="iota" width="329"/>
-    <char name="phi1" width="603"/>
-    <char name="kappa" width="549"/>
-    <char name="lambda" width="549"/>
-    <char name="m" width="576"/>
-    <char name="mu" width="576"/>
-    <char name="nu" width="521"/>
-    <char name="omicron" width="549"/>
-    <char name="pi" width="549"/>
-    <char name="theta" width="521"/>
-    <char name="rho" width="549"/>
-    <char name="sigma" width="603"/>
-    <char name="tau" width="439"/>
-    <char name="upsilon" width="576"/>
-    <char name="omega1" width="713"/>
-    <char name="omega" width="686"/>
-    <char name="xi" width="493"/>
-    <char name="psi" width="686"/>
-    <char name="zeta" width="494"/>
-    <char name="braceleft" width="480"/>
-    <char name="bar" width="200"/>
-    <char name="braceright" width="480"/>
-    <char name="similar" width="549"/>
-    <char name="Euro" width="750"/>
-    <char name="Upsilon1" width="620"/>
-    <char name="minute" width="247"/>
-    <char name="lessequal" width="549"/>
-    <char name="fraction" width="167"/>
-    <char name="infinity" width="713"/>
-    <char name="florin" width="500"/>
-    <char name="club" width="753"/>
-    <char name="diamond" width="753"/>
-    <char name="heart" width="753"/>
-    <char name="spade" width="753"/>
-    <char name="arrowboth" width="1042"/>
-    <char name="arrowleft" width="987"/>
-    <char name="arrowup" width="603"/>
-    <char name="arrowright" width="987"/>
-    <char name="arrowdown" width="603"/>
-    <char name="degree" width="400"/>
-    <char name="plusminus" width="549"/>
-    <char name="second" width="411"/>
-    <char name="greaterequal" width="549"/>
-    <char name="multiply" width="549"/>
-    <char name="proportional" width="713"/>
-    <char name="partialdiff" width="494"/>
-    <char name="bullet" width="460"/>
-    <char name="divide" width="549"/>
-    <char name="notequal" width="549"/>
-    <char name="equivalence" width="549"/>
-    <char name="approxequal" width="549"/>
-    <char name="ellipsis" width="1000"/>
-    <char name="arrowvertex" width="603"/>
-    <char name="arrowhorizex" width="1000"/>
-    <char name="carriagereturn" width="658"/>
-    <char name="aleph" width="823"/>
-    <char name="Ifraktur" width="686"/>
-    <char name="Rfraktur" width="795"/>
-    <char name="weierstrass" width="987"/>
-    <char name="circlemultiply" width="768"/>
-    <char name="circleplus" width="768"/>
-    <char name="emptyset" width="823"/>
-    <char name="intersection" width="768"/>
-    <char name="union" width="768"/>
-    <char name="propersuperset" width="713"/>
-    <char name="reflexsuperset" width="713"/>
-    <char name="notsubset" width="713"/>
-    <char name="propersubset" width="713"/>
-    <char name="reflexsubset" width="713"/>
-    <char name="element" width="713"/>
-    <char name="notelement" width="713"/>
-    <char name="angle" width="768"/>
-    <char name="gradient" width="713"/>
-    <char name="registerserif" width="790"/>
-    <char name="copyrightserif" width="790"/>
-    <char name="trademarkserif" width="890"/>
-    <char name="product" width="823"/>
-    <char name="radical" width="549"/>
-    <char name="dotmath" width="250"/>
-    <char name="logicalnot" width="713"/>
-    <char name="logicaland" width="603"/>
-    <char name="logicalor" width="603"/>
-    <char name="arrowdblboth" width="1042"/>
-    <char name="arrowdblleft" width="987"/>
-    <char name="arrowdblup" width="603"/>
-    <char name="arrowdblright" width="987"/>
-    <char name="arrowdbldown" width="603"/>
-    <char name="lozenge" width="494"/>
-    <char name="angleleft" width="329"/>
-    <char name="registersans" width="790"/>
-    <char name="copyrightsans" width="790"/>
-    <char name="trademarksans" width="786"/>
-    <char name="summation" width="713"/>
-    <char name="parenlefttp" width="384"/>
-    <char name="parenleftex" width="384"/>
-    <char name="parenleftbt" width="384"/>
-    <char name="bracketlefttp" width="384"/>
-    <char name="bracketleftex" width="384"/>
-    <char name="bracketleftbt" width="384"/>
-    <char name="bracelefttp" width="494"/>
-    <char name="braceleftmid" width="494"/>
-    <char name="braceleftbt" width="494"/>
-    <char name="braceex" width="494"/>
-    <char name="angleright" width="329"/>
-    <char name="integral" width="274"/>
-    <char name="integraltp" width="686"/>
-    <char name="integralex" width="686"/>
-    <char name="integralbt" width="686"/>
-    <char name="parenrighttp" width="384"/>
-    <char name="parenrightex" width="384"/>
-    <char name="parenrightbt" width="384"/>
-    <char name="bracketrighttp" width="384"/>
-    <char name="bracketrightex" width="384"/>
-    <char name="bracketrightbt" width="384"/>
-    <char name="bracerighttp" width="494"/>
-    <char name="bracerightmid" width="494"/>
-    <char name="bracerightbt" width="494"/>
-    <char name="apple" width="790"/>
-  </widths>
+    <char-metrics>
+    <char name="space" width="250" llx="0" lly="0" urx="0" ury="0"/>
+    <char name="exclam" width="333" llx="128" lly="-17" urx="240" ury="672"/>
+    <char name="universal" width="713" llx="31" lly="0" urx="681" ury="705"/>
+    <char name="numbersign" width="500" llx="20" lly="-16" urx="481" ury="673"/>
+    <char name="existential" width="549" llx="25" lly="0" urx="478" ury="707"/>
+    <char name="percent" width="833" llx="63" lly="-36" urx="771" ury="655"/>
+    <char name="ampersand" width="778" llx="41" lly="-18" urx="750" ury="661"/>
+    <char name="suchthat" width="439" llx="48" lly="-17" urx="414" ury="500"/>
+    <char name="parenleft" width="333" llx="53" lly="-191" urx="300" ury="673"/>
+    <char name="parenright" width="333" llx="30" lly="-191" urx="277" ury="673"/>
+    <char name="asteriskmath" width="500" llx="65" lly="134" urx="427" ury="551"/>
+    <char name="plus" width="549" llx="10" lly="0" urx="539" ury="533"/>
+    <char name="comma" width="250" llx="56" lly="-152" urx="194" ury="104"/>
+    <char name="minus" width="549" llx="11" lly="233" urx="535" ury="288"/>
+    <char name="period" width="250" llx="69" lly="-17" urx="181" ury="95"/>
+    <char name="slash" width="278" llx="0" lly="-18" urx="254" ury="646"/>
+    <char name="zero" width="500" llx="24" lly="-14" urx="476" ury="685"/>
+    <char name="one" width="500" llx="117" lly="0" urx="390" ury="673"/>
+    <char name="two" width="500" llx="25" lly="0" urx="475" ury="685"/>
+    <char name="three" width="500" llx="43" lly="-14" urx="435" ury="685"/>
+    <char name="four" width="500" llx="15" lly="0" urx="469" ury="685"/>
+    <char name="five" width="500" llx="32" lly="-14" urx="445" ury="690"/>
+    <char name="six" width="500" llx="34" lly="-14" urx="468" ury="685"/>
+    <char name="seven" width="500" llx="24" lly="-16" urx="448" ury="673"/>
+    <char name="eight" width="500" llx="56" lly="-14" urx="445" ury="685"/>
+    <char name="nine" width="500" llx="30" lly="-18" urx="459" ury="685"/>
+    <char name="colon" width="278" llx="81" lly="-17" urx="193" ury="460"/>
+    <char name="semicolon" width="278" llx="83" lly="-152" urx="221" ury="460"/>
+    <char name="less" width="549" llx="26" lly="0" urx="523" ury="522"/>
+    <char name="equal" width="549" llx="11" lly="141" urx="537" ury="390"/>
+    <char name="greater" width="549" llx="26" lly="0" urx="523" ury="522"/>
+    <char name="question" width="444" llx="70" lly="-17" urx="412" ury="686"/>
+    <char name="congruent" width="549" llx="11" lly="0" urx="537" ury="475"/>
+    <char name="Alpha" width="722" llx="4" lly="0" urx="684" ury="673"/>
+    <char name="Beta" width="667" llx="29" lly="0" urx="592" ury="673"/>
+    <char name="Chi" width="722" llx="-9" lly="0" urx="704" ury="673"/>
+    <char name="Delta" width="612" llx="6" lly="0" urx="608" ury="688"/>
+    <char name="Epsilon" width="611" llx="32" lly="0" urx="617" ury="673"/>
+    <char name="Phi" width="763" llx="26" lly="0" urx="741" ury="673"/>
+    <char name="Gamma" width="603" llx="24" lly="0" urx="609" ury="673"/>
+    <char name="Eta" width="722" llx="39" lly="0" urx="729" ury="673"/>
+    <char name="Iota" width="333" llx="32" lly="0" urx="316" ury="673"/>
+    <char name="theta1" width="631" llx="18" lly="-18" urx="623" ury="689"/>
+    <char name="Kappa" width="722" llx="35" lly="0" urx="722" ury="673"/>
+    <char name="Lambda" width="686" llx="6" lly="0" urx="680" ury="688"/>
+    <char name="Mu" width="889" llx="28" lly="0" urx="887" ury="673"/>
+    <char name="Nu" width="722" llx="29" lly="-8" urx="720" ury="673"/>
+    <char name="Omicron" width="722" llx="41" lly="-17" urx="715" ury="685"/>
+    <char name="Pi" width="768" llx="25" lly="0" urx="745" ury="673"/>
+    <char name="Theta" width="741" llx="41" lly="-17" urx="715" ury="685"/>
+    <char name="Rho" width="556" llx="28" lly="0" urx="563" ury="673"/>
+    <char name="Sigma" width="592" llx="5" lly="0" urx="589" ury="673"/>
+    <char name="Tau" width="611" llx="33" lly="0" urx="607" ury="673"/>
+    <char name="Upsilon" width="690" llx="-8" lly="0" urx="694" ury="673"/>
+    <char name="sigma1" width="439" llx="40" lly="-233" urx="436" ury="500"/>
+    <char name="Omega" width="768" llx="34" lly="0" urx="736" ury="688"/>
+    <char name="Xi" width="645" llx="40" lly="0" urx="599" ury="673"/>
+    <char name="Psi" width="795" llx="15" lly="0" urx="781" ury="684"/>
+    <char name="Zeta" width="611" llx="44" lly="0" urx="636" ury="673"/>
+    <char name="bracketleft" width="333" llx="86" lly="-155" urx="299" ury="674"/>
+    <char name="therefore" width="863" llx="163" lly="0" urx="701" ury="487"/>
+    <char name="bracketright" width="333" llx="33" lly="-155" urx="246" ury="674"/>
+    <char name="perpendicular" width="658" llx="15" lly="0" urx="652" ury="674"/>
+    <char name="underscore" width="500" llx="-2" lly="-125" urx="502" ury="-75"/>
+    <char name="radicalex" width="500" llx="480" lly="881" urx="1090" ury="917"/>
+    <char name="alpha" width="631" llx="41" lly="-18" urx="622" ury="500"/>
+    <char name="beta" width="549" llx="61" lly="-223" urx="515" ury="741"/>
+    <char name="chi" width="549" llx="12" lly="-231" urx="522" ury="499"/>
+    <char name="delta" width="494" llx="40" lly="-19" urx="481" ury="740"/>
+    <char name="epsilon" width="439" llx="22" lly="-19" urx="427" ury="502"/>
+    <char name="phi" width="521" llx="28" lly="-224" urx="492" ury="673"/>
+    <char name="gamma" width="411" llx="5" lly="-225" urx="484" ury="499"/>
+    <char name="eta" width="603" llx="0" lly="-202" urx="527" ury="514"/>
+    <char name="iota" width="329" llx="0" lly="-17" urx="301" ury="503"/>
+    <char name="phi1" width="603" llx="36" lly="-224" urx="587" ury="499"/>
+    <char name="kappa" width="549" llx="33" lly="0" urx="558" ury="501"/>
+    <char name="lambda" width="549" llx="24" lly="-17" urx="548" ury="739"/>
+    <char name="mu" width="576" llx="33" lly="-223" urx="567" ury="500"/>
+    <char name="nu" width="521" llx="-9" lly="-16" urx="475" ury="507"/>
+    <char name="omicron" width="549" llx="35" lly="-19" urx="501" ury="499"/>
+    <char name="pi" width="549" llx="10" lly="-19" urx="530" ury="487"/>
+    <char name="theta" width="521" llx="43" lly="-17" urx="485" ury="690"/>
+    <char name="rho" width="549" llx="50" lly="-230" urx="490" ury="499"/>
+    <char name="sigma" width="603" llx="30" lly="-21" urx="588" ury="500"/>
+    <char name="tau" width="439" llx="10" lly="-19" urx="418" ury="500"/>
+    <char name="upsilon" width="576" llx="7" lly="-18" urx="535" ury="507"/>
+    <char name="omega1" width="713" llx="12" lly="-18" urx="671" ury="583"/>
+    <char name="omega" width="686" llx="42" lly="-17" urx="684" ury="500"/>
+    <char name="xi" width="493" llx="27" lly="-224" urx="469" ury="766"/>
+    <char name="psi" width="686" llx="12" lly="-228" urx="701" ury="500"/>
+    <char name="zeta" width="494" llx="60" lly="-225" urx="467" ury="756"/>
+    <char name="braceleft" width="480" llx="58" lly="-183" urx="397" ury="673"/>
+    <char name="bar" width="200" llx="65" lly="-293" urx="135" ury="707"/>
+    <char name="braceright" width="480" llx="79" lly="-183" urx="418" ury="673"/>
+    <char name="similar" width="549" llx="17" lly="203" urx="529" ury="307"/>
+    <char name="Euro" width="750" llx="20" lly="-12" urx="714" ury="685"/>
+    <char name="Upsilon1" width="620" llx="-2" lly="0" urx="610" ury="685"/>
+    <char name="minute" width="247" llx="27" lly="459" urx="228" ury="735"/>
+    <char name="lessequal" width="549" llx="29" lly="0" urx="526" ury="639"/>
+    <char name="fraction" width="167" llx="-180" lly="-12" urx="340" ury="677"/>
+    <char name="infinity" width="713" llx="26" lly="124" urx="688" ury="404"/>
+    <char name="florin" width="500" llx="2" lly="-193" urx="494" ury="686"/>
+    <char name="club" width="753" llx="86" lly="-26" urx="660" ury="533"/>
+    <char name="diamond" width="753" llx="142" lly="-36" urx="600" ury="550"/>
+    <char name="heart" width="753" llx="117" lly="-33" urx="631" ury="532"/>
+    <char name="spade" width="753" llx="113" lly="-36" urx="629" ury="548"/>
+    <char name="arrowboth" width="1042" llx="24" lly="-15" urx="1024" ury="511"/>
+    <char name="arrowleft" width="987" llx="32" lly="-15" urx="942" ury="511"/>
+    <char name="arrowup" width="603" llx="45" lly="0" urx="571" ury="910"/>
+    <char name="arrowright" width="987" llx="49" lly="-15" urx="959" ury="511"/>
+    <char name="arrowdown" width="603" llx="45" lly="-22" urx="571" ury="888"/>
+    <char name="degree" width="400" llx="50" lly="385" urx="350" ury="685"/>
+    <char name="plusminus" width="549" llx="10" lly="0" urx="539" ury="645"/>
+    <char name="second" width="411" llx="20" lly="459" urx="413" ury="737"/>
+    <char name="greaterequal" width="549" llx="29" lly="0" urx="526" ury="639"/>
+    <char name="multiply" width="549" llx="17" lly="8" urx="533" ury="524"/>
+    <char name="proportional" width="713" llx="27" lly="123" urx="639" ury="404"/>
+    <char name="partialdiff" width="494" llx="26" lly="-20" urx="462" ury="746"/>
+    <char name="bullet" width="460" llx="50" lly="113" urx="410" ury="473"/>
+    <char name="divide" width="549" llx="10" lly="71" urx="536" ury="456"/>
+    <char name="notequal" width="549" llx="15" lly="-25" urx="540" ury="549"/>
+    <char name="equivalence" width="549" llx="14" lly="82" urx="538" ury="443"/>
+    <char name="approxequal" width="549" llx="14" lly="135" urx="527" ury="394"/>
+    <char name="ellipsis" width="1000" llx="111" lly="-17" urx="889" ury="95"/>
+    <char name="arrowvertex" width="603" llx="280" lly="-120" urx="336" ury="1010"/>
+    <char name="arrowhorizex" width="1000" llx="-60" lly="220" urx="1050" ury="276"/>
+    <char name="carriagereturn" width="658" llx="15" lly="-16" urx="602" ury="629"/>
+    <char name="aleph" width="823" llx="175" lly="-18" urx="661" ury="658"/>
+    <char name="Ifraktur" width="686" llx="10" lly="-53" urx="578" ury="740"/>
+    <char name="Rfraktur" width="795" llx="26" lly="-15" urx="759" ury="734"/>
+    <char name="weierstrass" width="987" llx="159" lly="-211" urx="870" ury="573"/>
+    <char name="circlemultiply" width="768" llx="43" lly="-17" urx="733" ury="673"/>
+    <char name="circleplus" width="768" llx="43" lly="-15" urx="733" ury="675"/>
+    <char name="emptyset" width="823" llx="39" lly="-24" urx="781" ury="719"/>
+    <char name="intersection" width="768" llx="40" lly="0" urx="732" ury="509"/>
+    <char name="union" width="768" llx="40" lly="-17" urx="732" ury="492"/>
+    <char name="propersuperset" width="713" llx="20" lly="0" urx="673" ury="470"/>
+    <char name="reflexsuperset" width="713" llx="20" lly="-125" urx="673" ury="470"/>
+    <char name="notsubset" width="713" llx="36" lly="-70" urx="690" ury="540"/>
+    <char name="propersubset" width="713" llx="37" lly="0" urx="690" ury="470"/>
+    <char name="reflexsubset" width="713" llx="37" lly="-125" urx="690" ury="470"/>
+    <char name="element" width="713" llx="45" lly="0" urx="505" ury="468"/>
+    <char name="notelement" width="713" llx="45" lly="-58" urx="505" ury="555"/>
+    <char name="angle" width="768" llx="26" lly="0" urx="738" ury="673"/>
+    <char name="gradient" width="713" llx="36" lly="-19" urx="681" ury="718"/>
+    <char name="registerserif" width="790" llx="50" lly="-17" urx="740" ury="673"/>
+    <char name="copyrightserif" width="790" llx="51" lly="-15" urx="741" ury="675"/>
+    <char name="trademarkserif" width="890" llx="18" lly="293" urx="855" ury="673"/>
+    <char name="product" width="823" llx="25" lly="-101" urx="803" ury="751"/>
+    <char name="radical" width="549" llx="10" lly="-38" urx="515" ury="917"/>
+    <char name="dotmath" width="250" llx="69" lly="210" urx="169" ury="310"/>
+    <char name="logicalnot" width="713" llx="15" lly="0" urx="680" ury="288"/>
+    <char name="logicaland" width="603" llx="23" lly="0" urx="583" ury="454"/>
+    <char name="logicalor" width="603" llx="30" lly="0" urx="578" ury="477"/>
+    <char name="arrowdblboth" width="1042" llx="27" lly="-20" urx="1023" ury="510"/>
+    <char name="arrowdblleft" width="987" llx="30" lly="-15" urx="939" ury="513"/>
+    <char name="arrowdblup" width="603" llx="39" lly="2" urx="567" ury="911"/>
+    <char name="arrowdblright" width="987" llx="45" lly="-20" urx="954" ury="508"/>
+    <char name="arrowdbldown" width="603" llx="44" lly="-19" urx="572" ury="890"/>
+    <char name="lozenge" width="494" llx="18" lly="0" urx="466" ury="745"/>
+    <char name="angleleft" width="329" llx="25" lly="-198" urx="306" ury="746"/>
+    <char name="registersans" width="790" llx="50" lly="-20" urx="740" ury="670"/>
+    <char name="copyrightsans" width="790" llx="49" lly="-15" urx="739" ury="675"/>
+    <char name="trademarksans" width="786" llx="5" lly="293" urx="725" ury="673"/>
+    <char name="summation" width="713" llx="14" lly="-108" urx="695" ury="752"/>
+    <char name="parenlefttp" width="384" llx="24" lly="-293" urx="436" ury="926"/>
+    <char name="parenleftex" width="384" llx="24" lly="-85" urx="108" ury="925"/>
+    <char name="parenleftbt" width="384" llx="24" lly="-293" urx="436" ury="926"/>
+    <char name="bracketlefttp" width="384" llx="0" lly="-80" urx="349" ury="926"/>
+    <char name="bracketleftex" width="384" llx="0" lly="-79" urx="77" ury="925"/>
+    <char name="bracketleftbt" width="384" llx="0" lly="-80" urx="349" ury="926"/>
+    <char name="bracelefttp" width="494" llx="209" lly="-85" urx="445" ury="925"/>
+    <char name="braceleftmid" width="494" llx="20" lly="-85" urx="284" ury="935"/>
+    <char name="braceleftbt" width="494" llx="209" lly="-75" urx="445" ury="935"/>
+    <char name="braceex" width="494" llx="209" lly="-85" urx="284" ury="935"/>
+    <char name="angleright" width="329" llx="21" lly="-198" urx="302" ury="746"/>
+    <char name="integral" width="274" llx="2" lly="-107" urx="291" ury="916"/>
+    <char name="integraltp" width="686" llx="308" lly="-88" urx="675" ury="920"/>
+    <char name="integralex" width="686" llx="308" lly="-88" urx="378" ury="975"/>
+    <char name="integralbt" width="686" llx="11" lly="-87" urx="378" ury="921"/>
+    <char name="parenrighttp" width="384" llx="54" lly="-293" urx="466" ury="926"/>
+    <char name="parenrightex" width="384" llx="382" lly="-85" urx="466" ury="925"/>
+    <char name="parenrightbt" width="384" llx="54" lly="-293" urx="466" ury="926"/>
+    <char name="bracketrighttp" width="384" llx="22" lly="-80" urx="371" ury="926"/>
+    <char name="bracketrightex" width="384" llx="294" lly="-79" urx="371" ury="925"/>
+    <char name="bracketrightbt" width="384" llx="22" lly="-80" urx="371" ury="926"/>
+    <char name="bracerighttp" width="494" llx="48" lly="-85" urx="284" ury="925"/>
+    <char name="bracerightmid" width="494" llx="209" lly="-85" urx="473" ury="935"/>
+    <char name="bracerightbt" width="494" llx="48" lly="-75" urx="284" ury="935"/>
+    <char name="apple" width="790" llx="56" lly="-3" urx="733" ury="808"/>
+    </char-metrics>
 </font-metrics>
diff --git a/src/codegen/fonts/TimesBold.xml b/src/codegen/fonts/TimesBold.xml
index 20d50fdd8..ef5d6bcc0 100644
--- a/src/codegen/fonts/TimesBold.xml
+++ b/src/codegen/fonts/TimesBold.xml
@@ -22,245 +22,246 @@
    <family-name>Times</family-name>
    <class-name>TimesBold</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>676</cap-height>
    <x-height>461</x-height>
    <ascender>676</ascender>
    <descender>-205</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="722"/>
-      <char name="AE" width="1000"/>
-      <char name="Aacute" width="722"/>
-      <char name="Acircumflex" width="722"/>
-      <char name="Adieresis" width="722"/>
-      <char name="Agrave" width="722"/>
-      <char name="Aring" width="722"/>
-      <char name="Atilde" width="722"/>
-      <char name="B" width="667"/>
-      <char name="C" width="722"/>
-      <char name="Ccedilla" width="722"/>
-      <char name="D" width="722"/>
-      <char name="E" width="667"/>
-      <char name="Eacute" width="667"/>
-      <char name="Ecircumflex" width="667"/>
-      <char name="Edieresis" width="667"/>
-      <char name="Egrave" width="667"/>
-      <char name="Eth" width="722"/>
-      <char name="Euro" width="500"/>
-      <char name="F" width="611"/>
-      <char name="G" width="778"/>
-      <char name="H" width="778"/>
-      <char name="I" width="389"/>
-      <char name="Iacute" width="389"/>
-      <char name="Icircumflex" width="389"/>
-      <char name="Idieresis" width="389"/>
-      <char name="Igrave" width="389"/>
-      <char name="J" width="500"/>
-      <char name="K" width="778"/>
-      <char name="L" width="667"/>
-      <char name="Lslash" width="667"/>
-      <char name="M" width="944"/>
-      <char name="N" width="722"/>
-      <char name="Ntilde" width="722"/>
-      <char name="O" width="778"/>
-      <char name="OE" width="1000"/>
-      <char name="Oacute" width="778"/>
-      <char name="Ocircumflex" width="778"/>
-      <char name="Odieresis" width="778"/>
-      <char name="Ograve" width="778"/>
-      <char name="Oslash" width="778"/>
-      <char name="Otilde" width="778"/>
-      <char name="P" width="611"/>
-      <char name="Q" width="778"/>
-      <char name="R" width="722"/>
-      <char name="S" width="556"/>
-      <char name="Scaron" width="556"/>
-      <char name="T" width="667"/>
-      <char name="Thorn" width="611"/>
-      <char name="U" width="722"/>
-      <char name="Uacute" width="722"/>
-      <char name="Ucircumflex" width="722"/>
-      <char name="Udieresis" width="722"/>
-      <char name="Ugrave" width="722"/>
-      <char name="V" width="722"/>
-      <char name="W" width="1000"/>
-      <char name="X" width="722"/>
-      <char name="Y" width="722"/>
-      <char name="Yacute" width="722"/>
-      <char name="Ydieresis" width="722"/>
-      <char name="Z" width="667"/>
-      <char name="Zcaron" width="667"/>
-      <char name="a" width="500"/>
-      <char name="aacute" width="500"/>
-      <char name="acircumflex" width="500"/>
-      <char name="acute" width="333"/>
-      <char name="adieresis" width="500"/>
-      <char name="ae" width="722"/>
-      <char name="agrave" width="500"/>
-      <char name="ampersand" width="833"/>
-      <char name="aring" width="500"/>
-      <char name="asciicircum" width="581"/>
-      <char name="asciitilde" width="520"/>
-      <char name="asterisk" width="500"/>
-      <char name="at" width="930"/>
-      <char name="atilde" width="500"/>
-      <char name="b" width="556"/>
-      <char name="backslash" width="278"/>
-      <char name="bar" width="220"/>
-      <char name="braceleft" width="394"/>
-      <char name="braceright" width="394"/>
-      <char name="bracketleft" width="333"/>
-      <char name="bracketright" width="333"/>
-      <char name="breve" width="333"/>
-      <char name="brokenbar" width="220"/>
-      <char name="bullet" width="350"/>
-      <char name="c" width="444"/>
-      <char name="caron" width="333"/>
-      <char name="ccedilla" width="444"/>
-      <char name="cedilla" width="333"/>
-      <char name="cent" width="500"/>
-      <char name="circumflex" width="333"/>
-      <char name="colon" width="333"/>
-      <char name="comma" width="250"/>
-      <char name="copyright" width="747"/>
-      <char name="currency" width="500"/>
-      <char name="d" width="556"/>
-      <char name="dagger" width="500"/>
-      <char name="daggerdbl" width="500"/>
-      <char name="degree" width="400"/>
-      <char name="dieresis" width="333"/>
-      <char name="divide" width="570"/>
-      <char name="dollar" width="500"/>
-      <char name="dotaccent" width="333"/>
-      <char name="dotlessi" width="278"/>
-      <char name="e" width="444"/>
-      <char name="eacute" width="444"/>
-      <char name="ecircumflex" width="444"/>
-      <char name="edieresis" width="444"/>
-      <char name="egrave" width="444"/>
-      <char name="eight" width="500"/>
-      <char name="ellipsis" width="1000"/>
-      <char name="emdash" width="1000"/>
-      <char name="endash" width="500"/>
-      <char name="equal" width="570"/>
-      <char name="eth" width="500"/>
-      <char name="exclam" width="333"/>
-      <char name="exclamdown" width="333"/>
-      <char name="f" width="333"/>
-      <char name="fi" width="556"/>
-      <char name="five" width="500"/>
-      <char name="fl" width="556"/>
-      <char name="florin" width="500"/>
-      <char name="four" width="500"/>
-      <char name="fraction" width="167"/>
-      <char name="g" width="500"/>
-      <char name="germandbls" width="556"/>
-      <char name="grave" width="333"/>
-      <char name="greater" width="570"/>
-      <char name="guillemotleft" width="500"/>
-      <char name="guillemotright" width="500"/>
-      <char name="guilsinglleft" width="333"/>
-      <char name="guilsinglright" width="333"/>
-      <char name="h" width="556"/>
-      <char name="hungarumlaut" width="333"/>
-      <char name="hyphen" width="333"/>
-      <char name="i" width="278"/>
-      <char name="iacute" width="278"/>
-      <char name="icircumflex" width="278"/>
-      <char name="idieresis" width="278"/>
-      <char name="igrave" width="278"/>
-      <char name="j" width="333"/>
-      <char name="k" width="556"/>
-      <char name="l" width="278"/>
-      <char name="less" width="570"/>
-      <char name="logicalnot" width="570"/>
-      <char name="lslash" width="278"/>
-      <char name="m" width="833"/>
-      <char name="macron" width="333"/>
-      <char name="minus" width="324"/>
-      <char name="mu" width="556"/>
-      <char name="multiply" width="570"/>
-      <char name="n" width="556"/>
-      <char name="nine" width="500"/>
-      <char name="ntilde" width="556"/>
-      <char name="numbersign" width="500"/>
-      <char name="o" width="500"/>
-      <char name="oacute" width="500"/>
-      <char name="ocircumflex" width="500"/>
-      <char name="odieresis" width="500"/>
-      <char name="oe" width="722"/>
-      <char name="ogonek" width="333"/>
-      <char name="ograve" width="500"/>
-      <char name="one" width="500"/>
-      <char name="onehalf" width="750"/>
-      <char name="onequarter" width="750"/>
-      <char name="onesuperior" width="300"/>
-      <char name="ordfeminine" width="300"/>
-      <char name="ordmasculine" width="330"/>
-      <char name="oslash" width="500"/>
-      <char name="otilde" width="500"/>
-      <char name="p" width="556"/>
-      <char name="paragraph" width="540"/>
-      <char name="parenleft" width="333"/>
-      <char name="parenright" width="333"/>
-      <char name="percent" width="1000"/>
-      <char name="period" width="250"/>
-      <char name="periodcentered" width="250"/>
-      <char name="perthousand" width="1000"/>
-      <char name="plus" width="570"/>
-      <char name="plusminus" width="570"/>
-      <char name="q" width="556"/>
-      <char name="question" width="500"/>
-      <char name="questiondown" width="500"/>
-      <char name="quotedbl" width="555"/>
-      <char name="quotedblbase" width="500"/>
-      <char name="quotedblleft" width="500"/>
-      <char name="quotedblright" width="500"/>
-      <char name="quoteleft" width="333"/>
-      <char name="quoteright" width="333"/>
-      <char name="quotesinglbase" width="333"/>
-      <char name="quotesingle" width="278"/>
-      <char name="r" width="444"/>
-      <char name="registered" width="747"/>
-      <char name="ring" width="333"/>
-      <char name="s" width="389"/>
-      <char name="scaron" width="389"/>
-      <char name="section" width="500"/>
-      <char name="semicolon" width="333"/>
-      <char name="seven" width="500"/>
-      <char name="six" width="500"/>
-      <char name="slash" width="278"/>
-      <char name="space" width="250"/>
+    <char-metrics>
+      <char name="A" width="722" llx="9" lly="0" urx="689" ury="690"/>
+      <char name="AE" width="1000" llx="4" lly="0" urx="951" ury="676"/>
+      <char name="Aacute" width="722" llx="9" lly="0" urx="689" ury="923"/>
+      <char name="Acircumflex" width="722" llx="9" lly="0" urx="689" ury="914"/>
+      <char name="Adieresis" width="722" llx="9" lly="0" urx="689" ury="877"/>
+      <char name="Agrave" width="722" llx="9" lly="0" urx="689" ury="923"/>
+      <char name="Aring" width="722" llx="9" lly="0" urx="689" ury="935"/>
+      <char name="Atilde" width="722" llx="9" lly="0" urx="689" ury="884"/>
+      <char name="B" width="667" llx="16" lly="0" urx="619" ury="676"/>
+      <char name="C" width="722" llx="49" lly="-19" urx="687" ury="691"/>
+      <char name="Ccedilla" width="722" llx="49" lly="-218" urx="687" ury="691"/>
+      <char name="D" width="722" llx="14" lly="0" urx="690" ury="676"/>
+      <char name="E" width="667" llx="16" lly="0" urx="641" ury="676"/>
+      <char name="Eacute" width="667" llx="16" lly="0" urx="641" ury="923"/>
+      <char name="Ecircumflex" width="667" llx="16" lly="0" urx="641" ury="914"/>
+      <char name="Edieresis" width="667" llx="16" lly="0" urx="641" ury="877"/>
+      <char name="Egrave" width="667" llx="16" lly="0" urx="641" ury="923"/>
+      <char name="Eth" width="722" llx="6" lly="0" urx="690" ury="676"/>
+      <char name="Euro" width="500" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="611" llx="16" lly="0" urx="583" ury="676"/>
+      <char name="G" width="778" llx="37" lly="-19" urx="755" ury="691"/>
+      <char name="H" width="778" llx="21" lly="0" urx="759" ury="676"/>
+      <char name="I" width="389" llx="20" lly="0" urx="370" ury="676"/>
+      <char name="Iacute" width="389" llx="20" lly="0" urx="370" ury="923"/>
+      <char name="Icircumflex" width="389" llx="20" lly="0" urx="370" ury="914"/>
+      <char name="Idieresis" width="389" llx="20" lly="0" urx="370" ury="877"/>
+      <char name="Igrave" width="389" llx="20" lly="0" urx="370" ury="923"/>
+      <char name="J" width="500" llx="3" lly="-96" urx="479" ury="676"/>
+      <char name="K" width="778" llx="30" lly="0" urx="769" ury="676"/>
+      <char name="L" width="667" llx="19" lly="0" urx="638" ury="676"/>
+      <char name="Lslash" width="667" llx="19" lly="0" urx="638" ury="676"/>
+      <char name="M" width="944" llx="14" lly="0" urx="921" ury="676"/>
+      <char name="N" width="722" llx="16" lly="-18" urx="701" ury="676"/>
+      <char name="Ntilde" width="722" llx="16" lly="-18" urx="701" ury="884"/>
+      <char name="O" width="778" llx="35" lly="-19" urx="743" ury="691"/>
+      <char name="OE" width="1000" llx="22" lly="-5" urx="981" ury="684"/>
+      <char name="Oacute" width="778" llx="35" lly="-19" urx="743" ury="923"/>
+      <char name="Ocircumflex" width="778" llx="35" lly="-19" urx="743" ury="914"/>
+      <char name="Odieresis" width="778" llx="35" lly="-19" urx="743" ury="877"/>
+      <char name="Ograve" width="778" llx="35" lly="-19" urx="743" ury="923"/>
+      <char name="Oslash" width="778" llx="35" lly="-74" urx="743" ury="737"/>
+      <char name="Otilde" width="778" llx="35" lly="-19" urx="743" ury="884"/>
+      <char name="P" width="611" llx="16" lly="0" urx="600" ury="676"/>
+      <char name="Q" width="778" llx="35" lly="-176" urx="743" ury="691"/>
+      <char name="R" width="722" llx="26" lly="0" urx="715" ury="676"/>
+      <char name="S" width="556" llx="35" lly="-19" urx="513" ury="692"/>
+      <char name="Scaron" width="556" llx="35" lly="-19" urx="513" ury="914"/>
+      <char name="T" width="667" llx="31" lly="0" urx="636" ury="676"/>
+      <char name="Thorn" width="611" llx="16" lly="0" urx="600" ury="676"/>
+      <char name="U" width="722" llx="16" lly="-19" urx="701" ury="676"/>
+      <char name="Uacute" width="722" llx="16" lly="-19" urx="701" ury="923"/>
+      <char name="Ucircumflex" width="722" llx="16" lly="-19" urx="701" ury="914"/>
+      <char name="Udieresis" width="722" llx="16" lly="-19" urx="701" ury="877"/>
+      <char name="Ugrave" width="722" llx="16" lly="-19" urx="701" ury="923"/>
+      <char name="V" width="722" llx="16" lly="-18" urx="701" ury="676"/>
+      <char name="W" width="1000" llx="19" lly="-15" urx="981" ury="676"/>
+      <char name="X" width="722" llx="16" lly="0" urx="699" ury="676"/>
+      <char name="Y" width="722" llx="15" lly="0" urx="699" ury="676"/>
+      <char name="Yacute" width="722" llx="15" lly="0" urx="699" ury="923"/>
+      <char name="Ydieresis" width="722" llx="15" lly="0" urx="699" ury="877"/>
+      <char name="Z" width="667" llx="28" lly="0" urx="634" ury="676"/>
+      <char name="Zcaron" width="667" llx="28" lly="0" urx="634" ury="914"/>
+      <char name="a" width="500" llx="25" lly="-14" urx="488" ury="473"/>
+      <char name="aacute" width="500" llx="25" lly="-14" urx="488" ury="713"/>
+      <char name="acircumflex" width="500" llx="25" lly="-14" urx="488" ury="704"/>
+      <char name="acute" width="333" llx="86" lly="528" urx="324" ury="713"/>
+      <char name="adieresis" width="500" llx="25" lly="-14" urx="488" ury="667"/>
+      <char name="ae" width="722" llx="33" lly="-14" urx="693" ury="473"/>
+      <char name="agrave" width="500" llx="25" lly="-14" urx="488" ury="713"/>
+      <char name="ampersand" width="833" llx="62" lly="-16" urx="787" ury="691"/>
+      <char name="aring" width="500" llx="25" lly="-14" urx="488" ury="740"/>
+      <char name="asciicircum" width="581" llx="73" lly="311" urx="509" ury="676"/>
+      <char name="asciitilde" width="520" llx="29" lly="173" urx="491" ury="333"/>
+      <char name="asterisk" width="500" llx="56" lly="255" urx="447" ury="691"/>
+      <char name="at" width="930" llx="108" lly="-19" urx="822" ury="691"/>
+      <char name="atilde" width="500" llx="25" lly="-14" urx="488" ury="674"/>
+      <char name="b" width="556" llx="17" lly="-14" urx="521" ury="676"/>
+      <char name="backslash" width="278" llx="-25" lly="-19" urx="303" ury="691"/>
+      <char name="bar" width="220" llx="66" lly="-218" urx="154" ury="782"/>
+      <char name="braceleft" width="394" llx="22" lly="-175" urx="340" ury="698"/>
+      <char name="braceright" width="394" llx="54" lly="-175" urx="372" ury="698"/>
+      <char name="bracketleft" width="333" llx="67" lly="-149" urx="301" ury="678"/>
+      <char name="bracketright" width="333" llx="32" lly="-149" urx="266" ury="678"/>
+      <char name="breve" width="333" llx="15" lly="528" urx="318" ury="691"/>
+      <char name="brokenbar" width="220" llx="66" lly="-143" urx="154" ury="707"/>
+      <char name="bullet" width="350" llx="35" lly="198" urx="315" ury="478"/>
+      <char name="c" width="444" llx="25" lly="-14" urx="430" ury="473"/>
+      <char name="caron" width="333" llx="-2" lly="528" urx="335" ury="704"/>
+      <char name="ccedilla" width="444" llx="25" lly="-218" urx="430" ury="473"/>
+      <char name="cedilla" width="333" llx="68" lly="-218" urx="294" ury="0"/>
+      <char name="cent" width="500" llx="53" lly="-140" urx="458" ury="588"/>
+      <char name="circumflex" width="333" llx="-2" lly="528" urx="335" ury="704"/>
+      <char name="colon" width="333" llx="82" lly="-13" urx="251" ury="472"/>
+      <char name="comma" width="250" llx="39" lly="-180" urx="223" ury="155"/>
+      <char name="copyright" width="747" llx="26" lly="-19" urx="721" ury="691"/>
+      <char name="currency" width="500" llx="-26" lly="61" urx="526" ury="613"/>
+      <char name="d" width="556" llx="25" lly="-14" urx="534" ury="676"/>
+      <char name="dagger" width="500" llx="47" lly="-134" urx="453" ury="691"/>
+      <char name="daggerdbl" width="500" llx="45" lly="-132" urx="456" ury="691"/>
+      <char name="degree" width="400" llx="57" lly="402" urx="343" ury="688"/>
+      <char name="dieresis" width="333" llx="-2" lly="537" urx="335" ury="667"/>
+      <char name="divide" width="570" llx="33" lly="-31" urx="537" ury="537"/>
+      <char name="dollar" width="500" llx="29" lly="-99" urx="472" ury="750"/>
+      <char name="dotaccent" width="333" llx="103" lly="536" urx="258" ury="691"/>
+      <char name="dotlessi" width="278" llx="16" lly="0" urx="255" ury="461"/>
+      <char name="e" width="444" llx="25" lly="-14" urx="426" ury="473"/>
+      <char name="eacute" width="444" llx="25" lly="-14" urx="426" ury="713"/>
+      <char name="ecircumflex" width="444" llx="25" lly="-14" urx="426" ury="704"/>
+      <char name="edieresis" width="444" llx="25" lly="-14" urx="426" ury="667"/>
+      <char name="egrave" width="444" llx="25" lly="-14" urx="426" ury="713"/>
+      <char name="eight" width="500" llx="28" lly="-13" urx="472" ury="688"/>
+      <char name="ellipsis" width="1000" llx="82" lly="-13" urx="917" ury="156"/>
+      <char name="emdash" width="1000" llx="0" lly="181" urx="1000" ury="271"/>
+      <char name="endash" width="500" llx="0" lly="181" urx="500" ury="271"/>
+      <char name="equal" width="570" llx="33" lly="107" urx="537" ury="399"/>
+      <char name="eth" width="500" llx="25" lly="-14" urx="476" ury="691"/>
+      <char name="exclam" width="333" llx="81" lly="-13" urx="251" ury="691"/>
+      <char name="exclamdown" width="333" llx="82" lly="-203" urx="252" ury="501"/>
+      <char name="f" width="333" llx="14" lly="0" urx="389" ury="691"/>
+      <char name="fi" width="556" llx="14" lly="0" urx="536" ury="691"/>
+      <char name="five" width="500" llx="22" lly="-8" urx="470" ury="676"/>
+      <char name="fl" width="556" llx="14" lly="0" urx="536" ury="691"/>
+      <char name="florin" width="500" llx="0" lly="-155" urx="498" ury="706"/>
+      <char name="four" width="500" llx="19" lly="0" urx="475" ury="688"/>
+      <char name="fraction" width="167" llx="-168" lly="-12" urx="329" ury="688"/>
+      <char name="g" width="500" llx="28" lly="-206" urx="483" ury="473"/>
+      <char name="germandbls" width="556" llx="19" lly="-12" urx="517" ury="691"/>
+      <char name="grave" width="333" llx="8" lly="528" urx="246" ury="713"/>
+      <char name="greater" width="570" llx="31" lly="-8" urx="539" ury="514"/>
+      <char name="guillemotleft" width="500" llx="23" lly="36" urx="473" ury="415"/>
+      <char name="guillemotright" width="500" llx="27" lly="36" urx="477" ury="415"/>
+      <char name="guilsinglleft" width="333" llx="51" lly="36" urx="305" ury="415"/>
+      <char name="guilsinglright" width="333" llx="28" lly="36" urx="282" ury="415"/>
+      <char name="h" width="556" llx="16" lly="0" urx="534" ury="676"/>
+      <char name="hungarumlaut" width="333" llx="-13" lly="528" urx="425" ury="713"/>
+      <char name="hyphen" width="333" llx="44" lly="171" urx="287" ury="287"/>
+      <char name="i" width="278" llx="16" lly="0" urx="255" ury="691"/>
+      <char name="iacute" width="278" llx="16" lly="0" urx="289" ury="713"/>
+      <char name="icircumflex" width="278" llx="-37" lly="0" urx="300" ury="704"/>
+      <char name="idieresis" width="278" llx="-37" lly="0" urx="300" ury="667"/>
+      <char name="igrave" width="278" llx="-27" lly="0" urx="255" ury="713"/>
+      <char name="j" width="333" llx="-57" lly="-203" urx="263" ury="691"/>
+      <char name="k" width="556" llx="22" lly="0" urx="543" ury="676"/>
+      <char name="l" width="278" llx="16" lly="0" urx="255" ury="676"/>
+      <char name="less" width="570" llx="31" lly="-8" urx="539" ury="514"/>
+      <char name="logicalnot" width="570" llx="33" lly="108" urx="537" ury="399"/>
+      <char name="lslash" width="278" llx="-22" lly="0" urx="303" ury="676"/>
+      <char name="m" width="833" llx="16" lly="0" urx="814" ury="473"/>
+      <char name="macron" width="333" llx="1" lly="565" urx="331" ury="637"/>
+      <char name="minus" width="324" llx="33" lly="209" urx="537" ury="297"/>
+      <char name="mu" width="556" llx="33" lly="-206" urx="536" ury="461"/>
+      <char name="multiply" width="570" llx="48" lly="16" urx="522" ury="490"/>
+      <char name="n" width="556" llx="21" lly="0" urx="539" ury="473"/>
+      <char name="nine" width="500" llx="26" lly="-13" urx="473" ury="688"/>
+      <char name="ntilde" width="556" llx="21" lly="0" urx="539" ury="674"/>
+      <char name="numbersign" width="500" llx="4" lly="0" urx="496" ury="700"/>
+      <char name="o" width="500" llx="25" lly="-14" urx="476" ury="473"/>
+      <char name="oacute" width="500" llx="25" lly="-14" urx="476" ury="713"/>
+      <char name="ocircumflex" width="500" llx="25" lly="-14" urx="476" ury="704"/>
+      <char name="odieresis" width="500" llx="25" lly="-14" urx="476" ury="667"/>
+      <char name="oe" width="722" llx="22" lly="-14" urx="696" ury="473"/>
+      <char name="ogonek" width="333" llx="90" lly="-193" urx="319" ury="24"/>
+      <char name="ograve" width="500" llx="25" lly="-14" urx="476" ury="713"/>
+      <char name="one" width="500" llx="65" lly="0" urx="442" ury="688"/>
+      <char name="onehalf" width="750" llx="-7" lly="-12" urx="775" ury="688"/>
+      <char name="onequarter" width="750" llx="28" lly="-12" urx="743" ury="688"/>
+      <char name="onesuperior" width="300" llx="28" lly="275" urx="273" ury="688"/>
+      <char name="ordfeminine" width="300" llx="-1" lly="397" urx="301" ury="688"/>
+      <char name="ordmasculine" width="330" llx="18" lly="397" urx="312" ury="688"/>
+      <char name="oslash" width="500" llx="25" lly="-92" urx="476" ury="549"/>
+      <char name="otilde" width="500" llx="25" lly="-14" urx="476" ury="674"/>
+      <char name="p" width="556" llx="19" lly="-205" urx="524" ury="473"/>
+      <char name="paragraph" width="540" llx="0" lly="-186" urx="519" ury="676"/>
+      <char name="parenleft" width="333" llx="46" lly="-168" urx="306" ury="694"/>
+      <char name="parenright" width="333" llx="27" lly="-168" urx="287" ury="694"/>
+      <char name="percent" width="1000" llx="124" lly="-14" urx="877" ury="692"/>
+      <char name="period" width="250" llx="41" lly="-13" urx="210" ury="156"/>
+      <char name="periodcentered" width="250" llx="41" lly="248" urx="210" ury="417"/>
+      <char name="perthousand" width="1000" llx="7" lly="-29" urx="995" ury="706"/>
+      <char name="plus" width="570" llx="33" lly="0" urx="537" ury="506"/>
+      <char name="plusminus" width="570" llx="33" lly="0" urx="537" ury="506"/>
+      <char name="q" width="556" llx="34" lly="-205" urx="536" ury="473"/>
+      <char name="question" width="500" llx="57" lly="-13" urx="445" ury="689"/>
+      <char name="questiondown" width="500" llx="55" lly="-201" urx="443" ury="501"/>
+      <char name="quotedbl" width="555" llx="83" lly="404" urx="472" ury="691"/>
+      <char name="quotedblbase" width="500" llx="14" lly="-180" urx="468" ury="155"/>
+      <char name="quotedblleft" width="500" llx="32" lly="356" urx="486" ury="691"/>
+      <char name="quotedblright" width="500" llx="14" lly="356" urx="468" ury="691"/>
+      <char name="quoteleft" width="333" llx="70" lly="356" urx="254" ury="691"/>
+      <char name="quoteright" width="333" llx="79" lly="356" urx="263" ury="691"/>
+      <char name="quotesinglbase" width="333" llx="79" lly="-180" urx="263" ury="155"/>
+      <char name="quotesingle" width="278" llx="75" lly="404" urx="204" ury="691"/>
+      <char name="r" width="444" llx="29" lly="0" urx="434" ury="473"/>
+      <char name="registered" width="747" llx="26" lly="-19" urx="721" ury="691"/>
+      <char name="ring" width="333" llx="60" lly="527" urx="273" ury="740"/>
+      <char name="s" width="389" llx="25" lly="-14" urx="361" ury="473"/>
+      <char name="scaron" width="389" llx="25" lly="-14" urx="363" ury="704"/>
+      <char name="section" width="500" llx="57" lly="-132" urx="443" ury="691"/>
+      <char name="semicolon" width="333" llx="82" lly="-180" urx="266" ury="472"/>
+      <char name="seven" width="500" llx="17" lly="0" urx="477" ury="676"/>
+      <char name="six" width="500" llx="28" lly="-13" urx="475" ury="688"/>
+      <char name="slash" width="278" llx="-24" lly="-19" urx="302" ury="691"/>
+      <char name="space" width="250" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="250"/>
-      <char name="sterling" width="500"/>
-      <char name="t" width="333"/>
-      <char name="thorn" width="556"/>
-      <char name="three" width="500"/>
-      <char name="threequarters" width="750"/>
-      <char name="threesuperior" width="300"/>
-      <char name="tilde" width="333"/>
-      <char name="trademark" width="1000"/>
-      <char name="two" width="500"/>
-      <char name="twosuperior" width="300"/>
-      <char name="u" width="556"/>
-      <char name="uacute" width="556"/>
-      <char name="ucircumflex" width="556"/>
-      <char name="udieresis" width="556"/>
-      <char name="ugrave" width="556"/>
-      <char name="underscore" width="500"/>
-      <char name="v" width="500"/>
-      <char name="w" width="722"/>
-      <char name="x" width="500"/>
-      <char name="y" width="500"/>
-      <char name="yacute" width="500"/>
-      <char name="ydieresis" width="500"/>
-      <char name="yen" width="500"/>
-      <char name="z" width="444"/>
-      <char name="zcaron" width="444"/>
-      <char name="zero" width="500"/>
-   </widths>
+      <char name="sterling" width="500" llx="21" lly="-14" urx="477" ury="684"/>
+      <char name="t" width="333" llx="20" lly="-12" urx="332" ury="630"/>
+      <char name="thorn" width="556" llx="19" lly="-205" urx="524" ury="676"/>
+      <char name="three" width="500" llx="16" lly="-14" urx="468" ury="688"/>
+      <char name="threequarters" width="750" llx="23" lly="-12" urx="733" ury="688"/>
+      <char name="threesuperior" width="300" llx="3" lly="268" urx="297" ury="688"/>
+      <char name="tilde" width="333" llx="-16" lly="547" urx="349" ury="674"/>
+      <char name="trademark" width="1000" llx="24" lly="271" urx="977" ury="676"/>
+      <char name="two" width="500" llx="17" lly="0" urx="478" ury="688"/>
+      <char name="twosuperior" width="300" llx="0" lly="275" urx="300" ury="688"/>
+      <char name="u" width="556" llx="16" lly="-14" urx="537" ury="461"/>
+      <char name="uacute" width="556" llx="16" lly="-14" urx="537" ury="713"/>
+      <char name="ucircumflex" width="556" llx="16" lly="-14" urx="537" ury="704"/>
+      <char name="udieresis" width="556" llx="16" lly="-14" urx="537" ury="667"/>
+      <char name="ugrave" width="556" llx="16" lly="-14" urx="537" ury="713"/>
+      <char name="underscore" width="500" llx="0" lly="-125" urx="500" ury="-75"/>
+      <char name="v" width="500" llx="21" lly="-14" urx="485" ury="461"/>
+      <char name="w" width="722" llx="23" lly="-14" urx="707" ury="461"/>
+      <char name="x" width="500" llx="12" lly="0" urx="484" ury="461"/>
+      <char name="y" width="500" llx="16" lly="-205" urx="480" ury="461"/>
+      <char name="yacute" width="500" llx="16" lly="-205" urx="480" ury="713"/>
+      <char name="ydieresis" width="500" llx="16" lly="-205" urx="480" ury="667"/>
+      <char name="yen" width="500" llx="-64" lly="0" urx="547" ury="676"/>
+      <char name="z" width="444" llx="21" lly="0" urx="420" ury="461"/>
+      <char name="zcaron" width="444" llx="21" lly="0" urx="420" ury="704"/>
+      <char name="zero" width="500" llx="24" lly="-13" urx="476" ury="688"/>
+    </char-metrics>
   <kerning kpx1="79">
     <pair kern="-40" kpx2="65"/>
     <pair kern="-50" kpx2="87"/>
diff --git a/src/codegen/fonts/TimesBoldItalic.xml b/src/codegen/fonts/TimesBoldItalic.xml
index d1b70872a..ec67369f2 100644
--- a/src/codegen/fonts/TimesBoldItalic.xml
+++ b/src/codegen/fonts/TimesBoldItalic.xml
@@ -22,245 +22,246 @@
    <family-name>Times</family-name>
    <class-name>TimesBoldItalic</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>669</cap-height>
    <x-height>462</x-height>
    <ascender>699</ascender>
    <descender>-205</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="667"/>
-      <char name="AE" width="944"/>
-      <char name="Aacute" width="667"/>
-      <char name="Acircumflex" width="667"/>
-      <char name="Adieresis" width="667"/>
-      <char name="Agrave" width="667"/>
-      <char name="Aring" width="667"/>
-      <char name="Atilde" width="667"/>
-      <char name="B" width="667"/>
-      <char name="C" width="667"/>
-      <char name="Ccedilla" width="667"/>
-      <char name="D" width="722"/>
-      <char name="E" width="667"/>
-      <char name="Eacute" width="667"/>
-      <char name="Ecircumflex" width="667"/>
-      <char name="Edieresis" width="667"/>
-      <char name="Egrave" width="667"/>
-      <char name="Eth" width="722"/>
-      <char name="Euro" width="500"/>
-      <char name="F" width="667"/>
-      <char name="G" width="722"/>
-      <char name="H" width="778"/>
-      <char name="I" width="389"/>
-      <char name="Iacute" width="389"/>
-      <char name="Icircumflex" width="389"/>
-      <char name="Idieresis" width="389"/>
-      <char name="Igrave" width="389"/>
-      <char name="J" width="500"/>
-      <char name="K" width="667"/>
-      <char name="L" width="611"/>
-      <char name="Lslash" width="611"/>
-      <char name="M" width="889"/>
-      <char name="N" width="722"/>
-      <char name="Ntilde" width="722"/>
-      <char name="O" width="722"/>
-      <char name="OE" width="944"/>
-      <char name="Oacute" width="722"/>
-      <char name="Ocircumflex" width="722"/>
-      <char name="Odieresis" width="722"/>
-      <char name="Ograve" width="722"/>
-      <char name="Oslash" width="722"/>
-      <char name="Otilde" width="722"/>
-      <char name="P" width="611"/>
-      <char name="Q" width="722"/>
-      <char name="R" width="667"/>
-      <char name="S" width="556"/>
-      <char name="Scaron" width="556"/>
-      <char name="T" width="611"/>
-      <char name="Thorn" width="611"/>
-      <char name="U" width="722"/>
-      <char name="Uacute" width="722"/>
-      <char name="Ucircumflex" width="722"/>
-      <char name="Udieresis" width="722"/>
-      <char name="Ugrave" width="722"/>
-      <char name="V" width="667"/>
-      <char name="W" width="889"/>
-      <char name="X" width="667"/>
-      <char name="Y" width="611"/>
-      <char name="Yacute" width="611"/>
-      <char name="Ydieresis" width="611"/>
-      <char name="Z" width="611"/>
-      <char name="Zcaron" width="611"/>
-      <char name="a" width="500"/>
-      <char name="aacute" width="500"/>
-      <char name="acircumflex" width="500"/>
-      <char name="acute" width="333"/>
-      <char name="adieresis" width="500"/>
-      <char name="ae" width="722"/>
-      <char name="agrave" width="500"/>
-      <char name="ampersand" width="778"/>
-      <char name="aring" width="500"/>
-      <char name="asciicircum" width="570"/>
-      <char name="asciitilde" width="570"/>
-      <char name="asterisk" width="500"/>
-      <char name="at" width="832"/>
-      <char name="atilde" width="500"/>
-      <char name="b" width="500"/>
-      <char name="backslash" width="278"/>
-      <char name="bar" width="220"/>
-      <char name="braceleft" width="348"/>
-      <char name="braceright" width="348"/>
-      <char name="bracketleft" width="333"/>
-      <char name="bracketright" width="333"/>
-      <char name="breve" width="333"/>
-      <char name="brokenbar" width="220"/>
-      <char name="bullet" width="350"/>
-      <char name="c" width="444"/>
-      <char name="caron" width="333"/>
-      <char name="ccedilla" width="444"/>
-      <char name="cedilla" width="333"/>
-      <char name="cent" width="500"/>
-      <char name="circumflex" width="333"/>
-      <char name="colon" width="333"/>
-      <char name="comma" width="250"/>
-      <char name="copyright" width="747"/>
-      <char name="currency" width="500"/>
-      <char name="d" width="500"/>
-      <char name="dagger" width="500"/>
-      <char name="daggerdbl" width="500"/>
-      <char name="degree" width="400"/>
-      <char name="dieresis" width="333"/>
-      <char name="divide" width="570"/>
-      <char name="dollar" width="500"/>
-      <char name="dotaccent" width="333"/>
-      <char name="dotlessi" width="278"/>
-      <char name="e" width="444"/>
-      <char name="eacute" width="444"/>
-      <char name="ecircumflex" width="444"/>
-      <char name="edieresis" width="444"/>
-      <char name="egrave" width="444"/>
-      <char name="eight" width="500"/>
-      <char name="ellipsis" width="1000"/>
-      <char name="emdash" width="1000"/>
-      <char name="endash" width="500"/>
-      <char name="equal" width="570"/>
-      <char name="eth" width="500"/>
-      <char name="exclam" width="389"/>
-      <char name="exclamdown" width="389"/>
-      <char name="f" width="333"/>
-      <char name="fi" width="556"/>
-      <char name="five" width="500"/>
-      <char name="fl" width="556"/>
-      <char name="florin" width="500"/>
-      <char name="four" width="500"/>
-      <char name="fraction" width="167"/>
-      <char name="g" width="500"/>
-      <char name="germandbls" width="500"/>
-      <char name="grave" width="333"/>
-      <char name="greater" width="570"/>
-      <char name="guillemotleft" width="500"/>
-      <char name="guillemotright" width="500"/>
-      <char name="guilsinglleft" width="333"/>
-      <char name="guilsinglright" width="333"/>
-      <char name="h" width="556"/>
-      <char name="hungarumlaut" width="333"/>
-      <char name="hyphen" width="333"/>
-      <char name="i" width="278"/>
-      <char name="iacute" width="278"/>
-      <char name="icircumflex" width="278"/>
-      <char name="idieresis" width="278"/>
-      <char name="igrave" width="278"/>
-      <char name="j" width="278"/>
-      <char name="k" width="500"/>
-      <char name="l" width="278"/>
-      <char name="less" width="570"/>
-      <char name="logicalnot" width="606"/>
-      <char name="lslash" width="278"/>
-      <char name="m" width="778"/>
-      <char name="macron" width="333"/>
-      <char name="minus" width="330"/>
-      <char name="mu" width="576"/>
-      <char name="multiply" width="570"/>
-      <char name="n" width="556"/>
-      <char name="nine" width="500"/>
-      <char name="ntilde" width="556"/>
-      <char name="numbersign" width="500"/>
-      <char name="o" width="500"/>
-      <char name="oacute" width="500"/>
-      <char name="ocircumflex" width="500"/>
-      <char name="odieresis" width="500"/>
-      <char name="oe" width="722"/>
-      <char name="ogonek" width="333"/>
-      <char name="ograve" width="500"/>
-      <char name="one" width="500"/>
-      <char name="onehalf" width="750"/>
-      <char name="onequarter" width="750"/>
-      <char name="onesuperior" width="300"/>
-      <char name="ordfeminine" width="266"/>
-      <char name="ordmasculine" width="300"/>
-      <char name="oslash" width="500"/>
-      <char name="otilde" width="500"/>
-      <char name="p" width="500"/>
-      <char name="paragraph" width="500"/>
-      <char name="parenleft" width="333"/>
-      <char name="parenright" width="333"/>
-      <char name="percent" width="833"/>
-      <char name="period" width="250"/>
-      <char name="periodcentered" width="250"/>
-      <char name="perthousand" width="1000"/>
-      <char name="plus" width="570"/>
-      <char name="plusminus" width="570"/>
-      <char name="q" width="500"/>
-      <char name="question" width="500"/>
-      <char name="questiondown" width="500"/>
-      <char name="quotedbl" width="555"/>
-      <char name="quotedblbase" width="500"/>
-      <char name="quotedblleft" width="500"/>
-      <char name="quotedblright" width="500"/>
-      <char name="quoteleft" width="333"/>
-      <char name="quoteright" width="333"/>
-      <char name="quotesinglbase" width="333"/>
-      <char name="quotesingle" width="278"/>
-      <char name="r" width="389"/>
-      <char name="registered" width="747"/>
-      <char name="ring" width="333"/>
-      <char name="s" width="389"/>
-      <char name="scaron" width="389"/>
-      <char name="section" width="500"/>
-      <char name="semicolon" width="333"/>
-      <char name="seven" width="500"/>
-      <char name="six" width="500"/>
-      <char name="slash" width="278"/>
-      <char name="space" width="250"/>
+    <char-metrics>
+      <char name="A" width="667" llx="-67" lly="0" urx="593" ury="683"/>
+      <char name="AE" width="944" llx="-64" lly="0" urx="918" ury="669"/>
+      <char name="Aacute" width="667" llx="-67" lly="0" urx="593" ury="904"/>
+      <char name="Acircumflex" width="667" llx="-67" lly="0" urx="593" ury="897"/>
+      <char name="Adieresis" width="667" llx="-67" lly="0" urx="593" ury="862"/>
+      <char name="Agrave" width="667" llx="-67" lly="0" urx="593" ury="904"/>
+      <char name="Aring" width="667" llx="-67" lly="0" urx="593" ury="921"/>
+      <char name="Atilde" width="667" llx="-67" lly="0" urx="593" ury="862"/>
+      <char name="B" width="667" llx="-24" lly="0" urx="624" ury="669"/>
+      <char name="C" width="667" llx="32" lly="-18" urx="677" ury="685"/>
+      <char name="Ccedilla" width="667" llx="32" lly="-218" urx="677" ury="685"/>
+      <char name="D" width="722" llx="-46" lly="0" urx="685" ury="669"/>
+      <char name="E" width="667" llx="-27" lly="0" urx="653" ury="669"/>
+      <char name="Eacute" width="667" llx="-27" lly="0" urx="653" ury="904"/>
+      <char name="Ecircumflex" width="667" llx="-27" lly="0" urx="653" ury="897"/>
+      <char name="Edieresis" width="667" llx="-27" lly="0" urx="653" ury="862"/>
+      <char name="Egrave" width="667" llx="-27" lly="0" urx="653" ury="904"/>
+      <char name="Eth" width="722" llx="-31" lly="0" urx="700" ury="669"/>
+      <char name="Euro" width="500" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="667" llx="-13" lly="0" urx="660" ury="669"/>
+      <char name="G" width="722" llx="21" lly="-18" urx="706" ury="685"/>
+      <char name="H" width="778" llx="-24" lly="0" urx="799" ury="669"/>
+      <char name="I" width="389" llx="-32" lly="0" urx="406" ury="669"/>
+      <char name="Iacute" width="389" llx="-32" lly="0" urx="432" ury="904"/>
+      <char name="Icircumflex" width="389" llx="-32" lly="0" urx="450" ury="897"/>
+      <char name="Idieresis" width="389" llx="-32" lly="0" urx="450" ury="862"/>
+      <char name="Igrave" width="389" llx="-32" lly="0" urx="406" ury="904"/>
+      <char name="J" width="500" llx="-46" lly="-99" urx="524" ury="669"/>
+      <char name="K" width="667" llx="-21" lly="0" urx="702" ury="669"/>
+      <char name="L" width="611" llx="-22" lly="0" urx="590" ury="669"/>
+      <char name="Lslash" width="611" llx="-22" lly="0" urx="590" ury="669"/>
+      <char name="M" width="889" llx="-29" lly="-12" urx="917" ury="669"/>
+      <char name="N" width="722" llx="-27" lly="-15" urx="748" ury="669"/>
+      <char name="Ntilde" width="722" llx="-27" lly="-15" urx="748" ury="862"/>
+      <char name="O" width="722" llx="27" lly="-18" urx="691" ury="685"/>
+      <char name="OE" width="944" llx="23" lly="-8" urx="946" ury="677"/>
+      <char name="Oacute" width="722" llx="27" lly="-18" urx="691" ury="904"/>
+      <char name="Ocircumflex" width="722" llx="27" lly="-18" urx="691" ury="897"/>
+      <char name="Odieresis" width="722" llx="27" lly="-18" urx="691" ury="862"/>
+      <char name="Ograve" width="722" llx="27" lly="-18" urx="691" ury="904"/>
+      <char name="Oslash" width="722" llx="27" lly="-125" urx="691" ury="764"/>
+      <char name="Otilde" width="722" llx="27" lly="-18" urx="691" ury="862"/>
+      <char name="P" width="611" llx="-27" lly="0" urx="613" ury="669"/>
+      <char name="Q" width="722" llx="27" lly="-208" urx="691" ury="685"/>
+      <char name="R" width="667" llx="-29" lly="0" urx="623" ury="669"/>
+      <char name="S" width="556" llx="2" lly="-18" urx="526" ury="685"/>
+      <char name="Scaron" width="556" llx="2" lly="-18" urx="553" ury="897"/>
+      <char name="T" width="611" llx="50" lly="0" urx="650" ury="669"/>
+      <char name="Thorn" width="611" llx="-27" lly="0" urx="573" ury="669"/>
+      <char name="U" width="722" llx="67" lly="-18" urx="744" ury="669"/>
+      <char name="Uacute" width="722" llx="67" lly="-18" urx="744" ury="904"/>
+      <char name="Ucircumflex" width="722" llx="67" lly="-18" urx="744" ury="897"/>
+      <char name="Udieresis" width="722" llx="67" lly="-18" urx="744" ury="862"/>
+      <char name="Ugrave" width="722" llx="67" lly="-18" urx="744" ury="904"/>
+      <char name="V" width="667" llx="65" lly="-18" urx="715" ury="669"/>
+      <char name="W" width="889" llx="65" lly="-18" urx="940" ury="669"/>
+      <char name="X" width="667" llx="-24" lly="0" urx="694" ury="669"/>
+      <char name="Y" width="611" llx="73" lly="0" urx="659" ury="669"/>
+      <char name="Yacute" width="611" llx="73" lly="0" urx="659" ury="904"/>
+      <char name="Ydieresis" width="611" llx="73" lly="0" urx="659" ury="862"/>
+      <char name="Z" width="611" llx="-11" lly="0" urx="590" ury="669"/>
+      <char name="Zcaron" width="611" llx="-11" lly="0" urx="590" ury="897"/>
+      <char name="a" width="500" llx="-21" lly="-14" urx="455" ury="462"/>
+      <char name="aacute" width="500" llx="-21" lly="-14" urx="463" ury="697"/>
+      <char name="acircumflex" width="500" llx="-21" lly="-14" urx="455" ury="690"/>
+      <char name="acute" width="333" llx="139" lly="516" urx="379" ury="697"/>
+      <char name="adieresis" width="500" llx="-21" lly="-14" urx="476" ury="655"/>
+      <char name="ae" width="722" llx="-5" lly="-13" urx="673" ury="462"/>
+      <char name="agrave" width="500" llx="-21" lly="-14" urx="455" ury="697"/>
+      <char name="ampersand" width="778" llx="5" lly="-19" urx="699" ury="682"/>
+      <char name="aring" width="500" llx="-21" lly="-14" urx="455" ury="729"/>
+      <char name="asciicircum" width="570" llx="67" lly="304" urx="503" ury="669"/>
+      <char name="asciitilde" width="570" llx="54" lly="173" urx="516" ury="333"/>
+      <char name="asterisk" width="500" llx="65" lly="249" urx="456" ury="685"/>
+      <char name="at" width="832" llx="63" lly="-18" urx="770" ury="685"/>
+      <char name="atilde" width="500" llx="-21" lly="-14" urx="491" ury="655"/>
+      <char name="b" width="500" llx="-14" lly="-13" urx="444" ury="699"/>
+      <char name="backslash" width="278" llx="-1" lly="-18" urx="279" ury="685"/>
+      <char name="bar" width="220" llx="66" lly="-218" urx="154" ury="782"/>
+      <char name="braceleft" width="348" llx="5" lly="-187" urx="436" ury="686"/>
+      <char name="braceright" width="348" llx="-129" lly="-187" urx="302" ury="686"/>
+      <char name="bracketleft" width="333" llx="-37" lly="-159" urx="362" ury="674"/>
+      <char name="bracketright" width="333" llx="-56" lly="-157" urx="343" ury="674"/>
+      <char name="breve" width="333" llx="71" lly="516" urx="387" ury="678"/>
+      <char name="brokenbar" width="220" llx="66" lly="-143" urx="154" ury="707"/>
+      <char name="bullet" width="350" llx="0" lly="175" urx="350" ury="525"/>
+      <char name="c" width="444" llx="-5" lly="-13" urx="392" ury="462"/>
+      <char name="caron" width="333" llx="79" lly="516" urx="411" ury="690"/>
+      <char name="ccedilla" width="444" llx="-5" lly="-218" urx="392" ury="462"/>
+      <char name="cedilla" width="333" llx="-80" lly="-218" urx="156" ury="5"/>
+      <char name="cent" width="500" llx="42" lly="-143" urx="439" ury="576"/>
+      <char name="circumflex" width="333" llx="40" lly="516" urx="367" ury="690"/>
+      <char name="colon" width="333" llx="23" lly="-13" urx="264" ury="459"/>
+      <char name="comma" width="250" llx="-60" lly="-182" urx="144" ury="134"/>
+      <char name="copyright" width="747" llx="30" lly="-18" urx="718" ury="685"/>
+      <char name="currency" width="500" llx="-26" lly="34" urx="526" ury="586"/>
+      <char name="d" width="500" llx="-21" lly="-13" urx="517" ury="699"/>
+      <char name="dagger" width="500" llx="91" lly="-145" urx="494" ury="685"/>
+      <char name="daggerdbl" width="500" llx="10" lly="-139" urx="493" ury="685"/>
+      <char name="degree" width="400" llx="83" lly="397" urx="369" ury="683"/>
+      <char name="dieresis" width="333" llx="55" lly="550" urx="402" ury="684"/>
+      <char name="divide" width="570" llx="33" lly="-29" urx="537" ury="535"/>
+      <char name="dollar" width="500" llx="-20" lly="-100" urx="497" ury="733"/>
+      <char name="dotaccent" width="333" llx="163" lly="550" urx="298" ury="684"/>
+      <char name="dotlessi" width="278" llx="2" lly="-9" urx="238" ury="462"/>
+      <char name="e" width="444" llx="5" lly="-13" urx="398" ury="462"/>
+      <char name="eacute" width="444" llx="5" lly="-13" urx="435" ury="697"/>
+      <char name="ecircumflex" width="444" llx="5" lly="-13" urx="423" ury="690"/>
+      <char name="edieresis" width="444" llx="5" lly="-13" urx="448" ury="655"/>
+      <char name="egrave" width="444" llx="5" lly="-13" urx="398" ury="697"/>
+      <char name="eight" width="500" llx="3" lly="-13" urx="476" ury="683"/>
+      <char name="ellipsis" width="1000" llx="40" lly="-13" urx="852" ury="135"/>
+      <char name="emdash" width="1000" llx="-40" lly="178" urx="977" ury="269"/>
+      <char name="endash" width="500" llx="-40" lly="178" urx="477" ury="269"/>
+      <char name="equal" width="570" llx="33" lly="107" urx="537" ury="399"/>
+      <char name="eth" width="500" llx="-3" lly="-13" urx="454" ury="699"/>
+      <char name="exclam" width="389" llx="67" lly="-13" urx="370" ury="684"/>
+      <char name="exclamdown" width="389" llx="19" lly="-205" urx="322" ury="492"/>
+      <char name="f" width="333" llx="-169" lly="-205" urx="446" ury="698"/>
+      <char name="fi" width="556" llx="-188" lly="-205" urx="514" ury="703"/>
+      <char name="five" width="500" llx="-11" lly="-13" urx="487" ury="669"/>
+      <char name="fl" width="556" llx="-186" lly="-205" urx="553" ury="704"/>
+      <char name="florin" width="500" llx="-87" lly="-156" urx="537" ury="707"/>
+      <char name="four" width="500" llx="-15" lly="0" urx="503" ury="683"/>
+      <char name="fraction" width="167" llx="-169" lly="-14" urx="324" ury="683"/>
+      <char name="g" width="500" llx="-52" lly="-203" urx="478" ury="462"/>
+      <char name="germandbls" width="500" llx="-200" lly="-200" urx="473" ury="705"/>
+      <char name="grave" width="333" llx="85" lly="516" urx="297" ury="697"/>
+      <char name="greater" width="570" llx="31" lly="-8" urx="539" ury="514"/>
+      <char name="guillemotleft" width="500" llx="12" lly="32" urx="468" ury="415"/>
+      <char name="guillemotright" width="500" llx="12" lly="32" urx="468" ury="415"/>
+      <char name="guilsinglleft" width="333" llx="32" lly="32" urx="303" ury="415"/>
+      <char name="guilsinglright" width="333" llx="10" lly="32" urx="281" ury="415"/>
+      <char name="h" width="556" llx="-13" lly="-9" urx="498" ury="699"/>
+      <char name="hungarumlaut" width="333" llx="69" lly="516" urx="498" ury="697"/>
+      <char name="hyphen" width="333" llx="2" lly="166" urx="271" ury="282"/>
+      <char name="i" width="278" llx="2" lly="-9" urx="263" ury="684"/>
+      <char name="iacute" width="278" llx="2" lly="-9" urx="352" ury="697"/>
+      <char name="icircumflex" width="278" llx="-3" lly="-9" urx="324" ury="690"/>
+      <char name="idieresis" width="278" llx="2" lly="-9" urx="364" ury="655"/>
+      <char name="igrave" width="278" llx="2" lly="-9" urx="259" ury="697"/>
+      <char name="j" width="278" llx="-189" lly="-207" urx="279" ury="684"/>
+      <char name="k" width="500" llx="-23" lly="-8" urx="483" ury="699"/>
+      <char name="l" width="278" llx="2" lly="-9" urx="290" ury="699"/>
+      <char name="less" width="570" llx="31" lly="-8" urx="539" ury="514"/>
+      <char name="logicalnot" width="606" llx="51" lly="108" urx="555" ury="399"/>
+      <char name="lslash" width="278" llx="-7" lly="-9" urx="307" ury="699"/>
+      <char name="m" width="778" llx="-14" lly="-9" urx="722" ury="462"/>
+      <char name="macron" width="333" llx="51" lly="553" urx="393" ury="623"/>
+      <char name="minus" width="330" llx="51" lly="209" urx="555" ury="297"/>
+      <char name="mu" width="576" llx="-60" lly="-207" urx="516" ury="449"/>
+      <char name="multiply" width="570" llx="48" lly="16" urx="522" ury="490"/>
+      <char name="n" width="556" llx="-6" lly="-9" urx="493" ury="462"/>
+      <char name="nine" width="500" llx="-12" lly="-10" urx="475" ury="683"/>
+      <char name="ntilde" width="556" llx="-6" lly="-9" urx="504" ury="655"/>
+      <char name="numbersign" width="500" llx="-33" lly="0" urx="533" ury="700"/>
+      <char name="o" width="500" llx="-3" lly="-13" urx="441" ury="462"/>
+      <char name="oacute" width="500" llx="-3" lly="-13" urx="463" ury="697"/>
+      <char name="ocircumflex" width="500" llx="-3" lly="-13" urx="451" ury="690"/>
+      <char name="odieresis" width="500" llx="-3" lly="-13" urx="471" ury="655"/>
+      <char name="oe" width="722" llx="6" lly="-13" urx="674" ury="462"/>
+      <char name="ogonek" width="333" llx="15" lly="-183" urx="244" ury="34"/>
+      <char name="ograve" width="500" llx="-3" lly="-13" urx="441" ury="697"/>
+      <char name="one" width="500" llx="5" lly="0" urx="419" ury="683"/>
+      <char name="onehalf" width="750" llx="-9" lly="-14" urx="723" ury="683"/>
+      <char name="onequarter" width="750" llx="7" lly="-14" urx="721" ury="683"/>
+      <char name="onesuperior" width="300" llx="30" lly="274" urx="301" ury="683"/>
+      <char name="ordfeminine" width="266" llx="16" lly="399" urx="330" ury="685"/>
+      <char name="ordmasculine" width="300" llx="56" lly="400" urx="347" ury="685"/>
+      <char name="oslash" width="500" llx="-3" lly="-119" urx="441" ury="560"/>
+      <char name="otilde" width="500" llx="-3" lly="-13" urx="491" ury="655"/>
+      <char name="p" width="500" llx="-120" lly="-205" urx="446" ury="462"/>
+      <char name="paragraph" width="500" llx="-57" lly="-193" urx="562" ury="669"/>
+      <char name="parenleft" width="333" llx="28" lly="-179" urx="344" ury="685"/>
+      <char name="parenright" width="333" llx="-44" lly="-179" urx="271" ury="685"/>
+      <char name="percent" width="833" llx="39" lly="-10" urx="793" ury="692"/>
+      <char name="period" width="250" llx="-9" lly="-13" urx="139" ury="135"/>
+      <char name="periodcentered" width="250" llx="51" lly="257" urx="199" ury="405"/>
+      <char name="perthousand" width="1000" llx="7" lly="-29" urx="996" ury="706"/>
+      <char name="plus" width="570" llx="33" lly="0" urx="537" ury="506"/>
+      <char name="plusminus" width="570" llx="33" lly="0" urx="537" ury="506"/>
+      <char name="q" width="500" llx="1" lly="-205" urx="471" ury="462"/>
+      <char name="question" width="500" llx="79" lly="-13" urx="470" ury="684"/>
+      <char name="questiondown" width="500" llx="30" lly="-205" urx="421" ury="492"/>
+      <char name="quotedbl" width="555" llx="136" lly="398" urx="536" ury="685"/>
+      <char name="quotedblbase" width="500" llx="-57" lly="-182" urx="403" ury="134"/>
+      <char name="quotedblleft" width="500" llx="53" lly="369" urx="513" ury="685"/>
+      <char name="quotedblright" width="500" llx="53" lly="369" urx="513" ury="685"/>
+      <char name="quoteleft" width="333" llx="128" lly="369" urx="332" ury="685"/>
+      <char name="quoteright" width="333" llx="98" lly="369" urx="302" ury="685"/>
+      <char name="quotesinglbase" width="333" llx="-5" lly="-182" urx="199" ury="134"/>
+      <char name="quotesingle" width="278" llx="128" lly="398" urx="268" ury="685"/>
+      <char name="r" width="389" llx="-21" lly="0" urx="389" ury="462"/>
+      <char name="registered" width="747" llx="30" lly="-18" urx="718" ury="685"/>
+      <char name="ring" width="333" llx="127" lly="516" urx="340" ury="729"/>
+      <char name="s" width="389" llx="-19" lly="-13" urx="333" ury="462"/>
+      <char name="scaron" width="389" llx="-19" lly="-13" urx="424" ury="690"/>
+      <char name="section" width="500" llx="36" lly="-143" urx="459" ury="685"/>
+      <char name="semicolon" width="333" llx="-25" lly="-183" urx="264" ury="459"/>
+      <char name="seven" width="500" llx="52" lly="0" urx="525" ury="669"/>
+      <char name="six" width="500" llx="23" lly="-15" urx="509" ury="679"/>
+      <char name="slash" width="278" llx="-64" lly="-18" urx="342" ury="685"/>
+      <char name="space" width="250" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="250"/>
-      <char name="sterling" width="500"/>
-      <char name="t" width="278"/>
-      <char name="thorn" width="500"/>
-      <char name="three" width="500"/>
-      <char name="threequarters" width="750"/>
-      <char name="threesuperior" width="300"/>
-      <char name="tilde" width="333"/>
-      <char name="trademark" width="1000"/>
-      <char name="two" width="500"/>
-      <char name="twosuperior" width="300"/>
-      <char name="u" width="556"/>
-      <char name="uacute" width="556"/>
-      <char name="ucircumflex" width="556"/>
-      <char name="udieresis" width="556"/>
-      <char name="ugrave" width="556"/>
-      <char name="underscore" width="500"/>
-      <char name="v" width="444"/>
-      <char name="w" width="667"/>
-      <char name="x" width="500"/>
-      <char name="y" width="444"/>
-      <char name="yacute" width="444"/>
-      <char name="ydieresis" width="444"/>
-      <char name="yen" width="500"/>
-      <char name="z" width="389"/>
-      <char name="zcaron" width="389"/>
-      <char name="zero" width="500"/>
-   </widths>
+      <char name="sterling" width="500" llx="-32" lly="-12" urx="510" ury="683"/>
+      <char name="t" width="278" llx="-11" lly="-9" urx="281" ury="594"/>
+      <char name="thorn" width="500" llx="-120" lly="-205" urx="446" ury="699"/>
+      <char name="three" width="500" llx="-15" lly="-13" urx="450" ury="683"/>
+      <char name="threequarters" width="750" llx="7" lly="-14" urx="726" ury="683"/>
+      <char name="threesuperior" width="300" llx="17" lly="265" urx="321" ury="683"/>
+      <char name="tilde" width="333" llx="48" lly="536" urx="407" ury="655"/>
+      <char name="trademark" width="1000" llx="32" lly="263" urx="968" ury="669"/>
+      <char name="two" width="500" llx="-27" lly="0" urx="446" ury="683"/>
+      <char name="twosuperior" width="300" llx="2" lly="274" urx="313" ury="683"/>
+      <char name="u" width="556" llx="15" lly="-9" urx="492" ury="462"/>
+      <char name="uacute" width="556" llx="15" lly="-9" urx="492" ury="697"/>
+      <char name="ucircumflex" width="556" llx="15" lly="-9" urx="492" ury="690"/>
+      <char name="udieresis" width="556" llx="15" lly="-9" urx="499" ury="655"/>
+      <char name="ugrave" width="556" llx="15" lly="-9" urx="492" ury="697"/>
+      <char name="underscore" width="500" llx="0" lly="-125" urx="500" ury="-75"/>
+      <char name="v" width="444" llx="16" lly="-13" urx="401" ury="462"/>
+      <char name="w" width="667" llx="16" lly="-13" urx="614" ury="462"/>
+      <char name="x" width="500" llx="-46" lly="-13" urx="469" ury="462"/>
+      <char name="y" width="444" llx="-94" lly="-205" urx="392" ury="462"/>
+      <char name="yacute" width="444" llx="-94" lly="-205" urx="435" ury="697"/>
+      <char name="ydieresis" width="444" llx="-94" lly="-205" urx="443" ury="655"/>
+      <char name="yen" width="500" llx="33" lly="0" urx="628" ury="669"/>
+      <char name="z" width="389" llx="-43" lly="-78" urx="368" ury="449"/>
+      <char name="zcaron" width="389" llx="-43" lly="-78" urx="424" ury="690"/>
+      <char name="zero" width="500" llx="17" lly="-14" urx="477" ury="683"/>
+    </char-metrics>
   <kerning kpx1="79">
     <pair kern="-40" kpx2="65"/>
     <pair kern="-50" kpx2="87"/>
diff --git a/src/codegen/fonts/TimesItalic.xml b/src/codegen/fonts/TimesItalic.xml
index 514aaa6dd..607f4d701 100644
--- a/src/codegen/fonts/TimesItalic.xml
+++ b/src/codegen/fonts/TimesItalic.xml
@@ -22,245 +22,246 @@
    <family-name>Times</family-name>
    <class-name>TimesItalic</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>653</cap-height>
    <x-height>441</x-height>
    <ascender>683</ascender>
    <descender>-205</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="611"/>
-      <char name="AE" width="889"/>
-      <char name="Aacute" width="611"/>
-      <char name="Acircumflex" width="611"/>
-      <char name="Adieresis" width="611"/>
-      <char name="Agrave" width="611"/>
-      <char name="Aring" width="611"/>
-      <char name="Atilde" width="611"/>
-      <char name="B" width="611"/>
-      <char name="C" width="667"/>
-      <char name="Ccedilla" width="667"/>
-      <char name="D" width="722"/>
-      <char name="E" width="611"/>
-      <char name="Eacute" width="611"/>
-      <char name="Ecircumflex" width="611"/>
-      <char name="Edieresis" width="611"/>
-      <char name="Egrave" width="611"/>
-      <char name="Eth" width="722"/>
-      <char name="Euro" width="500"/>
-      <char name="F" width="611"/>
-      <char name="G" width="722"/>
-      <char name="H" width="722"/>
-      <char name="I" width="333"/>
-      <char name="Iacute" width="333"/>
-      <char name="Icircumflex" width="333"/>
-      <char name="Idieresis" width="333"/>
-      <char name="Igrave" width="333"/>
-      <char name="J" width="444"/>
-      <char name="K" width="667"/>
-      <char name="L" width="556"/>
-      <char name="Lslash" width="556"/>
-      <char name="M" width="833"/>
-      <char name="N" width="667"/>
-      <char name="Ntilde" width="667"/>
-      <char name="O" width="722"/>
-      <char name="OE" width="944"/>
-      <char name="Oacute" width="722"/>
-      <char name="Ocircumflex" width="722"/>
-      <char name="Odieresis" width="722"/>
-      <char name="Ograve" width="722"/>
-      <char name="Oslash" width="722"/>
-      <char name="Otilde" width="722"/>
-      <char name="P" width="611"/>
-      <char name="Q" width="722"/>
-      <char name="R" width="611"/>
-      <char name="S" width="500"/>
-      <char name="Scaron" width="500"/>
-      <char name="T" width="556"/>
-      <char name="Thorn" width="611"/>
-      <char name="U" width="722"/>
-      <char name="Uacute" width="722"/>
-      <char name="Ucircumflex" width="722"/>
-      <char name="Udieresis" width="722"/>
-      <char name="Ugrave" width="722"/>
-      <char name="V" width="611"/>
-      <char name="W" width="833"/>
-      <char name="X" width="611"/>
-      <char name="Y" width="556"/>
-      <char name="Yacute" width="556"/>
-      <char name="Ydieresis" width="556"/>
-      <char name="Z" width="556"/>
-      <char name="Zcaron" width="556"/>
-      <char name="a" width="500"/>
-      <char name="aacute" width="500"/>
-      <char name="acircumflex" width="500"/>
-      <char name="acute" width="333"/>
-      <char name="adieresis" width="500"/>
-      <char name="ae" width="667"/>
-      <char name="agrave" width="500"/>
-      <char name="ampersand" width="778"/>
-      <char name="aring" width="500"/>
-      <char name="asciicircum" width="422"/>
-      <char name="asciitilde" width="541"/>
-      <char name="asterisk" width="500"/>
-      <char name="at" width="920"/>
-      <char name="atilde" width="500"/>
-      <char name="b" width="500"/>
-      <char name="backslash" width="278"/>
-      <char name="bar" width="275"/>
-      <char name="braceleft" width="400"/>
-      <char name="braceright" width="400"/>
-      <char name="bracketleft" width="389"/>
-      <char name="bracketright" width="389"/>
-      <char name="breve" width="333"/>
-      <char name="brokenbar" width="275"/>
-      <char name="bullet" width="350"/>
-      <char name="c" width="444"/>
-      <char name="caron" width="333"/>
-      <char name="ccedilla" width="444"/>
-      <char name="cedilla" width="333"/>
-      <char name="cent" width="500"/>
-      <char name="circumflex" width="333"/>
-      <char name="colon" width="333"/>
-      <char name="comma" width="250"/>
-      <char name="copyright" width="760"/>
-      <char name="currency" width="500"/>
-      <char name="d" width="500"/>
-      <char name="dagger" width="500"/>
-      <char name="daggerdbl" width="500"/>
-      <char name="degree" width="400"/>
-      <char name="dieresis" width="333"/>
-      <char name="divide" width="675"/>
-      <char name="dollar" width="500"/>
-      <char name="dotaccent" width="333"/>
-      <char name="dotlessi" width="278"/>
-      <char name="e" width="444"/>
-      <char name="eacute" width="444"/>
-      <char name="ecircumflex" width="444"/>
-      <char name="edieresis" width="444"/>
-      <char name="egrave" width="444"/>
-      <char name="eight" width="500"/>
-      <char name="ellipsis" width="889"/>
-      <char name="emdash" width="889"/>
-      <char name="endash" width="500"/>
-      <char name="equal" width="675"/>
-      <char name="eth" width="500"/>
-      <char name="exclam" width="333"/>
-      <char name="exclamdown" width="389"/>
-      <char name="f" width="278"/>
-      <char name="fi" width="500"/>
-      <char name="five" width="500"/>
-      <char name="fl" width="500"/>
-      <char name="florin" width="500"/>
-      <char name="four" width="500"/>
-      <char name="fraction" width="167"/>
-      <char name="g" width="500"/>
-      <char name="germandbls" width="500"/>
-      <char name="grave" width="333"/>
-      <char name="greater" width="675"/>
-      <char name="guillemotleft" width="500"/>
-      <char name="guillemotright" width="500"/>
-      <char name="guilsinglleft" width="333"/>
-      <char name="guilsinglright" width="333"/>
-      <char name="h" width="500"/>
-      <char name="hungarumlaut" width="333"/>
-      <char name="hyphen" width="333"/>
-      <char name="i" width="278"/>
-      <char name="iacute" width="278"/>
-      <char name="icircumflex" width="278"/>
-      <char name="idieresis" width="278"/>
-      <char name="igrave" width="278"/>
-      <char name="j" width="278"/>
-      <char name="k" width="444"/>
-      <char name="l" width="278"/>
-      <char name="less" width="675"/>
-      <char name="logicalnot" width="675"/>
-      <char name="lslash" width="278"/>
-      <char name="m" width="722"/>
-      <char name="macron" width="333"/>
-      <char name="minus" width="675"/>
-      <char name="mu" width="500"/>
-      <char name="multiply" width="675"/>
-      <char name="n" width="500"/>
-      <char name="nine" width="500"/>
-      <char name="ntilde" width="500"/>
-      <char name="numbersign" width="500"/>
-      <char name="o" width="500"/>
-      <char name="oacute" width="500"/>
-      <char name="ocircumflex" width="500"/>
-      <char name="odieresis" width="500"/>
-      <char name="oe" width="667"/>
-      <char name="ogonek" width="333"/>
-      <char name="ograve" width="500"/>
-      <char name="one" width="500"/>
-      <char name="onehalf" width="750"/>
-      <char name="onequarter" width="750"/>
-      <char name="onesuperior" width="300"/>
-      <char name="ordfeminine" width="276"/>
-      <char name="ordmasculine" width="310"/>
-      <char name="oslash" width="500"/>
-      <char name="otilde" width="500"/>
-      <char name="p" width="500"/>
-      <char name="paragraph" width="523"/>
-      <char name="parenleft" width="333"/>
-      <char name="parenright" width="333"/>
-      <char name="percent" width="833"/>
-      <char name="period" width="250"/>
-      <char name="periodcentered" width="250"/>
-      <char name="perthousand" width="1000"/>
-      <char name="plus" width="675"/>
-      <char name="plusminus" width="675"/>
-      <char name="q" width="500"/>
-      <char name="question" width="500"/>
-      <char name="questiondown" width="500"/>
-      <char name="quotedbl" width="420"/>
-      <char name="quotedblbase" width="556"/>
-      <char name="quotedblleft" width="556"/>
-      <char name="quotedblright" width="556"/>
-      <char name="quoteleft" width="333"/>
-      <char name="quoteright" width="333"/>
-      <char name="quotesinglbase" width="333"/>
-      <char name="quotesingle" width="214"/>
-      <char name="r" width="389"/>
-      <char name="registered" width="760"/>
-      <char name="ring" width="333"/>
-      <char name="s" width="389"/>
-      <char name="scaron" width="389"/>
-      <char name="section" width="500"/>
-      <char name="semicolon" width="333"/>
-      <char name="seven" width="500"/>
-      <char name="six" width="500"/>
-      <char name="slash" width="278"/>
-      <char name="space" width="250"/>
+    <char-metrics>
+      <char name="A" width="611" llx="-51" lly="0" urx="564" ury="668"/>
+      <char name="AE" width="889" llx="-27" lly="0" urx="911" ury="653"/>
+      <char name="Aacute" width="611" llx="-51" lly="0" urx="564" ury="876"/>
+      <char name="Acircumflex" width="611" llx="-51" lly="0" urx="564" ury="873"/>
+      <char name="Adieresis" width="611" llx="-51" lly="0" urx="564" ury="818"/>
+      <char name="Agrave" width="611" llx="-51" lly="0" urx="564" ury="876"/>
+      <char name="Aring" width="611" llx="-51" lly="0" urx="564" ury="883"/>
+      <char name="Atilde" width="611" llx="-51" lly="0" urx="566" ury="836"/>
+      <char name="B" width="611" llx="-8" lly="0" urx="588" ury="653"/>
+      <char name="C" width="667" llx="66" lly="-18" urx="689" ury="666"/>
+      <char name="Ccedilla" width="667" llx="66" lly="-217" urx="689" ury="666"/>
+      <char name="D" width="722" llx="-8" lly="0" urx="700" ury="653"/>
+      <char name="E" width="611" llx="-1" lly="0" urx="634" ury="653"/>
+      <char name="Eacute" width="611" llx="-1" lly="0" urx="634" ury="876"/>
+      <char name="Ecircumflex" width="611" llx="-1" lly="0" urx="634" ury="873"/>
+      <char name="Edieresis" width="611" llx="-1" lly="0" urx="634" ury="818"/>
+      <char name="Egrave" width="611" llx="-1" lly="0" urx="634" ury="876"/>
+      <char name="Eth" width="722" llx="-8" lly="0" urx="700" ury="653"/>
+      <char name="Euro" width="500" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="611" llx="8" lly="0" urx="645" ury="653"/>
+      <char name="G" width="722" llx="52" lly="-18" urx="722" ury="666"/>
+      <char name="H" width="722" llx="-8" lly="0" urx="767" ury="653"/>
+      <char name="I" width="333" llx="-8" lly="0" urx="384" ury="653"/>
+      <char name="Iacute" width="333" llx="-8" lly="0" urx="433" ury="876"/>
+      <char name="Icircumflex" width="333" llx="-8" lly="0" urx="425" ury="873"/>
+      <char name="Idieresis" width="333" llx="-8" lly="0" urx="435" ury="818"/>
+      <char name="Igrave" width="333" llx="-8" lly="0" urx="384" ury="876"/>
+      <char name="J" width="444" llx="-6" lly="-18" urx="491" ury="653"/>
+      <char name="K" width="667" llx="7" lly="0" urx="722" ury="653"/>
+      <char name="L" width="556" llx="-8" lly="0" urx="559" ury="653"/>
+      <char name="Lslash" width="556" llx="-8" lly="0" urx="559" ury="653"/>
+      <char name="M" width="833" llx="-18" lly="0" urx="873" ury="653"/>
+      <char name="N" width="667" llx="-20" lly="-15" urx="727" ury="653"/>
+      <char name="Ntilde" width="667" llx="-20" lly="-15" urx="727" ury="836"/>
+      <char name="O" width="722" llx="60" lly="-18" urx="699" ury="666"/>
+      <char name="OE" width="944" llx="49" lly="-8" urx="964" ury="666"/>
+      <char name="Oacute" width="722" llx="60" lly="-18" urx="699" ury="876"/>
+      <char name="Ocircumflex" width="722" llx="60" lly="-18" urx="699" ury="873"/>
+      <char name="Odieresis" width="722" llx="60" lly="-18" urx="699" ury="818"/>
+      <char name="Ograve" width="722" llx="60" lly="-18" urx="699" ury="876"/>
+      <char name="Oslash" width="722" llx="60" lly="-105" urx="699" ury="722"/>
+      <char name="Otilde" width="722" llx="60" lly="-18" urx="699" ury="836"/>
+      <char name="P" width="611" llx="0" lly="0" urx="605" ury="653"/>
+      <char name="Q" width="722" llx="59" lly="-182" urx="699" ury="666"/>
+      <char name="R" width="611" llx="-13" lly="0" urx="588" ury="653"/>
+      <char name="S" width="500" llx="17" lly="-18" urx="508" ury="667"/>
+      <char name="Scaron" width="500" llx="17" lly="-18" urx="520" ury="873"/>
+      <char name="T" width="556" llx="59" lly="0" urx="633" ury="653"/>
+      <char name="Thorn" width="611" llx="0" lly="0" urx="569" ury="653"/>
+      <char name="U" width="722" llx="102" lly="-18" urx="765" ury="653"/>
+      <char name="Uacute" width="722" llx="102" lly="-18" urx="765" ury="876"/>
+      <char name="Ucircumflex" width="722" llx="102" lly="-18" urx="765" ury="873"/>
+      <char name="Udieresis" width="722" llx="102" lly="-18" urx="765" ury="818"/>
+      <char name="Ugrave" width="722" llx="102" lly="-18" urx="765" ury="876"/>
+      <char name="V" width="611" llx="76" lly="-18" urx="688" ury="653"/>
+      <char name="W" width="833" llx="71" lly="-18" urx="906" ury="653"/>
+      <char name="X" width="611" llx="-29" lly="0" urx="655" ury="653"/>
+      <char name="Y" width="556" llx="78" lly="0" urx="633" ury="653"/>
+      <char name="Yacute" width="556" llx="78" lly="0" urx="633" ury="876"/>
+      <char name="Ydieresis" width="556" llx="78" lly="0" urx="633" ury="818"/>
+      <char name="Z" width="556" llx="-6" lly="0" urx="606" ury="653"/>
+      <char name="Zcaron" width="556" llx="-6" lly="0" urx="606" ury="873"/>
+      <char name="a" width="500" llx="17" lly="-11" urx="476" ury="441"/>
+      <char name="aacute" width="500" llx="17" lly="-11" urx="487" ury="664"/>
+      <char name="acircumflex" width="500" llx="17" lly="-11" urx="476" ury="661"/>
+      <char name="acute" width="333" llx="180" lly="494" urx="403" ury="664"/>
+      <char name="adieresis" width="500" llx="17" lly="-11" urx="489" ury="606"/>
+      <char name="ae" width="667" llx="23" lly="-11" urx="640" ury="441"/>
+      <char name="agrave" width="500" llx="17" lly="-11" urx="476" ury="664"/>
+      <char name="ampersand" width="778" llx="76" lly="-18" urx="723" ury="666"/>
+      <char name="aring" width="500" llx="17" lly="-11" urx="476" ury="691"/>
+      <char name="asciicircum" width="422" llx="0" lly="301" urx="422" ury="666"/>
+      <char name="asciitilde" width="541" llx="40" lly="183" urx="502" ury="323"/>
+      <char name="asterisk" width="500" llx="128" lly="255" urx="492" ury="666"/>
+      <char name="at" width="920" llx="118" lly="-18" urx="806" ury="666"/>
+      <char name="atilde" width="500" llx="17" lly="-11" urx="511" ury="624"/>
+      <char name="b" width="500" llx="23" lly="-11" urx="473" ury="683"/>
+      <char name="backslash" width="278" llx="-41" lly="-18" urx="319" ury="666"/>
+      <char name="bar" width="275" llx="105" lly="-217" urx="171" ury="783"/>
+      <char name="braceleft" width="400" llx="51" lly="-177" urx="407" ury="687"/>
+      <char name="braceright" width="400" llx="-7" lly="-177" urx="349" ury="687"/>
+      <char name="bracketleft" width="389" llx="21" lly="-153" urx="391" ury="663"/>
+      <char name="bracketright" width="389" llx="12" lly="-153" urx="382" ury="663"/>
+      <char name="breve" width="333" llx="117" lly="492" urx="418" ury="650"/>
+      <char name="brokenbar" width="275" llx="105" lly="-142" urx="171" ury="708"/>
+      <char name="bullet" width="350" llx="40" lly="191" urx="310" ury="461"/>
+      <char name="c" width="444" llx="30" lly="-11" urx="425" ury="441"/>
+      <char name="caron" width="333" llx="121" lly="492" urx="426" ury="661"/>
+      <char name="ccedilla" width="444" llx="30" lly="-217" urx="425" ury="441"/>
+      <char name="cedilla" width="333" llx="-30" lly="-217" urx="182" ury="0"/>
+      <char name="cent" width="500" llx="77" lly="-143" urx="472" ury="560"/>
+      <char name="circumflex" width="333" llx="91" lly="492" urx="385" ury="661"/>
+      <char name="colon" width="333" llx="50" lly="-11" urx="261" ury="441"/>
+      <char name="comma" width="250" llx="-4" lly="-129" urx="135" ury="101"/>
+      <char name="copyright" width="760" llx="41" lly="-18" urx="719" ury="666"/>
+      <char name="currency" width="500" llx="-22" lly="53" urx="522" ury="597"/>
+      <char name="d" width="500" llx="15" lly="-13" urx="527" ury="683"/>
+      <char name="dagger" width="500" llx="101" lly="-159" urx="488" ury="666"/>
+      <char name="daggerdbl" width="500" llx="22" lly="-143" urx="491" ury="666"/>
+      <char name="degree" width="400" llx="101" lly="390" urx="387" ury="676"/>
+      <char name="dieresis" width="333" llx="107" lly="548" urx="405" ury="646"/>
+      <char name="divide" width="675" llx="86" lly="-11" urx="590" ury="517"/>
+      <char name="dollar" width="500" llx="31" lly="-89" urx="497" ury="731"/>
+      <char name="dotaccent" width="333" llx="207" lly="548" urx="305" ury="646"/>
+      <char name="dotlessi" width="278" llx="49" lly="-11" urx="235" ury="441"/>
+      <char name="e" width="444" llx="31" lly="-11" urx="412" ury="441"/>
+      <char name="eacute" width="444" llx="31" lly="-11" urx="459" ury="664"/>
+      <char name="ecircumflex" width="444" llx="31" lly="-11" urx="441" ury="661"/>
+      <char name="edieresis" width="444" llx="31" lly="-11" urx="451" ury="606"/>
+      <char name="egrave" width="444" llx="31" lly="-11" urx="412" ury="664"/>
+      <char name="eight" width="500" llx="30" lly="-7" urx="493" ury="676"/>
+      <char name="ellipsis" width="889" llx="57" lly="-11" urx="762" ury="100"/>
+      <char name="emdash" width="889" llx="-6" lly="197" urx="894" ury="243"/>
+      <char name="endash" width="500" llx="-6" lly="197" urx="505" ury="243"/>
+      <char name="equal" width="675" llx="86" lly="120" urx="590" ury="386"/>
+      <char name="eth" width="500" llx="27" lly="-11" urx="482" ury="683"/>
+      <char name="exclam" width="333" llx="39" lly="-11" urx="302" ury="667"/>
+      <char name="exclamdown" width="389" llx="59" lly="-205" urx="322" ury="473"/>
+      <char name="f" width="278" llx="-147" lly="-207" urx="424" ury="678"/>
+      <char name="fi" width="500" llx="-141" lly="-207" urx="481" ury="681"/>
+      <char name="five" width="500" llx="15" lly="-7" urx="491" ury="666"/>
+      <char name="fl" width="500" llx="-141" lly="-204" urx="518" ury="682"/>
+      <char name="florin" width="500" llx="25" lly="-182" urx="507" ury="682"/>
+      <char name="four" width="500" llx="1" lly="0" urx="479" ury="676"/>
+      <char name="fraction" width="167" llx="-169" lly="-10" urx="337" ury="676"/>
+      <char name="g" width="500" llx="8" lly="-206" urx="472" ury="441"/>
+      <char name="germandbls" width="500" llx="-168" lly="-207" urx="493" ury="679"/>
+      <char name="grave" width="333" llx="121" lly="492" urx="311" ury="664"/>
+      <char name="greater" width="675" llx="84" lly="-8" urx="592" ury="514"/>
+      <char name="guillemotleft" width="500" llx="53" lly="37" urx="445" ury="403"/>
+      <char name="guillemotright" width="500" llx="55" lly="37" urx="447" ury="403"/>
+      <char name="guilsinglleft" width="333" llx="51" lly="37" urx="281" ury="403"/>
+      <char name="guilsinglright" width="333" llx="52" lly="37" urx="282" ury="403"/>
+      <char name="h" width="500" llx="19" lly="-9" urx="478" ury="683"/>
+      <char name="hungarumlaut" width="333" llx="93" lly="494" urx="486" ury="664"/>
+      <char name="hyphen" width="333" llx="49" lly="192" urx="282" ury="255"/>
+      <char name="i" width="278" llx="49" lly="-11" urx="264" ury="654"/>
+      <char name="iacute" width="278" llx="49" lly="-11" urx="355" ury="664"/>
+      <char name="icircumflex" width="278" llx="33" lly="-11" urx="327" ury="661"/>
+      <char name="idieresis" width="278" llx="49" lly="-11" urx="352" ury="606"/>
+      <char name="igrave" width="278" llx="49" lly="-11" urx="284" ury="664"/>
+      <char name="j" width="278" llx="-124" lly="-207" urx="276" ury="654"/>
+      <char name="k" width="444" llx="14" lly="-11" urx="461" ury="683"/>
+      <char name="l" width="278" llx="41" lly="-11" urx="279" ury="683"/>
+      <char name="less" width="675" llx="84" lly="-8" urx="592" ury="514"/>
+      <char name="logicalnot" width="675" llx="86" lly="108" urx="590" ury="386"/>
+      <char name="lslash" width="278" llx="41" lly="-11" urx="312" ury="683"/>
+      <char name="m" width="722" llx="12" lly="-9" urx="704" ury="441"/>
+      <char name="macron" width="333" llx="99" lly="532" urx="411" ury="583"/>
+      <char name="minus" width="675" llx="86" lly="220" urx="590" ury="286"/>
+      <char name="mu" width="500" llx="-30" lly="-209" urx="497" ury="428"/>
+      <char name="multiply" width="675" llx="93" lly="8" urx="582" ury="497"/>
+      <char name="n" width="500" llx="14" lly="-9" urx="474" ury="441"/>
+      <char name="nine" width="500" llx="23" lly="-17" urx="492" ury="676"/>
+      <char name="ntilde" width="500" llx="14" lly="-9" urx="476" ury="624"/>
+      <char name="numbersign" width="500" llx="2" lly="0" urx="540" ury="676"/>
+      <char name="o" width="500" llx="27" lly="-11" urx="468" ury="441"/>
+      <char name="oacute" width="500" llx="27" lly="-11" urx="487" ury="664"/>
+      <char name="ocircumflex" width="500" llx="27" lly="-11" urx="468" ury="661"/>
+      <char name="odieresis" width="500" llx="27" lly="-11" urx="489" ury="606"/>
+      <char name="oe" width="667" llx="20" lly="-12" urx="646" ury="441"/>
+      <char name="ogonek" width="333" llx="20" lly="-169" urx="203" ury="40"/>
+      <char name="ograve" width="500" llx="27" lly="-11" urx="468" ury="664"/>
+      <char name="one" width="500" llx="49" lly="0" urx="409" ury="676"/>
+      <char name="onehalf" width="750" llx="34" lly="-10" urx="749" ury="676"/>
+      <char name="onequarter" width="750" llx="33" lly="-10" urx="736" ury="676"/>
+      <char name="onesuperior" width="300" llx="43" lly="271" urx="284" ury="676"/>
+      <char name="ordfeminine" width="276" llx="42" lly="406" urx="352" ury="676"/>
+      <char name="ordmasculine" width="310" llx="67" lly="406" urx="362" ury="676"/>
+      <char name="oslash" width="500" llx="28" lly="-135" urx="469" ury="554"/>
+      <char name="otilde" width="500" llx="27" lly="-11" urx="496" ury="624"/>
+      <char name="p" width="500" llx="-75" lly="-205" urx="469" ury="441"/>
+      <char name="paragraph" width="523" llx="55" lly="-123" urx="616" ury="653"/>
+      <char name="parenleft" width="333" llx="42" lly="-181" urx="315" ury="669"/>
+      <char name="parenright" width="333" llx="16" lly="-180" urx="289" ury="669"/>
+      <char name="percent" width="833" llx="79" lly="-13" urx="790" ury="676"/>
+      <char name="period" width="250" llx="27" lly="-11" urx="138" ury="100"/>
+      <char name="periodcentered" width="250" llx="70" lly="199" urx="181" ury="310"/>
+      <char name="perthousand" width="1000" llx="25" lly="-19" urx="1010" ury="706"/>
+      <char name="plus" width="675" llx="86" lly="0" urx="590" ury="506"/>
+      <char name="plusminus" width="675" llx="86" lly="0" urx="590" ury="506"/>
+      <char name="q" width="500" llx="25" lly="-209" urx="483" ury="441"/>
+      <char name="question" width="500" llx="132" lly="-12" urx="472" ury="664"/>
+      <char name="questiondown" width="500" llx="28" lly="-205" urx="368" ury="471"/>
+      <char name="quotedbl" width="420" llx="144" lly="421" urx="432" ury="666"/>
+      <char name="quotedblbase" width="556" llx="57" lly="-129" urx="405" ury="101"/>
+      <char name="quotedblleft" width="556" llx="166" lly="436" urx="514" ury="666"/>
+      <char name="quotedblright" width="556" llx="151" lly="436" urx="499" ury="666"/>
+      <char name="quoteleft" width="333" llx="171" lly="436" urx="310" ury="666"/>
+      <char name="quoteright" width="333" llx="151" lly="436" urx="290" ury="666"/>
+      <char name="quotesinglbase" width="333" llx="44" lly="-129" urx="183" ury="101"/>
+      <char name="quotesingle" width="214" llx="132" lly="421" urx="241" ury="666"/>
+      <char name="r" width="389" llx="45" lly="0" urx="412" ury="441"/>
+      <char name="registered" width="760" llx="41" lly="-18" urx="719" ury="666"/>
+      <char name="ring" width="333" llx="155" lly="492" urx="355" ury="691"/>
+      <char name="s" width="389" llx="16" lly="-13" urx="366" ury="442"/>
+      <char name="scaron" width="389" llx="16" lly="-13" urx="454" ury="661"/>
+      <char name="section" width="500" llx="53" lly="-162" urx="461" ury="666"/>
+      <char name="semicolon" width="333" llx="27" lly="-129" urx="261" ury="441"/>
+      <char name="seven" width="500" llx="75" lly="-8" urx="537" ury="666"/>
+      <char name="six" width="500" llx="30" lly="-7" urx="521" ury="686"/>
+      <char name="slash" width="278" llx="-65" lly="-18" urx="386" ury="666"/>
+      <char name="space" width="250" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="250"/>
-      <char name="sterling" width="500"/>
-      <char name="t" width="278"/>
-      <char name="thorn" width="500"/>
-      <char name="three" width="500"/>
-      <char name="threequarters" width="750"/>
-      <char name="threesuperior" width="300"/>
-      <char name="tilde" width="333"/>
-      <char name="trademark" width="980"/>
-      <char name="two" width="500"/>
-      <char name="twosuperior" width="300"/>
-      <char name="u" width="500"/>
-      <char name="uacute" width="500"/>
-      <char name="ucircumflex" width="500"/>
-      <char name="udieresis" width="500"/>
-      <char name="ugrave" width="500"/>
-      <char name="underscore" width="500"/>
-      <char name="v" width="444"/>
-      <char name="w" width="667"/>
-      <char name="x" width="444"/>
-      <char name="y" width="444"/>
-      <char name="yacute" width="444"/>
-      <char name="ydieresis" width="444"/>
-      <char name="yen" width="500"/>
-      <char name="z" width="389"/>
-      <char name="zcaron" width="389"/>
-      <char name="zero" width="500"/>
-   </widths>
+      <char name="sterling" width="500" llx="10" lly="-6" urx="517" ury="670"/>
+      <char name="t" width="278" llx="37" lly="-11" urx="296" ury="546"/>
+      <char name="thorn" width="500" llx="-75" lly="-205" urx="469" ury="683"/>
+      <char name="three" width="500" llx="15" lly="-7" urx="465" ury="676"/>
+      <char name="threequarters" width="750" llx="23" lly="-10" urx="736" ury="676"/>
+      <char name="threesuperior" width="300" llx="43" lly="268" urx="339" ury="676"/>
+      <char name="tilde" width="333" llx="100" lly="517" urx="427" ury="624"/>
+      <char name="trademark" width="980" llx="30" lly="247" urx="957" ury="653"/>
+      <char name="two" width="500" llx="12" lly="0" urx="452" ury="676"/>
+      <char name="twosuperior" width="300" llx="33" lly="271" urx="324" ury="676"/>
+      <char name="u" width="500" llx="42" lly="-11" urx="475" ury="441"/>
+      <char name="uacute" width="500" llx="42" lly="-11" urx="477" ury="664"/>
+      <char name="ucircumflex" width="500" llx="42" lly="-11" urx="475" ury="661"/>
+      <char name="udieresis" width="500" llx="42" lly="-11" urx="479" ury="606"/>
+      <char name="ugrave" width="500" llx="42" lly="-11" urx="475" ury="664"/>
+      <char name="underscore" width="500" llx="0" lly="-125" urx="500" ury="-75"/>
+      <char name="v" width="444" llx="21" lly="-18" urx="426" ury="441"/>
+      <char name="w" width="667" llx="16" lly="-18" urx="648" ury="441"/>
+      <char name="x" width="444" llx="-27" lly="-11" urx="447" ury="441"/>
+      <char name="y" width="444" llx="-24" lly="-206" urx="426" ury="441"/>
+      <char name="yacute" width="444" llx="-24" lly="-206" urx="459" ury="664"/>
+      <char name="ydieresis" width="444" llx="-24" lly="-206" urx="441" ury="606"/>
+      <char name="yen" width="500" llx="27" lly="0" urx="603" ury="653"/>
+      <char name="z" width="389" llx="-2" lly="-81" urx="380" ury="428"/>
+      <char name="zcaron" width="389" llx="-2" lly="-81" urx="434" ury="661"/>
+      <char name="zero" width="500" llx="32" lly="-7" urx="497" ury="676"/>
+    </char-metrics>
   <kerning kpx1="79">
     <pair kern="-55" kpx2="65"/>
     <pair kern="-50" kpx2="87"/>
@@ -641,4 +642,4 @@
     <pair kern="0" kpx2="121"/>
     <pair kern="-40" kpx2="118"/>
   </kerning>
-</font-metrics>
-\ No newline at end of file
+</font-metrics>
diff --git a/src/codegen/fonts/TimesRoman.xml b/src/codegen/fonts/TimesRoman.xml
index 9ddadfddd..9e16b6a3b 100644
--- a/src/codegen/fonts/TimesRoman.xml
+++ b/src/codegen/fonts/TimesRoman.xml
@@ -22,245 +22,246 @@
    <family-name>Times</family-name>
    <class-name>TimesRoman</class-name>
    <encoding>StandardEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
    <cap-height>662</cap-height>
    <x-height>450</x-height>
    <ascender>683</ascender>
    <descender>-217</descender>
    <first-char>32</first-char>
    <last-char>255</last-char>
-   <widths>
-      <char name="A" width="722"/>
-      <char name="AE" width="889"/>
-      <char name="Aacute" width="722"/>
-      <char name="Acircumflex" width="722"/>
-      <char name="Adieresis" width="722"/>
-      <char name="Agrave" width="722"/>
-      <char name="Aring" width="722"/>
-      <char name="Atilde" width="722"/>
-      <char name="B" width="667"/>
-      <char name="C" width="667"/>
-      <char name="Ccedilla" width="667"/>
-      <char name="D" width="722"/>
-      <char name="E" width="611"/>
-      <char name="Eacute" width="611"/>
-      <char name="Ecircumflex" width="611"/>
-      <char name="Edieresis" width="611"/>
-      <char name="Egrave" width="611"/>
-      <char name="Eth" width="722"/>
-      <char name="Euro" width="500"/>
-      <char name="F" width="556"/>
-      <char name="G" width="722"/>
-      <char name="H" width="722"/>
-      <char name="I" width="333"/>
-      <char name="Iacute" width="333"/>
-      <char name="Icircumflex" width="333"/>
-      <char name="Idieresis" width="333"/>
-      <char name="Igrave" width="333"/>
-      <char name="J" width="389"/>
-      <char name="K" width="722"/>
-      <char name="L" width="611"/>
-      <char name="Lslash" width="611"/>
-      <char name="M" width="889"/>
-      <char name="N" width="722"/>
-      <char name="Ntilde" width="722"/>
-      <char name="O" width="722"/>
-      <char name="OE" width="889"/>
-      <char name="Oacute" width="722"/>
-      <char name="Ocircumflex" width="722"/>
-      <char name="Odieresis" width="722"/>
-      <char name="Ograve" width="722"/>
-      <char name="Oslash" width="722"/>
-      <char name="Otilde" width="722"/>
-      <char name="P" width="556"/>
-      <char name="Q" width="722"/>
-      <char name="R" width="667"/>
-      <char name="S" width="556"/>
-      <char name="Scaron" width="556"/>
-      <char name="T" width="611"/>
-      <char name="Thorn" width="556"/>
-      <char name="U" width="722"/>
-      <char name="Uacute" width="722"/>
-      <char name="Ucircumflex" width="722"/>
-      <char name="Udieresis" width="722"/>
-      <char name="Ugrave" width="722"/>
-      <char name="V" width="722"/>
-      <char name="W" width="944"/>
-      <char name="X" width="722"/>
-      <char name="Y" width="722"/>
-      <char name="Yacute" width="722"/>
-      <char name="Ydieresis" width="722"/>
-      <char name="Z" width="611"/>
-      <char name="Zcaron" width="611"/>
-      <char name="a" width="444"/>
-      <char name="aacute" width="444"/>
-      <char name="acircumflex" width="444"/>
-      <char name="acute" width="333"/>
-      <char name="adieresis" width="444"/>
-      <char name="ae" width="667"/>
-      <char name="agrave" width="444"/>
-      <char name="ampersand" width="778"/>
-      <char name="aring" width="444"/>
-      <char name="asciicircum" width="469"/>
-      <char name="asciitilde" width="541"/>
-      <char name="asterisk" width="500"/>
-      <char name="at" width="921"/>
-      <char name="atilde" width="444"/>
-      <char name="b" width="500"/>
-      <char name="backslash" width="278"/>
-      <char name="bar" width="200"/>
-      <char name="braceleft" width="480"/>
-      <char name="braceright" width="480"/>
-      <char name="bracketleft" width="333"/>
-      <char name="bracketright" width="333"/>
-      <char name="breve" width="333"/>
-      <char name="brokenbar" width="200"/>
-      <char name="bullet" width="350"/>
-      <char name="c" width="444"/>
-      <char name="caron" width="333"/>
-      <char name="ccedilla" width="444"/>
-      <char name="cedilla" width="333"/>
-      <char name="cent" width="500"/>
-      <char name="circumflex" width="333"/>
-      <char name="colon" width="278"/>
-      <char name="comma" width="250"/>
-      <char name="copyright" width="760"/>
-      <char name="currency" width="500"/>
-      <char name="d" width="500"/>
-      <char name="dagger" width="500"/>
-      <char name="daggerdbl" width="500"/>
-      <char name="degree" width="400"/>
-      <char name="dieresis" width="333"/>
-      <char name="divide" width="564"/>
-      <char name="dollar" width="500"/>
-      <char name="dotaccent" width="333"/>
-      <char name="dotlessi" width="278"/>
-      <char name="e" width="444"/>
-      <char name="eacute" width="444"/>
-      <char name="ecircumflex" width="444"/>
-      <char name="edieresis" width="444"/>
-      <char name="egrave" width="444"/>
-      <char name="eight" width="500"/>
-      <char name="ellipsis" width="1000"/>
-      <char name="emdash" width="1000"/>
-      <char name="endash" width="500"/>
-      <char name="equal" width="564"/>
-      <char name="eth" width="500"/>
-      <char name="exclam" width="333"/>
-      <char name="exclamdown" width="333"/>
-      <char name="f" width="333"/>
-      <char name="fi" width="556"/>
-      <char name="five" width="500"/>
-      <char name="fl" width="556"/>
-      <char name="florin" width="500"/>
-      <char name="four" width="500"/>
-      <char name="fraction" width="167"/>
-      <char name="g" width="500"/>
-      <char name="germandbls" width="500"/>
-      <char name="grave" width="333"/>
-      <char name="greater" width="564"/>
-      <char name="guillemotleft" width="500"/>
-      <char name="guillemotright" width="500"/>
-      <char name="guilsinglleft" width="333"/>
-      <char name="guilsinglright" width="333"/>
-      <char name="h" width="500"/>
-      <char name="hungarumlaut" width="333"/>
-      <char name="hyphen" width="333"/>
-      <char name="i" width="278"/>
-      <char name="iacute" width="278"/>
-      <char name="icircumflex" width="278"/>
-      <char name="idieresis" width="278"/>
-      <char name="igrave" width="278"/>
-      <char name="j" width="278"/>
-      <char name="k" width="500"/>
-      <char name="l" width="278"/>
-      <char name="less" width="564"/>
-      <char name="logicalnot" width="564"/>
-      <char name="lslash" width="278"/>
-      <char name="m" width="778"/>
-      <char name="macron" width="333"/>
-      <char name="minus" width="324"/>
-      <char name="mu" width="500"/>
-      <char name="multiply" width="564"/>
-      <char name="n" width="500"/>
-      <char name="nine" width="500"/>
-      <char name="ntilde" width="500"/>
-      <char name="numbersign" width="500"/>
-      <char name="o" width="500"/>
-      <char name="oacute" width="500"/>
-      <char name="ocircumflex" width="500"/>
-      <char name="odieresis" width="500"/>
-      <char name="oe" width="722"/>
-      <char name="ogonek" width="333"/>
-      <char name="ograve" width="500"/>
-      <char name="one" width="500"/>
-      <char name="onehalf" width="750"/>
-      <char name="onequarter" width="750"/>
-      <char name="onesuperior" width="300"/>
-      <char name="ordfeminine" width="276"/>
-      <char name="ordmasculine" width="310"/>
-      <char name="oslash" width="500"/>
-      <char name="otilde" width="500"/>
-      <char name="p" width="500"/>
-      <char name="paragraph" width="453"/>
-      <char name="parenleft" width="333"/>
-      <char name="parenright" width="333"/>
-      <char name="percent" width="833"/>
-      <char name="period" width="250"/>
-      <char name="periodcentered" width="250"/>
-      <char name="perthousand" width="1000"/>
-      <char name="plus" width="564"/>
-      <char name="plusminus" width="564"/>
-      <char name="q" width="500"/>
-      <char name="question" width="444"/>
-      <char name="questiondown" width="444"/>
-      <char name="quotedbl" width="408"/>
-      <char name="quotedblbase" width="444"/>
-      <char name="quotedblleft" width="444"/>
-      <char name="quotedblright" width="444"/>
-      <char name="quoteleft" width="333"/>
-      <char name="quoteright" width="333"/>
-      <char name="quotesinglbase" width="333"/>
-      <char name="quotesingle" width="180"/>
-      <char name="r" width="333"/>
-      <char name="registered" width="760"/>
-      <char name="ring" width="333"/>
-      <char name="s" width="389"/>
-      <char name="scaron" width="389"/>
-      <char name="section" width="500"/>
-      <char name="semicolon" width="278"/>
-      <char name="seven" width="500"/>
-      <char name="six" width="500"/>
-      <char name="slash" width="278"/>
-      <char name="space" width="250"/>
+    <char-metrics>
+      <char name="A" width="722" llx="15" lly="0" urx="706" ury="674"/>
+      <char name="AE" width="889" llx="0" lly="0" urx="863" ury="662"/>
+      <char name="Aacute" width="722" llx="15" lly="0" urx="706" ury="890"/>
+      <char name="Acircumflex" width="722" llx="15" lly="0" urx="706" ury="886"/>
+      <char name="Adieresis" width="722" llx="15" lly="0" urx="706" ury="835"/>
+      <char name="Agrave" width="722" llx="15" lly="0" urx="706" ury="890"/>
+      <char name="Aring" width="722" llx="15" lly="0" urx="706" ury="898"/>
+      <char name="Atilde" width="722" llx="15" lly="0" urx="706" ury="850"/>
+      <char name="B" width="667" llx="17" lly="0" urx="593" ury="662"/>
+      <char name="C" width="667" llx="28" lly="-14" urx="633" ury="676"/>
+      <char name="Ccedilla" width="667" llx="28" lly="-215" urx="633" ury="676"/>
+      <char name="D" width="722" llx="16" lly="0" urx="685" ury="662"/>
+      <char name="E" width="611" llx="12" lly="0" urx="597" ury="662"/>
+      <char name="Eacute" width="611" llx="12" lly="0" urx="597" ury="890"/>
+      <char name="Ecircumflex" width="611" llx="12" lly="0" urx="597" ury="886"/>
+      <char name="Edieresis" width="611" llx="12" lly="0" urx="597" ury="835"/>
+      <char name="Egrave" width="611" llx="12" lly="0" urx="597" ury="890"/>
+      <char name="Eth" width="722" llx="16" lly="0" urx="685" ury="662"/>
+      <char name="Euro" width="500" llx="0" lly="0" urx="0" ury="0"/>
+      <char name="F" width="556" llx="12" lly="0" urx="546" ury="662"/>
+      <char name="G" width="722" llx="32" lly="-14" urx="709" ury="676"/>
+      <char name="H" width="722" llx="19" lly="0" urx="702" ury="662"/>
+      <char name="I" width="333" llx="18" lly="0" urx="315" ury="662"/>
+      <char name="Iacute" width="333" llx="18" lly="0" urx="317" ury="890"/>
+      <char name="Icircumflex" width="333" llx="11" lly="0" urx="322" ury="886"/>
+      <char name="Idieresis" width="333" llx="18" lly="0" urx="315" ury="835"/>
+      <char name="Igrave" width="333" llx="18" lly="0" urx="315" ury="890"/>
+      <char name="J" width="389" llx="10" lly="-14" urx="370" ury="662"/>
+      <char name="K" width="722" llx="34" lly="0" urx="723" ury="662"/>
+      <char name="L" width="611" llx="12" lly="0" urx="598" ury="662"/>
+      <char name="Lslash" width="611" llx="12" lly="0" urx="598" ury="662"/>
+      <char name="M" width="889" llx="12" lly="0" urx="863" ury="662"/>
+      <char name="N" width="722" llx="12" lly="-11" urx="707" ury="662"/>
+      <char name="Ntilde" width="722" llx="12" lly="-11" urx="707" ury="850"/>
+      <char name="O" width="722" llx="34" lly="-14" urx="688" ury="676"/>
+      <char name="OE" width="889" llx="30" lly="-6" urx="885" ury="668"/>
+      <char name="Oacute" width="722" llx="34" lly="-14" urx="688" ury="890"/>
+      <char name="Ocircumflex" width="722" llx="34" lly="-14" urx="688" ury="886"/>
+      <char name="Odieresis" width="722" llx="34" lly="-14" urx="688" ury="835"/>
+      <char name="Ograve" width="722" llx="34" lly="-14" urx="688" ury="890"/>
+      <char name="Oslash" width="722" llx="34" lly="-80" urx="688" ury="734"/>
+      <char name="Otilde" width="722" llx="34" lly="-14" urx="688" ury="850"/>
+      <char name="P" width="556" llx="16" lly="0" urx="542" ury="662"/>
+      <char name="Q" width="722" llx="34" lly="-178" urx="701" ury="676"/>
+      <char name="R" width="667" llx="17" lly="0" urx="659" ury="662"/>
+      <char name="S" width="556" llx="42" lly="-14" urx="491" ury="676"/>
+      <char name="Scaron" width="556" llx="42" lly="-14" urx="491" ury="886"/>
+      <char name="T" width="611" llx="17" lly="0" urx="593" ury="662"/>
+      <char name="Thorn" width="556" llx="16" lly="0" urx="542" ury="662"/>
+      <char name="U" width="722" llx="14" lly="-14" urx="705" ury="662"/>
+      <char name="Uacute" width="722" llx="14" lly="-14" urx="705" ury="890"/>
+      <char name="Ucircumflex" width="722" llx="14" lly="-14" urx="705" ury="886"/>
+      <char name="Udieresis" width="722" llx="14" lly="-14" urx="705" ury="835"/>
+      <char name="Ugrave" width="722" llx="14" lly="-14" urx="705" ury="890"/>
+      <char name="V" width="722" llx="16" lly="-11" urx="697" ury="662"/>
+      <char name="W" width="944" llx="5" lly="-11" urx="932" ury="662"/>
+      <char name="X" width="722" llx="10" lly="0" urx="704" ury="662"/>
+      <char name="Y" width="722" llx="22" lly="0" urx="703" ury="662"/>
+      <char name="Yacute" width="722" llx="22" lly="0" urx="703" ury="890"/>
+      <char name="Ydieresis" width="722" llx="22" lly="0" urx="703" ury="835"/>
+      <char name="Z" width="611" llx="9" lly="0" urx="597" ury="662"/>
+      <char name="Zcaron" width="611" llx="9" lly="0" urx="597" ury="886"/>
+      <char name="a" width="444" llx="37" lly="-10" urx="442" ury="460"/>
+      <char name="aacute" width="444" llx="37" lly="-10" urx="442" ury="678"/>
+      <char name="acircumflex" width="444" llx="37" lly="-10" urx="442" ury="674"/>
+      <char name="acute" width="333" llx="93" lly="507" urx="317" ury="678"/>
+      <char name="adieresis" width="444" llx="37" lly="-10" urx="442" ury="623"/>
+      <char name="ae" width="667" llx="38" lly="-10" urx="632" ury="460"/>
+      <char name="agrave" width="444" llx="37" lly="-10" urx="442" ury="678"/>
+      <char name="ampersand" width="778" llx="42" lly="-13" urx="750" ury="676"/>
+      <char name="aring" width="444" llx="37" lly="-10" urx="442" ury="711"/>
+      <char name="asciicircum" width="469" llx="24" lly="297" urx="446" ury="662"/>
+      <char name="asciitilde" width="541" llx="40" lly="183" urx="502" ury="323"/>
+      <char name="asterisk" width="500" llx="69" lly="265" urx="432" ury="676"/>
+      <char name="at" width="921" llx="116" lly="-14" urx="809" ury="676"/>
+      <char name="atilde" width="444" llx="37" lly="-10" urx="442" ury="638"/>
+      <char name="b" width="500" llx="3" lly="-10" urx="468" ury="683"/>
+      <char name="backslash" width="278" llx="-9" lly="-14" urx="287" ury="676"/>
+      <char name="bar" width="200" llx="67" lly="-218" urx="133" ury="782"/>
+      <char name="braceleft" width="480" llx="100" lly="-181" urx="350" ury="680"/>
+      <char name="braceright" width="480" llx="130" lly="-181" urx="380" ury="680"/>
+      <char name="bracketleft" width="333" llx="88" lly="-156" urx="299" ury="662"/>
+      <char name="bracketright" width="333" llx="34" lly="-156" urx="245" ury="662"/>
+      <char name="breve" width="333" llx="26" lly="507" urx="307" ury="664"/>
+      <char name="brokenbar" width="200" llx="67" lly="-143" urx="133" ury="707"/>
+      <char name="bullet" width="350" llx="40" lly="196" urx="310" ury="466"/>
+      <char name="c" width="444" llx="25" lly="-10" urx="412" ury="460"/>
+      <char name="caron" width="333" llx="11" lly="507" urx="322" ury="674"/>
+      <char name="ccedilla" width="444" llx="25" lly="-215" urx="412" ury="460"/>
+      <char name="cedilla" width="333" llx="52" lly="-215" urx="261" ury="0"/>
+      <char name="cent" width="500" llx="53" lly="-138" urx="448" ury="579"/>
+      <char name="circumflex" width="333" llx="11" lly="507" urx="322" ury="674"/>
+      <char name="colon" width="278" llx="81" lly="-11" urx="192" ury="459"/>
+      <char name="comma" width="250" llx="56" lly="-141" urx="195" ury="102"/>
+      <char name="copyright" width="760" llx="38" lly="-14" urx="722" ury="676"/>
+      <char name="currency" width="500" llx="-22" lly="58" urx="522" ury="602"/>
+      <char name="d" width="500" llx="27" lly="-10" urx="491" ury="683"/>
+      <char name="dagger" width="500" llx="59" lly="-149" urx="442" ury="676"/>
+      <char name="daggerdbl" width="500" llx="58" lly="-153" urx="442" ury="676"/>
+      <char name="degree" width="400" llx="57" lly="390" urx="343" ury="676"/>
+      <char name="dieresis" width="333" llx="18" lly="581" urx="315" ury="681"/>
+      <char name="divide" width="564" llx="30" lly="-10" urx="534" ury="516"/>
+      <char name="dollar" width="500" llx="44" lly="-87" urx="457" ury="727"/>
+      <char name="dotaccent" width="333" llx="118" lly="581" urx="216" ury="681"/>
+      <char name="dotlessi" width="278" llx="16" lly="0" urx="253" ury="460"/>
+      <char name="e" width="444" llx="25" lly="-10" urx="424" ury="460"/>
+      <char name="eacute" width="444" llx="25" lly="-10" urx="424" ury="678"/>
+      <char name="ecircumflex" width="444" llx="25" lly="-10" urx="424" ury="674"/>
+      <char name="edieresis" width="444" llx="25" lly="-10" urx="424" ury="623"/>
+      <char name="egrave" width="444" llx="25" lly="-10" urx="424" ury="678"/>
+      <char name="eight" width="500" llx="56" lly="-14" urx="445" ury="676"/>
+      <char name="ellipsis" width="1000" llx="111" lly="-11" urx="888" ury="100"/>
+      <char name="emdash" width="1000" llx="0" lly="201" urx="1000" ury="250"/>
+      <char name="endash" width="500" llx="0" lly="201" urx="500" ury="250"/>
+      <char name="equal" width="564" llx="30" lly="120" urx="534" ury="386"/>
+      <char name="eth" width="500" llx="29" lly="-10" urx="471" ury="686"/>
+      <char name="exclam" width="333" llx="130" lly="-9" urx="238" ury="676"/>
+      <char name="exclamdown" width="333" llx="97" lly="-218" urx="205" ury="467"/>
+      <char name="f" width="333" llx="20" lly="0" urx="383" ury="683"/>
+      <char name="fi" width="556" llx="31" lly="0" urx="521" ury="683"/>
+      <char name="five" width="500" llx="32" lly="-14" urx="438" ury="688"/>
+      <char name="fl" width="556" llx="32" lly="0" urx="521" ury="683"/>
+      <char name="florin" width="500" llx="7" lly="-189" urx="490" ury="676"/>
+      <char name="four" width="500" llx="12" lly="0" urx="472" ury="676"/>
+      <char name="fraction" width="167" llx="-168" lly="-14" urx="331" ury="676"/>
+      <char name="g" width="500" llx="28" lly="-218" urx="470" ury="460"/>
+      <char name="germandbls" width="500" llx="12" lly="-9" urx="468" ury="683"/>
+      <char name="grave" width="333" llx="19" lly="507" urx="242" ury="678"/>
+      <char name="greater" width="564" llx="28" lly="-8" urx="536" ury="514"/>
+      <char name="guillemotleft" width="500" llx="42" lly="33" urx="456" ury="416"/>
+      <char name="guillemotright" width="500" llx="44" lly="33" urx="458" ury="416"/>
+      <char name="guilsinglleft" width="333" llx="63" lly="33" urx="285" ury="416"/>
+      <char name="guilsinglright" width="333" llx="48" lly="33" urx="270" ury="416"/>
+      <char name="h" width="500" llx="9" lly="0" urx="487" ury="683"/>
+      <char name="hungarumlaut" width="333" llx="-3" lly="507" urx="377" ury="678"/>
+      <char name="hyphen" width="333" llx="39" lly="194" urx="285" ury="257"/>
+      <char name="i" width="278" llx="16" lly="0" urx="253" ury="683"/>
+      <char name="iacute" width="278" llx="16" lly="0" urx="290" ury="678"/>
+      <char name="icircumflex" width="278" llx="-16" lly="0" urx="295" ury="674"/>
+      <char name="idieresis" width="278" llx="-9" lly="0" urx="288" ury="623"/>
+      <char name="igrave" width="278" llx="-8" lly="0" urx="253" ury="678"/>
+      <char name="j" width="278" llx="-70" lly="-218" urx="194" ury="683"/>
+      <char name="k" width="500" llx="7" lly="0" urx="505" ury="683"/>
+      <char name="l" width="278" llx="19" lly="0" urx="257" ury="683"/>
+      <char name="less" width="564" llx="28" lly="-8" urx="536" ury="514"/>
+      <char name="logicalnot" width="564" llx="30" lly="108" urx="534" ury="386"/>
+      <char name="lslash" width="278" llx="19" lly="0" urx="259" ury="683"/>
+      <char name="m" width="778" llx="16" lly="0" urx="775" ury="460"/>
+      <char name="macron" width="333" llx="11" lly="547" urx="322" ury="601"/>
+      <char name="minus" width="324" llx="30" lly="220" urx="534" ury="286"/>
+      <char name="mu" width="500" llx="36" lly="-218" urx="512" ury="450"/>
+      <char name="multiply" width="564" llx="38" lly="8" urx="527" ury="497"/>
+      <char name="n" width="500" llx="16" lly="0" urx="485" ury="460"/>
+      <char name="nine" width="500" llx="30" lly="-22" urx="459" ury="676"/>
+      <char name="ntilde" width="500" llx="16" lly="0" urx="485" ury="638"/>
+      <char name="numbersign" width="500" llx="5" lly="0" urx="496" ury="662"/>
+      <char name="o" width="500" llx="29" lly="-10" urx="470" ury="460"/>
+      <char name="oacute" width="500" llx="29" lly="-10" urx="470" ury="678"/>
+      <char name="ocircumflex" width="500" llx="29" lly="-10" urx="470" ury="674"/>
+      <char name="odieresis" width="500" llx="29" lly="-10" urx="470" ury="623"/>
+      <char name="oe" width="722" llx="30" lly="-10" urx="690" ury="460"/>
+      <char name="ogonek" width="333" llx="62" lly="-165" urx="243" ury="0"/>
+      <char name="ograve" width="500" llx="29" lly="-10" urx="470" ury="678"/>
+      <char name="one" width="500" llx="111" lly="0" urx="394" ury="676"/>
+      <char name="onehalf" width="750" llx="31" lly="-14" urx="746" ury="676"/>
+      <char name="onequarter" width="750" llx="37" lly="-14" urx="718" ury="676"/>
+      <char name="onesuperior" width="300" llx="57" lly="270" urx="248" ury="676"/>
+      <char name="ordfeminine" width="276" llx="4" lly="394" urx="270" ury="676"/>
+      <char name="ordmasculine" width="310" llx="6" lly="394" urx="304" ury="676"/>
+      <char name="oslash" width="500" llx="29" lly="-112" urx="470" ury="551"/>
+      <char name="otilde" width="500" llx="29" lly="-10" urx="470" ury="638"/>
+      <char name="p" width="500" llx="5" lly="-217" urx="470" ury="460"/>
+      <char name="paragraph" width="453" llx="-22" lly="-154" urx="450" ury="662"/>
+      <char name="parenleft" width="333" llx="48" lly="-177" urx="304" ury="676"/>
+      <char name="parenright" width="333" llx="29" lly="-177" urx="285" ury="676"/>
+      <char name="percent" width="833" llx="61" lly="-13" urx="772" ury="676"/>
+      <char name="period" width="250" llx="70" lly="-11" urx="181" ury="100"/>
+      <char name="periodcentered" width="250" llx="70" lly="199" urx="181" ury="310"/>
+      <char name="perthousand" width="1000" llx="7" lly="-19" urx="994" ury="706"/>
+      <char name="plus" width="564" llx="30" lly="0" urx="534" ury="506"/>
+      <char name="plusminus" width="564" llx="30" lly="0" urx="534" ury="506"/>
+      <char name="q" width="500" llx="24" lly="-217" urx="488" ury="460"/>
+      <char name="question" width="444" llx="68" lly="-8" urx="414" ury="676"/>
+      <char name="questiondown" width="444" llx="30" lly="-218" urx="376" ury="466"/>
+      <char name="quotedbl" width="408" llx="77" lly="431" urx="331" ury="676"/>
+      <char name="quotedblbase" width="444" llx="45" lly="-141" urx="416" ury="102"/>
+      <char name="quotedblleft" width="444" llx="43" lly="433" urx="414" ury="676"/>
+      <char name="quotedblright" width="444" llx="30" lly="433" urx="401" ury="676"/>
+      <char name="quoteleft" width="333" llx="115" lly="433" urx="254" ury="676"/>
+      <char name="quoteright" width="333" llx="79" lly="433" urx="218" ury="676"/>
+      <char name="quotesinglbase" width="333" llx="79" lly="-141" urx="218" ury="102"/>
+      <char name="quotesingle" width="180" llx="48" lly="431" urx="133" ury="676"/>
+      <char name="r" width="333" llx="5" lly="0" urx="335" ury="460"/>
+      <char name="registered" width="760" llx="38" lly="-14" urx="722" ury="676"/>
+      <char name="ring" width="333" llx="67" lly="512" urx="266" ury="711"/>
+      <char name="s" width="389" llx="51" lly="-10" urx="348" ury="460"/>
+      <char name="scaron" width="389" llx="39" lly="-10" urx="350" ury="674"/>
+      <char name="section" width="500" llx="70" lly="-148" urx="426" ury="676"/>
+      <char name="semicolon" width="278" llx="80" lly="-141" urx="219" ury="459"/>
+      <char name="seven" width="500" llx="20" lly="-8" urx="449" ury="662"/>
+      <char name="six" width="500" llx="34" lly="-14" urx="468" ury="684"/>
+      <char name="slash" width="278" llx="-9" lly="-14" urx="287" ury="676"/>
+      <char name="space" width="250" llx="0" lly="0" urx="0" ury="0"/>
       <!-- JKT: the following has been manually added -->
-      <char name="nbsp" width="250"/>
-      <char name="sterling" width="500"/>
-      <char name="t" width="278"/>
-      <char name="thorn" width="500"/>
-      <char name="three" width="500"/>
-      <char name="threequarters" width="750"/>
-      <char name="threesuperior" width="300"/>
-      <char name="tilde" width="333"/>
-      <char name="trademark" width="980"/>
-      <char name="two" width="500"/>
-      <char name="twosuperior" width="300"/>
-      <char name="u" width="500"/>
-      <char name="uacute" width="500"/>
-      <char name="ucircumflex" width="500"/>
-      <char name="udieresis" width="500"/>
-      <char name="ugrave" width="500"/>
-      <char name="underscore" width="500"/>
-      <char name="v" width="500"/>
-      <char name="w" width="722"/>
-      <char name="x" width="500"/>
-      <char name="y" width="500"/>
-      <char name="yacute" width="500"/>
-      <char name="ydieresis" width="500"/>
-      <char name="yen" width="500"/>
-      <char name="z" width="444"/>
-      <char name="zcaron" width="444"/>
-      <char name="zero" width="500"/>
-   </widths>
+      <char name="sterling" width="500" llx="12" lly="-8" urx="490" ury="676"/>
+      <char name="t" width="278" llx="13" lly="-10" urx="279" ury="579"/>
+      <char name="thorn" width="500" llx="5" lly="-217" urx="470" ury="683"/>
+      <char name="three" width="500" llx="43" lly="-14" urx="431" ury="676"/>
+      <char name="threequarters" width="750" llx="15" lly="-14" urx="718" ury="676"/>
+      <char name="threesuperior" width="300" llx="15" lly="262" urx="291" ury="676"/>
+      <char name="tilde" width="333" llx="1" lly="532" urx="331" ury="638"/>
+      <char name="trademark" width="980" llx="30" lly="256" urx="957" ury="662"/>
+      <char name="two" width="500" llx="30" lly="0" urx="475" ury="676"/>
+      <char name="twosuperior" width="300" llx="1" lly="270" urx="296" ury="676"/>
+      <char name="u" width="500" llx="9" lly="-10" urx="479" ury="450"/>
+      <char name="uacute" width="500" llx="9" lly="-10" urx="479" ury="678"/>
+      <char name="ucircumflex" width="500" llx="9" lly="-10" urx="479" ury="674"/>
+      <char name="udieresis" width="500" llx="9" lly="-10" urx="479" ury="623"/>
+      <char name="ugrave" width="500" llx="9" lly="-10" urx="479" ury="678"/>
+      <char name="underscore" width="500" llx="0" lly="-125" urx="500" ury="-75"/>
+      <char name="v" width="500" llx="19" lly="-14" urx="477" ury="450"/>
+      <char name="w" width="722" llx="21" lly="-14" urx="694" ury="450"/>
+      <char name="x" width="500" llx="17" lly="0" urx="479" ury="450"/>
+      <char name="y" width="500" llx="14" lly="-218" urx="475" ury="450"/>
+      <char name="yacute" width="500" llx="14" lly="-218" urx="475" ury="678"/>
+      <char name="ydieresis" width="500" llx="14" lly="-218" urx="475" ury="623"/>
+      <char name="yen" width="500" llx="-53" lly="0" urx="512" ury="662"/>
+      <char name="z" width="444" llx="27" lly="0" urx="418" ury="450"/>
+      <char name="zcaron" width="444" llx="27" lly="0" urx="418" ury="674"/>
+      <char name="zero" width="500" llx="24" lly="-14" urx="476" ury="676"/>
+    </char-metrics>
   <kerning kpx1="79">
     <pair kern="-35" kpx2="65"/>
     <pair kern="-35" kpx2="87"/>
diff --git a/src/codegen/fonts/ZapfDingbats.xml b/src/codegen/fonts/ZapfDingbats.xml
index f6ed76d25..bd72901dc 100644
--- a/src/codegen/fonts/ZapfDingbats.xml
+++ b/src/codegen/fonts/ZapfDingbats.xml
@@ -21,214 +21,216 @@
   <family-name>ZapfDingbats</family-name>
   <class-name>ZapfDingbats</class-name>
   <encoding>ZapfDingbatsEncoding</encoding>
+   <underline-position>-100</underline-position>
+   <underline-thickness>50</underline-thickness>
   <cap-height>820</cap-height>
   <x-height>426</x-height>
   <ascender>820</ascender>
   <descender>-143</descender>
   <first-char>32</first-char>
   <last-char>255</last-char>
-  <widths>
-    <char name="space" width="278"/>
-    <char name="a1" width="974"/>
-    <char name="a2" width="961"/>
-    <char name="a202" width="974"/>
-    <char name="a3" width="980"/>
-    <char name="a4" width="719"/>
-    <char name="a5" width="789"/>
-    <char name="a119" width="790"/>
-    <char name="a118" width="791"/>
-    <char name="a117" width="690"/>
-    <char name="a11" width="960"/>
-    <char name="a12" width="939"/>
-    <char name="a13" width="549"/>
-    <char name="a14" width="855"/>
-    <char name="a15" width="911"/>
-    <char name="a16" width="933"/>
-    <char name="a105" width="911"/>
-    <char name="a17" width="945"/>
-    <char name="a18" width="974"/>
-    <char name="a19" width="755"/>
-    <char name="a20" width="846"/>
-    <char name="a21" width="762"/>
-    <char name="a22" width="761"/>
-    <char name="a23" width="571"/>
-    <char name="a24" width="677"/>
-    <char name="a25" width="763"/>
-    <char name="a26" width="760"/>
-    <char name="a27" width="759"/>
-    <char name="a28" width="754"/>
-    <char name="a6" width="494"/>
-    <char name="a7" width="552"/>
-    <char name="a8" width="537"/>
-    <char name="a9" width="577"/>
-    <char name="a10" width="692"/>
-    <char name="a29" width="786"/>
-    <char name="a30" width="788"/>
-    <char name="a31" width="788"/>
-    <char name="a32" width="790"/>
-    <char name="a33" width="793"/>
-    <char name="a34" width="794"/>
-    <char name="a35" width="816"/>
-    <char name="a36" width="823"/>
-    <char name="a37" width="789"/>
-    <char name="a38" width="841"/>
-    <char name="a39" width="823"/>
-    <char name="a40" width="833"/>
-    <char name="a41" width="816"/>
-    <char name="a42" width="831"/>
-    <char name="a43" width="923"/>
-    <char name="a44" width="744"/>
-    <char name="a45" width="723"/>
-    <char name="a46" width="749"/>
-    <char name="a47" width="790"/>
-    <char name="a48" width="792"/>
-    <char name="a49" width="695"/>
-    <char name="a50" width="776"/>
-    <char name="a51" width="768"/>
-    <char name="a52" width="792"/>
-    <char name="a53" width="759"/>
-    <char name="a54" width="707"/>
-    <char name="a55" width="708"/>
-    <char name="a56" width="682"/>
-    <char name="a57" width="701"/>
-    <char name="a58" width="826"/>
-    <char name="a59" width="815"/>
-    <char name="a60" width="789"/>
-    <char name="a61" width="789"/>
-    <char name="a62" width="707"/>
-    <char name="a63" width="687"/>
-    <char name="a64" width="696"/>
-    <char name="a65" width="689"/>
-    <char name="a66" width="786"/>
-    <char name="a67" width="787"/>
-    <char name="a68" width="713"/>
-    <char name="a69" width="791"/>
-    <char name="a70" width="785"/>
-    <char name="a71" width="791"/>
-    <char name="a72" width="873"/>
-    <char name="a73" width="761"/>
-    <char name="a74" width="762"/>
-    <char name="a203" width="762"/>
-    <char name="a75" width="759"/>
-    <char name="a204" width="759"/>
-    <char name="a76" width="892"/>
-    <char name="a77" width="892"/>
-    <char name="a78" width="788"/>
-    <char name="a79" width="784"/>
-    <char name="a81" width="438"/>
-    <char name="a82" width="138"/>
-    <char name="a83" width="277"/>
-    <char name="a84" width="415"/>
-    <char name="a97" width="392"/>
-    <char name="a98" width="392"/>
-    <char name="a99" width="668"/>
-    <char name="a100" width="668"/>
-    <char name="a101" width="732"/>
-    <char name="a102" width="544"/>
-    <char name="a103" width="544"/>
-    <char name="a104" width="910"/>
-    <char name="a106" width="667"/>
-    <char name="a107" width="760"/>
-    <char name="a108" width="760"/>
-    <char name="a112" width="776"/>
-    <char name="a111" width="595"/>
-    <char name="a110" width="694"/>
-    <char name="a109" width="626"/>
-    <char name="a120" width="788"/>
-    <char name="a121" width="788"/>
-    <char name="a122" width="788"/>
-    <char name="a123" width="788"/>
-    <char name="a124" width="788"/>
-    <char name="a125" width="788"/>
-    <char name="a126" width="788"/>
-    <char name="a127" width="788"/>
-    <char name="a128" width="788"/>
-    <char name="a129" width="788"/>
-    <char name="a130" width="788"/>
-    <char name="a131" width="788"/>
-    <char name="a132" width="788"/>
-    <char name="a133" width="788"/>
-    <char name="a134" width="788"/>
-    <char name="a135" width="788"/>
-    <char name="a136" width="788"/>
-    <char name="a137" width="788"/>
-    <char name="a138" width="788"/>
-    <char name="a139" width="788"/>
-    <char name="a140" width="788"/>
-    <char name="a141" width="788"/>
-    <char name="a142" width="788"/>
-    <char name="a143" width="788"/>
-    <char name="a144" width="788"/>
-    <char name="a145" width="788"/>
-    <char name="a146" width="788"/>
-    <char name="a147" width="788"/>
-    <char name="a148" width="788"/>
-    <char name="a149" width="788"/>
-    <char name="a150" width="788"/>
-    <char name="a151" width="788"/>
-    <char name="a152" width="788"/>
-    <char name="a153" width="788"/>
-    <char name="a154" width="788"/>
-    <char name="a155" width="788"/>
-    <char name="a156" width="788"/>
-    <char name="a157" width="788"/>
-    <char name="a158" width="788"/>
-    <char name="a159" width="788"/>
-    <char name="a160" width="894"/>
-    <char name="a161" width="838"/>
-    <char name="a163" width="1016"/>
-    <char name="a164" width="458"/>
-    <char name="a196" width="748"/>
-    <char name="a165" width="924"/>
-    <char name="a192" width="748"/>
-    <char name="a166" width="918"/>
-    <char name="a167" width="927"/>
-    <char name="a168" width="928"/>
-    <char name="a169" width="928"/>
-    <char name="a170" width="834"/>
-    <char name="a171" width="873"/>
-    <char name="a172" width="828"/>
-    <char name="a173" width="924"/>
-    <char name="a162" width="924"/>
-    <char name="a174" width="917"/>
-    <char name="a175" width="930"/>
-    <char name="a176" width="931"/>
-    <char name="a177" width="463"/>
-    <char name="a178" width="883"/>
-    <char name="a179" width="836"/>
-    <char name="a193" width="836"/>
-    <char name="a180" width="867"/>
-    <char name="a199" width="867"/>
-    <char name="a181" width="696"/>
-    <char name="a200" width="696"/>
-    <char name="a182" width="874"/>
-    <char name="a201" width="874"/>
-    <char name="a183" width="760"/>
-    <char name="a184" width="946"/>
-    <char name="a197" width="771"/>
-    <char name="a185" width="865"/>
-    <char name="a194" width="771"/>
-    <char name="a198" width="888"/>
-    <char name="a186" width="967"/>
-    <char name="a195" width="888"/>
-    <char name="a187" width="831"/>
-    <char name="a188" width="873"/>
-    <char name="a189" width="927"/>
-    <char name="a190" width="970"/>
-    <char name="a191" width="918"/>
-    <char name="a86" width="410"/>
-    <char name="a85" width="509"/>
-    <char name="a95" width="334"/>
-    <char name="a205" width="509"/>
-    <char name="a89" width="390"/>
-    <char name="a87" width="234"/>
-    <char name="a91" width="276"/>
-    <char name="a90" width="390"/>
-    <char name="a206" width="410"/>
-    <char name="a94" width="317"/>
-    <char name="a93" width="317"/>
-    <char name="a92" width="276"/>
-    <char name="a96" width="334"/>
-    <char name="a88" width="234"/>
-  </widths>
-</font-metrics>
-\ No newline at end of file
+    <char-metrics>
+    <char name="space" width="278" llx="0" lly="0" urx="0" ury="0"/>
+    <char name="a1" width="974" llx="35" lly="72" urx="939" ury="621"/>
+    <char name="a2" width="961" llx="35" lly="81" urx="927" ury="611"/>
+    <char name="a202" width="974" llx="35" lly="72" urx="939" ury="621"/>
+    <char name="a3" width="980" llx="35" lly="0" urx="945" ury="692"/>
+    <char name="a4" width="719" llx="34" lly="139" urx="685" ury="566"/>
+    <char name="a5" width="789" llx="35" lly="-14" urx="755" ury="705"/>
+    <char name="a119" width="790" llx="35" lly="-14" urx="755" ury="705"/>
+    <char name="a118" width="791" llx="35" lly="-13" urx="761" ury="705"/>
+    <char name="a117" width="690" llx="34" lly="138" urx="655" ury="553"/>
+    <char name="a11" width="960" llx="35" lly="123" urx="925" ury="568"/>
+    <char name="a12" width="939" llx="35" lly="134" urx="904" ury="559"/>
+    <char name="a13" width="549" llx="29" lly="-11" urx="516" ury="705"/>
+    <char name="a14" width="855" llx="34" lly="59" urx="820" ury="632"/>
+    <char name="a15" width="911" llx="35" lly="50" urx="876" ury="642"/>
+    <char name="a16" width="933" llx="35" lly="139" urx="899" ury="550"/>
+    <char name="a105" width="911" llx="35" lly="50" urx="876" ury="642"/>
+    <char name="a17" width="945" llx="35" lly="139" urx="909" ury="553"/>
+    <char name="a18" width="974" llx="35" lly="104" urx="938" ury="587"/>
+    <char name="a19" width="755" llx="34" lly="-13" urx="721" ury="705"/>
+    <char name="a20" width="846" llx="36" lly="-14" urx="811" ury="705"/>
+    <char name="a21" width="762" llx="35" lly="0" urx="727" ury="692"/>
+    <char name="a22" width="761" llx="35" lly="0" urx="727" ury="692"/>
+    <char name="a23" width="571" llx="-1" lly="-68" urx="571" ury="661"/>
+    <char name="a24" width="677" llx="36" lly="-13" urx="642" ury="705"/>
+    <char name="a25" width="763" llx="35" lly="0" urx="728" ury="692"/>
+    <char name="a26" width="760" llx="35" lly="0" urx="726" ury="692"/>
+    <char name="a27" width="759" llx="35" lly="0" urx="725" ury="692"/>
+    <char name="a28" width="754" llx="35" lly="0" urx="720" ury="692"/>
+    <char name="a6" width="494" llx="35" lly="0" urx="460" ury="692"/>
+    <char name="a7" width="552" llx="35" lly="0" urx="517" ury="692"/>
+    <char name="a8" width="537" llx="35" lly="0" urx="503" ury="692"/>
+    <char name="a9" width="577" llx="35" lly="96" urx="542" ury="596"/>
+    <char name="a10" width="692" llx="35" lly="-14" urx="657" ury="705"/>
+    <char name="a29" width="786" llx="35" lly="-14" urx="751" ury="705"/>
+    <char name="a30" width="788" llx="35" lly="-14" urx="752" ury="705"/>
+    <char name="a31" width="788" llx="35" lly="-14" urx="753" ury="705"/>
+    <char name="a32" width="790" llx="35" lly="-14" urx="756" ury="705"/>
+    <char name="a33" width="793" llx="35" lly="-13" urx="759" ury="705"/>
+    <char name="a34" width="794" llx="35" lly="-13" urx="759" ury="705"/>
+    <char name="a35" width="816" llx="35" lly="-14" urx="782" ury="705"/>
+    <char name="a36" width="823" llx="35" lly="-14" urx="787" ury="705"/>
+    <char name="a37" width="789" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a38" width="841" llx="35" lly="-14" urx="807" ury="705"/>
+    <char name="a39" width="823" llx="35" lly="-14" urx="789" ury="705"/>
+    <char name="a40" width="833" llx="35" lly="-14" urx="798" ury="705"/>
+    <char name="a41" width="816" llx="35" lly="-13" urx="782" ury="705"/>
+    <char name="a42" width="831" llx="35" lly="-14" urx="796" ury="705"/>
+    <char name="a43" width="923" llx="35" lly="-14" urx="888" ury="705"/>
+    <char name="a44" width="744" llx="35" lly="0" urx="710" ury="692"/>
+    <char name="a45" width="723" llx="35" lly="0" urx="688" ury="692"/>
+    <char name="a46" width="749" llx="35" lly="0" urx="714" ury="692"/>
+    <char name="a47" width="790" llx="34" lly="-14" urx="756" ury="705"/>
+    <char name="a48" width="792" llx="35" lly="-14" urx="758" ury="705"/>
+    <char name="a49" width="695" llx="35" lly="-14" urx="661" ury="706"/>
+    <char name="a50" width="776" llx="35" lly="-6" urx="741" ury="699"/>
+    <char name="a51" width="768" llx="35" lly="-7" urx="734" ury="699"/>
+    <char name="a52" width="792" llx="35" lly="-14" urx="757" ury="705"/>
+    <char name="a53" width="759" llx="35" lly="0" urx="725" ury="692"/>
+    <char name="a54" width="707" llx="35" lly="-13" urx="672" ury="704"/>
+    <char name="a55" width="708" llx="35" lly="-14" urx="672" ury="705"/>
+    <char name="a56" width="682" llx="35" lly="-14" urx="647" ury="705"/>
+    <char name="a57" width="701" llx="35" lly="-14" urx="666" ury="705"/>
+    <char name="a58" width="826" llx="35" lly="-14" urx="791" ury="705"/>
+    <char name="a59" width="815" llx="35" lly="-14" urx="780" ury="705"/>
+    <char name="a60" width="789" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a61" width="789" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a62" width="707" llx="34" lly="-14" urx="673" ury="705"/>
+    <char name="a63" width="687" llx="36" lly="0" urx="651" ury="692"/>
+    <char name="a64" width="696" llx="35" lly="0" urx="661" ury="691"/>
+    <char name="a65" width="689" llx="35" lly="0" urx="655" ury="692"/>
+    <char name="a66" width="786" llx="34" lly="-14" urx="751" ury="705"/>
+    <char name="a67" width="787" llx="35" lly="-14" urx="752" ury="705"/>
+    <char name="a68" width="713" llx="35" lly="-14" urx="678" ury="705"/>
+    <char name="a69" width="791" llx="35" lly="-14" urx="756" ury="705"/>
+    <char name="a70" width="785" llx="36" lly="-14" urx="751" ury="705"/>
+    <char name="a71" width="791" llx="35" lly="-14" urx="757" ury="705"/>
+    <char name="a72" width="873" llx="35" lly="-14" urx="838" ury="705"/>
+    <char name="a73" width="761" llx="35" lly="0" urx="726" ury="692"/>
+    <char name="a74" width="762" llx="35" lly="0" urx="727" ury="692"/>
+    <char name="a203" width="762" llx="35" lly="0" urx="727" ury="692"/>
+    <char name="a75" width="759" llx="35" lly="0" urx="725" ury="692"/>
+    <char name="a204" width="759" llx="35" lly="0" urx="725" ury="692"/>
+    <char name="a76" width="892" llx="35" lly="0" urx="858" ury="705"/>
+    <char name="a77" width="892" llx="35" lly="-14" urx="858" ury="692"/>
+    <char name="a78" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a79" width="784" llx="35" lly="-14" urx="749" ury="705"/>
+    <char name="a81" width="438" llx="35" lly="-14" urx="403" ury="705"/>
+    <char name="a82" width="138" llx="35" lly="0" urx="104" ury="692"/>
+    <char name="a83" width="277" llx="35" lly="0" urx="242" ury="692"/>
+    <char name="a84" width="415" llx="35" lly="0" urx="380" ury="692"/>
+    <char name="a97" width="392" llx="35" lly="263" urx="357" ury="705"/>
+    <char name="a98" width="392" llx="34" lly="263" urx="357" ury="705"/>
+    <char name="a99" width="668" llx="35" lly="263" urx="633" ury="705"/>
+    <char name="a100" width="668" llx="36" lly="263" urx="634" ury="705"/>
+    <char name="a101" width="732" llx="35" lly="-143" urx="697" ury="806"/>
+    <char name="a102" width="544" llx="56" lly="-14" urx="488" ury="706"/>
+    <char name="a103" width="544" llx="34" lly="-14" urx="508" ury="705"/>
+    <char name="a104" width="910" llx="35" lly="40" urx="875" ury="651"/>
+    <char name="a106" width="667" llx="35" lly="-14" urx="633" ury="705"/>
+    <char name="a107" width="760" llx="35" lly="-14" urx="726" ury="705"/>
+    <char name="a108" width="760" llx="0" lly="121" urx="758" ury="569"/>
+    <char name="a112" width="776" llx="35" lly="0" urx="741" ury="705"/>
+    <char name="a111" width="595" llx="34" lly="-14" urx="560" ury="705"/>
+    <char name="a110" width="694" llx="35" lly="-14" urx="659" ury="705"/>
+    <char name="a109" width="626" llx="34" lly="0" urx="591" ury="705"/>
+    <char name="a120" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a121" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a122" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a123" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a124" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a125" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a126" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a127" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a128" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a129" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a130" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a131" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a132" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a133" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a134" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a135" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a136" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a137" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a138" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a139" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a140" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a141" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a142" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a143" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a144" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a145" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a146" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a147" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a148" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a149" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a150" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a151" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a152" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a153" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a154" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a155" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a156" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a157" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a158" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a159" width="788" llx="35" lly="-14" urx="754" ury="705"/>
+    <char name="a160" width="894" llx="35" lly="58" urx="860" ury="634"/>
+    <char name="a161" width="838" llx="35" lly="152" urx="803" ury="540"/>
+    <char name="a163" width="1016" llx="34" lly="152" urx="981" ury="540"/>
+    <char name="a164" width="458" llx="35" lly="-127" urx="422" ury="820"/>
+    <char name="a196" width="748" llx="35" lly="94" urx="698" ury="597"/>
+    <char name="a165" width="924" llx="35" lly="140" urx="890" ury="552"/>
+    <char name="a192" width="748" llx="35" lly="94" urx="698" ury="597"/>
+    <char name="a166" width="918" llx="35" lly="166" urx="884" ury="526"/>
+    <char name="a167" width="927" llx="35" lly="32" urx="892" ury="660"/>
+    <char name="a168" width="928" llx="35" lly="129" urx="891" ury="562"/>
+    <char name="a169" width="928" llx="35" lly="128" urx="893" ury="563"/>
+    <char name="a170" width="834" llx="35" lly="155" urx="799" ury="537"/>
+    <char name="a171" width="873" llx="35" lly="93" urx="838" ury="599"/>
+    <char name="a172" width="828" llx="35" lly="104" urx="791" ury="588"/>
+    <char name="a173" width="924" llx="35" lly="98" urx="889" ury="594"/>
+    <char name="a162" width="924" llx="35" lly="98" urx="889" ury="594"/>
+    <char name="a174" width="917" llx="35" lly="0" urx="882" ury="692"/>
+    <char name="a175" width="930" llx="35" lly="84" urx="896" ury="608"/>
+    <char name="a176" width="931" llx="35" lly="84" urx="896" ury="608"/>
+    <char name="a177" width="463" llx="35" lly="-99" urx="429" ury="791"/>
+    <char name="a178" width="883" llx="35" lly="71" urx="848" ury="623"/>
+    <char name="a179" width="836" llx="35" lly="44" urx="802" ury="648"/>
+    <char name="a193" width="836" llx="35" lly="44" urx="802" ury="648"/>
+    <char name="a180" width="867" llx="35" lly="101" urx="832" ury="591"/>
+    <char name="a199" width="867" llx="35" lly="101" urx="832" ury="591"/>
+    <char name="a181" width="696" llx="35" lly="44" urx="661" ury="648"/>
+    <char name="a200" width="696" llx="35" lly="44" urx="661" ury="648"/>
+    <char name="a182" width="874" llx="35" lly="77" urx="840" ury="619"/>
+    <char name="a201" width="874" llx="35" lly="73" urx="840" ury="615"/>
+    <char name="a183" width="760" llx="35" lly="0" urx="725" ury="692"/>
+    <char name="a184" width="946" llx="35" lly="160" urx="911" ury="533"/>
+    <char name="a197" width="771" llx="34" lly="37" urx="736" ury="655"/>
+    <char name="a185" width="865" llx="35" lly="207" urx="830" ury="481"/>
+    <char name="a194" width="771" llx="34" lly="37" urx="736" ury="655"/>
+    <char name="a198" width="888" llx="34" lly="-19" urx="853" ury="712"/>
+    <char name="a186" width="967" llx="35" lly="124" urx="932" ury="568"/>
+    <char name="a195" width="888" llx="34" lly="-19" urx="853" ury="712"/>
+    <char name="a187" width="831" llx="35" lly="113" urx="796" ury="579"/>
+    <char name="a188" width="873" llx="36" lly="118" urx="838" ury="578"/>
+    <char name="a189" width="927" llx="35" lly="150" urx="891" ury="542"/>
+    <char name="a190" width="970" llx="35" lly="76" urx="931" ury="616"/>
+    <char name="a191" width="918" llx="34" lly="99" urx="884" ury="593"/>
+    <char name="a86" width="410" llx="35" lly="0" urx="375" ury="692"/>
+    <char name="a85" width="509" llx="35" lly="0" urx="475" ury="692"/>
+    <char name="a95" width="334" llx="35" lly="0" urx="299" ury="692"/>
+    <char name="a205" width="509" llx="35" lly="0" urx="475" ury="692"/>
+    <char name="a89" width="390" llx="35" lly="-14" urx="356" ury="705"/>
+    <char name="a87" width="234" llx="35" lly="-14" urx="199" ury="705"/>
+    <char name="a91" width="276" llx="35" lly="0" urx="242" ury="692"/>
+    <char name="a90" width="390" llx="35" lly="-14" urx="355" ury="705"/>
+    <char name="a206" width="410" llx="35" lly="0" urx="375" ury="692"/>
+    <char name="a94" width="317" llx="35" lly="0" urx="283" ury="692"/>
+    <char name="a93" width="317" llx="35" lly="0" urx="283" ury="692"/>
+    <char name="a92" width="276" llx="35" lly="0" urx="242" ury="692"/>
+    <char name="a96" width="334" llx="35" lly="0" urx="299" ury="692"/>
+    <char name="a88" width="234" llx="35" lly="-14" urx="199" ury="705"/>
+    </char-metrics>
+</font-metrics>
diff --git a/src/codegen/fonts/font-file.xsl b/src/codegen/fonts/font-file.xsl
index 85b968808..8723ed960 100644
--- a/src/codegen/fonts/font-file.xsl
+++ b/src/codegen/fonts/font-file.xsl
@@ -35,6 +35,7 @@
   <xsl:template match="font-metrics">
 package org.apache.fop.fonts.base14;
 
+import java.awt.Rectangle;
 <xsl:if test="count(kerning) &gt; 0">
 import java.util.Map;
 </xsl:if>
@@ -42,12 +43,14 @@ import java.util.Set;
 import org.apache.fop.fonts.FontType;
 import org.apache.fop.fonts.Base14Font;
 import org.apache.fop.fonts.CodePointMapping;
-import org.apache.fop.fonts.Typeface;;
+import org.apache.fop.fonts.Typeface;
 
 public class <xsl:value-of select="class-name"/> extends Base14Font {
     private final static String fontName = "<xsl:value-of select="font-name"/>";
     private final static String fullName = "<xsl:value-of select="full-name"/>";
     private final static Set familyNames;
+    private final static int underlinePosition = <xsl:value-of select="underline-position"/>;
+    private final static int underlineThickness = <xsl:value-of select="underline-thickness"/>;
     private final static String encoding = "<xsl:value-of select="$encoding"/>";
     private final static int capHeight = <xsl:value-of select="cap-height"/>;
     private final static int xHeight = <xsl:value-of select="x-height"/>;
@@ -56,6 +59,7 @@ public class <xsl:value-of select="class-name"/> extends Base14Font {
     private final static int firstChar = <xsl:value-of select="first-char"/>;
     private final static int lastChar = <xsl:value-of select="last-char"/>;
     private final static int[] width;
+    private final static Rectangle[] boundingBoxes;
     private final CodePointMapping mapping =
         CodePointMapping.getMapping("<xsl:value-of select="$encoding"/>");
 <xsl:if test="count(kerning) &gt; 0">
@@ -66,7 +70,8 @@ public class <xsl:value-of select="class-name"/> extends Base14Font {
 
     static {
         width = new int[256];
-        <xsl:apply-templates select="widths"/>
+        boundingBoxes = new Rectangle[256];
+        <xsl:apply-templates select="char-metrics"/>
 <xsl:if test="count(kerning) &gt; 0">
         kerning = new java.util.HashMap();
         Integer first, second;
@@ -125,6 +130,14 @@ public class <xsl:value-of select="class-name"/> extends Base14Font {
         return size * xHeight;
     }
 
+    public int getUnderlinePosition(int size) {
+        return size * underlinePosition;
+    }
+
+    public int getUnderlineThickness(int size) {
+        return size * underlineThickness;
+    }
+
     public int getFirstChar() {
         return firstChar;
     }
@@ -137,6 +150,11 @@ public class <xsl:value-of select="class-name"/> extends Base14Font {
         return size * width[i];
     }
 
+    public Rectangle getBoundingBox(int glyphIndex, int size) {
+        Rectangle bbox = boundingBoxes[glyphIndex];
+        return new Rectangle(bbox.x * size, bbox.y * size, bbox.width * size, bbox.height * size);
+    }
+
     public int[] getWidths() {
         int[] arr = new int[getLastChar() - getFirstChar() + 1];
         System.arraycopy(width, getFirstChar(), arr, 0, getLastChar() - getFirstChar() + 1);
@@ -182,7 +200,9 @@ public class <xsl:value-of select="class-name"/> extends Base14Font {
 }
   </xsl:template>
 
-  <xsl:template match="widths/char"><xsl:variable name="char-name" select="@name"/><xsl:variable name="char-num" select="$glyphs[@name = $char-name]/@codepoint"/><xsl:if test="$char-num!=''">        width[0x<xsl:value-of select="$char-num"/>] = <xsl:value-of select="@width"/>;</xsl:if></xsl:template>
+  <xsl:template match="char-metrics/char">
+    <xsl:variable name="char-name" select="@name"/><xsl:variable name="char-num" select="$glyphs[@name = $char-name]/@codepoint"/><xsl:if test="$char-num!=''">  width[0x<xsl:value-of select="$char-num"/>] = <xsl:value-of select="@width"/>;
+        boundingBoxes[0x<xsl:value-of select="$char-num"/>] = new Rectangle(<xsl:value-of select="@llx"/>,<xsl:value-of select="@lly"/>,<xsl:value-of select="@urx - @llx"/>,<xsl:value-of select="@ury - @lly"/>);</xsl:if></xsl:template>
   
   <xsl:template match="kerning">
         first = new Integer(<xsl:value-of select="@kpx1"/>);
author	Vincent Hennebert <vhennebert@apache.org>	2013-07-29 21:45:20 +0000
committer	Vincent Hennebert <vhennebert@apache.org>	2013-07-29 21:45:20 +0000
commit	f8e822efe1de8bd8192dbb8ff035b9a79f876614 (patch)
tree	8d38f873dd101e6ed0c2ba3b4dfa29e1eb0fdc60 /src/codegen
parent	c0b99ad44d0e1409008886e2f687c46f4ac05d9d (diff)
download	xmlgraphics-fop-f8e822efe1de8bd8192dbb8ff035b9a79f876614.tar.gz xmlgraphics-fop-f8e822efe1de8bd8192dbb8ff035b9a79f876614.zip