Merged changes from Trunk up to rev. 1039179

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

diff --cc src/java/org/apache/fop/area/LineArea.java
Simple merge

diff --cc src/java/org/apache/fop/area/Trait.java
Simple merge

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

diff --cc src/java/org/apache/fop/fonts/Typeface.java
index cf625ebb1d202c671a954362272cd8328e014adf,f0419464c534966ffb39539e6f117c72ba5939b9..3c4bcb83734c9d13ca0e6d7dc5d8a64642faadc2
--- 1/src/java/org/apache/fop/fonts/Typeface.java
--- 2/src/java/org/apache/fop/fonts/Typeface.java
+++ b/src/java/org/apache/fop/fonts/Typeface.java
@@@ -139,13 -139,9 +139,13 @@@ public abstract class Typeface implemen
              }
          }
      }
-     
+ 
      /** {@inheritDoc} */
      public String toString() {
 -        return getFullName();
 +        StringBuffer sbuf = new StringBuffer(super.toString());
 +        sbuf.append('{');
 +        sbuf.append(getFullName());
 +        sbuf.append('}');
 +        return sbuf.toString();
-     }   
+     }
  }

diff --cc src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
Simple merge

diff --cc src/java/org/apache/fop/render/java2d/Java2DRenderer.java
Simple merge