Support span property

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

diff --git a/src/org/apache/fop/fo/flow/Block.java b/src/org/apache/fop/fo/flow/Block.java
index f5979d0eb14b735f1e56f4f57fc54779606f764f..63d15d5ccf8e7a98b4d165a5e6c5e6bdd2d4a713 100644 (file)
--- a/src/org/apache/fop/fo/flow/Block.java
+++ b/src/org/apache/fop/fo/flow/Block.java
@@ -113,7 +113,8 @@ public class Block extends FObjMixed {
     int hyphenationRemainCharacterCount;
     String language;
     String country;
-
+       int span;
+       
     BlockArea blockArea;
 
     // this may be helpful on other FOs too
@@ -122,6 +123,7 @@ public class Block extends FObjMixed {
     public Block(FObj parent, PropertyList propertyList) {
         super(parent, propertyList);
         this.name = "fo:block";
+        this.span = this.properties.get("span").getEnum();
     }
 
     public Status layout(Area area) throws FOPException {
@@ -243,7 +245,6 @@ public class Block extends FObjMixed {
             this.language = this.properties.get("language").getString();
             this.country = this.properties.get("country").getString();
 
-
             this.id = this.properties.get("id").getString();
 
             if (area instanceof BlockArea) {
@@ -437,4 +438,8 @@ public class Block extends FObjMixed {
       return blockArea.getContentWidth(); //getAllocationWidth()??
     else return 0;  // not laid out yet
   }
+  
+  public int getSpan() {
+         return this.span;
+  }
 }

diff --git a/src/org/apache/fop/fo/flow/BlockContainer.java b/src/org/apache/fop/fo/flow/BlockContainer.java
index 77831b5e1b24be1fccc53ee8c28404100d59de94..440f393682df5bdf296a4a209ac4ce0eff8950c1 100644 (file)
--- a/src/org/apache/fop/fo/flow/BlockContainer.java
+++ b/src/org/apache/fop/fo/flow/BlockContainer.java
@@ -93,6 +93,8 @@ public class BlockContainer extends FObj {
     int borderRightWidth;
     int borderRightStyle;
     
+       int span;
+       
     AreaContainer areaContainer;
 
     public static class Maker extends FObj.Maker {
@@ -112,6 +114,7 @@ public class BlockContainer extends FObj {
        throws FOPException {
        super(parent, propertyList);
         this.name =  "fo:block-container";
+        this.span = this.properties.get("span").getEnum();
     }
        
     public Status layout(Area area) throws FOPException {
@@ -208,6 +211,8 @@ public class BlockContainer extends FObj {
                    this.properties.get("border-right-style").getEnum();
            }
 
+            span = this.properties.get("span").getEnum();            
+
             // initialize id                       
             String id = this.properties.get("id").getString();            
             area.getIDReferences().initializeID(id,area);  
@@ -287,4 +292,7 @@ public class BlockContainer extends FObj {
        return true;
   }
 
+  public int getSpan() {
+         return this.span;
+  }
 }