Fixed leader expansion and leader alignment to reference area to some

extent.
Deleted superfluous text decoration data and assiciated (incomplete)
methods from WordArea.
PR: 7490, 15936

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195926 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a05198f0cdd1db245ceaec55f38a389b60e1fb70..2512d86960a7b5aec181c6cec61aa64ddbadd3ed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 ==============================================================================
 Done since 0.20.4 release
+- Fixed leader expansion and leader alignment to reference area to some
+  extent(#7490 and #15936).
 - Temporary fix for wrong mapping of the hyphen character in the PostScript
   renderer. Needs to be done in a clean way later.
   Submitted by: Arnd Beissner <arnd.beissner@cappelino.de>

diff --git a/src/org/apache/fop/layout/LineArea.java b/src/org/apache/fop/layout/LineArea.java
index 160080be8f6888fda86bec98692cc19faa886e78..80623d1959a1614737af39253f6fe3fc59eacda8 100644 (file)
--- a/src/org/apache/fop/layout/LineArea.java
+++ b/src/org/apache/fop/layout/LineArea.java
@@ -184,7 +184,6 @@ public class LineArea extends Area {
                         // appending indent space leader-alignment setting
                         // InlineSpace to false, so it is not used in line
                         // justification
-                        System.out.println("align, space="+spaceBeforeLeader);
                         if (spaceBeforeLeader > 0) {
                             children.add(idx, new InlineSpace(spaceBeforeLeader,
                                                               false));
@@ -219,7 +218,6 @@ public class LineArea extends Area {
                         // appending indent space leader-alignment setting
                         // InlineSpace to false, so it is not used in line
                         // justification
-                        System.out.println("align, space="+spaceBeforeLeader);
                         if (spaceBeforeLeader > 0) {
                             children.add(idx, new InlineSpace(spaceBeforeLeader,
                                                               false));
@@ -742,12 +740,6 @@ public class LineArea extends Area {
                           int leaderLengthOptimum, int leaderLengthMaximum,
                           int ruleStyle, int ruleThickness,
                           int leaderPatternWidth, int leaderAlignment) {
-        System.out.println(
-            "min="+leaderLengthMinimum+
-            " opt="+leaderLengthOptimum+
-            " max="+leaderLengthMaximum+
-            " th="+ruleThickness+
-            " al="+leaderAlignment);
         if (leaderLengthMinimum>leaderLengthOptimum
             || leaderLengthOptimum>leaderLengthMaximum) {
             MessageHandler.errorln("leader sizes wrong");
@@ -892,8 +884,10 @@ public class LineArea extends Area {
                     }
                 }
             }
+            break;
         default: 
             MessageHandler.errorln("bad align: "+type);
+            break;
         }
     }
 

diff --git a/src/org/apache/fop/layout/inline/WordArea.java b/src/org/apache/fop/layout/inline/WordArea.java
index 18e8175f5334ee788c690f10eebad5aa480c700e..88f20faee2a6cebdf4c1b89d0030e9678373f754 100644 (file)
--- a/src/org/apache/fop/layout/inline/WordArea.java
+++ b/src/org/apache/fop/layout/inline/WordArea.java
@@ -14,12 +14,6 @@ public class WordArea extends InlineArea {
 
     private String text;
 
-    // Textdecoration
-    protected boolean underlined = false;
-    protected boolean overlined = false;
-    protected boolean lineThrough = false;
-
-
     public WordArea(FontState fontState, float red, float green, float blue,
                     String text, int width) {
         super(fontState, width, red, green, blue);
@@ -35,12 +29,4 @@ public class WordArea extends InlineArea {
         return this.text;
     }
 
-    public void setUnderlined(boolean ul) {
-        this.underlined = ul;
-    }
-
-    public boolean getUnderlined() {
-        return this.underlined;
-    }
-
 }