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

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

Revision: 12325
          http://sourceforge.net/p/foray/code/12325
Author:   victormote
Date:     2022-01-03 15:03:22 +0000 (Mon, 03 Jan 2022)
Log Message:
-----------
Rename linkage/generator instance variable names for clarity.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTitleArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -65,7 +65,7 @@
     /** The initial size at which the linkage map should be created. */
     private static final short INITIAL_LINKAGE_MAP_SIZE = 200;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
+    /** The link to the FO tree. */
     private FoTree foTree;
 
     /** The children of this node. */

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -45,13 +45,13 @@
 public final class BasicLinkArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
+    /** The link to the FO tree. */
+    private Link<BasicLink> foLink;
+
     /** The parent of this node. The parent can be either a {@link LineArea4a}
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<BasicLink> generatedBy;
-
     /**
      * Private Constructor for a LineArea parent.
      * @param parentArea The parent area.
@@ -76,7 +76,7 @@
      */
     static BasicLinkArea makeBasicLinkArea(final BasicLink generatedBy, final LineArea4a parentArea) {
         final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
-        newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
+        newLinkArea.foLink = newLinkArea.getLink(generatedBy);
         newLinkArea.registerLink(generatedBy);
         final int initialPD = newLinkArea.computeInitialPD();
         newLinkArea.setProgressionDimension(initialPD);
@@ -92,7 +92,7 @@
      */
     static BasicLinkArea makeBasicLinkArea(final BasicLink generatedBy, final AbstractInlineArea parentArea) {
         final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
-        newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
+        newLinkArea.foLink = newLinkArea.getLink(generatedBy);
         newLinkArea.registerLink(generatedBy);
         final int initialPD = newLinkArea.computeInitialPD();
         newLinkArea.setProgressionDimension(initialPD);
@@ -121,7 +121,7 @@
 
     @Override
     public Link<BasicLink> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -47,8 +47,8 @@
  */
 public final class BeforeFloatRa extends AreaFixed implements BeforeFloatAreaG5, org.axsl.area.BeforeFloatRefArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<RegionBody> generatedBy;
+    /** The link to the FO tree. */
+    private Link<RegionBody> foLink;
 
     /** The parent of this node. */
     private AreaNode4a parent;
@@ -72,7 +72,7 @@
      */
     static BeforeFloatRa makeBeforeFloatArea(final RegionBody generatedBy, final RegionRaBody parentArea) {
         final BeforeFloatRa newFloatRA = new BeforeFloatRa(parentArea);
-        newFloatRA.generatedBy = newFloatRA.getLink(generatedBy);
+        newFloatRA.foLink = newFloatRA.getLink(generatedBy);
         newFloatRA.registerLink(generatedBy);
         return newFloatRA;
     }
@@ -163,7 +163,7 @@
 
     @Override
     public Link<RegionBody> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -44,13 +44,13 @@
 public final class BidiOverrideArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
+    /** The link to the FO tree. */
+    private Link<BidiOverride> foLink;
+
     /** The parent of this node. The parent can be either a {@link LineArea4a}
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<BidiOverride> generatedBy;
-
     /**
      * Private Constructor for a LineArea parent.
      * @param parentArea The parent area.
@@ -75,7 +75,7 @@
      */
     static BidiOverrideArea makeBidiOverrideArea(final BidiOverride generatedBy, final LineArea4a parentArea) {
         final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
-        newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
+        newBidiArea.foLink = newBidiArea.getLink(generatedBy);
         newBidiArea.registerLink(generatedBy);
         final int initialPD = newBidiArea.computeInitialPD();
         newBidiArea.setProgressionDimension(initialPD);
@@ -91,7 +91,7 @@
      */
     static BidiOverrideArea makeBidiOverrideArea(final BidiOverride generatedBy, final AbstractInlineArea parentArea) {
         final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
-        newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
+        newBidiArea.foLink = newBidiArea.getLink(generatedBy);
         newBidiArea.registerLink(generatedBy);
         final int initialPD = newBidiArea.computeInitialPD();
         newBidiArea.setProgressionDimension(initialPD);
@@ -120,7 +120,7 @@
 
     @Override
     public Link<BidiOverride> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -59,8 +59,8 @@
 public final class BlockContainerRa extends ContainerRa
         implements BlockContainerAreaG5, org.axsl.area.BlockContainerRefArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<BlockContainer> generatedBy;
+    /** The link to the FO tree. */
+    private Link<BlockContainer> foLink;
 
     /** The parent of this node. */
     private AreaNode4a parent;
@@ -88,7 +88,7 @@
      */
     static BlockContainerRa makeBlockContainerArea(final BlockContainer generatedBy, final AreaNode4a parentArea) {
         final BlockContainerRa newBcArea = new BlockContainerRa(parentArea);
-        newBcArea.generatedBy = newBcArea.getLink(generatedBy);
+        newBcArea.foLink = newBcArea.getLink(generatedBy);
         newBcArea.registerLink(generatedBy);
         final int initialPD = newBcArea.computeInitialPD();
         newBcArea.setProgressionDimension(initialPD);
@@ -201,7 +201,7 @@
 
     @Override
     public Link<BlockContainer> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -43,8 +43,8 @@
  */
 public final class BookmarkArea extends BookmarkParentArea implements BookmarkG5 {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Bookmark generatedBy;
+    /** The link to the FO tree. */
+    private Bookmark foLink;
 
     /** The parent of this node. */
     private BookmarkParentArea parent;
@@ -72,7 +72,7 @@
     static BookmarkArea makeBookmarkArea(final Bookmark generatedBy,
             final BookmarkParentArea parentArea) {
         final BookmarkArea newBookmarkArea = new BookmarkArea(parentArea);
-        newBookmarkArea.generatedBy = generatedBy;
+        newBookmarkArea.foLink = generatedBy;
         return newBookmarkArea;
     }
 
@@ -125,7 +125,7 @@
      * @return The FO Tree bookmark.
      */
     public Bookmark traitGeneratedBy() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTitleArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTitleArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTitleArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -38,8 +38,8 @@
  */
 public final class BookmarkTitleArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private BookmarkTitle generatedBy;
+    /** The link to the FO tree. */
+    private BookmarkTitle foLink;
 
     /** The parent of this node. */
     private BookmarkArea parent;
@@ -62,7 +62,7 @@
             final BookmarkTitle generatedBy, final BookmarkArea parentArea) {
         final BookmarkTitleArea newTitleArea = new BookmarkTitleArea(
                 parentArea);
-        newTitleArea.generatedBy = generatedBy;
+        newTitleArea.foLink = generatedBy;
         return newTitleArea;
     }
 
@@ -88,7 +88,7 @@
      * @return The FO Tree bookmark-title object that generated this.
      */
     public BookmarkTitle traitGeneratedBy() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     /**

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -39,8 +39,8 @@
  */
 public final class BookmarkTreeArea extends BookmarkParentArea implements BookmarkTreeG5 {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private BookmarkTree generatedBy;
+    /** The link to the FO tree. */
+    private BookmarkTree foLink;
 
     /** The parent of this node. */
     private AreaTree4a parent;
@@ -66,7 +66,7 @@
             final AreaTree4a parentArea) {
         final BookmarkTreeArea newBookmarkTreeArea = new BookmarkTreeArea(
                 parentArea);
-        newBookmarkTreeArea.generatedBy = generatedBy;
+        newBookmarkTreeArea.foLink = generatedBy;
         return newBookmarkTreeArea;
     }
 
@@ -93,7 +93,7 @@
      * @return The FO Tree node that generated this bookmark tree.
      */
     public BookmarkTree getGeneratedBy() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
 }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -47,13 +47,13 @@
 public final class ExternalGraphicArea extends AbstractInlineArea implements ExternalGraphicAreaG5,
         org.axsl.area.NormalInlineArea {
 
+    /** The link to the FO tree. */
+    private Link<ExternalGraphic> foLink;
+
     /** The parent of this node. The parent can be either a {@link LineArea4a}
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<ExternalGraphic> generatedBy;
-
     /**
      * Private Constructor.
      * @param parentArea The parent area.
@@ -80,7 +80,7 @@
         if (generatedBy.getGraphic(newEgArea) == null) {
             throw new IllegalArgumentException("Cannot create an Area for a null Graphic.");
         }
-        newEgArea.generatedBy = newEgArea.getLink(generatedBy);
+        newEgArea.foLink = newEgArea.getLink(generatedBy);
         newEgArea.registerLink(generatedBy);
         final int initialPD = newEgArea.computeInitialPD();
         newEgArea.setProgressionDimension(initialPD);
@@ -171,7 +171,7 @@
 
     @Override
     public Link<ExternalGraphic> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -46,8 +46,8 @@
  */
 public final class FootnoteRa extends AreaFixed implements FootnoteAreaG5, org.axsl.area.FootnoteRefArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<RegionBody> generatedBy;
+    /** The link to the FO tree. */
+    private Link<RegionBody> foLink;
 
     /** The parent of this node. */
     private AreaNode4a parent;
@@ -71,7 +71,7 @@
      */
     static FootnoteRa makeFootnoteReferenceArea(final RegionBody generatedBy, final RegionRaBody parentArea) {
         final FootnoteRa footnoteRA = new FootnoteRa(parentArea);
-        footnoteRA.generatedBy = footnoteRA.getLink(generatedBy);
+        footnoteRA.foLink = footnoteRA.getLink(generatedBy);
         footnoteRA.registerLink(generatedBy);
         return footnoteRA;
     }
@@ -173,7 +173,7 @@
 
     @Override
     public Link<RegionBody> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -50,13 +50,13 @@
 public final class ForeignObjectArea extends AbstractInlineArea implements ForeignObjectAreaG5,
         org.axsl.area.NormalInlineArea {
 
+    /** The link to the FO tree. */
+    private Link<InstreamForeignObject> foLink;
+
     /** The parent of this node. The parent can be either a {@link LineArea4a}
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<InstreamForeignObject> generatedBy;
-
     /** The foreign content encapsulated inside this area. */
     private ForeignContentG5 foreignContent;
 
@@ -112,7 +112,7 @@
      */
     private static void init(final ForeignObjectArea newFoArea, final InstreamForeignObject generatedBy,
             final int width) {
-        newFoArea.generatedBy = newFoArea.getLink(generatedBy);
+        newFoArea.foLink = newFoArea.getLink(generatedBy);
         newFoArea.registerLink(generatedBy);
         final int initialPD = newFoArea.computeInitialPD();
         newFoArea.setProgressionDimension(initialPD);
@@ -187,7 +187,7 @@
 
     @Override
     public Link<InstreamForeignObject> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -44,13 +44,13 @@
 public final class IndexPageCitationListArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
+    /** The link to the FO tree. */
+    private Link<IndexPageCitationList> foLink;
+
     /** The parent of this node. The parent can be either a {@link LineArea4a}
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<IndexPageCitationList> generatedBy;
-
     /**
      * Private Constructor for a LineArea parent.
      * @param parentArea The parent area.
@@ -76,7 +76,7 @@
     static IndexPageCitationListArea makeIndexPageCitationListArea(final IndexPageCitationList generatedBy,
             final LineArea4a parentArea) {
         final IndexPageCitationListArea newCitationListArea = new IndexPageCitationListArea(parentArea);
-        newCitationListArea.generatedBy = newCitationListArea.getLink(generatedBy);
+        newCitationListArea.foLink = newCitationListArea.getLink(generatedBy);
         newCitationListArea.registerLink(generatedBy);
         final int initialPD = newCitationListArea.computeInitialPD();
         newCitationListArea.setProgressionDimension(initialPD);
@@ -93,7 +93,7 @@
     static IndexPageCitationListArea makeIndexPageCitationListArea(final IndexPageCitationList generatedBy,
             final AbstractInlineArea parentArea) {
         final IndexPageCitationListArea newCitationListArea = new IndexPageCitationListArea(parentArea);
-        newCitationListArea.generatedBy = newCitationListArea.getLink(generatedBy);
+        newCitationListArea.foLink = newCitationListArea.getLink(generatedBy);
         newCitationListArea.registerLink(generatedBy);
         final int initialPD = newCitationListArea.computeInitialPD();
         newCitationListArea.setProgressionDimension(initialPD);
@@ -122,7 +122,7 @@
 
     @Override
     public Link<IndexPageCitationList> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -47,13 +47,13 @@
 public final class InlineArea extends AbstractAncestralInlineArea implements InlineAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
+    /** The link to the FO tree. */
+    private Link<Inline> foLink;
+
     /** The parent of this node. The parent can be either a {@link LineArea4a}
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<Inline> generatedBy;
-
     /**
      * Private Constructor for a LineArea parent.
      * @param parentArea The parent area.
@@ -78,7 +78,7 @@
      */
     static InlineArea makeInlineArea(final Inline generatedBy, final LineArea4a parentArea) {
         final InlineArea newInlineArea = new InlineArea(parentArea);
-        newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
+        newInlineArea.foLink = newInlineArea.getLink(generatedBy);
         newInlineArea.registerLink(generatedBy);
         final int initialPD = newInlineArea.computeInitialPD();
         newInlineArea.setProgressionDimension(initialPD);
@@ -94,7 +94,7 @@
      */
     static InlineArea makeInlineArea(final Inline generatedBy, final AbstractInlineArea parentArea) {
         final InlineArea newInlineArea = new InlineArea(parentArea);
-        newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
+        newInlineArea.foLink = newInlineArea.getLink(generatedBy);
         newInlineArea.registerLink(generatedBy);
         final int initialPD = newInlineArea.computeInitialPD();
         newInlineArea.setProgressionDimension(initialPD);
@@ -128,7 +128,7 @@
 
     @Override
     public Link<Inline> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -53,13 +53,13 @@
 public final class InlineContainerArea extends AbstractInlineArea
         implements org.axsl.area.InlineContainerArea {
 
+    /** The link to the FO tree. */
+    private Link<InlineContainer> foLink;
+
     /** The parent of this node. The parent can be either a {@link LineArea4a}
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<InlineContainer> generatedBy;
-
     /** The children of this node. */
     private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
 
@@ -87,7 +87,7 @@
      */
     static InlineContainerArea makeInlineContainerArea(final InlineContainer generatedBy, final LineArea4a parentArea) {
         final InlineContainerArea newInlineArea = new InlineContainerArea(parentArea);
-        newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
+        newInlineArea.foLink = newInlineArea.getLink(generatedBy);
         newInlineArea.registerLink(generatedBy);
         final int initialPD = newInlineArea.computeInitialPD();
         newInlineArea.setProgressionDimension(initialPD);
@@ -104,7 +104,7 @@
     static InlineContainerArea makeInlineContainerArea(final InlineContainer generatedBy,
             final AbstractInlineArea parentArea) {
         final InlineContainerArea newInlineArea = new InlineContainerArea(parentArea);
-        newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
+        newInlineArea.foLink = newInlineArea.getLink(generatedBy);
         newInlineArea.registerLink(generatedBy);
         final int initialPD = newInlineArea.computeInitialPD();
         newInlineArea.setProgressionDimension(initialPD);
@@ -135,7 +135,7 @@
 
     @Override
     public Link<InlineContainer> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -71,13 +71,13 @@
 public final class LeaderArea extends AbstractAncestralInlineArea implements LeaderAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
+    /** The link to the FO tree. */
+    private Link<Leader> foLink;
+
     /** The parent of this node. The parent can be either a {@link LineArea4a}
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<Leader> generatedBy;
-
     /**
      * Private Constructor.
      * @param parentArea The parent area.
@@ -106,7 +106,7 @@
      */
     private static void initLeaderArea(final LeaderArea newLeaderArea, final Leader generatedBy,
             final int initialProgressionDimension) throws AreaTreeException {
-        newLeaderArea.generatedBy = newLeaderArea.getLink(generatedBy);
+        newLeaderArea.foLink = newLeaderArea.getLink(generatedBy);
         newLeaderArea.registerLink(generatedBy);
         final int initialPD = newLeaderArea.computeInitialPD();
         newLeaderArea.setProgressionDimension(initialPD);
@@ -397,7 +397,7 @@
 
     @Override
     public Link<Leader> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -76,12 +76,12 @@
  */
 public final class LineArea4a extends BlockArea implements LineArea {
 
+    /** The link to the FO tree. */
+    private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
+
     /** The parent of this node. */
     private NormalBlockArea4a parent;
 
-    /** The children of this node. */
-    private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
-
     /** See {@link #getProgressionDimension()} for a description of
      * "progression dimension". */
     private int progressionDimension = 0;

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -46,8 +46,8 @@
  */
 public final class ListBlockArea extends ContainerRa implements ListBlockAreaG5, org.axsl.area.ListBlockArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<ListBlock> generatedBy;
+    /** The link to the FO tree. */
+    private Link<ListBlock> foLink;
 
     /** The parent of this node. */
     private AreaNode4a parent;
@@ -75,7 +75,7 @@
      */
     static ListBlockArea makeListBlockArea(final ListBlock generatedBy, final AreaNode4a parentArea) {
         final ListBlockArea newListBlockArea = new ListBlockArea(parentArea);
-        newListBlockArea.generatedBy = newListBlockArea.getLink(generatedBy);
+        newListBlockArea.foLink = newListBlockArea.getLink(generatedBy);
         newListBlockArea.registerLink(generatedBy);
         final int initialPD = newListBlockArea.computeInitialPD();
         newListBlockArea.setProgressionDimension(initialPD);
@@ -162,7 +162,7 @@
 
     @Override
     public Link<ListBlock> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -48,8 +48,8 @@
 public final class ListItemArea extends AreaFlexible
         implements org.axsl.area.ListItemArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<ListItem> generatedBy;
+    /** The link to the FO tree. */
+    private Link<ListItem> foLink;
 
     /** The parent of this node. */
     private ListBlockArea parent;
@@ -78,7 +78,7 @@
      */
     static ListItemArea makeListItemArea(final ListItem generatedBy, final ListBlockArea parentArea) {
         final ListItemArea newItemArea = new ListItemArea(parentArea);
-        newItemArea.generatedBy = newItemArea.getLink(generatedBy);
+        newItemArea.foLink = newItemArea.getLink(generatedBy);
         newItemArea.registerLink(generatedBy);
         final int initialPD = newItemArea.computeInitialPD();
         newItemArea.setProgressionDimension(initialPD);
@@ -201,7 +201,7 @@
 
     @Override
     public Link<ListItem> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -39,8 +39,8 @@
 public final class ListItemBodyContainer extends AbstractListItemContent
         implements org.axsl.area.ListItemBodyContainer {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<ListItemBody> generatedBy;
+    /** The link to the FO tree. */
+    private Link<ListItemBody> foLink;
 
     /**
      * Private Constructor.
@@ -76,7 +76,7 @@
 
     @Override
     public Link<ListItemBody> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     /**
@@ -84,7 +84,7 @@
      * @param generatedBy The new "generated by" value.
      */
     protected void setGeneratedBy(final Link<ListItemBody> generatedBy) {
-        this.generatedBy = generatedBy;
+        this.foLink = generatedBy;
     }
 
 }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -39,8 +39,8 @@
 public final class ListItemLabelContainer extends AbstractListItemContent
         implements org.axsl.area.ListItemLabelContainer {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<ListItemLabel> generatedBy;
+    /** The link to the FO tree. */
+    private Link<ListItemLabel> foLink;
 
     /**
      * Private Constructor.
@@ -76,7 +76,7 @@
 
     @Override
     public Link<ListItemLabel> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     /**
@@ -84,7 +84,7 @@
      * @param generatedBy The new "generated by" value.
      */
     protected void setGeneratedBy(final Link<ListItemLabel> generatedBy) {
-        this.generatedBy = generatedBy;
+        this.foLink = generatedBy;
     }
 
 }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -56,8 +56,8 @@
 //    private static final int SPAN_SAFETY_FACTOR = (int) Math.round(
 //            2 * 12000 * 1.3);
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<RegionBody> generatedBy;
+    /** The link to the FO tree. */
+    private Link<RegionBody> foLink;
 
     /** The parent of this node. */
     private AreaNode4a parent;
@@ -84,7 +84,7 @@
      */
     static MainRa makeMainReferenceArea(final RegionBody generatedBy, final RegionRaBody parentArea) {
         final MainRa newMainRA = new MainRa(parentArea);
-        newMainRA.generatedBy = newMainRA.getLink(generatedBy);
+        newMainRA.foLink = newMainRA.getLink(generatedBy);
         newMainRA.registerLink(generatedBy);
         return newMainRA;
     }
@@ -353,7 +353,7 @@
 
     @Override
     public Link<RegionBody> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -38,12 +38,12 @@
  */
 public final class MathArea implements ForeignContentMathG5 {
 
+    /** The link to the FO tree. */
+    private MathElement foLink;
+
     /** The parent of this node. */
     private ForeignObjectArea parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private MathElement generatedBy;
-
     /**
      * Construct a MathArea.
      * @param parentArea The parent area.
@@ -60,13 +60,13 @@
      */
     static MathArea makeMathArea(final MathElement generatedBy, final ForeignObjectArea parentArea) {
         final MathArea newMathArea = new MathArea(parentArea);
-        newMathArea.generatedBy = generatedBy;
+        newMathArea.foLink = generatedBy;
         return newMathArea;
     }
 
     @Override
     public MathGraphic getGraphic() {
-        return this.generatedBy.getMathGraphic();
+        return this.foLink.getMathGraphic();
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -62,8 +62,8 @@
  */
 public final class NormalBlockArea4a extends BlockArea implements NormalBlockArea, ParaContext {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<Block> generatedBy;
+    /** The link to the FO tree. */
+    private Link<Block> foLink;
 
     /** The parent of this node. */
     private AreaNode4a parent;
@@ -92,7 +92,7 @@
     static NormalBlockArea4a makeNormalBlockArea(final Block generatedBy, final AreaNode4a parentArea) {
         final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
         final Link<Block> linkage = newBlockArea.getLink(generatedBy);
-        newBlockArea.generatedBy = linkage;
+        newBlockArea.foLink = linkage;
         newBlockArea.registerLink(generatedBy);
         final int initialPD = newBlockArea.computeInitialPD();
         newBlockArea.setProgressionDimension(initialPD);
@@ -103,7 +103,7 @@
     static NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete generatedBy, final AreaNode4a parentArea) {
         final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
         final Link<Block> linkage = newBlockArea.getLink((Block) generatedBy);
-        newBlockArea.generatedBy = linkage;
+        newBlockArea.foLink = linkage;
         newBlockArea.registerLink(generatedBy);
         final int initialPD = newBlockArea.computeInitialPD();
         newBlockArea.setProgressionDimension(initialPD);
@@ -270,7 +270,7 @@
 
     @Override
     public Link<Block> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -55,8 +55,8 @@
 public final class NormalFlowRa extends ContainerRa
         implements org.axsl.area.NormalFlowRefArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<RegionBody> generatedBy;
+    /** The link to the FO tree. */
+    private Link<RegionBody> foLink;
 
     /** The parent of this node. */
     private SpanRa parent;
@@ -84,7 +84,7 @@
      */
     static NormalFlowRa makeNormalFlowRA(final RegionBody generatedBy, final SpanRa parentArea) {
         final NormalFlowRa newNormalFlow = new NormalFlowRa(parentArea);
-        newNormalFlow.generatedBy = newNormalFlow.getLink(generatedBy);
+        newNormalFlow.foLink = newNormalFlow.getLink(generatedBy);
         newNormalFlow.registerLink(generatedBy);
         final int initialPD = newNormalFlow.computeInitialPD();
         newNormalFlow.setProgressionDimension(initialPD);
@@ -262,7 +262,7 @@
 
     @Override
     public Link<RegionBody> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -57,8 +57,8 @@
  */
 public final class PageCollection extends NonArea implements PageCollectionG5, org.axsl.area.PageCollection {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<PageSequence> generatedBy;
+    /** The link to the FO tree. */
+    private Link<PageSequence> foLink;
 
     /** The parent of this node. */
     private AreaTree4a parent;
@@ -101,7 +101,7 @@
     static PageCollection makePageCollection(final PageSequence generatedBy, final AreaTree4a parentArea,
             final int lastPageNumber) throws AreaTreeException {
         final PageCollection newCollection = new PageCollection(parentArea);
-        newCollection.generatedBy = newCollection.getLink(generatedBy);
+        newCollection.foLink = newCollection.getLink(generatedBy);
         newCollection.registerLink(generatedBy);
         newCollection.pageMasterResolver = generatedBy.makePageMasterResolver(
                 lastPageNumber);
@@ -419,7 +419,7 @@
 
     @Override
     public Link<PageSequence> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -49,8 +49,8 @@
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<PageNumber> generatedBy;
+    /** The link to the FO tree. */
+    private Link<PageNumber> foLink;
 
     /**
      * Private Constructor.
@@ -103,7 +103,7 @@
      * @param width The width, in millipoints, to set.
      */
     private static void init(final PageNumberArea newPnArea, final PageNumber generatedBy, final int width) {
-        newPnArea.generatedBy = newPnArea.getLink(generatedBy);
+        newPnArea.foLink = newPnArea.getLink(generatedBy);
         newPnArea.registerLink(generatedBy);
         final int initialPD = newPnArea.computeInitialPD();
         newPnArea.setProgressionDimension(initialPD);
@@ -140,7 +140,7 @@
 
     @Override
     public Link<PageNumber> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -49,8 +49,8 @@
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<PageNumberCitation> generatedBy;
+    /** The link to the FO tree. */
+    private Link<PageNumberCitation> foLink;
 
     /**
      * Private Constructor.
@@ -104,7 +104,7 @@
      */
     private static void init(final PageNumberCitationArea newPncArea, final PageNumberCitation generatedBy,
             final int width) {
-        newPncArea.generatedBy = newPncArea.getLink(generatedBy);
+        newPncArea.foLink = newPncArea.getLink(generatedBy);
         newPncArea.registerLink(generatedBy);
         final int initialPD = newPncArea.computeInitialPD();
         newPncArea.setProgressionDimension(initialPD);
@@ -153,7 +153,7 @@
 
     @Override
     public Link<PageNumberCitation> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -49,8 +49,8 @@
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<PageNumberCitationLast> generatedBy;
+    /** The link to the FO tree. */
+    private Link<PageNumberCitationLast> foLink;
 
     /**
      * Private Constructor.
@@ -104,7 +104,7 @@
      */
     private static void init(final PageNumberCitationLastArea newPncArea, final PageNumberCitationLast generatedBy,
             final int width) {
-        newPncArea.generatedBy = newPncArea.getLink(generatedBy);
+        newPncArea.foLink = newPncArea.getLink(generatedBy);
         newPncArea.registerLink(generatedBy);
         final int initialPD = newPncArea.computeInitialPD();
         newPncArea.setProgressionDimension(initialPD);
@@ -153,7 +153,7 @@
 
     @Override
     public Link<PageNumberCitationLast> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -67,8 +67,8 @@
 public final class PageRa extends AreaFixed implements PageG5,
         org.axsl.area.PageArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<SimplePageMaster> generatedBy;
+    /** The link to the FO tree. */
+    private Link<SimplePageMaster> foLink;
 
     /** The parent of this node. */
     private PageCollection parent;
@@ -117,7 +117,7 @@
      */
     static PageRa makePageArea(final SimplePageMaster generatedBy, final PageCollection parentArea) {
         final PageRa newPage = new PageRa(parentArea);
-        newPage.generatedBy = newPage.getLink(generatedBy);
+        newPage.foLink = newPage.getLink(generatedBy);
         newPage.registerLink(generatedBy);
         newPage.createRegions();
         return newPage;
@@ -675,7 +675,7 @@
 
     @Override
     public Link<SimplePageMaster> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -59,8 +59,8 @@
  */
 public final class RegionRa extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionRefArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<Region> generatedBy;
+    /** The link to the FO tree. */
+    private Link<Region> foLink;
 
     /** The parent of this node. */
     private AreaNode4a parent;
@@ -84,7 +84,7 @@
      */
     static RegionRa makeRegionArea(final Region generatedBy, final PageRa parentArea) {
         final RegionRa newRegionArea = new RegionRa(parentArea);
-        newRegionArea.generatedBy = newRegionArea.getLink(generatedBy);
+        newRegionArea.foLink = newRegionArea.getLink(generatedBy);
         newRegionArea.registerLink(generatedBy);
         return newRegionArea;
     }
@@ -250,7 +250,7 @@
 
     @Override
     public Link<Region> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -51,8 +51,8 @@
 public final class RegionRaBody extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionBodyRefArea {
     /* TODO: Why doesn't this class extend RegionRa? */
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<RegionBody> generatedBy;
+    /** The link to the FO tree. */
+    private Link<RegionBody> foLink;
 
     /** The parent of this node. */
     private AreaNode4a parent;
@@ -93,7 +93,7 @@
      */
     static RegionRaBody makeRegionBodyArea(final RegionBody generatedBy, final PageRa parentArea) {
         final RegionRaBody regionBody = new RegionRaBody(parentArea);
-        regionBody.generatedBy = regionBody.getLink(generatedBy);
+        regionBody.foLink = regionBody.getLink(generatedBy);
         regionBody.registerLink(generatedBy);
 
         // create the primary reference areas
@@ -338,7 +338,7 @@
 
     @Override
     public Link<RegionBody> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -46,8 +46,8 @@
  */
 public final class RetrieveMarkerNode4a extends AreaNode4a implements RetrieveMarkerNode {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private NoGenerationLink<RetrieveMarker> generatedBy;
+    /** The link to the FO tree. */
+    private NoGenerationLink<RetrieveMarker> foLink;
 
     /** The {@link Marker} instance whose content is grafted onto the encapsulated {@link RetrieveMarker}. */
     private Marker selectedMarker;
@@ -78,7 +78,7 @@
             final Marker selectedMarker) {
         final RetrieveMarkerNode4a newRmNode = new RetrieveMarkerNode4a(parent);
         final NoGenerationLink<RetrieveMarker> link = new NoGenerationLink<RetrieveMarker>(generatedBy);
-        newRmNode.generatedBy = link;
+        newRmNode.foLink = link;
         newRmNode.selectedMarker = selectedMarker;
         /* Do not try to register the link as the generator generates no areas. */
 //        newRmNode.registerLink(generatedBy);
@@ -112,12 +112,12 @@
 
     @Override
     public RetrieveMarker traitGeneratedBy() {
-        return (RetrieveMarker) this.generatedBy.getGenerator();
+        return (RetrieveMarker) this.foLink.getGenerator();
     }
 
     @Override
     public NoGenerationLink<RetrieveMarker> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override
@@ -127,7 +127,7 @@
 
     @Override
     public RetrieveMarker getGraftingPoint() {
-        return (RetrieveMarker) this.generatedBy.getGenerator();
+        return (RetrieveMarker) this.foLink.getGenerator();
     }
 
     /**

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -46,8 +46,8 @@
  */
 public final class RetrieveTableMarkerNode4a extends AreaNode4a implements RetrieveTableMarkerNode {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private NoGenerationLink<RetrieveTableMarker> generatedBy;
+    /** The link to the FO tree. */
+    private NoGenerationLink<RetrieveTableMarker> foLink;
 
     /** The {@link Marker} instance whose content is grafted onto the encapsulated {@link RetrieveTableMarker}. */
     private Marker selectedMarker;
@@ -78,7 +78,7 @@
             final AreaNode4a parent, final Marker selectedMarker) {
         final RetrieveTableMarkerNode4a newRtmNode = new RetrieveTableMarkerNode4a(parent);
         final NoGenerationLink<RetrieveTableMarker> link = new NoGenerationLink<RetrieveTableMarker>(generatedBy);
-        newRtmNode.generatedBy = link;
+        newRtmNode.foLink = link;
         newRtmNode.selectedMarker = selectedMarker;
         /* Do not try to register the link as the generator generates no areas. */
 //        newRtmNode.registerLink(generatedBy);
@@ -112,12 +112,12 @@
 
     @Override
     public RetrieveTableMarker traitGeneratedBy() {
-        return (RetrieveTableMarker) this.generatedBy.getGenerator();
+        return (RetrieveTableMarker) this.foLink.getGenerator();
     }
 
     @Override
     public NoGenerationLink<RetrieveTableMarker> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override
@@ -127,7 +127,7 @@
 
     @Override
     public RetrieveTableMarker getGraftingPoint() {
-        return (RetrieveTableMarker) this.generatedBy.getGenerator();
+        return (RetrieveTableMarker) this.foLink.getGenerator();
     }
 
     /**

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -53,8 +53,8 @@
      * or another {@link AbstractInlineArea}. */
     private Area4a parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<ScalingValueCitation> generatedBy;
+    /** The link to the FO tree. */
+    private Link<ScalingValueCitation> foLink;
 
     /**
      * Private Constructor.
@@ -108,7 +108,7 @@
      */
     private static void init(final ScalingValueCitationArea newPnArea, final ScalingValueCitation generatedBy,
             final int width) {
-        newPnArea.generatedBy = newPnArea.getLink(generatedBy);
+        newPnArea.foLink = newPnArea.getLink(generatedBy);
         newPnArea.registerLink(generatedBy);
         final int initialPD = newPnArea.computeInitialPD();
         newPnArea.setProgressionDimension(initialPD);
@@ -147,7 +147,7 @@
 
     @Override
     public Link<ScalingValueCitation> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -50,8 +50,8 @@
 public final class SpanRa extends ContainerRa
         implements org.axsl.area.SpanRefArea {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<RegionBody> generatedBy;
+    /** The link to the FO tree. */
+    private Link<RegionBody> foLink;
 
     /** The parent of this node. */
     private AreaNode4a parent;
@@ -86,7 +86,7 @@
      */
     static SpanRa makeSpanArea(final RegionBody generatedBy, final MainRa parentArea, final int numColumns) {
         final SpanRa newSpanArea = new SpanRa(parentArea);
-        newSpanArea.generatedBy = newSpanArea.getLink(generatedBy);
+        newSpanArea.foLink = newSpanArea.getLink(generatedBy);
         newSpanArea.registerLink(generatedBy);
         final int initialPD = newSpanArea.computeInitialPD();
         newSpanArea.setProgressionDimension(initialPD);
@@ -416,7 +416,7 @@
 
     @Override
     public Link<RegionBody> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -42,8 +42,8 @@
     /** The parent of this node. */
     private ForeignObjectArea parent;
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private SvgElement generatedBy;
+    /** The link to the FO tree. */
+    private SvgElement foLink;
 
     /**
      * Construct an SvgArea.
@@ -61,13 +61,13 @@
      */
     static SvgArea makeSvgArea(final SvgElement generatedBy, final ForeignObjectArea parentArea) {
         final SvgArea newSvgArea = new SvgArea(parentArea);
-        newSvgArea.generatedBy = generatedBy;
+        newSvgArea.foLink = generatedBy;
         return newSvgArea;
     }
 
     @Override
     public SvgGraphic getGraphic() {
-        return this.generatedBy.getSvgGraphic();
+        return this.foLink.getSvgGraphic();
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java	2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java	2022-01-03 15:03:22 UTC (rev 12325)
@@ -47,8 +47,8 @@
 public final class TableBodyContainer extends AbstractTablePartContainer implements BackgroundAreaG5,
         org.axsl.area.TableBodyContainer {
 
-    /** The "generated-by" trait, as defined in Section 6.1.1. */
-    private Link<TableBody> generatedBy;
+    /** The link to the FO tree. */
+    private Link<TableBody> foLink;
 
     /**
      * Private Constructor.
@@ -68,7 +68,7 @@
      */
     static TableBodyContainer makeTableBodyContainer(final TableBody generatedBy, final TableRa parentArea) {
         final TableBodyContainer bodyContainer = new TableBodyContainer(parentArea);
-        bodyContainer.generatedBy = bodyContainer.getLink(generatedBy);
+        bodyContainer.foLink = bodyContainer.getLink(generatedBy);
         bodyContainer.registerLink(generatedBy);
         final int initialPD = bodyContainer.computeInitialPD();
         bodyContainer.setProgressionDimension(initialPD);
@@ -110,7 +110,7 @@
 
     @Override
     public Link<TableBody> getFoLink() {
-        return this.generatedBy;
+        return this.foLink;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org...
 
[truncated message content]