Merged /xmlgraphics/fop/trunk:r1094917-1135999

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

diff --cc findbugs-exclude.xml
Simple merge

diff --cc src/java/org/apache/fop/fonts/MultiByteFont.java
Simple merge

diff --cc src/java/org/apache/fop/pdf/PDFTextUtil.java
index afa86ae729f629653a6ae90a875c700bff524ba1,3768bb6cec0a229f5e45272878e88fd5f0479b66..ed475fcb84a7ff6661bc7db9d2c1ac4c699179fb
--- 1/src/java/org/apache/fop/pdf/PDFTextUtil.java
--- 2/src/java/org/apache/fop/pdf/PDFTextUtil.java
+++ b/src/java/org/apache/fop/pdf/PDFTextUtil.java
@@@ -81,10 -81,10 +81,10 @@@ public abstract class PDFTextUtil 
          sb.append(PDFNumber.doubleOut(lt[5], DEC));
      }
  
 -    private void writeChar(char ch, StringBuffer sb) {
 -        if (!useMultiByte) {
 +    private static void writeChar(char ch, StringBuffer sb, boolean multibyte) {
 +        if (!multibyte) {
              if (ch < 32 || ch > 127) {
-                 sb.append("\\").append(Integer.toOctalString((int)ch));
+                 sb.append("\\").append(Integer.toOctalString(ch));
              } else {
                  switch (ch) {
                  case '(':

diff --cc src/java/org/apache/fop/render/ps/PSPainter.java
Simple merge