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

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

Revision: 7435
Author:   victormote
Date:     2006-06-07 11:05:14 -0700 (Wed, 07 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7435&view=rev

Log Message:
-----------
Conform to axsl changes: Use new FOContext interface to provide information to the FOTree.

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/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
    trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.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-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -79,7 +79,7 @@
     }
 
     public int traitBaselineShift() {
-        return traitGeneratedBy().traitBaselineShift();
+        return traitGeneratedBy().traitBaselineShift(this);
     }
 
 }

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-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -36,8 +36,6 @@
 import org.axsl.foR.fo.Block;
 import org.axsl.foR.fo.BlockContainer;
 import org.axsl.foR.fo.ListBlock;
-import org.axsl.foR.fo.Marker;
-import org.axsl.foR.fo.RetrieveMarker;
 import org.axsl.foR.fo.Table;
 import org.axsl.fontR.Font;
 import org.axsl.fontR.FontUse;
@@ -60,43 +58,43 @@
     }
 
     public int traitBackgroundRepeat() {
-        return this.traitGeneratedBy().traitBackgroundRepeat();
+        return this.traitGeneratedBy().traitBackgroundRepeat(this);
     }
 
     public Graphic traitBackgroundImage() {
-        return this.traitGeneratedBy().traitBackgroundImage();
+        return this.traitGeneratedBy().traitBackgroundImage(this);
     }
 
     public int getPaddingTop() {
-        return this.traitGeneratedBy().traitPaddingTop();
+        return this.traitGeneratedBy().traitPaddingTop(this);
     }
 
     public int getPaddingLeft() {
-        return this.traitGeneratedBy().traitPaddingLeft();
+        return this.traitGeneratedBy().traitPaddingLeft(this);
     }
 
     public int getPaddingBottom() {
-        return this.traitGeneratedBy().traitPaddingBottom();
+        return this.traitGeneratedBy().traitPaddingBottom(this);
     }
 
     public int getPaddingRight() {
-        return this.traitGeneratedBy().traitPaddingRight();
+        return this.traitGeneratedBy().traitPaddingRight(this);
     }
 
     public int getBorderTopWidth() {
-        return this.traitGeneratedBy().traitBorderTopWidth();
+        return this.traitGeneratedBy().traitBorderTopWidth(this);
     }
 
     public int getBorderRightWidth() {
-        return this.traitGeneratedBy().traitBorderRightWidth();
+        return this.traitGeneratedBy().traitBorderRightWidth(this);
     }
 
     public int getBorderLeftWidth() {
-        return this.traitGeneratedBy().traitBorderLeftWidth();
+        return this.traitGeneratedBy().traitBorderLeftWidth(this);
     }
 
     public int getBorderBottomWidth() {
-        return this.traitGeneratedBy().traitBorderBottomWidth();
+        return this.traitGeneratedBy().traitBorderBottomWidth(this);
     }
 
     public BlockContainerRA getNearestAncestorAreaContainer() {
@@ -116,15 +114,15 @@
     }
 
     public int traitLetterSpacingOpt() {
-        return traitGeneratedBy().traitLetterSpacingOpt();
+        return traitGeneratedBy().traitLetterSpacingOpt(this);
     }
 
     public int traitLetterSpacingMax() {
-        return traitGeneratedBy().traitLetterSpacingMax();
+        return traitGeneratedBy().traitLetterSpacingMax(this);
     }
 
     public int traitLetterSpacingMin() {
-        return traitGeneratedBy().traitLetterSpacingMin();
+        return traitGeneratedBy().traitLetterSpacingMin(this);
     }
 
     /**
@@ -138,29 +136,29 @@
     }
 
     public int traitWordSpacingOpt() {
-        return traitGeneratedBy().traitWordSpacingOpt();
+        return traitGeneratedBy().traitWordSpacingOpt(this);
     }
 
     public int traitWordSpacingMax() {
-        return traitGeneratedBy().traitWordSpacingMax();
+        return traitGeneratedBy().traitWordSpacingMax(this);
     }
 
     public int traitWordSpacingMin() {
-        return traitGeneratedBy().traitWordSpacingMin();
+        return traitGeneratedBy().traitWordSpacingMin(this);
     }
 
     public int traitFontSize() {
-        return traitGeneratedBy().traitFontSize();
+        return traitGeneratedBy().traitFontSize(this);
     }
 
     public int traitEndIndent() {
         int percentBase = this.getContainingReferenceArea().crIPD();
-        return traitGeneratedBy().traitEndIndent(percentBase);
+        return traitGeneratedBy().traitEndIndent(this, percentBase);
     }
 
     public int traitStartIndent() {
         int percentBase = this.getContainingReferenceArea().crIPD();
-        return traitGeneratedBy().traitStartIndent(percentBase);
+        return traitGeneratedBy().traitStartIndent(this, percentBase);
     }
 
     public int parentAllocationWidth() {
@@ -171,11 +169,11 @@
     }
 
     public FontUse getPrimaryFont() {
-        return traitGeneratedBy().getPrimaryFont();
+        return traitGeneratedBy().getPrimaryFont(this);
     }
 
     public FontUse getSecondaryFont(int codePoint) {
-        return traitGeneratedBy().getSecondaryFont(codePoint);
+        return traitGeneratedBy().getSecondaryFont(this, codePoint);
     }
 
     public int getAscender() {
@@ -187,35 +185,35 @@
     }
 
     public Color traitBorderTopColor() {
-        return traitGeneratedBy().traitBorderTopColor();
+        return traitGeneratedBy().traitBorderTopColor(this);
     }
 
     public Color traitBorderLeftColor() {
-        return traitGeneratedBy().traitBorderLeftColor();
+        return traitGeneratedBy().traitBorderLeftColor(this);
     }
 
     public Color traitBorderRightColor() {
-        return traitGeneratedBy().traitBorderRightColor();
+        return traitGeneratedBy().traitBorderRightColor(this);
     }
 
     public Color traitBorderBottomColor() {
-        return traitGeneratedBy().traitBorderBottomColor();
+        return traitGeneratedBy().traitBorderBottomColor(this);
     }
 
     public String traitFontFamily() {
-        return traitGeneratedBy().traitFontFamily()[0];
+        return traitGeneratedBy().traitFontFamily(this)[0];
     }
 
     public Color traitBackgroundColor() {
-        return traitGeneratedBy().traitBackgroundColor();
+        return traitGeneratedBy().traitBackgroundColor(this);
     }
 
     public short traitRelativePosition() {
-        return traitGeneratedBy().traitRelativePosition();
+        return traitGeneratedBy().traitRelativePosition(this);
     }
 
     public short traitAbsolutePosition() {
-        return traitGeneratedBy().traitAbsolutePosition();
+        return traitGeneratedBy().traitAbsolutePosition(this);
     }
 
     public int getFontAscender() {
@@ -275,31 +273,31 @@
     }
 
     public short traitFontVariant() {
-        return traitGeneratedBy().traitFontVariant();
+        return traitGeneratedBy().traitFontVariant(this);
     }
 
     public boolean traitUnderlineScore() {
-        return traitGeneratedBy().traitUnderlineScore();
+        return traitGeneratedBy().traitUnderlineScore(this);
     }
 
     public boolean traitOverlineScore() {
-        return traitGeneratedBy().traitOverlineScore();
+        return traitGeneratedBy().traitOverlineScore(this);
     }
 
     public boolean traitThroughScore() {
-        return traitGeneratedBy().traitThroughScore();
+        return traitGeneratedBy().traitThroughScore(this);
     }
 
     public Color traitUnderlineScoreColor() {
-        return traitGeneratedBy().traitUnderlineScoreColor();
+        return traitGeneratedBy().traitUnderlineScoreColor(this);
     }
 
     public Color traitOverlineScoreColor() {
-        return traitGeneratedBy().traitOverlineScoreColor();
+        return traitGeneratedBy().traitOverlineScoreColor(this);
     }
 
     public Color traitThroughScoreColor() {
-        return traitGeneratedBy().traitThroughScoreColor();
+        return traitGeneratedBy().traitThroughScoreColor(this);
     }
 
     public Area getAreaParent() {
@@ -744,77 +742,78 @@
     }
 
     public int traitBorderStartWidth() {
-        return traitGeneratedBy().traitBorderStartWidth(traitIsFirst());
+        return traitGeneratedBy().traitBorderStartWidth(this, traitIsFirst());
     }
 
     public int traitBorderEndWidth() {
-        return traitGeneratedBy().traitBorderEndWidth(traitIsLast());
+        return traitGeneratedBy().traitBorderEndWidth(this, traitIsLast());
     }
 
     public int traitBorderBeforeWidth() {
-        return traitGeneratedBy().traitBorderBeforeWidth(traitIsFirst());
+        return traitGeneratedBy().traitBorderBeforeWidth(this, traitIsFirst());
     }
 
     public int traitBorderAfterWidth() {
-        return traitGeneratedBy().traitBorderAfterWidth(traitIsLast());
+        return traitGeneratedBy().traitBorderAfterWidth(this, traitIsLast());
     }
 
     public int traitPaddingStart() {
-        return traitGeneratedBy().traitPaddingStart(traitIsFirst());
+        return traitGeneratedBy().traitPaddingStart(this, traitIsFirst());
     }
 
     public int traitPaddingEnd() {
-        return traitGeneratedBy().traitPaddingEnd(traitIsLast());
+        return traitGeneratedBy().traitPaddingEnd(this, traitIsLast());
     }
 
     public int traitPaddingBefore() {
-        return traitGeneratedBy().traitPaddingBefore(traitIsFirst());
+        return traitGeneratedBy().traitPaddingBefore(this, traitIsFirst());
     }
 
     public int traitPaddingAfter() {
-        return traitGeneratedBy().traitPaddingAfter(traitIsLast());
+        return traitGeneratedBy().traitPaddingAfter(this, traitIsLast());
     }
 
     public int traitSpaceBeforeMinimum() {
-        return traitGeneratedBy().traitSpaceBeforeMinimum();
+        return traitGeneratedBy().traitSpaceBeforeMinimum(this);
     }
 
     public int traitSpaceBeforeOptimum() {
-        return traitGeneratedBy().traitSpaceBeforeOptimum();
+        return traitGeneratedBy().traitSpaceBeforeOptimum(this);
     }
 
     public int traitSpaceBeforeMaximum() {
-        return traitGeneratedBy().traitSpaceBeforeMaximum();
+        return traitGeneratedBy().traitSpaceBeforeMaximum(this);
     }
 
     public int traitSpaceAfterMinumum() {
-        return traitGeneratedBy().traitSpaceAfterMinimum();
+        return traitGeneratedBy().traitSpaceAfterMinimum(this);
     }
 
     public int traitSpaceAfterOptimum() {
-        return traitGeneratedBy().traitSpaceAfterOptimum();
+        return traitGeneratedBy().traitSpaceAfterOptimum(this);
     }
 
     public int traitSpaceAfterMaximum() {
-        return traitGeneratedBy().traitSpaceAfterMaximum();
+        return traitGeneratedBy().traitSpaceAfterMaximum(this);
     }
 
     public int traitSpaceStartOptimum() {
         Area ancestor = this.ancestorBlockAreaNotALineArea();
-        return traitGeneratedBy().traitSpaceStartOptimum(ancestor.crIPD());
+        return traitGeneratedBy().traitSpaceStartOptimum(this,
+                ancestor.crIPD());
     }
 
     public int traitSpaceEndOptimum() {
         Area ancestor = this.ancestorBlockAreaNotALineArea();
-        return traitGeneratedBy().traitSpaceEndOptimum(ancestor.crIPD());
+        return traitGeneratedBy().traitSpaceEndOptimum(this, ancestor.crIPD());
     }
 
     public int traitBPDirection() {
-        return traitGeneratedBy().traitBPDirection();
+        return traitGeneratedBy().traitBPDirection(this);
     }
 
     public int traitIPDirection() {
-        return traitGeneratedBy().traitIPDirection();
+        return traitGeneratedBy().traitIPDirection(this);
     }
 
     private int nearestBaseBPD() {
@@ -831,7 +830,7 @@
      * @return -1 for "auto.
      */
     public int traitBPDimensionMin() {
-        return traitGeneratedBy().traitBPDimensionMin(nearestBaseBPD());
+        return traitGeneratedBy().traitBPDimensionMin(this, nearestBaseBPD());
     }
 
     /**
@@ -839,7 +838,7 @@
      * @return -1 for "auto.
      */
     public int traitBPDimensionOpt() {
-        return traitGeneratedBy().traitBPDimensionOpt(nearestBaseBPD());
+        return traitGeneratedBy().traitBPDimensionOpt(this, nearestBaseBPD());
     }
 
     /**
@@ -847,7 +846,7 @@
      * @return -1 for "auto.
      */
     public int traitBPDimensionMax() {
-        return traitGeneratedBy().traitBPDimensionMax(nearestBaseBPD());
+        return traitGeneratedBy().traitBPDimensionMax(this, nearestBaseBPD());
     }
 
     private int nearestBaseIPD() {
@@ -864,7 +863,7 @@
      * @return -1 for "auto.
      */
     public int traitIPDimensionMin() {
-        return traitGeneratedBy().traitIPDimensionMin(nearestBaseIPD());
+        return traitGeneratedBy().traitIPDimensionMin(this, nearestBaseIPD());
     }
 
     /**
@@ -872,7 +871,7 @@
      * @return -1 for "auto.
      */
     public int traitIPDimensionOpt() {
-        return traitGeneratedBy().traitIPDimensionOpt(nearestBaseIPD());
+        return traitGeneratedBy().traitIPDimensionOpt(this, nearestBaseIPD());
     }
 
     /**
@@ -880,15 +879,15 @@
      * @return -1 for "auto.
      */
     public int traitIPDimensionMax() {
-        return traitGeneratedBy().traitIPDimensionMax(nearestBaseIPD());
+        return traitGeneratedBy().traitIPDimensionMax(this, nearestBaseIPD());
     }
 
     public int traitPageWidth() {
-        return traitGeneratedBy().traitPageWidth();
+        return traitGeneratedBy().traitPageWidth(this);
     }
 
     public int traitPageHeight() {
-        return traitGeneratedBy().traitPageHeight();
+        return traitGeneratedBy().traitPageHeight(this);
     }
 
     /**
@@ -897,15 +896,15 @@
      * is invalid.
      */
     public byte getBPAxis() {
-        return traitGeneratedBy().getBPAxis();
+        return traitGeneratedBy().getBPAxis(this);
     }
 
     public byte getIPAxis() {
-        return traitGeneratedBy().getIPAxis();
+        return traitGeneratedBy().getIPAxis(this);
     }
 
     public WritingMode getWritingMode() {
-        return traitGeneratedBy().getWritingMode();
+        return traitGeneratedBy().getWritingMode(this);
     }
 
     /**
@@ -941,19 +940,19 @@
     }
 
     public int getMarginTop() {
-        return traitGeneratedBy().getMarginTop(traitPageWidth());
+        return traitGeneratedBy().getMarginTop(this, traitPageWidth());
     }
 
     public int getMarginBottom() {
-        return traitGeneratedBy().getMarginBottom(traitPageWidth());
+        return traitGeneratedBy().getMarginBottom(this, traitPageWidth());
     }
 
     public int getMarginLeft() {
-        return traitGeneratedBy().getMarginLeft(traitPageWidth());
+        return traitGeneratedBy().getMarginLeft(this, traitPageWidth());
     }
 
     public int getMarginRight() {
-        return traitGeneratedBy().getMarginRight(traitPageWidth());
+        return traitGeneratedBy().getMarginRight(this, traitPageWidth());
     }
 
     /**
@@ -990,7 +989,7 @@
             throws AreaWException;
 
     public int traitHalfLeadingOpt() {
-        return traitGeneratedBy().traitHalfLeadingOpt();
+        return traitGeneratedBy().traitHalfLeadingOpt(this);
     }
 
     public boolean traitIsReferenceArea() {
@@ -998,7 +997,7 @@
     }
 
     public short traitReferenceOrientation() {
-        return traitGeneratedBy().traitReferenceOrientation();
+        return traitGeneratedBy().traitReferenceOrientation(this);
     }
 
     public short referenceOrientationCumulative() {
@@ -1016,11 +1015,11 @@
     }
 
     public int traitExtent() {
-        return traitGeneratedBy().traitExtent();
+        return traitGeneratedBy().traitExtent(this);
     }
 
     public short traitWhiteSpaceTreatment() {
-        return traitGeneratedBy().traitWhiteSpaceTreatment();
+        return traitGeneratedBy().traitWhiteSpaceTreatment(this);
     }
 
     public boolean traitIsFirst() {
@@ -1032,39 +1031,39 @@
     }
 
     public short traitWrapOption() {
-        return traitGeneratedBy().traitWrapOption();
+        return traitGeneratedBy().traitWrapOption(this);
     }
 
     public String traitLanguage() {
-        return traitGeneratedBy().traitLanguage();
+        return traitGeneratedBy().traitLanguage(this);
     }
 
     public short traitScaling() {
-        return traitGeneratedBy().traitScaling();
+        return traitGeneratedBy().traitScaling(this);
     }
 
     public short traitTextAlign() {
-        return traitGeneratedBy().traitTextAlign();
+        return traitGeneratedBy().traitTextAlign(this);
     }
 
     public short traitAlignmentBaseline() {
-        return traitGeneratedBy().traitAlignmentBaseline();
+        return traitGeneratedBy().traitAlignmentBaseline(this);
     }
 
     public short traitOverflow() {
-        return traitGeneratedBy().traitOverflow();
+        return traitGeneratedBy().traitOverflow(this);
     }
 
     public String traitRefId() {
-        return traitGeneratedBy().traitRefId();
+        return traitGeneratedBy().traitRefId(this);
     }
 
     public char traitHyphenationCharacter() {
-        return traitGeneratedBy().traitHyphenationCharacter();
+        return traitGeneratedBy().traitHyphenationCharacter(this);
     }
 
     public short traitDominantBaseline() {
-        return traitGeneratedBy().traitDominantBaseline();
+        return traitGeneratedBy().traitDominantBaseline(this);
     }
 
     /**
@@ -1098,7 +1097,7 @@
      * of a link, returns {@link Constants#BASIC_LINK_INVALID}.
      */
     public byte linkType() {
-        BasicLink link = this.traitGeneratedBy().getBasicLink();
+        BasicLink link = this.traitGeneratedBy().getBasicLink(this);
         if (link == null) {
             return Constants.BASIC_LINK_INVALID;
         }
@@ -1112,7 +1111,7 @@
      * external-destination.
      */
     public String linkDestination() {
-        BasicLink link = this.traitGeneratedBy().getBasicLink();
+        BasicLink link = this.traitGeneratedBy().getBasicLink(this);
         if (link == null) {
             return null;
         }
@@ -1182,22 +1181,22 @@
 
     public int traitTop() {
         Area ancestor = this.ancestorBlockAreaNotALineArea();
-        return traitGeneratedBy().traitTop(ancestor.crBPD());
+        return traitGeneratedBy().traitTop(this, ancestor.crBPD());
     }
 
     public int traitBottom() {
         Area ancestor = this.ancestorBlockAreaNotALineArea();
-        return traitGeneratedBy().traitBottom(ancestor.crBPD());
+        return traitGeneratedBy().traitBottom(this, ancestor.crBPD());
     }
 
     public int traitLeft() {
         Area ancestor = this.ancestorBlockAreaNotALineArea();
-        return traitGeneratedBy().traitLeft(ancestor.crIPD());
+        return traitGeneratedBy().traitLeft(this, ancestor.crIPD());
     }
 
     public int traitRight() {
         Area ancestor = this.ancestorBlockAreaNotALineArea();
-        return traitGeneratedBy().traitRight(ancestor.crIPD());
+        return traitGeneratedBy().traitRight(this, ancestor.crIPD());
     }
 
     /**
@@ -1244,8 +1243,4 @@
         return true;
     }
 
-    public RetrieveMarker getRetrieveMarker(Marker marker) {
-        return null;
-    }
-
 }

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-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -29,8 +29,11 @@
 import org.axsl.areaW.FOLinkage;
 import org.axsl.areaW.PageArea;
 import org.axsl.common.Constants;
+import org.axsl.foR.FOContext;
 import org.axsl.foR.FONode;
 import org.axsl.foR.FObj;
+import org.axsl.foR.fo.Marker;
+import org.axsl.foR.fo.RetrieveMarker;
 import org.axsl.fontR.FontConsumer;
 import org.axsl.text.TextServer;
 
@@ -255,7 +258,7 @@
     }
 
     public Color traitColor() {
-        return traitGeneratedBy().traitColor();
+        return traitGeneratedBy().traitColor(this);
     }
 
     /**
@@ -263,10 +266,10 @@
      * typeface that should be used.
      * @return One of 100 (lightest), 200, 300, 400 (normal), 500, 600,
      * 700 (bold), 800, or 900 (boldest).
-     * @see FObj#traitFontWeight()
+     * @see FObj#traitFontWeight(FOContext)
      */
     public short traitFontWeight() {
-        return traitGeneratedBy().traitFontWeight();
+        return traitGeneratedBy().traitFontWeight(this);
     }
 
     /**
@@ -275,7 +278,7 @@
      * {@link Constants#FOVAL_BACKSLANT}.
      */
     public short traitFontStyle() {
-        return traitGeneratedBy().traitFontStyle();
+        return traitGeneratedBy().traitFontStyle(this);
     }
 
     /**
@@ -433,4 +436,8 @@
         return nearest.crIPD();
     }
 
+    public RetrieveMarker getRetrieveMarker(Marker marker) {
+        return null;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -42,7 +42,7 @@
     }
 
     public Graphic getGraphic() {
-        return ((ExternalGraphic) this.traitGeneratedBy()).getGraphic();
+        return ((ExternalGraphic) this.traitGeneratedBy()).getGraphic(this);
     }
 
     public byte getAreaType() {
@@ -57,13 +57,13 @@
     public int viewportBPD() {
         ExternalGraphic eg = (ExternalGraphic) this.traitGeneratedBy();
         Area parentForDimensions = this.ancestorGeneratedByBlockLevelFO();
-        return eg.viewportBPD(parentForDimensions.crBPD());
+        return eg.viewportBPD(this, parentForDimensions.crBPD());
     }
 
     public int viewportIPD() {
         ExternalGraphic eg = (ExternalGraphic) this.traitGeneratedBy();
         Area parentForDimensions = this.ancestorGeneratedByBlockLevelFO();
-        return eg.viewportIPD(parentForDimensions.crIPD());
+        return eg.viewportIPD(this, parentForDimensions.crIPD());
     }
 
     /**

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -59,14 +59,14 @@
         InstreamForeignObject ifo
                 = (InstreamForeignObject) this.traitGeneratedBy();
         Area parentForDimensions = this.ancestorGeneratedByBlockLevelFO();
-        return ifo.viewportBPD(parentForDimensions.crBPD());
+        return ifo.viewportBPD(this, parentForDimensions.crBPD());
     }
 
     public int viewportIPD() {
         InstreamForeignObject ifo
                 = (InstreamForeignObject) this.traitGeneratedBy();
         Area parentForDimensions = this.ancestorGeneratedByBlockLevelFO();
-        return ifo.viewportIPD(parentForDimensions.crIPD());
+        return ifo.viewportIPD(this, parentForDimensions.crIPD());
     }
 
     public org.axsl.areaR.AreaNode getContainedForeignObject() {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -88,7 +88,7 @@
             boolean hasFauxSmallCaps, boolean isLastItemOnLine) {
         return LineArea.makeTextArea(foText, this, ipd, startOffset,
                 sizeInChars, hasDiscretionaryHyphen, hasFauxSmallCaps,
-                isLastItemOnLine);
+                isLastItemOnLine, this);
     }
 
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -86,11 +86,11 @@
      * @see FObj#traitLeaderPattern
      */
     public short traitLeaderPattern() {
-        if (traitGeneratedBy().traitLeaderPattern() == Constants.FOVAL_RULE
-                && traitGeneratedBy().traitRuleThickness() <= 0) {
+        if (traitGeneratedBy().traitLeaderPattern(this) == Constants.FOVAL_RULE
+                && traitGeneratedBy().traitRuleThickness(this) <= 0) {
             return Constants.FOVAL_SPACE;
         }
-        return traitGeneratedBy().traitLeaderPattern();
+        return traitGeneratedBy().traitLeaderPattern(this);
     }
 
     /**
@@ -99,7 +99,7 @@
      */
     public int traitLeaderPatternWidth() {
         return traitGeneratedBy().traitLeaderPatternWidth(
-                getParentArea().crIPD());
+                this, getParentArea().crIPD());
     }
 
     /**
@@ -107,7 +107,7 @@
      * @see FObj#traitLeaderAlignment
      */
     public short traitLeaderAlignment() {
-        return traitGeneratedBy().traitLeaderAlignment();
+        return traitGeneratedBy().traitLeaderAlignment(this);
     }
 
     /**
@@ -115,7 +115,7 @@
      * @see FObj#traitRuleStyle
      */
     public short traitRuleStyle() {
-        return traitGeneratedBy().traitRuleStyle();
+        return traitGeneratedBy().traitRuleStyle(this);
     }
 
     /**
@@ -123,7 +123,7 @@
      * @see FObj#traitRuleThickness
      */
     public int traitRuleThickness() {
-        return traitGeneratedBy().traitRuleThickness();
+        return traitGeneratedBy().traitRuleThickness(this);
     }
 
     /**
@@ -229,17 +229,17 @@
 
     public int traitLeaderLengthMin() {
         int percentBase = this.getParentArea().crIPD();
-        return this.traitGeneratedBy().traitLeaderLengthMin(percentBase);
+        return this.traitGeneratedBy().traitLeaderLengthMin(this, percentBase);
     }
 
     public int traitLeaderLengthOpt() {
         int percentBase = this.getParentArea().crIPD();
-        return this.traitGeneratedBy().traitLeaderLengthOpt(percentBase);
+        return this.traitGeneratedBy().traitLeaderLengthOpt(this, percentBase);
     }
 
     public int traitLeaderLengthMax() {
         int percentBase = this.getParentArea().crIPD();
-        return this.traitGeneratedBy().traitLeaderLengthMax(percentBase);
+        return this.traitGeneratedBy().traitLeaderLengthMax(this, percentBase);
     }
 
     public int getResolvedWordSpacing() {
@@ -286,7 +286,7 @@
             boolean hasFauxSmallCaps, boolean isLastItemOnLine) {
         return LineArea.makeTextArea(foText, this, ipd, startOffset,
                 sizeInChars, hasDiscretionaryHyphen, hasFauxSmallCaps,
-                isLastItemOnLine);
+                isLastItemOnLine, this);
     }
 
 }

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-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -27,6 +27,7 @@
 import org.axsl.areaW.AreaWException;
 import org.axsl.common.Constants;
 import org.axsl.common.ConstantsAreaTree;
+import org.axsl.foR.FOContext;
 import org.axsl.foR.FOText;
 import org.axsl.foR.FOTextContent;
 import org.axsl.foR.FObj;
@@ -85,7 +86,7 @@
         }
         default:
             getLogger().error("Invalid 'text-align': "
-                    + traitGeneratedBy().traitTextAlign());
+                    + traitGeneratedBy().traitTextAlign(this));
             return 0;
         }
     }
@@ -504,7 +505,7 @@
      * that results from aligning the line.
      */
     public int startAlignmentAdjustment() {
-        short textAlign = traitGeneratedBy().traitTextAlign();
+        short textAlign = traitGeneratedBy().traitTextAlign(this);
         switch (textAlign) {
         case Constants.FOVAL_END:
         case Constants.FOVAL_RIGHT: {
@@ -680,9 +681,9 @@
      * CENTER, JUSTIFY.
      */
     public short traitTextAlign() {
-        short textAlign = traitGeneratedBy().traitTextAlign();
+        short textAlign = traitGeneratedBy().traitTextAlign(this);
         if (this.textAlignLastApplies()) {
-            short textAlignLast = traitGeneratedBy().traitTextAlignLast();
+            short textAlignLast = traitGeneratedBy().traitTextAlignLast(this);
             if (textAlignLast == Constants.FOVAL_RELATIVE) {
                 if (textAlign == Constants.FOVAL_JUSTIFY) {
                     return Constants.FOVAL_START;
@@ -727,7 +728,7 @@
             return 0;
         }
         int percentBase = this.ancestorBlockAreaNotALineArea().crIPD();
-        return traitGeneratedBy().traitTextIndent(percentBase);
+        return traitGeneratedBy().traitTextIndent(this, percentBase);
     }
 
     public int traitLastLineEndIndent() {
@@ -735,7 +736,7 @@
             return 0;
         }
         int percentBase = this.ancestorBlockAreaNotALineArea().crIPD();
-        return traitGeneratedBy().traitLastLineEndIndent(percentBase);
+        return traitGeneratedBy().traitLastLineEndIndent(this, percentBase);
     }
 
     public int traitStartIndent() {
@@ -806,7 +807,8 @@
     public static org.axsl.areaW.TextArea makeTextArea(FOTextContent foText,
             Area parentArea, int ipd,
             int startOffset, int sizeInChars, boolean hasDiscretionaryHyphen,
-            boolean hasFauxSmallCaps, boolean isLastItemOnLine) {
+            boolean hasFauxSmallCaps, boolean isLastItemOnLine,
+            FOContext context) {
 
         /* If the raw text is empty, don't create the TextArea. */
         if (sizeInChars < 1) {
@@ -814,7 +816,7 @@
         }
 
         /* If the final text will be empty, don't create the TextArea. */
-        char[] rawText = foText.getAreaTreeText();
+        char[] rawText = foText.getAreaTreeText(context);
         boolean isFirstItemOnline = parentArea.children.size() == 0;
         int ignoreAtStart = TextArea.ignoreAtStart(rawText, startOffset,
                 sizeInChars, isFirstItemOnline,
@@ -864,7 +866,7 @@
             boolean hasFauxSmallCaps, boolean isLastItemOnLine) {
         return LineArea.makeTextArea(foText, this, ipd, startOffset,
                 sizeInChars, hasDiscretionaryHyphen, hasFauxSmallCaps,
-                isLastItemOnLine);
+                isLastItemOnLine, this);
     }
 
     public LineOutput asLineOutput() {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -67,9 +67,9 @@
 
         int span = Constants.FOVAL_NONE;
         if (fo instanceof Block) {
-            span = ((Block)fo).traitSpan();
+            span = ((Block)fo).traitSpan(this);
         } else if (fo instanceof BlockContainer) {
-            span = ((BlockContainer)fo).traitSpan();
+            span = ((BlockContainer)fo).traitSpan(this);
         }
 
         if (this.getChildren().isEmpty()) {
@@ -142,9 +142,9 @@
 
         int span = Constants.FOVAL_NONE;
         if (fo instanceof Block) {
-            span = ((Block)fo).traitSpan();
+            span = ((Block)fo).traitSpan(this);
         } else if (fo instanceof BlockContainer) {
-            span = ((BlockContainer)fo).traitSpan();
+            span = ((BlockContainer)fo).traitSpan(this);
         }
 
         if ((span == Constants.FOVAL_ALL)

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -92,7 +92,7 @@
             RegionBody body = (RegionBody) mainRA.traitGeneratedBy();
             FObj generatedBy = this.traitGeneratedBy();
             SpanRA span = new SpanRA(body, mainRA,
-                    generatedBy.traitColumnCount());
+                    generatedBy.traitColumnCount(this));
             overflowColumn = (NormalFlowRA) span.getChildren().get(0);
         }
         if (overflowColumn != null) {
@@ -146,7 +146,7 @@
             }
             AreaFlexible child = (AreaFlexible) object;
             FObj listRelatedAncestor = child.traitGeneratedBy()
-                    .ancestorListRelatedObject();
+                    .ancestorListRelatedObject(this);
             if (listRelatedAncestor instanceof ListItemLabel) {
                 labelBPD += child.usedProgressionDimension();
             } else if (listRelatedAncestor instanceof ListItemBody) {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -180,12 +180,13 @@
         PageSequence pageSeq = getPageSequence();
         PageCollection previousPageCollection = previousPageCollection();
         if (previousPageCollection == null) {
-            currentPageNumber = pageSeq.traitInitialPageNumber(0);
+            currentPageNumber = pageSeq.traitInitialPageNumber(this, 0);
             return;
         }
         int lastPageNumber = previousPageCollection.getCurrentPageNumber() - 1;
-        int computedPageNumber = pageSeq.traitInitialPageNumber(lastPageNumber);
-        if (pageSeq.getRawInitialPageNumber()
+        int computedPageNumber = pageSeq.traitInitialPageNumber(this,
+                lastPageNumber);
+        if (pageSeq.getRawInitialPageNumber(this)
                 == Constants.FOVAL_NOT_A_KEYWORD) {
             /*
              * If the user set the page number explicitly, there is nothing
@@ -233,7 +234,7 @@
          */
             PageSequence previousPageSequence
                     = previousPageCollection.getPageSequence();
-            if (previousPageSequence.traitForcePageCount()
+            if (previousPageSequence.traitForcePageCount(this)
                     == Constants.FOVAL_AUTO) {
                 /*
                  * In this case we'll try to put the added page in the previous
@@ -258,7 +259,7 @@
      */
     public void padPagesAtEnd() throws AreaWException {
         PageSequence pageSeq = getPageSequence();
-        switch (pageSeq.traitForcePageCount()) {
+        switch (pageSeq.traitForcePageCount(this)) {
         case Constants.FOVAL_AUTO: {
             /*
              * The standard would seem to imply that force-page-count="auto"
@@ -351,7 +352,7 @@
         MainRA mainRA = bodyArea.getMainRA();
         RegionBody body = (RegionBody) mainRA.traitGeneratedBy();
         int columnsNeeded = -1;
-        if (nextFObj.traitSpan() == Constants.FOVAL_NONE) {
+        if (nextFObj.traitSpan(this) == Constants.FOVAL_NONE) {
             columnsNeeded = mainRA.traitColumnCount();
         } else {
             columnsNeeded = 1;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -152,11 +152,11 @@
     }
 
     public int getHeight() {
-        return traitGeneratedBy().traitPageHeight();
+        return traitGeneratedBy().traitPageHeight(this);
     }
 
     public int getWidth() {
-        return traitGeneratedBy().traitPageWidth();
+        return traitGeneratedBy().traitPageWidth(this);
     }
 
     public void registerMarker(Marker marker) {
@@ -191,8 +191,8 @@
         }
         RegionBody regionBody = simplePageMaster.getRegionBody();
         RegionRABody area = new RegionRABody(regionBody, this,
-                regionBody.getXPositionVP_CR(),
-                regionBody.getYPositionVP_CR());
+                regionBody.getXPositionVP_CR(this),
+                regionBody.getYPositionVP_CR(this));
         this.body = area;
     }
 
@@ -458,43 +458,43 @@
         }
         // search forward if 'first-starting-within-page' or
         // 'first-including-carryover'
-        if (retrieve.traitRetrievePosition()
+        if (retrieve.traitRetrievePosition(this)
                 == Constants.FOVAL_FIRST_INCLUDING_CARRYOVER) {
             for (int i = 0; i < pageMarkers.size(); i++) {
                 Marker currentMarker = (Marker)pageMarkers.get(i);
-                if (currentMarker.traitMarkerClassName().equals(
-                        retrieve.traitRetrieveClassName())) {
+                if (currentMarker.traitMarkerClassName(this).equals(
+                        retrieve.traitRetrieveClassName(this))) {
                     return currentMarker;
                 }
             }
-        } else if (retrieve.traitRetrievePosition()
+        } else if (retrieve.traitRetrievePosition(this)
                 == Constants.FOVAL_FIRST_STARTING_WITHIN_PAGE) {
             for (int i = 0; i < pageMarkers.size(); i++) {
                 Marker currentMarker = (Marker)pageMarkers.get(i);
-                if (currentMarker.traitMarkerClassName().equals(
-                        retrieve.traitRetrieveClassName())) {
+                if (currentMarker.traitMarkerClassName(this).equals(
+                        retrieve.traitRetrieveClassName(this))) {
                     if (startsHere(currentMarker)) {
                         return currentMarker;
                     }
                 }
             }
-        } else if (retrieve.traitRetrievePosition()
+        } else if (retrieve.traitRetrievePosition(this)
                 == Constants.FOVAL_LAST_STARTING_WITHIN_PAGE) {
             for (int i = pageMarkers.size() - 1; i >= 0; i--) {
                 Marker currentMarker = (Marker)pageMarkers.get(i);
-                if (currentMarker.traitMarkerClassName().equals(
-                        retrieve.traitRetrieveClassName())) {
+                if (currentMarker.traitMarkerClassName(this).equals(
+                        retrieve.traitRetrieveClassName(this))) {
                     if (startsHere(currentMarker)) {
                         return currentMarker;
                     }
                 }
             }
-        } else if (retrieve.traitRetrievePosition()
+        } else if (retrieve.traitRetrievePosition(this)
                 == Constants.FOVAL_LAST_ENDING_WITHIN_PAGE) {
             for (int i = pageMarkers.size() - 1; i >= 0; i--) {
                 Marker currentMarker = (Marker)pageMarkers.get(i);
-                if (currentMarker.traitMarkerClassName().equals(
-                        retrieve.traitRetrieveClassName())) {
+                if (currentMarker.traitMarkerClassName(this).equals(
+                        retrieve.traitRetrieveClassName(this))) {
                     if (endsHere(currentMarker)) {
                         return currentMarker;
                     }
@@ -505,13 +505,14 @@
         // search backward.
         ArrayList additionalMarkers = null;
         PageCollection pageCollection = getPageCollection();
-        if (retrieve.traitRetrieveBoundary() == Constants.FOVAL_PAGE_SEQUENCE) {
+        if (retrieve.traitRetrieveBoundary(this)
+                == Constants.FOVAL_PAGE_SEQUENCE) {
             PageSequence pageSequence = pageCollection.getPageSequence();
             if (pageSequence == getPageSequence()) {
                 additionalMarkers = pageCollection
                         .getCurrentPageSequenceMarkers();
             }
-        } else if (retrieve.traitRetrieveBoundary()
+        } else if (retrieve.traitRetrieveBoundary(this)
                 == Constants.FOVAL_DOCUMENT) {
             additionalMarkers = pageCollection.getDocumentMarkers();
         }
@@ -520,8 +521,8 @@
         }
         for (int i = additionalMarkers.size() - 1; i >= 0; i--) {
             Marker currentMarker = (Marker) additionalMarkers.get(i);
-            if (currentMarker.traitMarkerClassName().equals(
-                    retrieve.traitRetrieveClassName())) {
+            if (currentMarker.traitMarkerClassName(this).equals(
+                    retrieve.traitRetrieveClassName(this))) {
                 return currentMarker;
             }
         }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -43,11 +43,11 @@
     }
 
     public int getYPosition() {
-        return ((Region) traitGeneratedBy()).getYPositionVP_CR();
+        return ((Region) traitGeneratedBy()).getYPositionVP_CR(this);
     }
 
     public int getXPosition() {
-        return ((Region) traitGeneratedBy()).getXPositionVP_CR();
+        return ((Region) traitGeneratedBy()).getXPositionVP_CR(this);
     }
 
     public byte getAreaType() {
@@ -57,7 +57,7 @@
     public int crBPD() {
         if (this.generatedBy.getFONode() instanceof RegionBefore
                 || this.generatedBy.getFONode() instanceof RegionAfter) {
-            return traitGeneratedBy().traitExtent();
+            return traitGeneratedBy().traitExtent(this);
         }
         return getParentArea().brBPD();
     }
@@ -65,7 +65,7 @@
     public int crIPD() {
         if (this.generatedBy.getFONode() instanceof RegionStart
                 || this.generatedBy.getFONode() instanceof RegionEnd) {
-            return traitGeneratedBy().traitExtent();
+            return traitGeneratedBy().traitExtent(this);
         }
         return getParentArea().brIPD();
     }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -196,11 +196,11 @@
     }
 
     public int traitColumnCount() {
-        return traitGeneratedBy().traitColumnCount();
+        return traitGeneratedBy().traitColumnCount(this);
     }
 
     public int traitColumnGap() {
-        return traitGeneratedBy().traitColumnGap();
+        return traitGeneratedBy().traitColumnGap(this);
     }
 
     /**

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -177,7 +177,7 @@
          * If the span requirement is for multiple columns & this has them,
          * then the requirements match & simply return this.
          */
-        if (fo.traitSpan() == Constants.FOVAL_NONE
+        if (fo.traitSpan(this) == Constants.FOVAL_NONE
                 && this.traitColumnCount() > 1) {
             return this;
         }
@@ -185,16 +185,16 @@
          * If the span requirement is for only one column & this has only one,
          * then the requirements match & simply return this.
          */
-        if (fo.traitSpan() == Constants.FOVAL_ALL
+        if (fo.traitSpan(this) == Constants.FOVAL_ALL
                 && this.traitColumnCount() == 1) {
             return this;
         }
         // The requirements do not match, so we need to create a new span area.
         int numColumns = 0;
-        if (fo.traitSpan() == Constants.FOVAL_ALL) {
+        if (fo.traitSpan(this) == Constants.FOVAL_ALL) {
             numColumns = 1;
         } else {
-            numColumns = fo.traitColumnCount();
+            numColumns = fo.traitColumnCount(this);
         }
         RegionBody body = (RegionBody) this.traitGeneratedBy();
         MainRA main = (MainRA) this.getParent();
@@ -239,7 +239,7 @@
         for (int i = 0; i < getChildren().size(); i++) {
             NormalFlowRA nf = (NormalFlowRA) getChildren().get(i);
             int sizeNextLine = blockArea.traitFontSize()
-                    + blockArea.traitGeneratedBy().traitHalfLeadingOpt();
+                    + blockArea.traitGeneratedBy().traitHalfLeadingOpt(this);
             if (nf.bpdUsedByChildren()
                     + sizeNextLine
                     <= this.progressionDimensionAvailable()) {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -50,22 +50,22 @@
     }
 
     public int getPaddingTop() {
-        return this.traitGeneratedBy().traitPaddingTop()
+        return this.traitGeneratedBy().traitPaddingTop(this)
                 + getCenteringPaddingTop();
     }
 
     public int getPaddingLeft() {
-        return this.traitGeneratedBy().traitPaddingLeft()
+        return this.traitGeneratedBy().traitPaddingLeft(this)
                 + getCenteringPaddingLeft();
     }
 
     public int getPaddingBottom() {
-        return this.traitGeneratedBy().traitPaddingBottom()
+        return this.traitGeneratedBy().traitPaddingBottom(this)
                 + getCenteringPaddingBottom();
     }
 
     public int getPaddingRight() {
-        return this.traitGeneratedBy().traitPaddingRight()
+        return this.traitGeneratedBy().traitPaddingRight(this)
                 + getCenteringPaddingRight();
     }
 
@@ -131,13 +131,13 @@
      */
     public int getStartAdjust() {
         TableCell tableCell = (TableCell) traitGeneratedBy();
-        if (tableCell.traitBorderCollapse() == Constants.FOVAL_SEPARATE) {
-            int iSep = tableCell.traitBorderSeparationIPD();
-            return iSep / 2 + tableCell.traitBorderLeftWidth()
-                               + tableCell.traitPaddingLeft();
+        if (tableCell.traitBorderCollapse(this) == Constants.FOVAL_SEPARATE) {
+            int iSep = tableCell.traitBorderSeparationIPD(this);
+            return iSep / 2 + tableCell.traitBorderLeftWidth(this)
+                               + tableCell.traitPaddingLeft(this);
         }
-        return tableCell.traitBorderLeftWidth() / 2
-                + tableCell.traitPaddingLeft();
+        return tableCell.traitBorderLeftWidth(this) / 2
+                + tableCell.traitPaddingLeft(this);
     }
 
     /**
@@ -147,7 +147,7 @@
      */
     public int getProgressionDimension() {
         TableArea tableRA = this.ancestorTableArea();
-        int startingColumn = this.traitGeneratedBy().traitColumnNumber();
+        int startingColumn = this.traitGeneratedBy().traitColumnNumber(this);
         int span = this.traitGeneratedBy().traitNumberColumnsSpanned();
         return tableRA.ipdCell(startingColumn, span);
     }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java	2006-06-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -29,6 +29,7 @@
 import org.axsl.areaW.TableFooterContainer;
 import org.axsl.areaW.TableHeaderContainer;
 import org.axsl.common.ConstantsAreaTree;
+import org.axsl.foR.FOContext;
 import org.axsl.foR.fo.Table;
 import org.axsl.foR.fo.TableBody;
 import org.axsl.foR.fo.TableColumn;
@@ -47,7 +48,8 @@
         for (int i = 0; i < numColumns; i++) {
             TableColumn column = generatedBy.getTableColumn(i);
             if (column != null) {
-                resolvedColumnWidth[i] = column.traitColumnWidth(this.crIPD());
+                resolvedColumnWidth[i] = column.traitColumnWidth(this,
+                        this.crIPD());
             }
         }
     }
@@ -87,8 +89,8 @@
 
     /**
      * The value returned here can be different from the nominal column-width
-     * returned by {@link TableColumn#traitColumnWidth(int)} because of
-     * allocation of excesses or deficiencies in the table width.
+     * returned by {@link TableColumn#traitColumnWidth(FOContext, int)}
+     * because of allocation of excesses or deficiencies in the table width.
      * @return The computed column-width, in millipoints.
      */
     public int getResolvedColumnWidth(int startingColumn) {

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-06 23:26:02 UTC (rev 7434)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2006-06-07 18:05:14 UTC (rev 7435)
@@ -179,7 +179,7 @@
      * @return The raw text from the FO Tree.
      */
     protected char[] getRawText() {
-        return this.getTextContent().getAreaTreeText();
+        return this.getTextContent().getAreaTreeText(this);
     }
 
     public byte getAreaType() {
@@ -516,7 +516,7 @@
      */
     public int traitFontSize() {
         if (hasFauxSmallCaps) {
-            return traitGeneratedBy().getFauxSmallCapFontSize();
+            return traitGeneratedBy().getFauxSmallCapFontSize(this);
         }
         return super.traitFontSize();
     }


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