[FOray-commit] SF.net SVN: foray: [7543] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7543
Author:   victormote
Date:     2006-06-12 15:54:05 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7543&view=rev

Log Message:
-----------
Steps toward creation of the FOLinkageMarker for marker content.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java	2006-06-12 22:37:53 UTC (rev 7542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java	2006-06-12 22:54:05 UTC (rev 7543)
@@ -28,6 +28,7 @@
 import org.axsl.areaW.AreaWException;
 import org.axsl.common.Constants;
 import org.axsl.foR.FONode;
+import org.axsl.foR.fo.RetrieveMarker;
 
 /**
  * Common superclass for all areas generated by inline formatting objects.
@@ -41,6 +42,11 @@
         super(generatedBy, parentArea);
     }
 
+    public AbstractInlineArea(FONode generatedBy, Area parentArea,
+            RetrieveMarker retrieveMarker) {
+        super(generatedBy, parentArea, retrieveMarker);
+    }
+
     /**
      * {@inheritDoc}
      */

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-12 22:37:53 UTC (rev 7542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-12 22:54:05 UTC (rev 7543)
@@ -59,6 +59,11 @@
         super(generatedBy, parentArea);
     }
 
+    public Area(FONode generatedBy, AreaNode parentArea,
+            RetrieveMarker retrieveMarker) {
+        super(generatedBy, parentArea, retrieveMarker);
+    }
+
     public int traitBackgroundRepeat() {
         return this.traitGeneratedBy().traitBackgroundRepeat(this);
     }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2006-06-12 22:37:53 UTC (rev 7542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2006-06-12 22:54:05 UTC (rev 7543)
@@ -26,6 +26,7 @@
 
 import org.axsl.common.Constants;
 import org.axsl.foR.FONode;
+import org.axsl.foR.fo.RetrieveMarker;
 
 import java.util.List;
 
@@ -52,7 +53,12 @@
     private int anteriorSpace;
 
     public AreaFlexible(FONode generatedBy, AreaNode parentArea) {
-        super(generatedBy, parentArea);
+        this(generatedBy, parentArea, null);
+    }
+
+    public AreaFlexible(FONode generatedBy, AreaNode parentArea,
+            RetrieveMarker retrieveMarker) {
+        super(generatedBy, parentArea, retrieveMarker);
         initializeProgressionDimension();
         initializeAnteriorSpace();
     }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 22:37:53 UTC (rev 7542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 22:54:05 UTC (rev 7543)
@@ -61,6 +61,11 @@
      * parent in the AreaTree.
      */
     public AreaNode(FONode generatedBy, AreaNode parentArea) {
+        this(generatedBy, parentArea, null);
+    }
+
+    public AreaNode(FONode generatedBy, AreaNode parentArea,
+            RetrieveMarker retrieveMarker) {
         super(parentArea);
         if (! (this instanceof AreaTree)) {
             // AreaTree has no parent with which to register

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-06-12 22:37:53 UTC (rev 7542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-06-12 22:54:05 UTC (rev 7543)
@@ -36,6 +36,7 @@
 import org.axsl.foR.fo.Leader;
 import org.axsl.foR.fo.PageNumber;
 import org.axsl.foR.fo.PageNumberCitation;
+import org.axsl.foR.fo.RetrieveMarker;
 import org.axsl.fontR.Font;
 import org.axsl.text.line.LineOutput;
 
@@ -825,8 +826,9 @@
         }
 
         /* Go ahead and create*/
-        return new TextArea(foText, parentArea, startOffset, sizeInChars, ipd,
-                hasDiscretionaryHyphen, hasFauxSmallCaps);
+        RetrieveMarker retrieveMarker = parentArea.getRetrieveMarker();
+        return new TextArea(foText, parentArea, retrieveMarker, startOffset,
+                sizeInChars, ipd, hasDiscretionaryHyphen, hasFauxSmallCaps);
     }
 
     public org.axsl.areaW.ForeignObjectArea makeForeignObjectArea(

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2006-06-12 22:37:53 UTC (rev 7542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2006-06-12 22:54:05 UTC (rev 7543)
@@ -31,6 +31,7 @@
 import org.axsl.foR.FONode;
 import org.axsl.foR.FOTextContent;
 import org.axsl.foR.FObj;
+import org.axsl.foR.fo.RetrieveMarker;
 import org.axsl.fontR.Font;
 import org.axsl.fontR.FontUse;
 
@@ -99,10 +100,10 @@
     boolean hasFauxSmallCaps = false;
 
     public TextArea(FOTextContent generatedBy, Area parentArea,
-            int backingOffset, int backingSize,
+            RetrieveMarker retrieveMarker, int backingOffset, int backingSize,
             int progressionDimensionUsed, boolean hasDiscretionaryHyphen,
             boolean hasFauxSmallCaps) {
-        super(generatedBy, parentArea);
+        super(generatedBy, parentArea, retrieveMarker);
         this.backingOffset = backingOffset;
         this.backingSize = backingSize;
         this.resolvedLetterSpacing = parentArea.traitLetterSpacingOpt();
@@ -111,7 +112,6 @@
         this.hasFauxSmallCaps = hasFauxSmallCaps;
         setProgressionDimension(progressionDimensionUsed);
     }
-
     /**
      * <p>Computes and returns the text that should actually be used in the
      * output document. Note that it may be different from the char array that


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.