Merged changes from trunk up to revision 990588

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

diff --cc src/java/org/apache/fop/fo/FOPropertyMapping.java
Simple merge

diff --cc src/java/org/apache/fop/fo/FObj.java
Simple merge

diff --cc src/java/org/apache/fop/fo/flow/Leader.java
index 6aad36ba98aa30a3eeb3050c8d911fca236f0d2a,54027514ce17d9f765646819274e6d92650ad8d8..b04bcde9a11529cdc43cc7679c6ee03866292257
--- 1/src/java/org/apache/fop/fo/flow/Leader.java
--- 2/src/java/org/apache/fop/fo/flow/Leader.java
+++ b/src/java/org/apache/fop/fo/flow/Leader.java
@@@ -30,9 -30,8 +30,9 @@@ import org.apache.fop.fo.properties.Len
   * <code>fo:leader</code></a> object.
   * The main property of <code>fo:leader</code> is leader-pattern.
   * The following patterns are treated: rule, space, dots and use-content.
-  * @asf.todo implement validateChildNode()
+  * TODO implement validateChildNode()
   */
 +// [TBD] implement validateChildNode()
  public class Leader extends InlineLevel {
      // The value of properties relevant for fo:leader.
      // See also superclass InlineLevel

diff --cc src/java/org/apache/fop/fo/pagination/PageSequence.java
Simple merge

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

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

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

diff --cc src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index 35a944e17714d1b8a84cfed7dc03fd9ec3a5fa0d,cbe2e2639c5a0d9b097055b2001dea9c7cb2c7d0..be0f558f319689e12b4301523905b261a25b8f79
--- 1/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
--- 2/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
@@@ -81,12 -80,11 +81,12 @@@ public class TextLayoutManager extends 
          private final boolean isSpace;
          private boolean breakOppAfter;
          private final Font font;
 +        private final int level;
  
-         AreaInfo                                                // CSOK: ParameterNumber
-             (int startIndex, int breakIndex, int wordSpaceCount, int letterSpaceCount,
-              MinOptMax areaIPD, boolean isHyphenated, boolean isSpace, boolean breakOppAfter,
-              Font font, int level) {
+         AreaInfo(                                                // CSOK: ParameterNumber
+                 int startIndex, int breakIndex, int wordSpaceCount, int letterSpaceCount,
+                 MinOptMax areaIPD, boolean isHyphenated, boolean isSpace, boolean breakOppAfter,
 -                Font font) {
++                Font font, int level) {
              assert startIndex <= breakIndex;
              this.startIndex = startIndex;
              this.breakIndex = breakIndex;

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

diff --cc src/java/org/apache/fop/render/intermediate/IFRenderer.java
Simple merge

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