replaces calls of System.err.println etc. with calls to the new MessageHandler methods

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193441 13f79535-47bb-0310-9956-ffa450edef68

src/codegen/charlist.xml

@@ -450,196 +450,184 @@
    <map adobe-name="a191" win-ansi="0x00FE" unicode="0x27BE" unicodeName="OPEN-OUTLINED RIGHTWARDS ARROW"/>
 
    <!-- the following mappings are used for the Symbol font 
-     TBD: remove doublettes and fill in unicode values -->
-   <map adobe-name="space" win-ansi="0x20" unicode="0x0000"/>
-   <map adobe-name="exclam" win-ansi="0x21" unicode="0x0000"/>
-   <map adobe-name="universal" win-ansi="0x22" unicode="0x0000"/>
-   <map adobe-name="numbersign" win-ansi="0x23" unicode="0x0000"/>
-   <map adobe-name="existential" win-ansi="0x24" unicode="0x0000"/>
-   <map adobe-name="percent" win-ansi="0x25" unicode="0x0000"/>
-   <map adobe-name="ampersand" win-ansi="0x26" unicode="0x0000"/>
-   <map adobe-name="suchthat" win-ansi="0x27" unicode="0x0000"/>
-   <map adobe-name="parenleft" win-ansi="0x28" unicode="0x0000"/>
-   <map adobe-name="parenright" win-ansi="0x29" unicode="0x0000"/>
-   <map adobe-name="asteriskmath" win-ansi="0x2A" unicode="0x0000"/>
-   <map adobe-name="plus" win-ansi="0x2B" unicode="0x0000"/>
-   <map adobe-name="comma" win-ansi="0x2C" unicode="0x0000"/>
-   <map adobe-name="minus" win-ansi="0x2D" unicode="0x0000"/>
-   <map adobe-name="period" win-ansi="0x2E" unicode="0x0000"/>
-   <map adobe-name="slash" win-ansi="0x2F" unicode="0x0000"/>
-   <map adobe-name="zero" win-ansi="0x30" unicode="0x0000"/>
-   <map adobe-name="one" win-ansi="0x31" unicode="0x0000"/>
-   <map adobe-name="two" win-ansi="0x32" unicode="0x0000"/>
-   <map adobe-name="three" win-ansi="0x33" unicode="0x0000"/>
-   <map adobe-name="four" win-ansi="0x34" unicode="0x0000"/>
-   <map adobe-name="five" win-ansi="0x35" unicode="0x0000"/>
-   <map adobe-name="six" win-ansi="0x36" unicode="0x0000"/>
-   <map adobe-name="seven" win-ansi="0x37" unicode="0x0000"/>
-   <map adobe-name="eight" win-ansi="0x38" unicode="0x0000"/>
-   <map adobe-name="nine" win-ansi="0x39" unicode="0x0000"/>
-   <map adobe-name="colon" win-ansi="0x3A" unicode="0x0000"/>
-   <map adobe-name="semicolon" win-ansi="0x3B" unicode="0x0000"/>
-   <map adobe-name="less" win-ansi="0x3C" unicode="0x0000"/>
-   <map adobe-name="equal" win-ansi="0x3D" unicode="0x0000"/>
-   <map adobe-name="greater" win-ansi="0x3E" unicode="0x0000"/>
-   <map adobe-name="question" win-ansi="0x3F" unicode="0x0000"/>
-   <map adobe-name="congruent" win-ansi="0x40" unicode="0x0000"/>
-   <map adobe-name="Alpha" win-ansi="0x41" unicode="0x0000"/>
-   <map adobe-name="Beta" win-ansi="0x42" unicode="0x0000"/>
-   <map adobe-name="Chi" win-ansi="0x43" unicode="0x0000"/>
-   <map adobe-name="Delta" win-ansi="0x44" unicode="0x0000"/>
-   <map adobe-name="Epsilon" win-ansi="0x45" unicode="0x0000"/>
-   <map adobe-name="Phi" win-ansi="0x46" unicode="0x0000"/>
-   <map adobe-name="Gamma" win-ansi="0x47" unicode="0x0000"/>
-   <map adobe-name="Eta" win-ansi="0x48" unicode="0x0000"/>
-   <map adobe-name="Iota" win-ansi="0x49" unicode="0x0000"/>
-   <map adobe-name="theta1" win-ansi="0x4A" unicode="0x0000"/>
-   <map adobe-name="Kappa" win-ansi="0x4B" unicode="0x0000"/>
-   <map adobe-name="Lambda" win-ansi="0x4C" unicode="0x0000"/>
-   <map adobe-name="Mu" win-ansi="0x4D" unicode="0x0000"/>
-   <map adobe-name="Nu" win-ansi="0x4E" unicode="0x0000"/>
-   <map adobe-name="Omicron" win-ansi="0x4F" unicode="0x0000"/>
-   <map adobe-name="Pi" win-ansi="0x50" unicode="0x0000"/>
-   <map adobe-name="Theta" win-ansi="0x51" unicode="0x0000"/>
-   <map adobe-name="Rho" win-ansi="0x52" unicode="0x0000"/>
-   <map adobe-name="Sigma" win-ansi="0x53" unicode="0x0000"/>
-   <map adobe-name="Tau" win-ansi="0x54" unicode="0x0000"/>
-   <map adobe-name="Upsilon" win-ansi="0x55" unicode="0x0000"/>
-   <map adobe-name="sigma1" win-ansi="0x56" unicode="0x0000"/>
-   <map adobe-name="Omega" win-ansi="0x57" unicode="0x0000"/>
-   <map adobe-name="Xi" win-ansi="0x58" unicode="0x0000"/>
-   <map adobe-name="Psi" win-ansi="0x59" unicode="0x0000"/>
-   <map adobe-name="Zeta" win-ansi="0x5A" unicode="0x0000"/>
-   <map adobe-name="bracketleft" win-ansi="0x5B" unicode="0x0000"/>
-   <map adobe-name="therefore" win-ansi="0x5C" unicode="0x0000"/>
-   <map adobe-name="bracketright" win-ansi="0x5D" unicode="0x0000"/>
-   <map adobe-name="perpendicular" win-ansi="0x5E" unicode="0x0000"/>
-   <map adobe-name="underscore" win-ansi="0x5F" unicode="0x0000"/>
-   <map adobe-name="radicalex" win-ansi="0x60" unicode="0x0000"/>
-   <map adobe-name="alpha" win-ansi="0x61" unicode="0x0000"/>
-   <map adobe-name="beta" win-ansi="0x62" unicode="0x0000"/>
-   <map adobe-name="chi" win-ansi="0x63" unicode="0x0000"/>
-   <map adobe-name="delta" win-ansi="0x64" unicode="0x0000"/>
-   <map adobe-name="epsilon" win-ansi="0x65" unicode="0x0000"/>
-   <map adobe-name="phi" win-ansi="0x66" unicode="0x0000"/>
-   <map adobe-name="gamma" win-ansi="0x67" unicode="0x0000"/>
-   <map adobe-name="eta" win-ansi="0x68" unicode="0x0000"/>
-   <map adobe-name="iota" win-ansi="0x69" unicode="0x0000"/>
-   <map adobe-name="phi1" win-ansi="0x6A" unicode="0x0000"/>
-   <map adobe-name="kappa" win-ansi="0x6B" unicode="0x0000"/>
-   <map adobe-name="lambda" win-ansi="0x6C" unicode="0x0000"/>
-   <map adobe-name="mu" win-ansi="0x6D" unicode="0x0000"/>
-   <map adobe-name="nu" win-ansi="0x6E" unicode="0x0000"/>
-   <map adobe-name="omicron" win-ansi="0x6F" unicode="0x0000"/>
-   <map adobe-name="pi" win-ansi="0x70" unicode="0x0000"/>
-   <map adobe-name="theta" win-ansi="0x71" unicode="0x0000"/>
-   <map adobe-name="rho" win-ansi="0x72" unicode="0x0000"/>
-   <map adobe-name="sigma" win-ansi="0x73" unicode="0x0000"/>
-   <map adobe-name="tau" win-ansi="0x74" unicode="0x0000"/>
-   <map adobe-name="upsilon" win-ansi="0x75" unicode="0x0000"/>
-   <map adobe-name="omega1" win-ansi="0x76" unicode="0x0000"/>
-   <map adobe-name="omega" win-ansi="0x77" unicode="0x0000"/>
-   <map adobe-name="xi" win-ansi="0x78" unicode="0x0000"/>
-   <map adobe-name="psi" win-ansi="0x79" unicode="0x0000"/>
-   <map adobe-name="zeta" win-ansi="0x7A" unicode="0x0000"/>
-   <map adobe-name="braceleft" win-ansi="0x7B" unicode="0x0000"/>
-   <map adobe-name="bar" win-ansi="0x7C" unicode="0x0000"/>
-   <map adobe-name="braceright" win-ansi="0x7D" unicode="0x0000"/>
-   <map adobe-name="similar" win-ansi="0x7E" unicode="0x0000"/>
-   <map adobe-name="Upsilon1" win-ansi="0xA1" unicode="0x0000"/>
-   <map adobe-name="minute" win-ansi="0xA2" unicode="0x0000"/>
-   <map adobe-name="lessequal" win-ansi="0xA3" unicode="0x0000"/>
-   <map adobe-name="fraction" win-ansi="0xA4" unicode="0x0000"/>
-   <map adobe-name="infinity" win-ansi="0xA5" unicode="0x0000"/>
-   <map adobe-name="florin" win-ansi="0xA6" unicode="0x0000"/>
-   <map adobe-name="club" win-ansi="0xA7" unicode="0x0000"/>
-   <map adobe-name="diamond" win-ansi="0xA8" unicode="0x0000"/>
-   <map adobe-name="heart" win-ansi="0xA9" unicode="0x0000"/>
-   <map adobe-name="spade" win-ansi="0xAA" unicode="0x0000"/>
-   <map adobe-name="arrowboth" win-ansi="0xAB" unicode="0x0000"/>
-   <map adobe-name="arrowleft" win-ansi="0xAC" unicode="0x0000"/>
-   <map adobe-name="arrowup" win-ansi="0xAD" unicode="0x0000"/>
-   <map adobe-name="arrowright" win-ansi="0xAE" unicode="0x0000"/>
-   <map adobe-name="arrowdown" win-ansi="0xAF" unicode="0x0000"/>
-   <map adobe-name="degree" win-ansi="0xB0" unicode="0x0000"/>
-   <map adobe-name="plusminus" win-ansi="0xB1" unicode="0x0000"/>
-   <map adobe-name="second" win-ansi="0xB2" unicode="0x0000"/>
-   <map adobe-name="greaterequal" win-ansi="0xB3" unicode="0x0000"/>
-   <map adobe-name="multiply" win-ansi="0xB4" unicode="0x0000"/>
-   <map adobe-name="proportional" win-ansi="0xB5" unicode="0x0000"/>
-   <map adobe-name="partialdiff" win-ansi="0xB6" unicode="0x0000"/>
-   <map adobe-name="bullet" win-ansi="0xB7" unicode="0x0000"/>
-   <map adobe-name="divide" win-ansi="0xB8" unicode="0x0000"/>
-   <map adobe-name="notequal" win-ansi="0xB9" unicode="0x0000"/>
-   <map adobe-name="equivalence" win-ansi="0xBA" unicode="0x0000"/>
-   <map adobe-name="approxequal" win-ansi="0xBB" unicode="0x0000"/>
-   <map adobe-name="ellipsis" win-ansi="0xBC" unicode="0x0000"/>
-   <map adobe-name="arrowvertex" win-ansi="0xBD" unicode="0x0000"/>
-   <map adobe-name="arrowhorizex" win-ansi="0xBE" unicode="0x0000"/>
-   <map adobe-name="carriagereturn" win-ansi="0xBF" unicode="0x0000"/>
-   <map adobe-name="aleph" win-ansi="0xC0" unicode="0x0000"/>
-   <map adobe-name="Ifraktur" win-ansi="0xC1" unicode="0x0000"/>
-   <map adobe-name="Rfraktur" win-ansi="0xC2" unicode="0x0000"/>
-   <map adobe-name="weierstrass" win-ansi="0xC3" unicode="0x0000"/>
-   <map adobe-name="circlemultiply" win-ansi="0xC4" unicode="0x0000"/>
-   <map adobe-name="circleplus" win-ansi="0xC5" unicode="0x0000"/>
-   <map adobe-name="emptyset" win-ansi="0xC6" unicode="0x0000"/>
-   <map adobe-name="intersection" win-ansi="0xC7" unicode="0x0000"/>
-   <map adobe-name="union" win-ansi="0xC8" unicode="0x0000"/>
-   <map adobe-name="propersuperset" win-ansi="0xC9" unicode="0x0000"/>
-   <map adobe-name="reflexsuperset" win-ansi="0xCA" unicode="0x0000"/>
-   <map adobe-name="notsubset" win-ansi="0xCB" unicode="0x0000"/>
-   <map adobe-name="propersubset" win-ansi="0xCC" unicode="0x0000"/>
-   <map adobe-name="reflexsubset" win-ansi="0xCD" unicode="0x0000"/>
-   <map adobe-name="element" win-ansi="0xCE" unicode="0x0000"/>
-   <map adobe-name="notelement" win-ansi="0xCF" unicode="0x0000"/>
-   <map adobe-name="angle" win-ansi="0xD0" unicode="0x0000"/>
-   <map adobe-name="gradient" win-ansi="0xD1" unicode="0x0000"/>
-   <map adobe-name="registerserif" win-ansi="0xD2" unicode="0x0000"/>
-   <map adobe-name="copyrightserif" win-ansi="0xD3" unicode="0x0000"/>
-   <map adobe-name="trademarkserif" win-ansi="0xD4" unicode="0x0000"/>
-   <map adobe-name="product" win-ansi="0xD5" unicode="0x0000"/>
-   <map adobe-name="radical" win-ansi="0xD6" unicode="0x0000"/>
-   <map adobe-name="dotmath" win-ansi="0xD7" unicode="0x0000"/>
-   <map adobe-name="logicalnot" win-ansi="0xD8" unicode="0x0000"/>
-   <map adobe-name="logicaland" win-ansi="0xD9" unicode="0x0000"/>
-   <map adobe-name="logicalor" win-ansi="0xDA" unicode="0x0000"/>
-   <map adobe-name="arrowdblboth" win-ansi="0xDB" unicode="0x0000"/>
-   <map adobe-name="arrowdblleft" win-ansi="0xDC" unicode="0x0000"/>
-   <map adobe-name="arrowdblup" win-ansi="0xDD" unicode="0x0000"/>
-   <map adobe-name="arrowdblright" win-ansi="0xDE" unicode="0x0000"/>
-   <map adobe-name="arrowdbldown" win-ansi="0xDF" unicode="0x0000"/>
-   <map adobe-name="lozenge" win-ansi="0xE0" unicode="0x0000"/>
-   <map adobe-name="angleleft" win-ansi="0xE1" unicode="0x0000"/>
-   <map adobe-name="registersans" win-ansi="0xE2" unicode="0x0000"/>
-   <map adobe-name="copyrightsans" win-ansi="0xE3" unicode="0x0000"/>
-   <map adobe-name="trademarksans" win-ansi="0xE4" unicode="0x0000"/>
-   <map adobe-name="summation" win-ansi="0xE5" unicode="0x0000"/>
-   <map adobe-name="parenlefttp" win-ansi="0xE6" unicode="0x0000"/>
-   <map adobe-name="parenleftex" win-ansi="0xE7" unicode="0x0000"/>
-   <map adobe-name="parenleftbt" win-ansi="0xE8" unicode="0x0000"/>
-   <map adobe-name="bracketlefttp" win-ansi="0xE9" unicode="0x0000"/>
-   <map adobe-name="bracketleftex" win-ansi="0xEA" unicode="0x0000"/>
-   <map adobe-name="bracketleftbt" win-ansi="0xEB" unicode="0x0000"/>
-   <map adobe-name="bracelefttp" win-ansi="0xEC" unicode="0x0000"/>
-   <map adobe-name="braceleftmid" win-ansi="0xED" unicode="0x0000"/>
-   <map adobe-name="braceleftbt" win-ansi="0xEE" unicode="0x0000"/>
-   <map adobe-name="braceex" win-ansi="0xEF" unicode="0x0000"/>
-   <map adobe-name="angleright" win-ansi="0xF1" unicode="0x0000"/>
-   <map adobe-name="integral" win-ansi="0xF2" unicode="0x0000"/>
-   <map adobe-name="integraltp" win-ansi="0xF3" unicode="0x0000"/>
-   <map adobe-name="integralex" win-ansi="0xF4" unicode="0x0000"/>
-   <map adobe-name="integralbt" win-ansi="0xF5" unicode="0x0000"/>
-   <map adobe-name="parenrighttp" win-ansi="0xF6" unicode="0x0000"/>
-   <map adobe-name="parenrightex" win-ansi="0xF7" unicode="0x0000"/>
-   <map adobe-name="parenrightbt" win-ansi="0xF8" unicode="0x0000"/>
-   <map adobe-name="bracketrighttp" win-ansi="0xF9" unicode="0x0000"/>
-   <map adobe-name="bracketrightex" win-ansi="0xFA" unicode="0x0000"/>
-   <map adobe-name="bracketrightbt" win-ansi="0xFB" unicode="0x0000"/>
-   <map adobe-name="bracerighttp" win-ansi="0xFC" unicode="0x0000"/>
-   <map adobe-name="bracerightmid" win-ansi="0xFD" unicode="0x0000"/>
-   <map adobe-name="bracerightbt" win-ansi="0xFE" unicode="0x0000"/>
-   <map adobe-name="apple" win-ansi="-1" unicode="0x0000"/>
+     TBD: remove doublettes  -->
+  <map adobe-name="universal" win-ansi="0x22" unicode="0x2200"/>
+  <map adobe-name="numbersign" win-ansi="0x23" unicode="0x0023"/>
+  <map adobe-name="existential" win-ansi="0x24" unicode="0x2203"/>
+  <map adobe-name="percent" win-ansi="0x25" unicode="0x0025"/>
+  <map adobe-name="ampersand" win-ansi="0x26" unicode="0x0026"/>
+  <map adobe-name="suchthat" win-ansi="0x27" unicode="0x220B"/>
+  <map adobe-name="parenleft" win-ansi="0x28" unicode="0x0028"/>
+  <map adobe-name="parenright" win-ansi="0x29" unicode="0x0029"/>
+  <map adobe-name="asteriskmath" win-ansi="0x2A" unicode="0x2217"/>
+  <map adobe-name="plus" win-ansi="0x2B" unicode="0x002B"/>
+  <map adobe-name="comma" win-ansi="0x2C" unicode="0x002C"/>
+  <map adobe-name="minus" win-ansi="0x2D" unicode="0x2212"/>
+  <map adobe-name="period" win-ansi="0x2E" unicode="0x002E"/>
+  <map adobe-name="slash" win-ansi="0x2F" unicode="0x002F"/>
+  <map adobe-name="colon" win-ansi="0x3A" unicode="0x003A"/>
+  <map adobe-name="semicolon" win-ansi="0x3B" unicode="0x003B"/>
+  <map adobe-name="less" win-ansi="0x3C" unicode="0x003C"/>
+  <map adobe-name="equal" win-ansi="0x3D" unicode="0x003D"/>
+  <map adobe-name="greater" win-ansi="0x3E" unicode="0x003E"/>
+  <map adobe-name="question" win-ansi="0x3F" unicode="0x003F"/>
+  <map adobe-name="congruent" win-ansi="0x40" unicode="0x2245"/>
+  <map adobe-name="Alpha" win-ansi="0x41" unicode="0x0391"/>
+  <map adobe-name="Beta" win-ansi="0x42" unicode="0x0392"/>
+  <map adobe-name="Chi" win-ansi="0x43" unicode="0x03A7"/>
+  <map adobe-name="Delta" win-ansi="0x44" unicode="0x2206"/>
+  <map adobe-name="Epsilon" win-ansi="0x45" unicode="0x0395"/>
+  <map adobe-name="Phi" win-ansi="0x46" unicode="0x03A6"/>
+  <map adobe-name="Gamma" win-ansi="0x47" unicode="0x0393"/>
+  <map adobe-name="Eta" win-ansi="0x48" unicode="0x0397"/>
+  <map adobe-name="Iota" win-ansi="0x49" unicode="0x0399"/>
+  <map adobe-name="theta1" win-ansi="0x4A" unicode="0x03D1"/>
+  <map adobe-name="Kappa" win-ansi="0x4B" unicode="0x039A"/>
+  <map adobe-name="Lambda" win-ansi="0x4C" unicode="0x039B"/>
+  <map adobe-name="Mu" win-ansi="0x4D" unicode="0x039C"/>
+  <map adobe-name="Nu" win-ansi="0x4E" unicode="0x039D"/>
+  <map adobe-name="Omicron" win-ansi="0x4F" unicode="0x039F"/>
+  <map adobe-name="Pi" win-ansi="0x50" unicode="0x03A0"/>
+  <map adobe-name="Theta" win-ansi="0x51" unicode="0x0398"/>
+  <map adobe-name="Rho" win-ansi="0x52" unicode="0x03A1"/>
+  <map adobe-name="Sigma" win-ansi="0x53" unicode="0x03A3"/>
+  <map adobe-name="Tau" win-ansi="0x54" unicode="0x03A4"/>
+  <map adobe-name="Upsilon" win-ansi="0x55" unicode="0x03A5"/>
+  <map adobe-name="sigma1" win-ansi="0x56" unicode="0x03C2"/>
+  <map adobe-name="Omega" win-ansi="0x57" unicode="0x2126"/>
+  <map adobe-name="Xi" win-ansi="0x58" unicode="0x039E"/>
+  <map adobe-name="Psi" win-ansi="0x59" unicode="0x03A8"/>
+  <map adobe-name="Zeta" win-ansi="0x5A" unicode="0x0396"/>
+  <map adobe-name="bracketleft" win-ansi="0x5B" unicode="0x005B"/>
+  <map adobe-name="therefore" win-ansi="0x5C" unicode="0x2234"/>
+  <map adobe-name="bracketright" win-ansi="0x5D" unicode="0x005D"/>
+  <map adobe-name="perpendicular" win-ansi="0x5E" unicode="0x22A5"/>
+  <map adobe-name="underscore" win-ansi="0x5F" unicode="0x005F"/>
+  <map adobe-name="radicalex" win-ansi="0x60" unicode="0xF8E5"/>
+  <map adobe-name="alpha" win-ansi="0x61" unicode="0x03B1"/>
+  <map adobe-name="beta" win-ansi="0x62" unicode="0x03B2"/>
+  <map adobe-name="chi" win-ansi="0x63" unicode="0x03C7"/>
+  <map adobe-name="delta" win-ansi="0x64" unicode="0x03B4"/>
+  <map adobe-name="epsilon" win-ansi="0x65" unicode="0x03B5"/>
+  <map adobe-name="phi" win-ansi="0x66" unicode="0x03C6"/>
+  <map adobe-name="gamma" win-ansi="0x67" unicode="0x03B3"/>
+  <map adobe-name="eta" win-ansi="0x68" unicode="0x03B7"/>
+  <map adobe-name="iota" win-ansi="0x69" unicode="0x03B9"/>
+  <map adobe-name="phi1" win-ansi="0x6A" unicode="0x03D5"/>
+  <map adobe-name="kappa" win-ansi="0x6B" unicode="0x03BA"/>
+  <map adobe-name="lambda" win-ansi="0x6C" unicode="0x03BB"/>
+  <map adobe-name="mu" win-ansi="0x6D" unicode="0x00B5"/>
+  <map adobe-name="nu" win-ansi="0x6E" unicode="0x03BD"/>
+  <map adobe-name="omicron" win-ansi="0x6F" unicode="0x03BF"/>
+  <map adobe-name="pi" win-ansi="0x70" unicode="0x03C0"/>
+  <map adobe-name="theta" win-ansi="0x71" unicode="0x03B8"/>
+  <map adobe-name="rho" win-ansi="0x72" unicode="0x03C1"/>
+  <map adobe-name="sigma" win-ansi="0x73" unicode="0x03C3"/>
+  <map adobe-name="tau" win-ansi="0x74" unicode="0x03C4"/>
+  <map adobe-name="upsilon" win-ansi="0x75" unicode="0x03C5"/>
+  <map adobe-name="omega1" win-ansi="0x76" unicode="0x03D6"/>
+  <map adobe-name="omega" win-ansi="0x77" unicode="0x03C9"/>
+  <map adobe-name="xi" win-ansi="0x78" unicode="0x03BE"/>
+  <map adobe-name="psi" win-ansi="0x79" unicode="0x03C8"/>
+  <map adobe-name="zeta" win-ansi="0x7A" unicode="0x03B6"/>
+  <map adobe-name="braceleft" win-ansi="0x7B" unicode="0x007B"/>
+  <map adobe-name="bar" win-ansi="0x7C" unicode="0x007C"/>
+  <map adobe-name="braceright" win-ansi="0x7D" unicode="0x007D"/>
+  <map adobe-name="similar" win-ansi="0x7E" unicode="0x223C"/>
+  <map adobe-name="Upsilon1" win-ansi="0xA1" unicode="0x03D2"/>
+  <map adobe-name="minute" win-ansi="0xA2" unicode="0x2032"/>
+  <map adobe-name="lessequal" win-ansi="0xA3" unicode="0x2264"/>
+  <map adobe-name="fraction" win-ansi="0xA4" unicode="0x2044"/>
+  <map adobe-name="infinity" win-ansi="0xA5" unicode="0x221E"/>
+  <map adobe-name="florin" win-ansi="0xA6" unicode="0x0192"/>
+  <map adobe-name="club" win-ansi="0xA7" unicode="0x2663"/>
+  <map adobe-name="diamond" win-ansi="0xA8" unicode="0x2666"/>
+  <map adobe-name="heart" win-ansi="0xA9" unicode="0x2665"/>
+  <map adobe-name="spade" win-ansi="0xAA" unicode="0x2660"/>
+  <map adobe-name="arrowboth" win-ansi="0xAB" unicode="0x2194"/>
+  <map adobe-name="arrowleft" win-ansi="0xAC" unicode="0x2190"/>
+  <map adobe-name="arrowup" win-ansi="0xAD" unicode="0x2191"/>
+  <map adobe-name="arrowright" win-ansi="0xAE" unicode="0x2192"/>
+  <map adobe-name="arrowdown" win-ansi="0xAF" unicode="0x2193"/>
+  <map adobe-name="degree" win-ansi="0xB0" unicode="0x00B0"/>
+  <map adobe-name="plusminus" win-ansi="0xB1" unicode="0x00B1"/>
+  <map adobe-name="second" win-ansi="0xB2" unicode="0x2033"/>
+  <map adobe-name="greaterequal" win-ansi="0xB3" unicode="0x2265"/>
+  <map adobe-name="multiply" win-ansi="0xB4" unicode="0x00D7"/>
+  <map adobe-name="proportional" win-ansi="0xB5" unicode="0x221D"/>
+  <map adobe-name="partialdiff" win-ansi="0xB6" unicode="0x2202"/>
+  <map adobe-name="bullet" win-ansi="0xB7" unicode="0x2022"/>
+  <map adobe-name="divide" win-ansi="0xB8" unicode="0x00F7"/>
+  <map adobe-name="notequal" win-ansi="0xB9" unicode="0x2260"/>
+  <map adobe-name="equivalence" win-ansi="0xBA" unicode="0x2261"/>
+  <map adobe-name="approxequal" win-ansi="0xBB" unicode="0x2248"/>
+  <map adobe-name="ellipsis" win-ansi="0xBC" unicode="0x2026"/>
+  <map adobe-name="arrowvertex" win-ansi="0xBD" unicode="0xF8E6"/>
+  <map adobe-name="arrowhorizex" win-ansi="0xBE" unicode="0xF8E7"/>
+  <map adobe-name="carriagereturn" win-ansi="0xBF" unicode="0x21B5"/>
+  <map adobe-name="aleph" win-ansi="0xC0" unicode="0x2135"/>
+  <map adobe-name="Ifraktur" win-ansi="0xC1" unicode="0x2111"/>
+  <map adobe-name="Rfraktur" win-ansi="0xC2" unicode="0x211C"/>
+  <map adobe-name="weierstrass" win-ansi="0xC3" unicode="0x2118"/>
+  <map adobe-name="circlemultiply" win-ansi="0xC4" unicode="0x2297"/>
+  <map adobe-name="circleplus" win-ansi="0xC5" unicode="0x2295"/>
+  <map adobe-name="emptyset" win-ansi="0xC6" unicode="0x2205"/>
+  <map adobe-name="intersection" win-ansi="0xC7" unicode="0x2229"/>
+  <map adobe-name="union" win-ansi="0xC8" unicode="0x222A"/>
+  <map adobe-name="propersuperset" win-ansi="0xC9" unicode="0x2283"/>
+  <map adobe-name="reflexsuperset" win-ansi="0xCA" unicode="0x2287"/>
+  <map adobe-name="notsubset" win-ansi="0xCB" unicode="0x2284"/>
+  <map adobe-name="propersubset" win-ansi="0xCC" unicode="0x2282"/>
+  <map adobe-name="reflexsubset" win-ansi="0xCD" unicode="0x2286"/>
+  <map adobe-name="element" win-ansi="0xCE" unicode="0x2208"/>
+  <map adobe-name="notelement" win-ansi="0xCF" unicode="0x2209"/>
+  <map adobe-name="angle" win-ansi="0xD0" unicode="0x2220"/>
+  <map adobe-name="gradient" win-ansi="0xD1" unicode="0x2207"/>
+  <map adobe-name="registerserif" win-ansi="0xD2" unicode="0xF6DA"/>
+  <map adobe-name="copyrightserif" win-ansi="0xD3" unicode="0xF6D9"/>
+  <map adobe-name="trademarkserif" win-ansi="0xD4" unicode="0xF6DB"/>
+  <map adobe-name="product" win-ansi="0xD5" unicode="0x220F"/>
+  <map adobe-name="radical" win-ansi="0xD6" unicode="0x221A"/>
+  <map adobe-name="dotmath" win-ansi="0xD7" unicode="0x22C5"/>
+  <map adobe-name="logicalnot" win-ansi="0xD8" unicode="0x00AC"/>
+  <map adobe-name="logicaland" win-ansi="0xD9" unicode="0x2227"/>
+  <map adobe-name="logicalor" win-ansi="0xDA" unicode="0x2228"/>
+  <map adobe-name="arrowdblboth" win-ansi="0xDB" unicode="0x21D4"/>
+  <map adobe-name="arrowdblleft" win-ansi="0xDC" unicode="0x21D0"/>
+  <map adobe-name="arrowdblup" win-ansi="0xDD" unicode="0x21D1"/>
+  <map adobe-name="arrowdblright" win-ansi="0xDE" unicode="0x21D2"/>
+  <map adobe-name="arrowdbldown" win-ansi="0xDF" unicode="0x21D3"/>
+  <map adobe-name="lozenge" win-ansi="0xE0" unicode="0x25CA"/>
+  <map adobe-name="angleleft" win-ansi="0xE1" unicode="0x2329"/>
+  <map adobe-name="registersans" win-ansi="0xE2" unicode="0xF8E8"/>
+  <map adobe-name="copyrightsans" win-ansi="0xE3" unicode="0xF8E9"/>
+  <map adobe-name="trademarksans" win-ansi="0xE4" unicode="0xF8EA"/>
+  <map adobe-name="summation" win-ansi="0xE5" unicode="0x2211"/>
+  <map adobe-name="parenlefttp" win-ansi="0xE6" unicode="0xF8EB"/>
+  <map adobe-name="parenleftex" win-ansi="0xE7" unicode="0xF8EC"/>
+  <map adobe-name="parenleftbt" win-ansi="0xE8" unicode="0xF8ED"/>
+  <map adobe-name="bracketlefttp" win-ansi="0xE9" unicode="0xF8EE"/>
+  <map adobe-name="bracketleftex" win-ansi="0xEA" unicode="0xF8EF"/>
+  <map adobe-name="bracketleftbt" win-ansi="0xEB" unicode="0xF8F0"/>
+  <map adobe-name="bracelefttp" win-ansi="0xEC" unicode="0xF8F1"/>
+  <map adobe-name="braceleftmid" win-ansi="0xED" unicode="0xF8F2"/>
+  <map adobe-name="braceleftbt" win-ansi="0xEE" unicode="0xF8F3"/>
+  <map adobe-name="braceex" win-ansi="0xEF" unicode="0xF8F4"/>
+  <map adobe-name="angleright" win-ansi="0xF1" unicode="0x232A"/>
+  <map adobe-name="integral" win-ansi="0xF2" unicode="0x222B"/>
+  <map adobe-name="integraltp" win-ansi="0xF3" unicode="0x2320"/>
+  <map adobe-name="integralex" win-ansi="0xF4" unicode="0xF8F5"/>
+  <map adobe-name="integralbt" win-ansi="0xF5" unicode="0x2321"/>
+  <map adobe-name="parenrighttp" win-ansi="0xF6" unicode="0xF8F6"/>
+  <map adobe-name="parenrightex" win-ansi="0xF7" unicode="0xF8F7"/>
+  <map adobe-name="parenrightbt" win-ansi="0xF8" unicode="0xF8F8"/>
+  <map adobe-name="bracketrighttp" win-ansi="0xF9" unicode="0xF8F9"/>
+  <map adobe-name="bracketrightex" win-ansi="0xFA" unicode="0xF8FA"/>
+  <map adobe-name="bracketrightbt" win-ansi="0xFB" unicode="0xF8FB"/>
+  <map adobe-name="bracerighttp" win-ansi="0xFC" unicode="0xF8FC"/>
+  <map adobe-name="bracerightmid" win-ansi="0xFD" unicode="0xF8FD"/>
+  <map adobe-name="bracerightbt" win-ansi="0xFE" unicode="0xF8FE"/>
+  <map adobe-name="apple" win-ansi="-1" unicode="0xF8FE"/>
 
 </font-mappings>
 

src/codegen/properties.xsl

@@ -13,6 +13,7 @@ package org.apache.fop.fo.properties;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.fo.*;
 import org.apache.fop.apps.FOPException;
+import org.apache.fop.messaging.MessageHandler;
 
 public class <xsl:value-of select="class-name"/> extends Property {
 
@@ -80,6 +81,7 @@ package org.apache.fop.fo.properties;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.fo.*;
 import org.apache.fop.apps.FOPException;
+import org.apache.fop.messaging.MessageHandler;
 
 public class <xsl:value-of select="class-name"/> extends Property {
 <xsl:for-each select="datatype/enumeration/value">
@@ -94,7 +96,7 @@ public class <xsl:value-of select="class-name"/> extends Property {
       if (value.equals("<xsl:value-of select="."/>")) { v = <xsl:value-of select="@const"/>; }
       else</xsl:for-each>
       {
-        System.err.println("WARNING: Unknown value for <xsl:value-of select="name"/>: " + value);
+        MessageHandler.errorln("WARNING: Unknown value for <xsl:value-of select="name"/>: " + value);
         return make(propertyList, "<xsl:value-of select="default"/>");
       }
       return new <xsl:value-of select="class-name"/>(propertyList, v);

src/org/apache/fop/apps/AWTCommandLine.java

@@ -6,11 +6,11 @@ package org.apache.fop.apps;
   Rainer Steinkuhle: Rainer.Steinkuhle@jcatalog.com,
   Stanislav Gorkhover: Stanislav.Gorkhover@jcatalog.com
  */
-
-
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.viewer.*;
 import org.apache.fop.render.awt.*;
 
+
 import javax.swing.UIManager;
 import java.awt.*;
 
@@ -72,7 +72,7 @@ public class AWTCommandLine {
 
 
 	if (parser == null) {
-	    System.err.println("ERROR: Unable to create SAX parser");
+	    MessageHandler.errorln("ERROR: Unable to create SAX parser");
 	    System.exit(1);
 	}
 
@@ -102,8 +102,8 @@ public class AWTCommandLine {
         frame.progress(resource.getString("Show"));
 
 	} catch (Exception e) {
-	    System.err.println("FATAL ERROR: " + e.getMessage());
-        e.printStackTrace();
+	    MessageHandler.errorln("FATAL ERROR: " + e.getMessage());
+      e.printStackTrace();
 	    System.exit(1);
 	}
   }
@@ -115,20 +115,20 @@ public class AWTCommandLine {
 	if (parserClassName == null) {
 	    parserClassName = "com.jclark.xml.sax.Driver";
 	}
-	System.err.println("using SAX parser " + parserClassName);
+	MessageHandler.errorln("using SAX parser " + parserClassName);
 
 	try {
 	    return (Parser)
 		Class.forName(parserClassName).newInstance();
 	} catch (ClassNotFoundException e) {
-	    System.err.println("Could not find " + parserClassName);
+	    MessageHandler.errorln("Could not find " + parserClassName);
 	} catch (InstantiationException e) {
-	    System.err.println("Could not instantiate "
+	    MessageHandler.errorln("Could not instantiate "
 			       + parserClassName);
 	} catch (IllegalAccessException e) {
-	    System.err.println("Could not access " + parserClassName);
+	    MessageHandler.errorln("Could not access " + parserClassName);
 	} catch (ClassCastException e) {
-	    System.err.println(parserClassName + " is not a SAX driver");
+	    MessageHandler.errorln(parserClassName + " is not a SAX driver");
 	}
 	return null;
     }
@@ -186,7 +186,7 @@ public class AWTCommandLine {
     URL url = getClass().getResource(path);
     in = url.openStream();
     } catch(Exception ex) {
-      System.out.println("Can't find URL to: <" + path + "> " + ex.getMessage());
+      MessageHandler.logln("Can't find URL to: <" + path + "> " + ex.getMessage());
     }
     return new SecureResourceBundle(in);
   }
@@ -205,9 +205,9 @@ public class AWTCommandLine {
     String language = null;
     String imageDir = null;
 
-    System.err.println(Version.getVersion());
+    MessageHandler.errorln(Version.getVersion());
     if (args.length < 1 || args.length > 3) {
-      System.err.println("usage: java AWTCommandLine " +
+      MessageHandler.errorln("usage: java AWTCommandLine " +
                          "formatting-object-file [language] ");
       System.exit(1);
     }

src/org/apache/fop/apps/CommandLine.java

@@ -65,6 +65,10 @@ import java.io.IOException;
 import java.io.FileNotFoundException;
 import java.net.URL;
 
+// FOP 
+import org.apache.fop.messaging.MessageHandler;
+
+
 /**
  * mainline class.
  *
@@ -86,20 +90,20 @@ public class CommandLine {
 	if (parserClassName == null) {
 	    parserClassName = "org.apache.xerces.parsers.SAXParser";
 	}
-	System.err.println("using SAX parser " + parserClassName);
+	org.apache.fop.messaging.MessageHandler.logln("using SAX parser " + parserClassName);
 
 	try {
 	    return (Parser)
 		Class.forName(parserClassName).newInstance();
 	} catch (ClassNotFoundException e) {
-	    System.err.println("Could not find " + parserClassName);
+	    org.apache.fop.messaging.MessageHandler.errorln("Could not find " + parserClassName);
 	} catch (InstantiationException e) {
-	    System.err.println("Could not instantiate "
+	    org.apache.fop.messaging.MessageHandler.errorln("Could not instantiate "
 			       + parserClassName);
 	} catch (IllegalAccessException e) {
-	    System.err.println("Could not access " + parserClassName);
+	    org.apache.fop.messaging.MessageHandler.errorln("Could not access " + parserClassName);
 	} catch (ClassCastException e) {
-	    System.err.println(parserClassName + " is not a SAX driver"); 
+	    org.apache.fop.messaging.MessageHandler.errorln(parserClassName + " is not a SAX driver"); 
 	}
 	return null;
     }
@@ -139,10 +143,12 @@ public class CommandLine {
      */
     public static void main(String[] args) {
 	String version = Version.getVersion();
-	System.err.println(version);
+   MessageHandler.errorln(version);
+
+
 		
 	if (args.length != 2) {
-	    System.err.println("usage: java "
+	    MessageHandler.errorln("usage: java "
 			       + "org.apache.fop.apps.CommandLine "
 			       + "formatting-object-file pdf-file");
 	    System.exit(1);
@@ -151,7 +157,7 @@ public class CommandLine {
 	Parser parser = createParser();
 		
 	if (parser == null) {
-	    System.err.println("ERROR: Unable to create SAX parser");
+	    MessageHandler.errorln("ERROR: Unable to create SAX parser");
 	    System.exit(1);
 	}
 	
@@ -165,7 +171,7 @@ public class CommandLine {
 	    driver.format();
 	    driver.render();
 	} catch (Exception e) {
-	    System.err.println("FATAL ERROR: " + e.getMessage());
+	    MessageHandler.errorln("FATAL ERROR: " + e.getMessage());
 	    System.exit(1);
 	}
     }

src/org/apache/fop/apps/Driver.java

@@ -57,6 +57,7 @@ import org.apache.fop.fo.ElementMapping;
 import org.apache.fop.layout.AreaTree;
 import org.apache.fop.layout.FontInfo;
 import org.apache.fop.render.Renderer;
+import org.apache.fop.messaging.MessageHandler;
 
 // DOM
 import org.w3c.dom.Document;
@@ -149,20 +150,20 @@ public class Driver {
      * instantiate the Renderer class
      */
     protected Renderer createRenderer(String rendererClassName) {
-	System.err.println("using renderer " + rendererClassName);
+    MessageHandler.logln("using renderer " + rendererClassName);
 
 	try {
 	    return (Renderer)
 		Class.forName(rendererClassName).newInstance();
 	} catch (ClassNotFoundException e) {
-	    System.err.println("Could not find " + rendererClassName);
+	    MessageHandler.errorln("Could not find " + rendererClassName);
 	} catch (InstantiationException e) {
-	    System.err.println("Could not instantiate "
+	    MessageHandler.errorln("Could not instantiate "
 			       + rendererClassName);
 	} catch (IllegalAccessException e) {
-	    System.err.println("Could not access " + rendererClassName);
+	    MessageHandler.errorln("Could not access " + rendererClassName);
 	} catch (ClassCastException e) {
-	    System.err.println(rendererClassName + " is not a renderer"); 
+	    MessageHandler.errorln(rendererClassName + " is not a renderer"); 
 	}
 	return null;
     }
@@ -188,20 +189,20 @@ public class Driver {
      * instantiate element mapping class
      */
     protected ElementMapping createElementMapping(String mappingClassName) {
-	System.err.println("using element mapping " + mappingClassName);
+    MessageHandler.logln("using element mapping " + mappingClassName);
 
 	try {
 	    return (ElementMapping)
 		Class.forName(mappingClassName).newInstance();
 	} catch (ClassNotFoundException e) {
-	    System.err.println("Could not find " + mappingClassName);
+	    MessageHandler.errorln("Could not find " + mappingClassName);
 	} catch (InstantiationException e) {
-	    System.err.println("Could not instantiate "
+	    MessageHandler.errorln("Could not instantiate "
 			       + mappingClassName);
 	} catch (IllegalAccessException e) {
-	    System.err.println("Could not access " + mappingClassName);
+	    MessageHandler.errorln("Could not access " + mappingClassName);
 	} catch (ClassCastException e) {
-	    System.err.println(mappingClassName + " is not an element mapping"); 
+	    MessageHandler.errorln(mappingClassName + " is not an element mapping"); 
 	}
 	return null;
     }

src/org/apache/fop/apps/PDFOutputHandler.java

@@ -10,6 +10,7 @@ import org.apache.fop.fo.ElementMapping;
 import org.apache.fop.layout.AreaTree;
 import org.apache.fop.layout.FontInfo;
 import org.apache.fop.render.Renderer;
+import org.apache.fop.messaging.MessageHandler;
 
 //////////////////////////////////////////////////////////////////////////////////////
 /**
@@ -138,20 +139,20 @@ public class PDFOutputHandler extends FOTreeBuilder implements OutputDocumentHan
    * instantiate element mapping class
    */
   protected ElementMapping createElementMapping(String mappingClassName) {
-    System.err.println("using element mapping " + mappingClassName);
+    MessageHandler.logln("using element mapping " + mappingClassName);
 
     try {
         return (ElementMapping)
     	Class.forName(mappingClassName).newInstance();
     } catch (ClassNotFoundException e) {
-        System.err.println("Could not find " + mappingClassName);
+        MessageHandler.errorln("Could not find " + mappingClassName);
     } catch (InstantiationException e) {
-        System.err.println("Could not instantiate "
+        MessageHandler.errorln("Could not instantiate "
     		       + mappingClassName);
     } catch (IllegalAccessException e) {
-        System.err.println("Could not access " + mappingClassName);
+        MessageHandler.errorln("Could not access " + mappingClassName);
     } catch (ClassCastException e) {
-        System.err.println(mappingClassName + " is not an element mapping"); 
+        MessageHandler.errorln(mappingClassName + " is not an element mapping"); 
     }
     return null;
   }
@@ -162,20 +163,20 @@ public class PDFOutputHandler extends FOTreeBuilder implements OutputDocumentHan
    * instantiate the Renderer class
    */
   protected Renderer createRenderer(String rendererClassName) {
-    System.err.println("using renderer " + rendererClassName);
+    MessageHandler.logln("using renderer " + rendererClassName);
 
     try {
         return (Renderer)
     	Class.forName(rendererClassName).newInstance();
     } catch (ClassNotFoundException e) {
-        System.err.println("Could not find " + rendererClassName);
+        MessageHandler.errorln("Could not find " + rendererClassName);
     } catch (InstantiationException e) {
-        System.err.println("Could not instantiate "
+        MessageHandler.errorln("Could not instantiate "
     		       + rendererClassName);
     } catch (IllegalAccessException e) {
-        System.err.println("Could not access " + rendererClassName);
+        MessageHandler.errorln("Could not access " + rendererClassName);
     } catch (ClassCastException e) {
-        System.err.println(rendererClassName + " is not a renderer"); 
+        MessageHandler.errorln(rendererClassName + " is not a renderer"); 
     }
     return null;
   }

src/org/apache/fop/apps/PrintCommandLine.java

@@ -21,6 +21,7 @@ import java.util.Vector;
 import org.apache.fop.render.awt.AWTRenderer;
 import org.apache.fop.layout.AreaTree;
 import org.apache.fop.layout.Page;
+import org.apache.fop.messaging.MessageHandler;
 
 
 /**
@@ -40,10 +41,10 @@ public class PrintCommandLine extends CommandLine {
   public static void main(String[] args) {
 
     String version = Version.getVersion();
-    System.err.println(version);
+    MessageHandler.errorln(version);
 
     if (args.length != 1) {
-      System.err.println("usage: java [-Dstart=i] [-Dend=i]"
+      MessageHandler.errorln("usage: java [-Dstart=i] [-Dend=i]"
         + " [-Dcopies=i] [-Deven=true|false]"
         + " org.apache.fop.apps.PrintCommandLine formatting-object-file");
       System.exit(1);
@@ -52,7 +53,7 @@ public class PrintCommandLine extends CommandLine {
     Parser parser = createParser();
 
     if (parser == null) {
-      System.err.println("ERROR: Unable to create SAX parser");
+      MessageHandler.errorln("ERROR: Unable to create SAX parser");
       System.exit(1);
     }
 
@@ -67,7 +68,7 @@ public class PrintCommandLine extends CommandLine {
       driver.format();
       driver.render();
     } catch (Exception e) {
-      System.err.println("FATAL ERROR: " + e.getMessage());
+      MessageHandler.errorln("FATAL ERROR: " + e.getMessage());
       System.exit(1);
     }
 

src/org/apache/fop/apps/XTCommandLine.java

@@ -54,6 +54,7 @@ package org.apache.fop.apps;
 import org.apache.fop.render.pdf.PDFRenderer;
 import org.apache.fop.fo.StandardElementMapping;
 import org.apache.fop.svg.SVGElementMapping;
+import org.apache.fop.messaging.MessageHandler;
 
 // James Clark
 import com.jclark.xsl.sax.XSLProcessor;
@@ -92,17 +93,17 @@ public class XTCommandLine extends CommandLine {
      */
     public static void main(String[] args) {
 	String version = Version.getVersion();
-	System.err.println(version);
+	MessageHandler.errorln(version);
 		
 	if (args.length != 3) {
-	    System.err.println("usage: java org.apache.fop.apps.XTCommandLine xml-file xsl-stylesheet pdf-file");
+	    MessageHandler.errorln("usage: java org.apache.fop.apps.XTCommandLine xml-file xsl-stylesheet pdf-file");
 	    System.exit(1);
 	}
 	
 	Parser parser = createParser();
 	
 	if (parser == null) {
-	    System.err.println("ERROR: Unable to create SAX parser");
+	    MessageHandler.errorln("ERROR: Unable to create SAX parser");
 	    System.exit(1);
 	}
 	
@@ -122,7 +123,7 @@ public class XTCommandLine extends CommandLine {
 	    driver.format();
 	    driver.render();
 	} catch (Exception e) {
-	    System.err.println("FATAL ERROR: " + e.getMessage());
+	    MessageHandler.errorln("FATAL ERROR: " + e.getMessage());
 	    System.exit(1);
 	}
     }

src/org/apache/fop/datatypes/ColorType.java

@@ -51,6 +51,7 @@
 package org.apache.fop.datatypes;
 
 import java.util.*;
+import org.apache.fop.messaging.MessageHandler;
 
 /**
  * a colour quantity in XSL
@@ -90,13 +91,13 @@ public class ColorType {
 		    this.red = 0;
 		    this.green = 0;
 		    this.blue = 0;
-		    System.err.println("ERROR: unknown colour format. Must be #RGB or #RRGGBB");
+		    MessageHandler.errorln("ERROR: unknown colour format. Must be #RGB or #RRGGBB");
 		}
 	    } catch (Exception e) {
 		this.red = 0;
 		this.green = 0;
 		this.blue = 0;
-		System.err.println("ERROR: unknown colour format. Must be #RGB or #RRGGBB");
+		MessageHandler.errorln("ERROR: unknown colour format. Must be #RGB or #RRGGBB");
 	    }
 	} else if (value.startsWith("rgb(")) {
 		int poss = value.indexOf("(");
@@ -133,7 +134,7 @@ public class ColorType {
 				this.red = 0;
 				this.green = 0;
 				this.blue = 0;
-				System.err.println("ERROR: unknown colour format. Must be #RGB or #RRGGBB");
+				MessageHandler.errorln("ERROR: unknown colour format. Must be #RGB or #RRGGBB");
 		    }
 	    }
 	} else if (value.startsWith("url(")) {
@@ -217,7 +218,7 @@ public class ColorType {
 		this.red = 0;
 		this.green = 0;
 		this.blue = 0;
-		System.err.println("ERROR: unknown colour name: " + value);
+		MessageHandler.errorln("ERROR: unknown colour name: " + value);
 	    }
 	}
     }

src/org/apache/fop/datatypes/Length.java

@@ -51,6 +51,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.Property;
+import org.apache.fop.messaging.MessageHandler;
 
 /**
  * a length quantity in XSL
@@ -95,7 +96,7 @@ public class Length {
 	int l = len.length();
 	
 	if (l == 0) {
-	    System.err.println("WARNING: empty length");
+	    MessageHandler.errorln("WARNING: empty length");
 	    this.millipoints = 0;
         } else if (len.equals("auto")) {
           this.auto = true;
@@ -120,7 +121,7 @@ public class Length {
 		dvalue = dvalue * assumed_resolution;
 	    else {
 		dvalue = 0;
-		System.err.println("ERROR: unknown length units in "
+		MessageHandler.errorln("ERROR: unknown length units in "
 				   + len);
 	    }
 	    

src/org/apache/fop/fo/FOText.java

@@ -53,6 +53,7 @@ package org.apache.fop.fo;
 
 // FOP
 import org.apache.fop.layout.Area;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.layout.BlockArea;
 import org.apache.fop.layout.FontState;
 import org.apache.fop.datatypes.*;
@@ -86,7 +87,7 @@ public class FOText extends FONode {
 
     public Status layout(Area area) throws FOPException {
 	if (!(area instanceof BlockArea)) {
-	    System.err.println("WARNING: text outside block area" + new String(ca, start, length));
+	    MessageHandler.errorln("WARNING: text outside block area" + new String(ca, start, length));
 	    return new Status(Status.OK);
 	}
 	if (this.marker == START) {

src/org/apache/fop/fo/FOTreeBuilder.java

@@ -52,6 +52,7 @@ package org.apache.fop.fo;
 
 // FOP
 import org.apache.fop.layout.AreaTree;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.pagination.Root;
 
@@ -178,7 +179,7 @@ public class FOTreeBuilder extends HandlerBase {
 
     /** SAX Handler for the start of the document */
     public void startDocument() {
-	System.err.println("building formatting object tree");
+	MessageHandler.logln("building formatting object tree");
     }
 
     /** SAX Handler for the start of an element */
@@ -212,7 +213,7 @@ public class FOTreeBuilder extends HandlerBase {
 	if (fobjMaker == null) {
 	    if (!this.unknownFOs.containsKey(fullName)) {
 		this.unknownFOs.put(fullName, "");
-		System.err.println("WARNING: Unknown formatting object "
+		MessageHandler.errorln("WARNING: Unknown formatting object "
 				   + fullName);  
 	    }
 	    fobjMaker = new FObjMixed.Maker(); // fall back
@@ -248,7 +249,7 @@ public class FOTreeBuilder extends HandlerBase {
      */
     public void format(AreaTree areaTree)
 	throws FOPException {
-	System.err.println("formatting FOs into areas");
+	MessageHandler.logln("formatting FOs into areas");
 	((Root) this.rootFObj).format(areaTree);
     }
 }

src/org/apache/fop/fo/PropertyList.java

@@ -51,6 +51,7 @@
 package org.apache.fop.fo;
 
 import java.util.Hashtable;
+import org.apache.fop.messaging.MessageHandler;
 
 import org.apache.fop.apps.FOPException;
 
@@ -65,7 +66,7 @@ public class PropertyList extends Hashtable {
   public Property get(String propertyName) {
 
     if (builder == null)
-      System.err.println("OH OH, builder has not been set");
+      MessageHandler.errorln("OH OH, builder has not been set");
     Property p = (Property)super.get(propertyName);
 		
     if (p == null) { // if not explicit

src/org/apache/fop/fo/PropertyListBuilder.java

@@ -52,6 +52,7 @@
 package org.apache.fop.fo;
 
 import org.apache.fop.fo.properties.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.svg.*;
 
 import org.apache.fop.apps.FOPException;
@@ -177,7 +178,7 @@ public class PropertyListBuilder {
 	if (propertyMaker != null) {
 	    p = propertyMaker.compute(propertyList);
 	} else {
-	    System.err.println("WARNING: property " + propertyName + " ignored");
+	    MessageHandler.errorln("WARNING: property " + propertyName + " ignored");
 	}
 	return p;
     }
@@ -189,7 +190,7 @@ public class PropertyListBuilder {
 	if (propertyMaker != null) {
 	    b = propertyMaker.isInherited();
 	} else {
-	    //System.err.println("WARNING: Unknown property " + propertyName);
+	    //MessageHandler.errorln("WARNING: Unknown property " + propertyName);
 	    b = true;
 	}
 	return b;
@@ -206,7 +207,7 @@ public class PropertyListBuilder {
 	    if (propertyMaker != null) {
 		p.put(attributeName,propertyMaker.make(p,attributes.getValue(i)));
 	    } else {
-		//System.err.println("WARNING: property " + attributeName + " ignored");
+		//MessageHandler.errorln("WARNING: property " + attributeName + " ignored");
 	    }
 	}
 	
@@ -221,7 +222,7 @@ public class PropertyListBuilder {
 	if (propertyMaker != null) {
 	    p = propertyMaker.make(propertyList);
 	} else {
-	    System.err.println("WARNING: property " + propertyName + " ignored");
+	    MessageHandler.errorln("WARNING: property " + propertyName + " ignored");
 	}
 	return p;
     }

src/org/apache/fop/fo/flow/Block.java

@@ -53,6 +53,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
 import org.apache.fop.datatypes.*;
@@ -104,7 +105,7 @@ public class Block extends FObjMixed {
     }
 
     public Status layout(Area area) throws FOPException {
-	// System.err.print(" b:LAY[" + marker + "] ");
+	// MessageHandler.error(" b:LAY[" + marker + "] ");
 
 	if (this.marker == BREAK_AFTER) {
 	    return new Status(Status.OK);
@@ -289,7 +290,7 @@ public class Block extends FObjMixed {
 	    return new Status(Status.KEEP_WITH_NEXT);
 	}
 
-	//System.err.print(" b:OK" + marker + " ");
+	//MessageHandler.error(" b:OK" + marker + " ");
 	return new Status(Status.OK);
     }
 

src/org/apache/fop/fo/flow/DisplayGraphic.java

@@ -54,6 +54,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.Area;
 import org.apache.fop.layout.BlockArea;
@@ -169,7 +170,7 @@ public class DisplayGraphic extends FObj {
 			} else if (width == 0) {
 				width = (int) ((imgWidth * ((double) height)) / imgHeight);
 			}
-//System.err.println("DisplayGraphic: imgW=" + imgWidth + " imgH=" + imgHeight + " w=" + width + " h=" + height);
+//MessageHandler.errorln("DisplayGraphic: imgW=" + imgWidth + " imgH=" + imgHeight + " w=" + width + " h=" + height);
 		}
 
 		if (area.spaceLeft() < (height + spaceBefore)) {
@@ -208,10 +209,10 @@ public class DisplayGraphic extends FObj {
 
 	} catch (MalformedURLException urlex) {
 		// bad URL
-System.err.println("Error while creating area : " + urlex.getMessage());
+MessageHandler.errorln("Error while creating area : " + urlex.getMessage());
 	} catch (FopImageException imgex) {
 		// image error
-System.err.println("Error while creating area : " + imgex.getMessage());
+MessageHandler.errorln("Error while creating area : " + imgex.getMessage());
 	}
 
 	if (area instanceof BlockArea) {

src/org/apache/fop/fo/flow/InlineGraphic.java

@@ -54,6 +54,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.Area;
 import org.apache.fop.layout.BlockArea;
@@ -172,7 +173,7 @@ public class InlineGraphic extends FObj {
 			} else if (width == 0) {
 				width = (int) ((imgWidth * ((double) height)) / imgHeight);
 			}
-//System.err.println("DisplayGraphic: imgW=" + imgWidth + " imgH=" + imgHeight + " w=" + width + " h=" + height);
+//MessageHandler.errorln("DisplayGraphic: imgW=" + imgWidth + " imgH=" + imgHeight + " w=" + width + " h=" + height);
 		}
 
 		if (area.spaceLeft() < (height + spaceBefore)) {
@@ -211,10 +212,10 @@ public class InlineGraphic extends FObj {
 
 	} catch (MalformedURLException urlex) {
 		// bad URL
-System.err.println("Error while creating area : " + urlex.getMessage());
+MessageHandler.errorln("Error while creating area : " + urlex.getMessage());
 	} catch (FopImageException imgex) {
 		// image error
-System.err.println("Error while creating area : " + imgex.getMessage());
+MessageHandler.errorln("Error while creating area : " + imgex.getMessage());
 	}
 
 	if (area instanceof BlockArea) {

src/org/apache/fop/fo/flow/ListBlock.java

@@ -53,6 +53,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.layout.Area;
@@ -171,7 +172,7 @@ public class ListBlock extends FObj {
 	int numChildren = this.children.size();
 	for (int i = this.marker; i < numChildren; i++) {
 	    if (!(children.elementAt(i) instanceof ListItem)) {
-		System.err.println("WARNING: This version of FOP requires list-items inside list-blocks");
+		MessageHandler.errorln("WARNING: This version of FOP requires list-items inside list-blocks");
 		return new Status(Status.OK);
 	    }
 	    ListItem listItem = (ListItem) children.elementAt(i);

src/org/apache/fop/fo/flow/PageNumber.java

@@ -53,6 +53,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
@@ -88,7 +89,7 @@ public class PageNumber extends FObj {
 
     public Status layout(Area area) throws FOPException {
 	if (!(area instanceof BlockArea)) {
-	    System.err.println("WARNING: page-number outside block area");
+	    MessageHandler.errorln("WARNING: page-number outside block area");
 	    return new Status(Status.OK);
 	}
 	if (this.marker == START) {

src/org/apache/fop/fo/flow/PageNumberCitation.java

@@ -53,6 +53,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.pagination.*;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.fo.properties.*;
@@ -170,7 +171,7 @@ public class PageNumberCitation extends FObj
 	{
 		if(!(area instanceof BlockArea)) 
 		{
-		    System.err.println("WARNING: page-number-citation outside block area");
+		    MessageHandler.errorln("WARNING: page-number-citation outside block area");
 		    return new Status(Status.OK);
 		}
 		this.area = area;
@@ -202,7 +203,7 @@ public class PageNumberCitation extends FObj
 		{	
 			FObj root;
 			refId = this.properties.get("ref-id").getString();
-//System.out.println("PageNumberCitation.layout() ref-id: "+refId);	
+//MessageHandler.logln("PageNumberCitation.layout() ref-id: "+refId);	
 
 			// find the reference number citation here, what to do if not found?
 			// to do this, get the root document, and do a search for the id that matches ref-id
@@ -217,7 +218,7 @@ public class PageNumberCitation extends FObj
 				citation = searchForId(root);
 				if(citation != null)
 				{
-//System.out.println("PageNumberCitation.layout() found citation");	
+//MessageHandler.logln("PageNumberCitation.layout() found citation");	
 					Status s = resolvePageNumber();
 					if(s.isIncomplete())
 					{
@@ -228,7 +229,7 @@ public class PageNumberCitation extends FObj
 			}
 			else
 			{
-//System.out.println("PageNumberCitation.layout() found citation");	
+//MessageHandler.logln("PageNumberCitation.layout() found citation");	
 				Status s = resolvePageNumber();
 				if(s.isIncomplete())
 				{
@@ -248,7 +249,7 @@ public class PageNumberCitation extends FObj
 	public Status resolvePageNumber()
 	{
 			idPageNumber = citation.getPageNumber();
-//System.out.println("PageNumberCitation: citation page #: "+idPageNumber);
+//MessageHandler.logln("PageNumberCitation: citation page #: "+idPageNumber);
 			if(idPageNumber <0) return new Status(Status.AREA_FULL_NONE);
 		
 			return new Status(Status.OK);

src/org/apache/fop/fo/flow/Table.java

@@ -53,6 +53,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
 import org.apache.fop.datatypes.*;
@@ -201,7 +202,7 @@ public class Table extends FObj {
                 offset += c.getColumnWidth();
 	    } else if (fo instanceof TableBody) {
 		if (columns.size() == 0) {
-		    System.err.println("WARNING: current implementation of tables requires a table-column for each column, indicating column-width");
+		    MessageHandler.errorln("WARNING: current implementation of tables requires a table-column for each column, indicating column-width");
 		    return new Status(Status.OK);
 		}
 		

src/org/apache/fop/fo/flow/TableRow.java

@@ -53,6 +53,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.layout.*;
@@ -163,7 +164,7 @@ public class TableRow extends FObj {
 
 	int numChildren = this.children.size();
 	if (numChildren != columns.size()) {
-	    System.err.println("WARNING: Number of children under table-row not equal to number of table-columns");
+	    MessageHandler.errorln("WARNING: Number of children under table-row not equal to number of table-columns");
 	    return new Status(Status.OK);
 	}
 

src/org/apache/fop/fo/pagination/PageSequence.java

@@ -53,6 +53,7 @@ package org.apache.fop.fo.pagination;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.fo.flow.Flow;
 import org.apache.fop.fo.flow.StaticContent;
@@ -217,7 +218,7 @@ public class PageSequence extends FObj
             currentPage.setNumber(++this.currentPageNumber);
             this.runningPageNumberCounter=this.currentPageNumber;            
 
-            System.err.print(" [" + currentPageNumber);
+            MessageHandler.log(" [" + currentPageNumber);
             if ( (this.staticBefore != null) &&
             (currentPage.getBefore() != null) )
             {
@@ -246,10 +247,10 @@ public class PageSequence extends FObj
                 bodyArea.setIDReferences(areaTree.getIDReferences());
                 status = this.flow.layout(bodyArea);
             }
-            System.err.print("]");
+            MessageHandler.log("]");
             areaTree.addPage(currentPage);
         } while ( status.isIncomplete() );
-        System.err.println();
+        MessageHandler.errorln("");
     }
 
     public void setFlow(Flow flow) {
@@ -272,7 +273,7 @@ public class PageSequence extends FObj
         }
         else
         {
-            System.err.println("WARNING: this version of FOP only supports "
+            MessageHandler.errorln("WARNING: this version of FOP only supports "
             + "static-content in region-before and region-after"); 
         }
     }

src/org/apache/fop/fo/pagination/Root.java

@@ -52,6 +52,7 @@ package org.apache.fop.fo.pagination;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.AreaTree;
@@ -104,7 +105,7 @@ public class Root extends FObj {
 
 	public void format(AreaTree areaTree) throws FOPException 
 	{
-//	System.err.println(" Root[" + marker + "] ");
+//	MessageHandler.errorln(" Root[" + marker + "] ");
 		if(layoutMasterSet == null) 
 		{
 			throw new FOPException("No layout master set.");

src/org/apache/fop/fo/pagination/SimplePageMaster.java

@@ -52,6 +52,7 @@ package org.apache.fop.fo.pagination;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.PageMaster;
 import org.apache.fop.layout.Region;
@@ -86,7 +87,7 @@ public class SimplePageMaster extends FObj {
 	    this.layoutMasterSet = (LayoutMasterSet) parent;
 	    String pm = this.properties.get("page-master-name").getString();
 	    if (pm == null) {
-		System.err.println("WARNING: simple-page-master does not have "
+		MessageHandler.errorln("WARNING: simple-page-master does not have "
 				   + "a page-master-name and so is being ignored");
 	    } else {
 		this.layoutMasterSet.addLayoutMaster(pm, this);

src/org/apache/fop/image/FopImageConsumer.java

@@ -56,6 +56,7 @@ package org.apache.fop.image;
 
 // Java
 import java.util.Hashtable;
+import org.apache.fop.messaging.MessageHandler;
 import java.awt.image.*;
 import java.awt.*;
 
@@ -77,25 +78,25 @@ public class FopImageConsumer implements ImageConsumer {
 
 	public void imageComplete(int status) {
 /*
-System.err.print("Status ");
+MessageHandler.error("Status ");
 if (status == ImageConsumer.COMPLETESCANLINES) {
-	System.err.println("CompleteScanLines");
+	MessageHandler.errorln("CompleteScanLines");
 } else if (status == ImageConsumer.IMAGEABORTED) {
-	System.err.println("ImageAborted");
+	MessageHandler.errorln("ImageAborted");
 } else if (status == ImageConsumer.IMAGEERROR) {
-	System.err.println("ImageError");
+	MessageHandler.errorln("ImageError");
 } else if (status == ImageConsumer.RANDOMPIXELORDER) {
-	System.err.println("RandomPixelOrder");
+	MessageHandler.errorln("RandomPixelOrder");
 } else if (status == ImageConsumer.SINGLEFRAME) {
-	System.err.println("SingleFrame");
+	MessageHandler.errorln("SingleFrame");
 } else if (status == ImageConsumer.SINGLEFRAMEDONE) {
-	System.err.println("SingleFrameDone");
+	MessageHandler.errorln("SingleFrameDone");
 } else if (status == ImageConsumer.SINGLEPASS) {
-	System.err.println("SinglePass");
+	MessageHandler.errorln("SinglePass");
 } else if (status == ImageConsumer.STATICIMAGEDONE) {
-	System.err.println("StaticImageDone");
+	MessageHandler.errorln("StaticImageDone");
 } else if (status == ImageConsumer.TOPDOWNLEFTRIGHT) {
-	System.err.println("TopDownLeftRight");
+	MessageHandler.errorln("TopDownLeftRight");
 }
 */
 		synchronized(this.imageStatus) {
@@ -106,23 +107,23 @@ if (status == ImageConsumer.COMPLETESCANLINES) {
 	}
 
 	public void setColorModel(ColorModel model) {
-//System.err.println("setColorModel: " + model);
+//MessageHandler.errorln("setColorModel: " + model);
 		this.cm = model;
 	}
 
 	public void setDimensions(int width, int height) {
-//System.err.println("setDimension: w=" + width + " h=" + height);
+//MessageHandler.errorln("setDimension: w=" + width + " h=" + height);
 		this.width = width;
 		this.height = height;
 	}
 
 	public void setHints(int hintflags) {
-//System.err.println("setHints: " + hintflags);
+//MessageHandler.errorln("setHints: " + hintflags);
 		this.hints = hintflags;
 	}
 
 	public void setProperties(Hashtable props) {
-//System.err.println("setProperties: " + props);
+//MessageHandler.errorln("setProperties: " + props);
 		this.properties = props;
 	}
 

src/org/apache/fop/image/FopImageFactory.java

@@ -56,6 +56,7 @@ package org.apache.fop.image;
 
 // Java
 import java.io.IOException;
+import org.apache.fop.messaging.MessageHandler;
 import java.net.*;
 import java.lang.reflect.*;
 import java.util.Hashtable;
@@ -82,13 +83,13 @@ public class FopImageFactory {
 				}
 				catch (MalformedURLException e_abs) {
 					// not found
-					System.err.println("Invalid Image URL : " + e_abs.getMessage() + "(base URL " + context_url.toString() + ")");
+					MessageHandler.errorln("Invalid Image URL : " + e_abs.getMessage() + "(base URL " + context_url.toString() + ")");
 					return null;
 				}
 			}
 			catch (MalformedURLException e_context) {
 				// pb context url
-				System.err.println("Invalid Image URL - error on relative URL : " + e_context.getMessage());
+				MessageHandler.errorln("Invalid Image URL - error on relative URL : " + e_context.getMessage());
 				return null;
 			}
 		}

src/org/apache/fop/layout/FontInfo.java

@@ -51,6 +51,7 @@
 package org.apache.fop.layout;
 
 import java.util.Hashtable;
+import org.apache.fop.messaging.MessageHandler;
 import java.util.Enumeration;
 
 import org.apache.fop.apps.FOPException;
@@ -104,9 +105,9 @@ public class FontInfo {
         if (f == null) {
           throw new FOPException("no default font defined by OutputConverter");
         }
-        System.err.println("WARNING: defaulted font to any,normal,normal");
+        MessageHandler.errorln("WARNING: defaulted font to any,normal,normal");
       }
-      System.err.println("WARNING: unknown font "+family+" so defaulted font to any");
+      MessageHandler.errorln("WARNING: unknown font "+family+" so defaulted font to any");
     }
     return f;
   }

src/org/apache/fop/layout/LineArea.java

@@ -52,6 +52,7 @@
 package org.apache.fop.layout;
 
 import org.apache.fop.render.Renderer;
+import org.apache.fop.messaging.MessageHandler;
 
 import java.util.Vector;
 import java.util.Enumeration;
@@ -172,7 +173,7 @@ public class LineArea extends Area {
 		if (d != 0) {
 		    c = data[i] = d;
 		} else {
-		    System.err.print("ch"
+		    MessageHandler.error("ch"
 				       + (int)c + "?");
 		    c = data[i] = '#';
 		}
@@ -311,7 +312,7 @@ public class LineArea extends Area {
 		    if ((finalWidth + spaceWidth + wordWidth) >
 			this.getContentWidth()) { 
 			if (overrun)
-			    System.err.print(">");
+			    MessageHandler.error(">");
 			if (this.wrapOption == WrapOption.WRAP)
 			    return i;
 		    }
@@ -373,7 +374,7 @@ public class LineArea extends Area {
 	}
 
 	if (overrun)
-	    System.err.print(">");
+	    MessageHandler.error(">");
 	return -1;
     }
 

src/org/apache/fop/pdf/PDFPages.java

@@ -52,6 +52,7 @@ package org.apache.fop.pdf;
 
 // Java
 import java.io.PrintWriter;
+import org.apache.fop.messaging.MessageHandler;
 import java.util.Vector;
 
 /**
@@ -107,7 +108,7 @@ public class PDFPages extends PDFObject {
      */
     public void incrementCount() {
 	this.count++;
-        // System.out.println("Incrementing count to " + this.getCount());
+        // MessageHandler.logln("Incrementing count to " + this.getCount());
     }
 
     /**

src/org/apache/fop/pdf/PDFXObject.java

@@ -55,6 +55,7 @@ package org.apache.fop.pdf;
 
 // Java
 import java.io.IOException;
+import org.apache.fop.messaging.MessageHandler;
 import java.io.PrintWriter;
 
 // FOP
@@ -83,7 +84,7 @@ public class PDFXObject extends PDFObject {
 	super(number);
 	this.Xnum=Xnumber;
 	if (img == null)
-	    System.err.println("FISH");
+	    MessageHandler.errorln("FISH");
 	fopimage=img;
     }
 
@@ -137,9 +138,9 @@ public class PDFXObject extends PDFObject {
 		writer.write(p);
 		length += p.length();
 	} catch (FopImageException imgex) {
-System.err.println("Error in XObject : " + imgex.getMessage());
+MessageHandler.errorln("Error in XObject : " + imgex.getMessage());
 	} catch (PDFFilterException filterex) {
-System.err.println("Error in XObject : " + filterex.getMessage());
+MessageHandler.errorln("Error in XObject : " + filterex.getMessage());
 	}
 	return length;
     }

src/org/apache/fop/render/awt/AWTRenderer.java

@@ -10,6 +10,7 @@ package org.apache.fop.render.awt;
  */
 
 import org.apache.fop.layout.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.image.*;
 import org.apache.fop.svg.*;
@@ -450,7 +451,7 @@ public class AWTRenderer implements Renderer, Printable, Pageable {
 	FopImage img = area.getImage();
 	
 	if (img == null) {
-	    System.out.println("area.getImage() is null");
+	    MessageHandler.logln("area.getImage() is null");
 	}
 	
 	try {
@@ -470,7 +471,7 @@ public class AWTRenderer implements Renderer, Printable, Pageable {
 		currentYPosition -= h;
 	} catch (FopImageException imgex) {
 		// ?
-		System.out.println("Error while loading image : " + imgex.getMessage());
+		MessageHandler.logln("Error while loading image : " + imgex.getMessage());
 	}
     }
 

src/org/apache/fop/render/pdf/FontSetup.java

@@ -52,6 +52,7 @@ package org.apache.fop.render.pdf;
 
 // FOP
 import org.apache.fop.render.pdf.fonts.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.layout.FontInfo;
 import org.apache.fop.pdf.PDFDocument;
 import org.apache.fop.pdf.PDFResources;
@@ -77,7 +78,7 @@ public class FontSetup {
      * @param fontInfo the font info object to set up
      */
     public static void setup(FontInfo fontInfo) {
-	System.err.println("setting up fonts");
+	MessageHandler.logln("setting up fonts");
 		
 	fontInfo.addMetrics("F1", new Helvetica());
 	fontInfo.addMetrics("F2", new HelveticaOblique());

src/org/apache/fop/render/pdf/PDFRenderer.java

@@ -53,6 +53,7 @@ package org.apache.fop.render.pdf;
 
 // FOP
 import org.apache.fop.render.Renderer;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.image.ImageArea;
 import org.apache.fop.image.FopImage;
 import org.apache.fop.apps.FOPException;
@@ -143,7 +144,7 @@ public class PDFRenderer implements Renderer {
 	 */	
         public void render(AreaTree areaTree, PrintWriter writer)
         throws IOException, FOPException {      
-            System.err.println("rendering areas to PDF");
+            MessageHandler.logln("rendering areas to PDF");
             IDReferences idReferences=areaTree.getIDReferences();           
             this.pdfResources = this.pdfDoc.getResources();            
             this.pdfDoc.setIDReferences(idReferences);
@@ -156,7 +157,7 @@ public class PDFRenderer implements Renderer {
                 throw new FOPException("The id \""+idReferences.getNextInvalidId()+"\" was referenced but does not exist\n");            
             }
     
-            System.err.println("writing out PDF");
+            MessageHandler.logln("writing out PDF");
             this.pdfDoc.output(writer);
         }
 

src/org/apache/fop/render/xml/XMLRenderer.java

@@ -52,6 +52,7 @@ package org.apache.fop.render.xml;
 
 // FOP
 import org.apache.fop.svg.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.render.Renderer;
 import org.apache.fop.image.ImageArea;
 import org.apache.fop.layout.*;
@@ -93,7 +94,7 @@ public class XMLRenderer implements Renderer {
      */
     public void render(AreaTree areaTree, PrintWriter writer)
 	throws IOException {
-	System.err.println("rendering areas to XML");
+	MessageHandler.logln("rendering areas to XML");
 	this.writer = writer;
 	this.writer.write("<?xml version=\"1.0\"?>\n<!-- produced by "
 			  + this.producer + " -->\n");
@@ -104,7 +105,7 @@ public class XMLRenderer implements Renderer {
 	}
 	writeEndTag("</AreaTree>");
 	this.writer.flush();
-	System.err.println("written out XML");
+	MessageHandler.errorln("written out XML");
     }
 
     /**

src/org/apache/fop/svg/Line.java

@@ -53,6 +53,7 @@ package org.apache.fop.svg;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.Area;
 import org.apache.fop.layout.FontState;
@@ -123,7 +124,7 @@ public class Line extends FObj {
 	    ((SVGArea) area).addGraphic(new LineGraphic(x1, y1, x2, y2));
 	} else {
 	    /* otherwise generate a warning */
-	    System.err.println("WARNING: svg:line outside svg:svg");
+	    MessageHandler.errorln("WARNING: svg:line outside svg:svg");
 	}
 
 	/* return status */

src/org/apache/fop/svg/Rect.java

@@ -53,6 +53,7 @@ package org.apache.fop.svg;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.Area;
 import org.apache.fop.layout.FontState;
@@ -123,7 +124,7 @@ public class Rect extends FObj {
 	    ((SVGArea) area).addGraphic(new RectGraphic(x, y, width, height));
 	} else {
 	    /* otherwise generate a warning */
-	    System.err.println("WARNING: svg:rect outside svg:svg");
+	    MessageHandler.errorln("WARNING: svg:rect outside svg:svg");
 	}
 
 	/* return status */

src/org/apache/fop/svg/Text.java

@@ -53,6 +53,7 @@ package org.apache.fop.svg;
 
 // FOP
 import org.apache.fop.fo.*;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.Area;
 import org.apache.fop.layout.FontState;
@@ -137,7 +138,7 @@ public class Text extends FObjMixed {
 	    ((SVGArea) area).addGraphic(new TextGraphic(x, y, text));
 	} else {
 	    /* otherwise generate a warning */
-	    System.err.println("WARNING: svg:text outside svg:svg");
+	    MessageHandler.errorln("WARNING: svg:text outside svg:svg");
 	}
 
 	/* return status */

src/org/apache/fop/viewer/Command.java

@@ -6,6 +6,7 @@ package org.apache.fop.viewer;
  */
 
 import java.awt.event.ActionEvent;
+import org.apache.fop.messaging.MessageHandler;
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
 import java.net.*;
@@ -39,7 +40,7 @@ public class Command extends AbstractAction {
     String path = IMAGE_DIR + iconName + ".gif";
     URL url = getClass().getResource(path);
     if (url == null) {
-      System.err.println("Icon not found: " + path);
+      MessageHandler.errorln("Icon not found: " + path);
     }
     else
       putValue(SMALL_ICON, new ImageIcon(url));
@@ -51,10 +52,10 @@ public class Command extends AbstractAction {
   }
 
   public void doit() {
-    System.err.println("Not implemented.");
+    MessageHandler.errorln("Not implemented.");
   }
 
   public void undoit() {
-    System.err.println("Not implemented.");
+    MessageHandler.errorln("Not implemented.");
   }
 }

src/org/apache/fop/viewer/LoadableProperties.java

@@ -1,6 +1,7 @@
 package org.apache.fop.viewer;
 
 import java.io.*;
+import org.apache.fop.messaging.MessageHandler;
 import java.util.*;
 
 /**
@@ -60,7 +61,7 @@ public class LoadableProperties extends Hashtable {
       return true;
     }
     else {
-      System.out.println(getClass().getName() + ": load(): invalid line " +
+      MessageHandler.logln(getClass().getName() + ": load(): invalid line " +
                          str + "." + " Character '=' missed.");
       return false;
     }

src/org/apache/fop/viewer/SecureResourceBundle.java

@@ -1,6 +1,7 @@
 package org.apache.fop.viewer;
 
 import java.util.*;
+import org.apache.fop.messaging.MessageHandler;
 import java.io.*;
 
 
@@ -35,7 +36,7 @@ public class SecureResourceBundle extends ResourceBundle implements Translator {
     try {
       lookup.load(in);
     } catch(Exception ex) {
-      System.out.println("Abgefangene Exception: " + ex.getMessage());
+      MessageHandler.logln("Abgefangene Exception: " + ex.getMessage());
       isSourceFound = false;
     }
   }
@@ -70,7 +71,7 @@ public class SecureResourceBundle extends ResourceBundle implements Translator {
       return obj;
     else {
       if (isMissingEmphasized) {
-        System.out.println(getClass().getName() + ": missing key: " + key);
+        MessageHandler.logln(getClass().getName() + ": missing key: " + key);
         return getMissedRepresentation(key.toString());
       }
       else

src/org/apache/fop/viewer/UserMessage.java

@@ -1,6 +1,7 @@
 package org.apache.fop.viewer;
 
 import java.awt.*;
+import org.apache.fop.messaging.MessageHandler;
 import java.io.*;
 import java.awt.event.*;
 import java.util.*;
@@ -33,7 +34,7 @@ public class UserMessage {
   public static void setTranslator(Translator aRes) {
     res = aRes;
     if (res == null) {
-      System.out.println("UserMessage: setTranslator(null) !");
+      MessageHandler.logln("UserMessage: setTranslator(null) !");
       res = new SecureResourceBundle(null);
     }
 
@@ -112,18 +113,18 @@ public class UserMessage {
   * Ersetzt die eventuellen Platzhalter durch die übergebenen Parameter
   */
   static String prepareMessage(String rawText, String[] par) {
-    System.out.println("prepareMessage(): " + rawText + ", parameter: " + par);
+    MessageHandler.logln("prepareMessage(): " + rawText + ", parameter: " + par);
     int index = rawText.indexOf(PARAMETER_TAG);
     String composedMess = "";
     if ((index == -1) && (par == null)) return rawText;
     if ((index != -1) && (par == null)) {
-      System.out.println("Message " + actMessId+ " erwartet Parameter. Aufgerufen ohne Parameter");
+      MessageHandler.logln("Message " + actMessId+ " erwartet Parameter. Aufgerufen ohne Parameter");
       return rawText;
     }
     if ((index == -1) && (par != null)) {
-      System.out.println("Message " + actMessId + " erwartet keine Parameter. Aufgerufen mit folgenden Parametern:");
+      MessageHandler.logln("Message " + actMessId + " erwartet keine Parameter. Aufgerufen mit folgenden Parametern:");
       for(int i = 0; i < par.length; ++i)
-        System.out.println(par[i].toString());
+        MessageHandler.logln(par[i].toString());
       return rawText;
     }
     int tagCount = 0;
@@ -132,7 +133,7 @@ public class UserMessage {
       try {
         composedMess += rawText.substring(0, index) + par[tagCount];
       } catch(ArrayIndexOutOfBoundsException ex) {
-        System.out.println("Anzahl der übergebenen Parameter zu der Meldung " + actMessId + " ist weniger als erwartet.");
+        MessageHandler.logln("Anzahl der übergebenen Parameter zu der Meldung " + actMessId + " ist weniger als erwartet.");
         ex.printStackTrace();
         return composedMess + rawText;
       }
@@ -141,7 +142,7 @@ public class UserMessage {
     }
     composedMess += rawText;
     if (tagCount != par.length)
-      System.out.println("Die zu der Meldung " + actMessId + "  übergebenen Parameter sind mehr als die Meldung vorsieht.");
+      MessageHandler.logln("Die zu der Meldung " + actMessId + "  übergebenen Parameter sind mehr als die Meldung vorsieht.");
     return composedMess;
   }
 
@@ -218,11 +219,11 @@ public class UserMessage {
         translatedMes = translatedMes.substring(translatedMes.indexOf(':')+1);
 
       } catch(Exception ex) {
-          System.out.println("FALSCHES FORMAT: MESSAGE: " + textID);
+          MessageHandler.logln("FALSCHES FORMAT: MESSAGE: " + textID);
       }
     }
     else { // Message not found
-      System.out.println("UserMessage: textID '" + textID + "' not found. Return " +
+      MessageHandler.logln("UserMessage: textID '" + textID + "' not found. Return " +
                    "value 'CANCEL' = " + CANCEL);
 
       //return CANCEL;
@@ -260,7 +261,7 @@ public class UserMessage {
     else {
       if (optionTypeIndex == STYLE_NOBUTTON) {
         // Wird nicht mehr unterstützt
-        System.out.println("UserMessage: STYLE_NOBUTTON wird nicht unterstützt");
+        MessageHandler.logln("UserMessage: STYLE_NOBUTTON wird nicht unterstützt");
         return result;
       }
       else {