Support for absolute positioning and borders (contributed by Jon Smirl)

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

1 files changed, 9 insertions, 2 deletions

diff --git a/src/org/apache/fop/layout/BlockArea.java b/src/org/apache/fop/layout/BlockArea.java
index 2532e9567..9cd8b98ca 100644
--- a/src/org/apache/fop/layout/BlockArea.java
+++ b/src/org/apache/fop/layout/BlockArea.java
@@ -95,7 +95,8 @@ public class BlockArea extends Area {
 	this.alignLastLine = alignLastLine;
 	this.lineHeight = lineHeight;
 
-	this.halfLeading = (lineHeight - fontState.getFontSize())/2;
+        if (fontState != null)
+	  this.halfLeading = (lineHeight - fontState.getFontSize())/2;
     }
 
     public void render(Renderer renderer) {
@@ -182,9 +183,15 @@ public class BlockArea extends Area {
     }
 
     public int getStartIndent() {
-	return startIndent;
+	return startIndent + paddingLeft + borderWidthLeft;
     }
 
+    public void setIndents(int startIndent, int endIndent) {
+	this.startIndent = startIndent;
+	this.endIndent = endIndent;
+	this.contentRectangleWidth = allocationWidth - startIndent - endIndent;
+    }
+    
     public int spaceLeft() {
 	return maxHeight - currentHeight;
     }