xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r1578276 [6/14] - in /xmlgraphics/fop/branches/Temp_WhitespaceManagement: ./ lib/ src/codegen/fonts/ src/java/org/apache/fop/ src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/fonts/ src/java/org/apache/fop/afp/goca/ src/java/org/apa...
Date Mon, 17 Mar 2014 09:31:20 GMT
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/TimesItalic.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/TimesItalic.xml?rev=1578276&r1=1578275&r2=1578276&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/TimesItalic.xml (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/TimesItalic.xml Mon Mar 17 09:31:13 2014
@@ -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>

Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/TimesRoman.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/TimesRoman.xml?rev=1578276&r1=1578275&r2=1578276&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/TimesRoman.xml (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/TimesRoman.xml Mon Mar 17 09:31:13 2014
@@ -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"/>

Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/ZapfDingbats.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/ZapfDingbats.xml?rev=1578276&r1=1578275&r2=1578276&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/ZapfDingbats.xml (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/ZapfDingbats.xml Mon Mar 17 09:31:13 2014
@@ -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>

Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/font-file.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/font-file.xsl?rev=1578276&r1=1578275&r2=1578276&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/font-file.xsl (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/fonts/font-file.xsl Mon Mar 17 09:31:13 2014
@@ -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
     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
 
     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
         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
         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
 }
   </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"/>);

Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/Version.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/Version.java?rev=1578276&r1=1578275&r2=1578276&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/Version.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/Version.java Mon Mar 17 09:31:13 2014
@@ -40,8 +40,9 @@ public final class Version {
         }
         if (version == null) {
             //Fallback if FOP is used in a development environment
-            String headURL
-                = "$HeadURL$";
+            // CSOFF: LineLength
+            String headURL = "$HeadURL$";
+            // CSON: LineLength
             version = headURL;
             final String pathPrefix = "/xmlgraphics/fop/";
             int pos = version.indexOf(pathPrefix);

Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/afp/AFPEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/afp/AFPEventProducer.java?rev=1578276&r1=1578275&r2=1578276&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/afp/AFPEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/afp/AFPEventProducer.java Mon Mar 17 09:31:13 2014
@@ -122,4 +122,12 @@ public interface AFPEventProducer extend
      * @event.severity WARN
      */
     void charactersetMissingMetrics(Object source, char character, String charSet);
+
+    /**
+     * Double-byte fonts are not currently supported in SVG.
+     * @param source the event source
+     * @param fontFamily name of DB font
+     * @event.severity WARN
+     */
+    void invalidDBFontInSVG(Object source, String fontFamily);
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message