uses LinkSet align()

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

diff --git a/src/org/apache/fop/layout/BlockArea.java b/src/org/apache/fop/layout/BlockArea.java
index 9cd8b98cae270c07d3de447c8fedfedb220a26fd..a034a9cfcd313d5c02dc0bd3bff90ac90105806f 100644 (file)
--- a/src/org/apache/fop/layout/BlockArea.java
+++ b/src/org/apache/fop/layout/BlockArea.java
@@ -77,6 +77,7 @@ public class BlockArea extends Area {
     protected int alignLastLine;
        
     protected LineArea currentLineArea;
+    protected LinkSet currentLinkSet;
 
     /* have any line areas been used? */
     protected boolean hasLines = false;
@@ -134,6 +135,7 @@ public class BlockArea extends Area {
        this.currentLineArea.changeWhiteSpaceTreatment(whiteSpaceTreatment);
 
        if (ls != null) {
+            this.currentLinkSet = ls;
            ls.setYOffset(currentHeight);
        }
 
@@ -142,6 +144,9 @@ public class BlockArea extends Area {
                
        while (ts != -1) {
            this.currentLineArea.align(this.align);
+            if (ls != null) {
+                ls.align(this.align, this.currentLineArea.getStartIndent());
+            }
            this.addLineArea(this.currentLineArea);
            this.currentLineArea = new
                LineArea(fontState, lineHeight, halfLeading,
@@ -168,6 +173,10 @@ public class BlockArea extends Area {
            this.currentLineArea.addPending();
            this.currentLineArea.align(this.alignLastLine);
            this.addLineArea(this.currentLineArea);
+            if (this.currentLinkSet != null) {
+                this.currentLinkSet.align(this.alignLastLine,
+                   this.currentLineArea.getStartIndent());
+            }
        }
     }