foray-commit — FOray repository commit log messages

[FOray-commit] SF.net SVN: foray:[12277] trunk/foray/foray-fotree/src/main/java/org/foray /fotree/fo/obj/FoTextWords4a.java

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

Revision: 12277
          http://sourceforge.net/p/foray/code/12277
Author:   victormote
Date:     2021-12-26 16:59:53 +0000 (Sun, 26 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Add getRawText() method to FoText.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java	2021-12-25 18:21:08 UTC (rev 12276)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java	2021-12-26 16:59:53 UTC (rev 12277)
@@ -235,4 +235,9 @@
         return visitor.visit((AbstractCharacterSequence) this);
     }
 
+    @Override
+    public CharSequence getRawText() {
+        return this;
+    }
+
 }

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

[FOray-commit] SF.net SVN: foray:[12276] trunk/foray

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

Revision: 12276
          http://sourceforge.net/p/foray/code/12276
Author:   victormote
Date:     2021-12-25 18:21:08 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Rename remaining types to conform to new Galley naming convention.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.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/TableCellRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
    trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

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	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -33,6 +33,7 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.fotree.fo.ExternalGraphic;
 import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.galley.ExternalGraphicAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.graphic.Graphic;
@@ -44,8 +45,7 @@
 /**
  * Area containing an external-graphic.
  */
-public final class ExternalGraphicArea extends AbstractInlineArea
-        implements org.axsl.galley.ExternalGraphicArea,
+public final class ExternalGraphicArea extends AbstractInlineArea implements ExternalGraphicAreaG5,
         org.axsl.area.NormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -37,6 +37,7 @@
 import org.axsl.fotree.fo.Inline;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.InlineAreaG5;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -44,8 +45,7 @@
 /**
  * Areas generated by the fo:inline object.
  */
-public final class InlineArea extends AbstractAncestralInlineArea
-        implements org.axsl.galley.InlineArea,
+public final class InlineArea extends AbstractAncestralInlineArea implements InlineAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -42,6 +42,7 @@
 import org.axsl.fotree.fo.prop.LeaderPatternWidthPa;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.LeaderAreaG5;
 
 import java.awt.Color;
 
@@ -68,8 +69,7 @@
  * {@link #dotLeaderText()} for dot leaders.</li>
  * </ul>
  */
-public final class LeaderArea extends AbstractAncestralInlineArea
-        implements org.axsl.galley.LeaderArea,
+public final class LeaderArea extends AbstractAncestralInlineArea implements LeaderAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -37,6 +37,7 @@
 import org.axsl.fotree.fo.ListItem;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.ListBlockAreaG5;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,8 +45,7 @@
 /**
  * Area containing all or part of a list-block.
  */
-public final class ListBlockArea extends ContainerRa
-        implements org.axsl.galley.ListBlockArea, org.axsl.area.ListBlockArea {
+public final class ListBlockArea extends ContainerRa implements ListBlockAreaG5, org.axsl.area.ListBlockArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private Linkage 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	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -39,7 +39,7 @@
 import org.axsl.fotree.fo.RegionBody;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.MainReferenceArea;
+import org.axsl.galley.MainReferenceAreaG5;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,7 +48,7 @@
  * Manages the main-reference-area. Its parent should always be an instance of
  * RegionRaBody, and its children should always be instances of SpanRa.
  */
-public final class MainRa extends AreaFixed implements MainReferenceArea,
+public final class MainRa extends AreaFixed implements MainReferenceAreaG5,
         org.axsl.area.MainRefArea {
 
     /** A definitely-not-sacred legacy span safety factor. It appears to be

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	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -46,7 +46,7 @@
 import org.axsl.fotree.fo.Table;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RegionArea;
+import org.axsl.galley.RegionAreaG5;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -56,8 +56,7 @@
 /**
  * This class is used to manage a region-reference-area.
  */
-public final class RegionRa extends AreaFixed implements RegionArea,
-        org.axsl.area.RegionRefArea {
+public final class RegionRa extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionRefArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private Linkage generatedBy;

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	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -38,7 +38,7 @@
 import org.axsl.fotree.fo.SimplePageMaster;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RegionArea;
+import org.axsl.galley.RegionAreaG5;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -48,8 +48,7 @@
 /**
  * Area containing a region-body.
  */
-public final class RegionRaBody extends AreaFixed implements RegionArea,
-        org.axsl.area.RegionBodyRefArea {
+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. */

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -45,7 +45,7 @@
 import org.axsl.fotree.fo.TableCell;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.TableCellArea;
+import org.axsl.galley.TableCellAreaG5;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -55,8 +55,7 @@
 /**
  * Area containing all or part of a table-cell.
  */
-public final class TableCellRa extends ContainerRa implements TableCellArea,
-        org.axsl.area.TableCellArea {
+public final class TableCellRa extends ContainerRa implements TableCellAreaG5, org.axsl.area.TableCellArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private Linkage generatedBy;

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -45,7 +45,7 @@
 import org.axsl.galley.BackgroundAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.TableArea;
+import org.axsl.galley.TableAreaG5;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -55,8 +55,7 @@
 /**
  * Area containing part or all of a {@link Table}.
  */
-public final class TableRa extends ContainerRa implements TableArea,
-        org.axsl.area.TableArea {
+public final class TableRa extends ContainerRa implements TableAreaG5, org.axsl.area.TableArea {
 
     /** Constant indicating the minimum column width (10 points), expressed in
      * millipoints, that is, 10,000. */

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -34,7 +34,7 @@
 import org.axsl.galley.BorderPaddingAreaG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.LeaderArea;
+import org.axsl.galley.LeaderAreaG5;
 import org.axsl.output.DocumentConfiguration;
 
 import java.awt.Color;
@@ -170,7 +170,7 @@
     }
 
     @Override
-    public Void visit(final LeaderArea area) throws GalleyVisitorException {
+    public Void visit(final LeaderAreaG5 area) throws GalleyVisitorException {
         // Handle text decoration.
         renderGenericSpace(area);
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -45,7 +45,7 @@
 import org.axsl.galley.BlockContainerAreaG5;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingAreaG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
 import org.axsl.galley.FootnoteAreaG5;
 import org.axsl.galley.ForeignContentG5;
 import org.axsl.galley.ForeignContentMathG5;
@@ -55,16 +55,16 @@
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.InlineArea;
-import org.axsl.galley.LineArea;
-import org.axsl.galley.MainReferenceArea;
-import org.axsl.galley.NormalBlockArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.InlineAreaG5;
+import org.axsl.galley.LineAreaG5;
+import org.axsl.galley.MainReferenceAreaG5;
+import org.axsl.galley.NormalBlockAreaG5;
 import org.axsl.galley.PageCollectionG5;
 import org.axsl.galley.PageG5;
-import org.axsl.galley.RegionArea;
-import org.axsl.galley.TableArea;
-import org.axsl.galley.TableCellArea;
+import org.axsl.galley.RegionAreaG5;
+import org.axsl.galley.TableAreaG5;
+import org.axsl.galley.TableCellAreaG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 
@@ -306,10 +306,10 @@
      * scaled during drawing.
      * @param clipRectangle The rectangle to which the content should be clipped
      * after any scaling.
-     * @see #drawGraphic(GraphicArea, Graphic, Rectangle, Rectangle)
+     * @see #drawGraphic(GraphicAreaG5, Graphic, Rectangle, Rectangle)
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected abstract void drawGraphic(GraphicArea area, Graphic image,
+    protected abstract void drawGraphic(GraphicAreaG5 area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) throws GalleyVisitorException;
 
     @Override
@@ -330,7 +330,7 @@
      * @throws GalleyVisitorException For errors during rendering.
      */
     protected void renderRegions(final PageG5 page) throws GalleyVisitorException {
-        for (RegionArea regionBody : page.getRegionBodies()) {
+        for (RegionAreaG5 regionBody : page.getRegionBodies()) {
             visit(regionBody);
         }
         if (page.getRegionBefore() != null) {
@@ -356,7 +356,7 @@
     }
 
     @Override
-    public Void visit(final RegionArea area) throws GalleyVisitorException {
+    public Void visit(final RegionAreaG5 area) throws GalleyVisitorException {
         markBackground(area);
         renderChildren(area);
         return null;
@@ -377,7 +377,7 @@
     }
 
     @Override
-    public Void visit(final NormalBlockArea area) throws GalleyVisitorException {
+    public Void visit(final NormalBlockAreaG5 area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
@@ -422,7 +422,7 @@
     }
 
     @Override
-    public Void visit(final ExternalGraphicArea area) throws GalleyVisitorException {
+    public Void visit(final ExternalGraphicAreaG5 area) throws GalleyVisitorException {
         final Graphic graphic = area.getGraphic();
         if (graphic == null) {
             throw new NullPointerException("Null graphic.");
@@ -436,7 +436,7 @@
     }
 
     @Override
-    public Void visit(final TableArea area) throws GalleyVisitorException {
+    public Void visit(final TableAreaG5 area) throws GalleyVisitorException {
         /* Render background Areas for the table-related background-only
          * areas. */
         final BackgroundAreaG5[] backgroundAreas = area.getBackgroundAreas();
@@ -455,7 +455,7 @@
     }
 
     @Override
-    public Void visit(final TableCellArea area) throws GalleyVisitorException {
+    public Void visit(final TableCellAreaG5 area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
@@ -475,7 +475,7 @@
             throws GalleyVisitorException;
 
     @Override
-    public Void visit(final LineArea area) throws GalleyVisitorException {
+    public Void visit(final LineAreaG5 area) throws GalleyVisitorException {
         renderChildren(area);
         return null;
     }
@@ -499,13 +499,13 @@
     }
 
     @Override
-    public Void visit(final MainReferenceArea area) throws GalleyVisitorException {
+    public Void visit(final MainReferenceAreaG5 area) throws GalleyVisitorException {
         renderChildren(area);
         return null;
     }
 
     @Override
-    public Void visit(final InlineArea area) throws GalleyVisitorException {
+    public Void visit(final InlineAreaG5 area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -49,14 +49,14 @@
 import org.axsl.font.FontUse;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingAreaG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.LeaderArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.LeaderAreaG5;
 import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -466,13 +466,13 @@
 
 
     @Override
-    protected void drawGraphic(final GraphicArea area, final Graphic image,
+    protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
             final Rectangle contentRectangle, final Rectangle clipRectangle) {
     // TODO: implement this
     }
 
     @Override
-    public Void visit(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicAreaG5 area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();
@@ -675,7 +675,7 @@
 
 
     @Override
-    public Void visit(final LeaderArea area) {
+    public Void visit(final LeaderAreaG5 area) {
         final int rx = area.crOriginX();
         final int ry = area.crOriginY();
         final int w = area.crIpd();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -44,12 +44,12 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
 import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
+import org.axsl.galley.GraphicAreaG5;
 import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -369,7 +369,7 @@
     }
 
     @Override
-    protected void drawGraphic(final GraphicArea area, final Graphic image,
+    protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
             final Rectangle contentRectangle, final Rectangle clipRectangle) {
     // TODO: implement this
     }
@@ -519,7 +519,7 @@
     }
 
     @Override
-    public Void visit(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicAreaG5 area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -53,7 +53,7 @@
 import org.axsl.galley.Galley;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
+import org.axsl.galley.GraphicAreaG5;
 import org.axsl.galley.PageCollectionG5;
 import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
@@ -296,7 +296,7 @@
     }
 
     @Override
-    protected void drawGraphic(final GraphicArea area, final Graphic image,
+    protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
             final Rectangle contentRectangle, final Rectangle clipRectangle)
             throws GalleyVisitorException {
         final Rectangle2D.Float pdfContentRectangle =

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -57,8 +57,8 @@
 import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.LeaderArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.LeaderAreaG5;
 import org.axsl.galley.PageG5;
 import org.axsl.graphic.EpsGraphic;
 import org.axsl.graphic.Graphic;
@@ -571,7 +571,7 @@
     }
 
     @Override
-    protected void drawGraphic(final GraphicArea area, final Graphic image,
+    protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
             final Rectangle contentRectangle, final Rectangle clipRectangle)
             throws GalleyVisitorException {
         if (clipRectangle.width > 0 || clipRectangle.height > 0) {
@@ -611,7 +611,7 @@
      * @param clipH The height to which the image should be clipped.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected void drawImageClipped(final GraphicArea area, final Graphic image,
+    protected void drawImageClipped(final GraphicAreaG5 area, final Graphic image,
             final int x, final int y, final int clipW,
             final int clipH) throws GalleyVisitorException {
         try {
@@ -984,7 +984,7 @@
 //    }
 
     @Override
-    public Void visit(final LeaderArea area) throws GalleyVisitorException {
+    public Void visit(final LeaderAreaG5 area) throws GalleyVisitorException {
         try {
             writeLeaderArea(area);
         } catch (final IOException e) {
@@ -998,7 +998,7 @@
      * @param area The leader area to be written.
      * @throws IOException For errors writing to output.
      */
-    private void writeLeaderArea(final LeaderArea area) throws IOException {
+    private void writeLeaderArea(final LeaderAreaG5 area) throws IOException {
         final int rx = area.crOriginX();
         final int ry = area.crOriginY();
         final int w = area.crIpd();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -38,14 +38,14 @@
 import org.axsl.galley.AreaG5;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingAreaG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.LeaderArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.LeaderAreaG5;
 import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -371,13 +371,13 @@
     }
 
     @Override
-    protected void drawGraphic(final GraphicArea area, final Graphic image,
+    protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
             final Rectangle contentRectangle, final Rectangle clipRectangle) {
     // TODO: implement this
     }
 
     @Override
-    public Void visit(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicAreaG5 area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();
@@ -516,7 +516,7 @@
     }
 
     @Override
-    public Void visit(final LeaderArea area) {
+    public Void visit(final LeaderAreaG5 area) {
         final int rx = area.crOriginX();
         final int ry = area.crOriginY();
         final int w = area.crIpd();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -34,12 +34,12 @@
 
 import org.axsl.common.value.RuleStyle;
 import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
+import org.axsl.galley.GraphicAreaG5;
 import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -424,7 +424,7 @@
     }
 
     @Override
-    protected void drawGraphic(final GraphicArea area, final Graphic image,
+    protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
             final Rectangle contentRectangle, final Rectangle clipRectangle) {
     // TODO: implement this
     }
@@ -473,7 +473,7 @@
     }
 
     @Override
-    public Void visit(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicAreaG5 area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 18:21:08 UTC (rev 12276)
@@ -46,7 +46,7 @@
 import org.axsl.galley.BlockContainerAreaG5;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingAreaG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
 import org.axsl.galley.FootnoteAreaG5;
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
@@ -54,16 +54,16 @@
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GeneralInlineAreaG5;
 import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.InlineArea;
-import org.axsl.galley.LeaderArea;
-import org.axsl.galley.LineArea;
-import org.axsl.galley.MainReferenceArea;
-import org.axsl.galley.NormalBlockArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.InlineAreaG5;
+import org.axsl.galley.LeaderAreaG5;
+import org.axsl.galley.LineAreaG5;
+import org.axsl.galley.MainReferenceAreaG5;
+import org.axsl.galley.NormalBlockAreaG5;
 import org.axsl.galley.PageG5;
-import org.axsl.galley.RegionArea;
-import org.axsl.galley.TableArea;
-import org.axsl.galley.TableCellArea;
+import org.axsl.galley.RegionAreaG5;
+import org.axsl.galley.TableAreaG5;
+import org.axsl.galley.TableCellAreaG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.output.DocumentAreaConfiguration;
 
@@ -109,10 +109,10 @@
 
     @Override
     public void render(final PageG5 page) throws GalleyVisitorException {
-        final RegionArea before = page.getRegionBefore();
-        final RegionArea after = page.getRegionAfter();
-        final RegionArea start = page.getRegionStart();
-        final RegionArea end = page.getRegionEnd();
+        final RegionAreaG5 before = page.getRegionBefore();
+        final RegionAreaG5 after = page.getRegionAfter();
+        final RegionAreaG5 start = page.getRegionStart();
+        final RegionAreaG5 end = page.getRegionEnd();
         final StringBuilder buffer = new StringBuilder();
         outputAttribute(buffer, "number", page.getFormattedNumber());
         this.writeStartTag(page, buffer);
@@ -128,7 +128,7 @@
         if (end != null) {
             visit(end);
         }
-        for (RegionArea regionBody : page.getRegionBodies()) {
+        for (RegionAreaG5 regionBody : page.getRegionBodies()) {
             visit(regionBody);
         }
         this.writeEndTag(page);
@@ -217,7 +217,7 @@
     }
 
     @Override
-    protected void drawGraphic(final GraphicArea area, final Graphic image,
+    protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
             final Rectangle contentRectangle, final Rectangle clipRectangle) {
         /* There is nothing to do here. */
     }
@@ -234,7 +234,7 @@
     }
 
     @Override
-    public Void visit(final MainReferenceArea area) throws GalleyVisitorException {
+    public Void visit(final MainReferenceAreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -245,7 +245,7 @@
     }
 
     @Override
-    public Void visit(final RegionArea area) throws GalleyVisitorException {
+    public Void visit(final RegionAreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -286,7 +286,7 @@
     }
 
     @Override
-    public Void visit(final NormalBlockArea area) throws GalleyVisitorException {
+    public Void visit(final NormalBlockAreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -329,7 +329,7 @@
     }
 
     @Override
-    public Void visit(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicAreaG5 area) {
         final StringBuilder attributes = new StringBuilder();
         outputCommonAttributes(area, attributes);
         final URL url = area.getGraphic().getUrl();
@@ -348,7 +348,7 @@
     }
 
     @Override
-    public Void visit(final LineArea area) throws GalleyVisitorException {
+    public Void visit(final LineAreaG5 area) throws GalleyVisitorException {
         if (isCoarseXml()) {
             return null;
         }
@@ -370,7 +370,7 @@
     }
 
     @Override
-    public Void visit(final LeaderArea area) {
+    public Void visit(final LeaderAreaG5 area) {
         if (isCoarseXml()) {
             return null;
         }
@@ -420,7 +420,7 @@
     }
 
     @Override
-    public Void visit(final InlineArea area) throws GalleyVisitorException {
+    public Void visit(final InlineAreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -431,7 +431,7 @@
     }
 
     @Override
-    public Void visit(final TableArea area) throws GalleyVisitorException {
+    public Void visit(final TableAreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -442,7 +442,7 @@
     }
 
     @Override
-    public Void visit(final TableCellArea area) throws GalleyVisitorException {
+    public Void visit(final TableCellAreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);

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

[FOray-commit] SF.net SVN: foray:[12275] trunk/foray

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

Revision: 12275
          http://sourceforge.net/p/foray/code/12275
Author:   victormote
Date:     2021-12-25 17:59:39 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Rename some types to conform to new Galley naming convention.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.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/IndexPageCitationListArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.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/ScalingValueCitationArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
    trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -47,7 +47,7 @@
 import org.axsl.fotree.fo.PageNumberCitation;
 import org.axsl.fotree.fo.PageNumberCitationLast;
 import org.axsl.fotree.fo.ScalingValueCitation;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -96,7 +96,7 @@
     }
 
     @Override
-    public GlyphAreaSequence makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
+    public GlyphAreaSequenceG5 makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
             final int sizeInLeaves, final boolean hasFauxSmallCaps, final GraftingPoint graftingPoint) {
         throw new UnsupportedOperationException();
     }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -34,7 +34,7 @@
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.prop.BaselineShiftPa;
-import org.axsl.galley.GeneralInlineArea;
+import org.axsl.galley.GeneralInlineAreaG5;
 
 /**
  * Common superclass for all areas generated by inline formatting objects.
@@ -41,8 +41,7 @@
  * This should not be confused with the more specific class {@link InlineArea}
  * which specifically handles areas generated by the fo:inline object.
  */
-public abstract class AbstractInlineArea extends AreaFlexible
-        implements GeneralInlineArea {
+public abstract class AbstractInlineArea extends AreaFlexible implements GeneralInlineAreaG5 {
 
     /** See {@link #getProgressionDimension()} for a description of
      * "progression dimension". */

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	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -36,6 +36,7 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GeneralInlineAreaG5;
 
 import java.awt.Color;
 
@@ -42,8 +43,7 @@
 /**
  * A normal inline-area generated by the fo:basic-link.
  */
-public final class BasicLinkArea extends AbstractAncestralInlineArea
-        implements org.axsl.galley.GeneralInlineArea,
+public final class BasicLinkArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -35,6 +35,7 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GeneralInlineAreaG5;
 
 import java.awt.Color;
 
@@ -41,8 +42,7 @@
 /**
  *  A normal inline-area generated by the fo:bidi-override object.
  */
-public final class BidiOverrideArea extends AbstractAncestralInlineArea
-        implements org.axsl.galley.GeneralInlineArea,
+public final class BidiOverrideArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -43,7 +43,7 @@
 import org.axsl.fotree.fo.ListBlock;
 import org.axsl.fotree.fo.Table;
 import org.axsl.fotree.fo.prop.CommonPositionPa;
-import org.axsl.galley.BlockContainerArea;
+import org.axsl.galley.BlockContainerAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.graphic.Graphic;
@@ -56,7 +56,7 @@
  * The container area for the contents of a block-container FO.
  */
 public final class BlockContainerRa extends ContainerRa
-        implements BlockContainerArea, org.axsl.area.BlockContainerRefArea {
+        implements BlockContainerAreaG5, org.axsl.area.BlockContainerRefArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private Linkage generatedBy;

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	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -35,6 +35,7 @@
 import org.axsl.fotree.fo.IndexPageCitationList;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GeneralInlineAreaG5;
 
 import java.awt.Color;
 
@@ -41,8 +42,7 @@
 /**
  * A normal inline-area generated by the fo:index-page-citation-list object.
  */
-public final class IndexPageCitationListArea extends AbstractAncestralInlineArea
-        implements org.axsl.galley.GeneralInlineArea,
+public final class IndexPageCitationListArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -61,7 +61,7 @@
 import org.axsl.fotree.fo.ScalingValueCitation;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -1014,7 +1014,7 @@
     }
 
     @Override
-    public GlyphAreaSequence makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
+    public GlyphAreaSequenceG5 makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
             final int sizeInLeaves, final boolean hasFauxSmallCaps, final GraftingPoint graftingPoint) {
         throw new UnsupportedOperationException();
     }

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	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -37,7 +37,7 @@
 import org.axsl.fotree.fo.PageNumber;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 
 import java.awt.Color;
 
@@ -44,8 +44,7 @@
 /**
  * The normal inline-area created by an fo:page-number object.
  */
-public final class PageNumberArea extends AbstractAncestralInlineArea
-        implements GlyphAreaSequence,
+public final class PageNumberArea extends AbstractAncestralInlineArea implements GlyphAreaSequenceG5,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -37,7 +37,7 @@
 import org.axsl.fotree.fo.PageNumberCitation;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 
 import java.awt.Color;
 
@@ -44,8 +44,7 @@
 /**
  * Area containing all or part of a page-number-citation.
  */
-public final class PageNumberCitationArea extends AbstractAncestralInlineArea
-        implements GlyphAreaSequence,
+public final class PageNumberCitationArea extends AbstractAncestralInlineArea implements GlyphAreaSequenceG5,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -37,7 +37,7 @@
 import org.axsl.fotree.fo.PageNumberCitationLast;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 
 import java.awt.Color;
 
@@ -44,9 +44,7 @@
 /**
  * Area containing all or part of a page-number-citation-last.
  */
-public final class PageNumberCitationLastArea
-        extends AbstractAncestralInlineArea
-        implements GlyphAreaSequence,
+public final class PageNumberCitationLastArea extends AbstractAncestralInlineArea implements GlyphAreaSequenceG5,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -39,7 +39,7 @@
 import org.axsl.fotree.fo.ScalingValueCitation;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 
 import java.awt.Color;
 import java.util.Collections;
@@ -48,8 +48,7 @@
 /**
  * The normal inline-area created by an fo:scaling-value-citation object.
  */
-public final class ScalingValueCitationArea extends AbstractInlineArea
-        implements GlyphAreaSequence,
+public final class ScalingValueCitationArea extends AbstractInlineArea implements GlyphAreaSequenceG5,
         org.axsl.area.NormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -40,7 +40,7 @@
 import org.axsl.fotree.fo.FoTextCharacters;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.unicode.block.Basic_Latin_Block;
 
 import java.awt.Color;
@@ -65,7 +65,7 @@
  * different Fonts due to overriding).
  * However, a TextSegment always springs from exactly one FOText node.
  */
-public abstract class TextArea extends AbstractInlineArea implements GlyphAreaSequence {
+public abstract class TextArea extends AbstractInlineArea implements GlyphAreaSequenceG5 {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a} or another {@link AbstractInlineArea}. */
     private Area4a parent;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -31,9 +31,9 @@
 import org.axsl.common.value.LeaderPattern;
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.galley.LeaderArea;
 import org.axsl.output.DocumentConfiguration;
 
@@ -51,7 +51,7 @@
     private static final byte DOUBLE_LEADER_CONSTANT = 3;
 
     @Override
-    protected void markBorder(final BorderPaddingArea area) throws GalleyVisitorException {
+    protected void markBorder(final BorderPaddingAreaG5 area) throws GalleyVisitorException {
         /* TODO: If the borders are all the same style, draw a rectangle
          * instead of four lines. */
 
@@ -108,7 +108,7 @@
      * @param area The area whose "space" features are to be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected void renderGenericSpace(final GlyphAreaSequence area) throws GalleyVisitorException {
+    protected void renderGenericSpace(final GlyphAreaSequenceG5 area) throws GalleyVisitorException {
         final int startX = area.crOriginX();
         int startY;
         final int endX = area.crOriginX() + area.crIpd();
@@ -138,7 +138,7 @@
      * @param area The area whose metrics should be used for the computation.
      * @return The Y position that should be used for the underline stroke.
      */
-    protected int getUnderlineYPosition(final GlyphAreaSequence area) {
+    protected int getUnderlineYPosition(final GlyphAreaSequenceG5 area) {
         final Font font = area.getPrimaryFont().getFont();
         final int underlinePosition = font.underlinePosition(
                 area.traitFontSize());
@@ -150,7 +150,7 @@
      * @param area The area whose metrics should be used for the computation.
      * @return The Y position that should be used for the overline stroke.
      */
-    protected int getOverlineYPosition(final GlyphAreaSequence area) {
+    protected int getOverlineYPosition(final GlyphAreaSequenceG5 area) {
         final Font font = area.getPrimaryFont().getFont();
         final int overlinePosition = font.overlinePosition(
                 area.traitFontSize());
@@ -162,7 +162,7 @@
      * @param area The area whose metrics should be used for the computation.
      * @return The Y position that should be used for the through stroke.
      */
-    protected int getThroughYPosition(final GlyphAreaSequence area) {
+    protected int getThroughYPosition(final GlyphAreaSequenceG5 area) {
         final Font font = area.getPrimaryFont().getFont();
         final int strikeoutPosition = font.strikeoutPosition(
                 area.traitFontSize());
@@ -233,7 +233,7 @@
     }
 
     @Override
-    public Void visit(final GlyphAreaSequence area) throws GalleyVisitorException {
+    public Void visit(final GlyphAreaSequenceG5 area) throws GalleyVisitorException {
         final CharSequence text = area.getText();
         renderGenericSpace(area);
         renderTextSegment(area, text);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -42,9 +42,9 @@
 import org.axsl.galley.AreaNodeG5;
 import org.axsl.galley.BackgroundAreaG5;
 import org.axsl.galley.BeforeFloatAreaG5;
-import org.axsl.galley.BlockContainerArea;
+import org.axsl.galley.BlockContainerAreaG5;
 import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.FootnoteAreaG5;
 import org.axsl.galley.ForeignContentG5;
@@ -54,7 +54,7 @@
 import org.axsl.galley.Galley;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.InlineArea;
 import org.axsl.galley.LineArea;
@@ -110,7 +110,7 @@
      * @param area The area whose border is to be drawn.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected abstract void markBorder(BorderPaddingArea area) throws GalleyVisitorException;
+    protected abstract void markBorder(BorderPaddingAreaG5 area) throws GalleyVisitorException;
 
     /**
      * Renders an area's background, both image and color.
@@ -348,7 +348,7 @@
     }
 
     @Override
-    public Void visit(final BlockContainerArea area) throws GalleyVisitorException {
+    public Void visit(final BlockContainerAreaG5 area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
@@ -471,7 +471,7 @@
      * @param text The text content to be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    public abstract void renderTextSegment(GlyphAreaSequence area, CharSequence text)
+    public abstract void renderTextSegment(GlyphAreaSequenceG5 area, CharSequence text)
             throws GalleyVisitorException;
 
     @Override

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -48,13 +48,13 @@
 import org.axsl.font.Font;
 import org.axsl.font.FontUse;
 import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
 import org.axsl.galley.PageG5;
@@ -437,7 +437,7 @@
     }
 
     @Override
-    protected void markBorder(final BorderPaddingArea area) {
+    protected void markBorder(final BorderPaddingAreaG5 area) {
         final int rx = area.brOriginX();
         final int ry = area.brOriginY();
         final int w = area.brIpd();
@@ -549,7 +549,7 @@
 
 
     @Override
-    public void renderTextSegment(final GlyphAreaSequence area,
+    public void renderTextSegment(final GlyphAreaSequenceG5 area,
             final CharSequence text) {
         final FontUse font = area.getPrimaryFont();
         final int size = area.traitFontSize();
@@ -699,7 +699,7 @@
     }
 
     @Override
-    public Void visit(final GlyphAreaSequence area) {
+    public Void visit(final GlyphAreaSequenceG5 area) {
         renderTextSegment(area, area.getText());
         return null;
     }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -48,7 +48,7 @@
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
@@ -669,7 +669,7 @@
     }
 
     @Override
-    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
+    public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) {
         /* TODO: Implement this. */
 
 //        Font font = area.getResolvedFont();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -52,7 +52,7 @@
 import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.Galley;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.PageCollectionG5;
 import org.axsl.galley.PageG5;
@@ -366,7 +366,8 @@
     }
 
     @Override
-    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) throws GalleyVisitorException {
+    public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text)
+            throws GalleyVisitorException {
         if (text == null || text.length() < 1) {
             return;
         }
@@ -424,7 +425,7 @@
      * @param c The next character to be written.
      * @return The appropriate font to use.
      */
-    private FontUse whichFont(final GlyphAreaSequence area, final FontUse primaryFont, final FontUse currentFont,
+    private FontUse whichFont(final GlyphAreaSequenceG5 area, final FontUse primaryFont, final FontUse currentFont,
             final int c) {
         /* Trying to avoid unnecessary font selection work on the one hand, and unnecessary switching between fonts in
          * the output on the other.*/
@@ -471,7 +472,7 @@
      * @param orthography The orthography that should be used when applying font features like subsitutions.
      * @throws PdfException For errors painting the text.
      */
-    private void paintText(final GlyphAreaSequence area, final FontUse fontUse,
+    private void paintText(final GlyphAreaSequenceG5 area, final FontUse fontUse,
             final CharSequence text, final int startIndex, final int size,
             final FontContext fontContext, final Orthography orthography) throws PdfException {
         if (size < 1) {

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -51,12 +51,12 @@
 import org.axsl.font.FontUse;
 import org.axsl.galley.AreaG5;
 import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
 import org.axsl.galley.PageG5;
@@ -872,7 +872,7 @@
     }*/
 
     @Override
-    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text)
+    public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text)
             throws GalleyVisitorException {
         try {
             writeTextSegment(area, text);
@@ -887,7 +887,7 @@
      * @param text The text segment to be written.
      * @throws IOException For errors writing to the output.
      */
-    private void writeTextSegment(final GlyphAreaSequence area, final CharSequence text) throws IOException {
+    private void writeTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) throws IOException {
         if (text == null || text.length() < 1) {
             return;
         }
@@ -1116,7 +1116,7 @@
     }
 
     @Override
-    protected void markBorder(final BorderPaddingArea area) throws GalleyVisitorException {
+    protected void markBorder(final BorderPaddingAreaG5 area) throws GalleyVisitorException {
         try {
             writeBorder(area);
         } catch (final IOException e) {
@@ -1129,7 +1129,7 @@
      * @param area The area whose border is to be written.
      * @throws IOException For errors writing to output.
      */
-    private void writeBorder(final BorderPaddingArea area) throws IOException {
+    private void writeBorder(final BorderPaddingAreaG5 area) throws IOException {
         final int rx = area.brOriginX();
         final int ry = area.brOriginY();
         final int w = area.crIpd();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -37,13 +37,13 @@
 import org.axsl.font.Font;
 import org.axsl.galley.AreaG5;
 import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
 import org.axsl.galley.PageG5;
@@ -333,7 +333,7 @@
     }
 
     @Override
-    protected void markBorder(final BorderPaddingArea area) {
+    protected void markBorder(final BorderPaddingAreaG5 area) {
         final int rx = area.brOriginX();
         final int ry = area.brOriginY();
         final int w = area.crIpd();
@@ -424,7 +424,7 @@
     }
 
     @Override
-    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
+    public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) {
         /* TODO: Implement this. */
 
 //        char ch;
@@ -526,7 +526,7 @@
     }
 
     @Override
-    public Void visit(final GlyphAreaSequence area) {
+    public Void visit(final GlyphAreaSequenceG5 area) {
         // TODO: Implement this.
         return null;
     }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -38,7 +38,7 @@
 import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
@@ -503,7 +503,7 @@
     }
 
     @Override
-    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
+    public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) {
         /* TODO: Implement this. */
 
 //        int rx = this.currentXPosition;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 17:59:39 UTC (rev 12275)
@@ -43,9 +43,9 @@
 import org.axsl.galley.AreaNodeG5;
 import org.axsl.galley.BackgroundAreaG5;
 import org.axsl.galley.BeforeFloatAreaG5;
-import org.axsl.galley.BlockContainerArea;
+import org.axsl.galley.BlockContainerAreaG5;
 import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.FootnoteAreaG5;
 import org.axsl.galley.ForeignContentMathG5;
@@ -52,8 +52,8 @@
 import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GeneralInlineArea;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GeneralInlineAreaG5;
+import org.axsl.galley.GlyphAreaSequenceG5;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.InlineArea;
 import org.axsl.galley.LeaderArea;
@@ -223,7 +223,7 @@
     }
 
     @Override
-    public Void visit(final BlockContainerArea area) throws GalleyVisitorException {
+    public Void visit(final BlockContainerAreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -301,7 +301,7 @@
      * @param area The Area to be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    public void renderInlineArea(final GeneralInlineArea area) throws GalleyVisitorException {
+    public void renderInlineArea(final GeneralInlineAreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -343,7 +343,7 @@
     }
 
     @Override
-    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
+    public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) {
         /* TODO: Implement this. */
     }
 
@@ -389,7 +389,7 @@
     }
 
     @Override
-    public Void visit(final GlyphAreaSequence area) {
+    public Void visit(final GlyphAreaSequenceG5 area) {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -528,7 +528,7 @@
     }
 
     @Override
-    protected void markBorder(final BorderPaddingArea area) {
+    protected void markBorder(final BorderPaddingAreaG5 area) {
         // No operation.
         return;
     }
@@ -617,7 +617,7 @@
      * @param area The area whose color information should be written.
      * @param buffer The buffer to which the attributes should be added.
      */
-    public void outputColor(final GeneralInlineArea area,
+    public void outputColor(final GeneralInlineAreaG5 area,
             final StringBuilder buffer) {
         final String color = colorToFloat(area.traitColor().getRed())
                 + ", "

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

[FOray-commit] SF.net SVN: foray:[12274] trunk/foray

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

Revision: 12274
          http://sourceforge.net/p/foray/code/12274
Author:   victormote
Date:     2021-12-25 17:40:58 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Rename some types to conform to new Galley naming convention.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.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/MathArea.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/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-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -32,7 +32,7 @@
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableRow;
-import org.axsl.galley.BackgroundArea;
+import org.axsl.galley.BackgroundAreaG5;
 import org.axsl.graphic.Graphic;
 
 import java.util.ArrayList;
@@ -41,8 +41,7 @@
 /**
  * Abstract superclass for table-body, table-header, and table-footer areas.
  */
-public abstract class AbstractTablePartContainer extends ContainerRa
-        implements BackgroundArea,
+public abstract class AbstractTablePartContainer extends ContainerRa implements BackgroundAreaG5,
         org.axsl.area.AbstractTablePartContainer {
 
     /** The parent of this node. */

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -47,7 +47,6 @@
 import org.axsl.fotree.fo.Block;
 import org.axsl.fotree.fo.prop.IdPa;
 import org.axsl.fotree.fo.prop.WritingModePa;
-import org.axsl.galley.BackgroundArea;
 
 import java.awt.geom.Rectangle2D;
 import java.util.List;
@@ -312,7 +311,7 @@
     }
 
     /**
-     * Implementation of {@link BackgroundArea#prOriginX}.
+     * Implementation of {@link org.axsl.galley.BackgroundAreaG5#prOriginX}.
      * @return The padding-rectangle point-of-origin x coordinate.
      */
     public int prOriginX() {
@@ -342,7 +341,7 @@
     }
 
     /**
-     * Implementation of {@link BackgroundArea#prOriginY}.
+     * Implementation of {@link org.axsl.galley.BackgroundAreaG5#prOriginY}.
      * @return The padding-rectangle point-of-origin y coordinate.
      */
     public int prOriginY() {

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	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -33,6 +33,7 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.Fo;
+import org.axsl.galley.BeforeFloatAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 
@@ -43,9 +44,7 @@
  * Manages the before-float-reference-area. Its parent should always be an
  * instance of RegionRaBody.
  */
-public final class BeforeFloatRa extends AreaFixed
-        implements org.axsl.galley.BeforeFloatArea,
-        org.axsl.area.BeforeFloatRefArea {
+public final class BeforeFloatRa extends AreaFixed implements BeforeFloatAreaG5, org.axsl.area.BeforeFloatRefArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private Linkage generatedBy;

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	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -33,6 +33,7 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.Fo;
+import org.axsl.galley.FootnoteAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 
@@ -42,8 +43,7 @@
 /**
  * Manages the footnote reference area for a page.
  */
-public final class FootnoteRa extends AreaFixed
-    implements org.axsl.galley.FootnoteArea, org.axsl.area.FootnoteRefArea {
+public final class FootnoteRa extends AreaFixed implements FootnoteAreaG5, org.axsl.area.FootnoteRefArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private Linkage generatedBy;

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	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -36,7 +36,8 @@
 import org.axsl.fotree.fo.InstreamForeignObject;
 import org.axsl.fotree.foreign.MathElement;
 import org.axsl.fotree.foreign.SvgElement;
-import org.axsl.galley.ForeignContent;
+import org.axsl.galley.ForeignContentG5;
+import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 
@@ -47,8 +48,7 @@
 /**
  * Area containing a foreign-object.
  */
-public final class ForeignObjectArea extends AbstractInlineArea
-        implements org.axsl.galley.ForeignObjectArea,
+public final class ForeignObjectArea extends AbstractInlineArea implements ForeignObjectAreaG5,
         org.axsl.area.NormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}
@@ -59,7 +59,7 @@
     private Linkage generatedBy;
 
     /** The foreign content encapsulated inside this area. */
-    private ForeignContent foreignContent;
+    private ForeignContentG5 foreignContent;
 
     /**
      * Private Constructor.
@@ -175,7 +175,7 @@
     }
 
     @Override
-    public ForeignContent getContainedForeignObject() {
+    public ForeignContentG5 getContainedForeignObject() {
         return this.foreignContent;
     }
 

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	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -30,6 +30,7 @@
 
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.foreign.MathElement;
+import org.axsl.galley.ForeignContentMathG5;
 import org.axsl.graphic.MathGraphic;
 
 /**
@@ -36,7 +37,7 @@
  * The <em>reference</em> area that contains the content that is in
  * a {@link ForeignObjectArea} <em>viewport</em> area.
  */
-public final class MathArea implements org.axsl.galley.ForeignContentMath {
+public final class MathArea implements ForeignContentMathG5 {
 
     /** The parent of this node. */
     private ForeignObjectArea parent;

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	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -30,6 +30,8 @@
 
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.foreign.SvgElement;
+import org.axsl.galley.ForeignContentSvgG5;
+import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.graphic.SvgGraphic;
 
 /**
@@ -36,7 +38,7 @@
  * An SvgArea represents the <em>reference </em> area that contains the
  * content that is in a {@link ForeignObjectArea} <em>viewport </em> area.
  */
-public final class SvgArea implements org.axsl.galley.ForeignContentSvg {
+public final class SvgArea implements ForeignContentSvgG5 {
 
     /** The parent of this node. */
     private ForeignObjectArea parent;
@@ -74,7 +76,7 @@
     }
 
     @Override
-    public ForeignObjectArea getParent() {
+    public ForeignObjectAreaG5 getParent() {
         return this.parent;
     }
 

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	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -34,6 +34,7 @@
 import org.axsl.common.value.BackgroundRepeat;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableBody;
+import org.axsl.galley.BackgroundAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.graphic.Graphic;
@@ -43,8 +44,7 @@
 /**
  * Area containing all or part of a table-body.
  */
-public final class TableBodyContainer extends AbstractTablePartContainer
-        implements org.axsl.galley.BackgroundArea,
+public final class TableBodyContainer extends AbstractTablePartContainer implements BackgroundAreaG5,
         org.axsl.area.TableBodyContainer {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -34,6 +34,7 @@
 import org.axsl.common.value.BackgroundRepeat;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableFooter;
+import org.axsl.galley.BackgroundAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.graphic.Graphic;
@@ -43,8 +44,7 @@
 /**
  * Area containing all or part of a table-footer.
  */
-public final class TableFooterContainer extends AbstractTablePartContainer
-        implements org.axsl.galley.BackgroundArea,
+public final class TableFooterContainer extends AbstractTablePartContainer implements BackgroundAreaG5,
         org.axsl.area.TableFooterContainer {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -34,6 +34,7 @@
 import org.axsl.common.value.BackgroundRepeat;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableHeader;
+import org.axsl.galley.BackgroundAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.graphic.Graphic;
@@ -43,8 +44,7 @@
 /**
  * Area containing all or part of a table-header.
  */
-public final class TableHeaderContainer extends AbstractTablePartContainer
-        implements org.axsl.galley.BackgroundArea,
+public final class TableHeaderContainer extends AbstractTablePartContainer implements BackgroundAreaG5,
         org.axsl.area.TableHeaderContainer {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -42,7 +42,7 @@
 import org.axsl.fotree.fo.TableColumn;
 import org.axsl.fotree.fo.TableFooter;
 import org.axsl.fotree.fo.TableHeader;
-import org.axsl.galley.BackgroundArea;
+import org.axsl.galley.BackgroundAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.TableArea;
@@ -435,9 +435,8 @@
     }
 
     @Override
-    public BackgroundArea[] getBackgroundAreas() {
-        final List<BackgroundArea> backgroundAreas
-                = new ArrayList<BackgroundArea>();
+    public BackgroundAreaG5[] getBackgroundAreas() {
+        final List<BackgroundAreaG5> backgroundAreas = new ArrayList<BackgroundAreaG5>();
         /* We add them in z-order. */
         /* 1. The table. */
         if (this.hasBackground(this)) {
@@ -459,8 +458,7 @@
         }
         /* 6. Cells. Cells handler their own backgrounds, so we ignore them
          * here. */
-        final BackgroundArea[] returnArray
-                = new BackgroundArea[backgroundAreas.size()];
+        final BackgroundAreaG5[] returnArray = new BackgroundAreaG5[backgroundAreas.size()];
         return backgroundAreas.toArray(returnArray);
     }
 
@@ -470,7 +468,7 @@
      * @param backgroundArea The background area to be tested.
      * @return True if and only if {@code backgroundArea} actually has a background.
      */
-    private boolean hasBackground(final BackgroundArea backgroundArea) {
+    private boolean hasBackground(final BackgroundAreaG5 backgroundArea) {
         if (backgroundArea.getGraphic() != null) {
             return true;
         }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -37,6 +37,7 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableCell;
 import org.axsl.fotree.fo.TableRow;
+import org.axsl.galley.BackgroundAreaG5;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.graphic.Graphic;
@@ -52,7 +53,7 @@
  */
 public final class TableRowContainer extends ContainerRa
         implements org.axsl.area.TableRowContainer,
-        org.axsl.galley.BackgroundArea {
+        BackgroundAreaG5 {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private Linkage generatedBy;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -40,17 +40,17 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.galley.AreaG5;
 import org.axsl.galley.AreaNodeG5;
-import org.axsl.galley.BackgroundArea;
-import org.axsl.galley.BeforeFloatArea;
+import org.axsl.galley.BackgroundAreaG5;
+import org.axsl.galley.BeforeFloatAreaG5;
 import org.axsl.galley.BlockContainerArea;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
-import org.axsl.galley.FootnoteArea;
-import org.axsl.galley.ForeignContent;
-import org.axsl.galley.ForeignContentMath;
-import org.axsl.galley.ForeignContentSvg;
-import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.FootnoteAreaG5;
+import org.axsl.galley.ForeignContentG5;
+import org.axsl.galley.ForeignContentMathG5;
+import org.axsl.galley.ForeignContentSvgG5;
+import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.Galley;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
@@ -117,7 +117,7 @@
      * @param area The area whose background should be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected void markBackground(final BackgroundArea area) throws GalleyVisitorException {
+    protected void markBackground(final BackgroundAreaG5 area) throws GalleyVisitorException {
         markBackgroundColor(area);
         markBackgroundImage(area);
     }
@@ -127,7 +127,7 @@
      * @param area The area whose background should be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    private void markBackgroundColor(final BackgroundArea area) throws GalleyVisitorException {
+    private void markBackgroundColor(final BackgroundAreaG5 area) throws GalleyVisitorException {
         final Color backgroundColor = area.traitBackgroundColor();
         /* If the background color is totally transparent, don't paint it. */
         if (backgroundColor.getAlpha() == 0) {
@@ -155,7 +155,7 @@
      * @param area The area whose background should be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    private void markBackgroundImage(final BackgroundArea area) throws GalleyVisitorException {
+    private void markBackgroundImage(final BackgroundAreaG5 area) throws GalleyVisitorException {
         final Graphic backgroundImage = area.traitBackgroundImage();
         if (backgroundImage == null) {
             return;
@@ -385,34 +385,34 @@
     }
 
     /**
-     * Render the SVG content of a {@link ForeignObjectArea}.
+     * Render the SVG content of a {@link ForeignObjectAreaG5}.
      * @param svgContent The SVG content to be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    public abstract void render(ForeignContentSvg svgContent) throws GalleyVisitorException;
+    public abstract void render(ForeignContentSvgG5 svgContent) throws GalleyVisitorException;
 
     /**
-     * Render the MathML content of a {@link ForeignObjectArea}.
+     * Render the MathML content of a {@link ForeignObjectAreaG5}.
      * @param mathContent The MathML content to be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    public abstract void render(ForeignContentMath mathContent) throws GalleyVisitorException;
+    public abstract void render(ForeignContentMathG5 mathContent) throws GalleyVisitorException;
 
     @Override
-    public Void visit(final ForeignObjectArea area) throws GalleyVisitorException {
-        final ForeignContent foreignContent = area.getContainedForeignObject();
+    public Void visit(final ForeignObjectAreaG5 area) throws GalleyVisitorException {
+        final ForeignContentG5 foreignContent = area.getContainedForeignObject();
         if (foreignContent == null) {
             this.getLogger().warn("At rendering, ForeignContent area "
                     + "has no parsed content");
             return null;
         }
-        if (foreignContent instanceof ForeignContentSvg) {
-            final ForeignContentSvg svgArea =
-                    (ForeignContentSvg) foreignContent;
+        if (foreignContent instanceof ForeignContentSvgG5) {
+            final ForeignContentSvgG5 svgArea =
+                    (ForeignContentSvgG5) foreignContent;
             render(svgArea);
-        } else if (foreignContent instanceof ForeignContentMath) {
-            final ForeignContentMath mathArea =
-                    (ForeignContentMath) foreignContent;
+        } else if (foreignContent instanceof ForeignContentMathG5) {
+            final ForeignContentMathG5 mathArea =
+                    (ForeignContentMathG5) foreignContent;
             render(mathArea);
         } else {
             this.getLogger().warn("At rendering, ForeignContent area "
@@ -439,10 +439,10 @@
     public Void visit(final TableArea area) throws GalleyVisitorException {
         /* Render background Areas for the table-related background-only
          * areas. */
-        final BackgroundArea[] backgroundAreas = area.getBackgroundAreas();
+        final BackgroundAreaG5[] backgroundAreas = area.getBackgroundAreas();
         if (backgroundAreas != null) {
             for (int i = 0; i < backgroundAreas.length; i++) {
-                final BackgroundArea bga = backgroundAreas[i];
+                final BackgroundAreaG5 bga = backgroundAreas[i];
                 markBackground(bga);
             }
         }
@@ -487,13 +487,13 @@
     public abstract void render(BookmarkTreeG5 bookmarkTree);
 
     @Override
-    public Void visit(final FootnoteArea area) throws GalleyVisitorException {
+    public Void visit(final FootnoteAreaG5 area) throws GalleyVisitorException {
         renderChildren(area);
         return null;
     }
 
     @Override
-    public Void visit(final BeforeFloatArea area) throws GalleyVisitorException {
+    public Void visit(final BeforeFloatAreaG5 area) throws GalleyVisitorException {
         renderChildren(area);
         return null;
     }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -50,9 +50,9 @@
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
-import org.axsl.galley.ForeignContentMath;
-import org.axsl.galley.ForeignContentSvg;
-import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.ForeignContentMathG5;
+import org.axsl.galley.ForeignContentSvgG5;
+import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
@@ -705,8 +705,8 @@
     }
 
     @Override
-    public void render(final ForeignContentSvg area) {
-        final ForeignObjectArea foreign = area.getParent();
+    public void render(final ForeignContentSvgG5 area) {
+        final ForeignObjectAreaG5 foreign = area.getParent();
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(foreign.crOriginX()), toPoints(foreign.crOriginY()),
                 toPoints(foreign.referenceIpd()),
@@ -739,7 +739,7 @@
     }
 
     @Override
-    public void render(final ForeignContentMath area) {
+    public void render(final ForeignContentMathG5 area) {
         /* TODO: Implement this. */
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -45,8 +45,8 @@
 import org.axsl.font.Font;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.ExternalGraphicArea;
-import org.axsl.galley.ForeignContentMath;
-import org.axsl.galley.ForeignContentSvg;
+import org.axsl.galley.ForeignContentMathG5;
+import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
@@ -547,7 +547,7 @@
     }
 
     @Override
-    public void render(final ForeignContentSvg area) {
+    public void render(final ForeignContentSvgG5 area) {
         getLogger().debug("PclRenderer.renderSVGArea(" + area + ")");
 //        int x = area.rrOriginX();
 //        int y = area.rrOriginY();
@@ -569,7 +569,7 @@
     }
 
     @Override
-    public void render(final ForeignContentMath area) {
+    public void render(final ForeignContentMathG5 area) {
         /* TODO: Implement this. */
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -47,9 +47,9 @@
 import org.axsl.galley.AreaNodeG5;
 import org.axsl.galley.BookmarkG5;
 import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.ForeignContentMath;
-import org.axsl.galley.ForeignContentSvg;
-import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.ForeignContentMathG5;
+import org.axsl.galley.ForeignContentSvgG5;
+import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.Galley;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
@@ -312,8 +312,8 @@
     }
 
     @Override
-    public void render(final ForeignContentSvg area) throws GalleyVisitorException {
-        final ForeignObjectArea foreign = area.getParent();
+    public void render(final ForeignContentSvgG5 area) throws GalleyVisitorException {
+        final ForeignObjectAreaG5 foreign = area.getParent();
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(foreign.crOriginX()), toPoints(foreign.crOriginY()),
                 toPoints(foreign.referenceIpd()),
@@ -330,8 +330,8 @@
     }
 
     @Override
-    public void render(final ForeignContentMath area) throws GalleyVisitorException {
-        final ForeignObjectArea foreign = area.getParent();
+    public void render(final ForeignContentMathG5 area) throws GalleyVisitorException {
+        final ForeignObjectAreaG5 foreign = area.getParent();
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(foreign.crOriginX()), toPoints(foreign.crOriginY()),
                 toPoints(foreign.referenceIpd()),

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -52,9 +52,9 @@
 import org.axsl.galley.AreaG5;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
-import org.axsl.galley.ForeignContentMath;
-import org.axsl.galley.ForeignContentSvg;
-import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.ForeignContentMathG5;
+import org.axsl.galley.ForeignContentSvgG5;
+import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
@@ -487,8 +487,8 @@
     }
 
     @Override
-    public void render(final ForeignContentSvg area) throws GalleyVisitorException {
-        final ForeignObjectArea foreign = area.getParent();
+    public void render(final ForeignContentSvgG5 area) throws GalleyVisitorException {
+        final ForeignObjectAreaG5 foreign = area.getParent();
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(foreign.crOriginX()), toPoints(foreign.crOriginY()),
                 toPoints(foreign.referenceIpd()),
@@ -566,7 +566,7 @@
     }
 
     @Override
-    public void render(final ForeignContentMath area) {
+    public void render(final ForeignContentMathG5 area) {
         /* TODO: Implement this. */
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -39,9 +39,9 @@
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
-import org.axsl.galley.ForeignContentMath;
-import org.axsl.galley.ForeignContentSvg;
-import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.ForeignContentMathG5;
+import org.axsl.galley.ForeignContentSvgG5;
+import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
@@ -532,8 +532,8 @@
     }
 
     @Override
-    public void render(final ForeignContentSvg area) {
-        final ForeignObjectArea foreign = area.getParent();
+    public void render(final ForeignContentSvgG5 area) {
+        final ForeignObjectAreaG5 foreign = area.getParent();
         final float x = toPoints(foreign.crOriginX());
         final float y = this.pageHeight - toPoints(foreign.crOriginY());
         final SvgGraphic svgGraphic = area.getGraphic();
@@ -579,7 +579,7 @@
     }
 
     @Override
-    public void render(final ForeignContentMath area) {
+    public void render(final ForeignContentMathG5 area) {
         /* TODO: Implement this. */
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -35,8 +35,8 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.ExternalGraphicArea;
-import org.axsl.galley.ForeignContentMath;
-import org.axsl.galley.ForeignContentSvg;
+import org.axsl.galley.ForeignContentMathG5;
+import org.axsl.galley.ForeignContentSvgG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
@@ -492,13 +492,13 @@
     }
 
     @Override
-    public void render(final ForeignContentSvg area) {
+    public void render(final ForeignContentSvgG5 area) {
         getLogger().debug("TxtRenderer.renderSVGArea(" + area + ")");
         /* TODO: Implement this?? */
     }
 
     @Override
-    public void render(final ForeignContentMath area) {
+    public void render(final ForeignContentMathG5 area) {
         /* TODO: Implement this. */
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 17:40:58 UTC (rev 12274)
@@ -41,16 +41,16 @@
 import org.axsl.font.Font;
 import org.axsl.galley.AreaG5;
 import org.axsl.galley.AreaNodeG5;
-import org.axsl.galley.BackgroundArea;
-import org.axsl.galley.BeforeFloatArea;
+import org.axsl.galley.BackgroundAreaG5;
+import org.axsl.galley.BeforeFloatAreaG5;
 import org.axsl.galley.BlockContainerArea;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
-import org.axsl.galley.FootnoteArea;
-import org.axsl.galley.ForeignContentMath;
-import org.axsl.galley.ForeignContentSvg;
-import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.FootnoteAreaG5;
+import org.axsl.galley.ForeignContentMathG5;
+import org.axsl.galley.ForeignContentSvgG5;
+import org.axsl.galley.ForeignObjectAreaG5;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GlyphAreaSequence;
@@ -256,7 +256,7 @@
     }
 
     @Override
-    public Void visit(final FootnoteArea area) throws GalleyVisitorException {
+    public Void visit(final FootnoteAreaG5 area) throws GalleyVisitorException {
         if (area == null
                 || area.areaNodeCount() < 1) {
             return null;
@@ -271,7 +271,7 @@
     }
 
     @Override
-    public Void visit(final BeforeFloatArea area) throws GalleyVisitorException {
+    public Void visit(final BeforeFloatAreaG5 area) throws GalleyVisitorException {
         if (area == null
                 || area.areaNodeCount() < 1) {
             return null;
@@ -310,7 +310,7 @@
     }
 
     @Override
-    public Void visit(final ForeignObjectArea area) throws GalleyVisitorException {
+    public Void visit(final ForeignObjectAreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -321,11 +321,11 @@
     }
 
     @Override
-    public void render(final ForeignContentSvg area) {
+    public void render(final ForeignContentSvgG5 area) {
     }
 
     @Override
-    public void render(final ForeignContentMath area) {
+    public void render(final ForeignContentMathG5 area) {
     }
 
     @Override
@@ -586,10 +586,10 @@
      * written.
      */
     public void outputPaddingRectangle(final AreaG5 area) {
-        if (! (area instanceof BackgroundArea)) {
+        if (! (area instanceof BackgroundAreaG5)) {
             return;
         }
-        final BackgroundArea backgroundArea = (BackgroundArea) area;
+        final BackgroundAreaG5 backgroundArea = (BackgroundAreaG5) area;
         final StringBuilder buffer = new StringBuilder();
         outputAttribute(buffer, "x", backgroundArea.prOriginX());
         outputAttribute(buffer, "y", backgroundArea.prOriginY());

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

[FOray-commit] SF.net SVN: foray:[12273] trunk/foray

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

Revision: 12273
          http://sourceforge.net/p/foray/code/12273
Author:   victormote
Date:     2021-12-25 17:11:19 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Rename some types to conform to new Galley naming convention.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java
    trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtPrintRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

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	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -44,6 +44,7 @@
 import org.axsl.fotree.fo.SimplePageMaster;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.PageCollectionG5;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,9 +55,7 @@
  * be considered its cousin. Its parent should always be an AreaTree instance,
  * and its children should always be PageRa instances.
  */
-public final class PageCollection extends NonArea
-        implements org.axsl.galley.GalleyPageCollection,
-        org.axsl.area.PageCollection {
+public final class PageCollection extends NonArea implements PageCollectionG5, org.axsl.area.PageCollection {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private Linkage generatedBy;

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	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -51,9 +51,9 @@
 import org.axsl.fotree.fo.RetrieveMarker;
 import org.axsl.fotree.fo.SimplePageMaster;
 import org.axsl.galley.AreaNodeG5;
-import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.PageG5;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -64,7 +64,7 @@
 /**
  * Area containing a page.
  */
-public final class PageRa extends AreaFixed implements GalleyPage,
+public final class PageRa extends AreaFixed implements PageG5,
         org.axsl.area.PageArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
@@ -115,8 +115,7 @@
      * @param parentArea The parent page collection.
      * @return The new instance.
      */
-    static PageRa makePageArea(final SimplePageMaster generatedBy,
-            final PageCollection parentArea) {
+    static PageRa makePageArea(final SimplePageMaster generatedBy, final PageCollection parentArea) {
         final PageRa newPage = new PageRa(parentArea);
         newPage.generatedBy = newPage.linkage(generatedBy, null);
         newPage.registerWithLinkage(null);

Modified: trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java
===================================================================
--- trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -42,6 +42,7 @@
 import org.axsl.fotree.FoTreeListener;
 import org.axsl.fotree.fo.PageSequence;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.PageG5;
 import org.axsl.layout.Layout;
 import org.axsl.layout.LayoutException;
 import org.axsl.layout.LayoutFactory;
@@ -306,7 +307,7 @@
 
     @Override
     public void pageComplete(final AreaTreeEvent event) {
-        final org.axsl.galley.GalleyPage page = event.getPage();
+        final PageG5 page = event.getPage();
         final Renderer renderer = (Renderer) this.outputTarget;
         try {
             renderer.render(page);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -52,8 +52,6 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.Galley;
-import org.axsl.galley.GalleyPage;
-import org.axsl.galley.GalleyPageCollection;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
@@ -62,6 +60,8 @@
 import org.axsl.galley.LineArea;
 import org.axsl.galley.MainReferenceArea;
 import org.axsl.galley.NormalBlockArea;
+import org.axsl.galley.PageCollectionG5;
+import org.axsl.galley.PageG5;
 import org.axsl.galley.RegionArea;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
@@ -103,7 +103,7 @@
     }
 
     @Override
-    public abstract void render(GalleyPage page) throws GalleyVisitorException;
+    public abstract void render(PageG5 page) throws GalleyVisitorException;
 
     /**
      * Marks the border, if any, for the given area.
@@ -329,7 +329,7 @@
      * @param page The page whose regions should be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected void renderRegions(final GalleyPage page) throws GalleyVisitorException {
+    protected void renderRegions(final PageG5 page) throws GalleyVisitorException {
         for (RegionArea regionBody : page.getRegionBodies()) {
             visit(regionBody);
         }
@@ -525,7 +525,7 @@
         }
         for (int i = 0; i < this.areaTree.areaNodeCount(); i++) {
             final AreaNodeG5 atNode = this.areaTree.areaNodeAt(i);
-            if (! (atNode instanceof GalleyPageCollection)) {
+            if (! (atNode instanceof PageCollectionG5)) {
                 atNode.acceptVisitor(this);
             }
         }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtPrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtPrintRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtPrintRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -28,8 +28,8 @@
 
 package org.foray.render.awt;
 
-import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.PageG5;
 import org.axsl.output.OutputConfiguration;
 import org.axsl.output.OutputException;
 
@@ -112,7 +112,7 @@
     }
 
     @Override
-    public void renderPage(final GalleyPage page) throws GalleyVisitorException {
+    public void renderPage(final PageG5 page) throws GalleyVisitorException {
         setPageWidth((int) toPoints(page.getWidth()));
         setPageHeight((int) toPoints(page.getHeight()));
         super.renderPage(page);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -53,11 +53,11 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
-import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
+import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.graphic.SvgGraphic;
@@ -108,7 +108,7 @@
     private int pageNumber = 0;
 
     /** The list of pages processed. */
-    private List<GalleyPage> pageList = new Vector<GalleyPage>();
+    private List<PageG5> pageList = new Vector<PageG5>();
 
     /** A color cached during processing. This could conceivably become a
      * local variable, but is an instance variable in the hope of reducing
@@ -400,7 +400,7 @@
     }
 
     @Override
-    public void render(final GalleyPage page) throws GalleyVisitorException {
+    public void render(final PageG5 page) throws GalleyVisitorException {
         this.pageWidth = Math.round(toPoints(page.getWidth()));
         this.pageHeight = Math.round(toPoints(page.getHeight()));
 
@@ -430,7 +430,7 @@
      * @param page The page to be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected void renderPage(final GalleyPage page) throws GalleyVisitorException {
+    protected void renderPage(final PageG5 page) throws GalleyVisitorException {
         this.currentFont = null;
         this.currentFontSize = 0;
         renderRegions(page);
@@ -765,7 +765,7 @@
         this.graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
                                    RenderingHints.VALUE_FRACTIONALMETRICS_ON);
 
-        final GalleyPage aPage = this.pageList.get(pageIndex);
+        final PageG5 aPage = this.pageList.get(pageIndex);
         try {
             renderPage(aPage);
         } catch (final GalleyVisitorException e) {
@@ -787,7 +787,7 @@
             return null;
         }
 
-        final GalleyPage page = this.pageList.get(pageIndex);
+        final PageG5 page = this.pageList.get(pageIndex);
         final PageFormat pageFormat = new PageFormat();
         final Paper paper = new Paper();
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -47,10 +47,10 @@
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
-import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
+import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.output.DocumentConfiguration;
@@ -739,7 +739,7 @@
     }
 
     @Override
-    public void render(final GalleyPage page) throws GalleyVisitorException {
+    public void render(final PageG5 page) throws GalleyVisitorException {
         getLogger().debug("PclRenderer.renderPage() page.Height() = "
                 + page.getHeight());
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -51,11 +51,11 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.Galley;
-import org.axsl.galley.GalleyPage;
-import org.axsl.galley.GalleyPageCollection;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
+import org.axsl.galley.PageCollectionG5;
+import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicLink;
 import org.axsl.graphic.MathGraphic;
@@ -110,7 +110,7 @@
     private PdfPage currentPage;
 
     /** The current area tree page being processed. */
-    private GalleyPage currentAreaTreePage;
+    private PageG5 currentAreaTreePage;
 
     /** The total number of pages processed so far. */
     private int pageCount;
@@ -486,7 +486,7 @@
     }
 
     @Override
-    public void render(final GalleyPage page) throws GalleyVisitorException {
+    public void render(final PageG5 page) throws GalleyVisitorException {
         getLogger().debug("Rendering single page to PDF.");
         this.pageCount ++;
         checkPageLabels(page);
@@ -510,8 +510,8 @@
      * If necessary, creates a new page label range entry in the PDF document.
      * @param page The new area tree page being processed.
      */
-    private void checkPageLabels(final GalleyPage page) {
-        final GalleyPageCollection currentCollection = page.getParent();
+    private void checkPageLabels(final PageG5 page) {
+        final PageCollectionG5 currentCollection = page.getParent();
         final PositiveIntegerFormatter currentFormatter =
                 currentCollection.getPageNumberFormatter();
         final PdfPageLabelStyle labelStyle = PdfRenderer.convertPageLabelStyle(currentFormatter.getType());
@@ -524,8 +524,7 @@
         }
 
         /* In all other cases, we are looking for changes from the last page. */
-        final GalleyPageCollection previousCollection =
-                this.currentAreaTreePage.getParent();
+        final PageCollectionG5 previousCollection = this.currentAreaTreePage.getParent();
         if (currentCollection == previousCollection) {
             /* The pages are in the same PageCollection. No new page label range
              * entry is needed. */

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -55,11 +55,11 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
-import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
+import org.axsl.galley.PageG5;
 import org.axsl.graphic.EpsGraphic;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -1286,7 +1286,7 @@
     }
 
     @Override
-    public void render(final GalleyPage page) throws GalleyVisitorException {
+    public void render(final PageG5 page) throws GalleyVisitorException {
         try {
             writeSetup();
             this.pagecount++;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -42,11 +42,11 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
-import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
+import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.graphic.GraphicServer;
@@ -247,7 +247,7 @@
     }
 
     @Override
-    public void render(final GalleyPage page) throws GalleyVisitorException {
+    public void render(final PageG5 page) throws GalleyVisitorException {
         this.pageNumber++;
         final int lastWidth = this.pageWidth;
         final int lastHeight = this.pageHeight;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -37,10 +37,10 @@
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
-import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
+import org.axsl.galley.PageG5;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.output.DocumentConfiguration;
@@ -549,7 +549,7 @@
     }
 
     @Override
-    public void render(final GalleyPage page) throws GalleyVisitorException {
+    public void render(final PageG5 page) throws GalleyVisitorException {
         if (this.firstPage) {
             this.firstPage = false;
         } else {

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 17:11:19 UTC (rev 12273)
@@ -51,7 +51,6 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
-import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GlyphAreaSequence;
@@ -61,6 +60,7 @@
 import org.axsl.galley.LineArea;
 import org.axsl.galley.MainReferenceArea;
 import org.axsl.galley.NormalBlockArea;
+import org.axsl.galley.PageG5;
 import org.axsl.galley.RegionArea;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
@@ -108,7 +108,7 @@
     }
 
     @Override
-    public void render(final GalleyPage page) throws GalleyVisitorException {
+    public void render(final PageG5 page) throws GalleyVisitorException {
         final RegionArea before = page.getRegionBefore();
         final RegionArea after = page.getRegionAfter();
         final RegionArea start = page.getRegionStart();

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

[FOray-commit] SF.net SVN: foray:[12272] trunk/foray

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

Revision: 12272
          http://sourceforge.net/p/foray/code/12272
Author:   victormote
Date:     2021-12-25 16:57:10 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Rename some types to conform to new Galley naming convention.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java	2021-12-25 16:42:34 UTC (rev 12271)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java	2021-12-25 16:57:10 UTC (rev 12272)
@@ -40,6 +40,7 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.Table;
 import org.axsl.fotree.fo.prop.ColorPa;
+import org.axsl.galley.AreaNodeG5;
 import org.axsl.galley.Galley;
 import org.axsl.orthography.Orthography;
 
@@ -683,7 +684,7 @@
     }
 
     @Override
-    public Iterator<org.axsl.galley.GalleyNode> iterator() {
+    public Iterator<AreaNodeG5> iterator() {
         return new ChildIterator();
     }
 
@@ -690,7 +691,7 @@
     /**
      * Private inner class to provide an iterator over the children.
      */
-    private class ChildIterator implements Iterator<org.axsl.galley.GalleyNode> {
+    private class ChildIterator implements Iterator<AreaNodeG5> {
 
         /** Index to the next child element to be returned. */
         private int nextIndex = 0;

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	2021-12-25 16:42:34 UTC (rev 12271)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java	2021-12-25 16:57:10 UTC (rev 12272)
@@ -50,6 +50,7 @@
 import org.axsl.fotree.fo.RegionStart;
 import org.axsl.fotree.fo.RetrieveMarker;
 import org.axsl.fotree.fo.SimplePageMaster;
+import org.axsl.galley.AreaNodeG5;
 import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
@@ -342,7 +343,7 @@
     }
 
     @Override
-    public org.axsl.galley.GalleyNode firstUnresolvedRefId() {
+    public AreaNodeG5 firstUnresolvedRefId() {
         return firstUnresolvedRefId(this);
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 16:42:34 UTC (rev 12271)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 16:57:10 UTC (rev 12272)
@@ -38,6 +38,8 @@
 import org.foray.output.OutputTarget;
 
 import org.axsl.common.value.RuleStyle;
+import org.axsl.galley.AreaG5;
+import org.axsl.galley.AreaNodeG5;
 import org.axsl.galley.BackgroundArea;
 import org.axsl.galley.BeforeFloatArea;
 import org.axsl.galley.BlockContainerArea;
@@ -50,8 +52,6 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.Galley;
-import org.axsl.galley.GalleyArea;
-import org.axsl.galley.GalleyNode;
 import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyPageCollection;
 import org.axsl.galley.GalleyVisitor;
@@ -313,13 +313,13 @@
             Rectangle contentRectangle, Rectangle clipRectangle) throws GalleyVisitorException;
 
     @Override
-    public Void visit(final GalleyNode node) throws GalleyVisitorException {
+    public Void visit(final AreaNodeG5 node) throws GalleyVisitorException {
         renderChildren(node);
         return null;
     }
 
     @Override
-    public Void visit(final GalleyArea node) throws GalleyVisitorException {
+    public Void visit(final AreaG5 node) throws GalleyVisitorException {
         renderChildren(node);
         return null;
     }
@@ -368,9 +368,9 @@
      * @return Void.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    public Void renderChildren(final GalleyNode area) throws GalleyVisitorException {
+    public Void renderChildren(final AreaNodeG5 area) throws GalleyVisitorException {
         for (int i = 0; i < area.areaNodeCount(); i++) {
-            final GalleyNode child = area.areaNodeAt(i);
+            final AreaNodeG5 child = area.areaNodeAt(i);
             child.acceptVisitor(this);
         }
         return null;
@@ -524,7 +524,7 @@
             render(bookmarkTree);
         }
         for (int i = 0; i < this.areaTree.areaNodeCount(); i++) {
-            final GalleyNode atNode = this.areaTree.areaNodeAt(i);
+            final AreaNodeG5 atNode = this.areaTree.areaNodeAt(i);
             if (! (atNode instanceof GalleyPageCollection)) {
                 atNode.acceptVisitor(this);
             }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
@@ -43,6 +43,8 @@
 import org.axsl.font.Font;
 import org.axsl.font.FontContext;
 import org.axsl.font.FontUse;
+import org.axsl.galley.AreaG5;
+import org.axsl.galley.AreaNodeG5;
 import org.axsl.galley.BookmarkG5;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.ForeignContentMath;
@@ -49,8 +51,6 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.Galley;
-import org.axsl.galley.GalleyArea;
-import org.axsl.galley.GalleyNode;
 import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyPageCollection;
 import org.axsl.galley.GalleyVisitorException;
@@ -570,7 +570,7 @@
      * should be sought.
      * @throws GalleyVisitorException If a destination already exists.
      */
-    private void renderDestinations(final GalleyArea area) throws GalleyVisitorException {
+    private void renderDestinations(final AreaG5 area) throws GalleyVisitorException {
         final String destinationName = area.destinationName();
         if (destinationName != null) {
             try {
@@ -584,11 +584,11 @@
             createBasicLink(area);
         }
         for (int i = 0; i < area.areaNodeCount(); i++) {
-            final GalleyNode child = area.areaNodeAt(i);
-            if (! (child instanceof GalleyArea)) {
+            final AreaNodeG5 child = area.areaNodeAt(i);
+            if (! (child instanceof AreaG5)) {
                 continue;
             }
-            final GalleyArea areaChild = (GalleyArea) child;
+            final AreaG5 areaChild = (AreaG5) child;
             renderDestinations(areaChild);
         }
     }
@@ -597,7 +597,7 @@
      * Marks a specified area as being a link.
      * @param area The area which should be marked as a link.
      */
-    protected void createBasicLink(final GalleyArea area) {
+    protected void createBasicLink(final AreaG5 area) {
         boolean externalLink = false;
         if (area.linkType() == LinkType.EXTERNAL) {
             externalLink = true;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
@@ -49,12 +49,12 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
 import org.axsl.font.FontUse;
+import org.axsl.galley.AreaG5;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
-import org.axsl.galley.GalleyArea;
 import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
@@ -509,7 +509,7 @@
      * @throws IOException For errors writing to output.
      */
     protected void renderSVGDocument(final SvgGraphic svgGraphic,
-            final Rectangle2D contentRectangle, final GalleyArea area) throws IOException {
+            final Rectangle2D contentRectangle, final AreaG5 area) throws IOException {
         float w = 0;
         float h = 0;
         try {
@@ -945,7 +945,7 @@
      * @param area The area to which the movement should be made.
      * @return The PostScript code to make the specified movement.
      */
-    private String moveTo(final GalleyArea area) {
+    private String moveTo(final AreaG5 area) {
         final float xPosition = Math.round(toPoints(area.crOriginX()));
         final float yPosition = Math.round(toPoints(area.crOriginY()));
         return xPosition + " " + yPosition + " M";

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
@@ -35,6 +35,7 @@
 
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
+import org.axsl.galley.AreaG5;
 import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
@@ -41,7 +42,6 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
-import org.axsl.galley.GalleyArea;
 import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
@@ -365,7 +365,7 @@
      * @param area The area whose bounds are needed.
      * @return The rectangle for the render rectangle {@code area}.
      */
-    protected Rectangle2D getBounds(final GalleyArea area) {
+    protected Rectangle2D getBounds(final AreaG5 area) {
         return new Rectangle2D.Double(area.crOriginX(), area.crOriginY(),
                 area.crIpd(), area.crBpd());
     }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 16:57:10 UTC (rev 12272)
@@ -39,6 +39,8 @@
 
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
+import org.axsl.galley.AreaG5;
+import org.axsl.galley.AreaNodeG5;
 import org.axsl.galley.BackgroundArea;
 import org.axsl.galley.BeforeFloatArea;
 import org.axsl.galley.BlockContainerArea;
@@ -49,8 +51,6 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
-import org.axsl.galley.GalleyArea;
-import org.axsl.galley.GalleyNode;
 import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GeneralInlineArea;
@@ -151,7 +151,7 @@
      * @param attributes Text of the attributes to be written.
      * @param content The element content.
      */
-    protected void writeCompleteElement(final GalleyArea area,
+    protected void writeCompleteElement(final AreaG5 area,
             final StringBuilder attributes, final String content) {
         writeIndent();
         this.writer.write("<");
@@ -169,7 +169,7 @@
      * @param area The area for whom element is written.
      * @param attributes Text of the attributes to be written.
      */
-    protected void writeEmptyElement(final GalleyArea area,
+    protected void writeEmptyElement(final AreaG5 area,
             final StringBuilder attributes) {
         this.writeEmptyElement(area.getAreaName(), attributes);
     }
@@ -195,7 +195,7 @@
      * @param node The area for whom element is written.
      * @param attributes Text of the attributes to be written.
      */
-    protected void writeStartTag(final GalleyNode node, final StringBuilder attributes) {
+    protected void writeStartTag(final AreaNodeG5 node, final StringBuilder attributes) {
         writeIndent();
         this.indent++;
         this.writer.write("<");
@@ -210,7 +210,7 @@
      * Write an end tag.
      * @param node The area whose end-tag should be written.
      */
-    protected void writeEndTag(final GalleyNode node) {
+    protected void writeEndTag(final AreaNodeG5 node) {
         this.indent--;
         writeIndent();
         this.writer.write("</" + node.getAreaName() + ">\n");
@@ -453,7 +453,7 @@
     }
 
     @Override
-    public Void visit(final GalleyNode node) throws GalleyVisitorException {
+    public Void visit(final AreaNodeG5 node) throws GalleyVisitorException {
         writeStartTag(node, null);
         renderChildren(node);
         writeEndTag(node);
@@ -461,7 +461,7 @@
     }
 
     @Override
-    public Void visit(final GalleyArea area) throws GalleyVisitorException {
+    public Void visit(final AreaG5 area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -542,7 +542,7 @@
      * @param area The Area instance whose generatedBy trait is to be output.
      * @param buffer StringBuilder instance in which to append the output.
      */
-    private void outputCommonAttributes(final GalleyArea area, final StringBuilder buffer) {
+    private void outputCommonAttributes(final AreaG5 area, final StringBuilder buffer) {
         if (area.generatedByExists()) {
             String idString = "";
             if (area.traitId() != null && ! area.traitId().equals("")) {
@@ -560,7 +560,7 @@
      * Writes information about all of an area's rectangles.
      * @param area The area whose rectangles are to be written.
      */
-    public void outputAllRectangles(final GalleyArea area) {
+    public void outputAllRectangles(final AreaG5 area) {
         outputBorderRectangle(area);
         outputPaddingRectangle(area);
         outputContentRectangle(area);
@@ -571,7 +571,7 @@
      * @param area The area whose border rectangle information should be
      * written.
      */
-    public void outputBorderRectangle(final GalleyArea area) {
+    public void outputBorderRectangle(final AreaG5 area) {
         final StringBuilder buffer = new StringBuilder();
         outputAttribute(buffer, "x", area.brOriginX());
         outputAttribute(buffer, "y", area.brOriginY());
@@ -585,7 +585,7 @@
      * @param area The area whose padding rectangle information should be
      * written.
      */
-    public void outputPaddingRectangle(final GalleyArea area) {
+    public void outputPaddingRectangle(final AreaG5 area) {
         if (! (area instanceof BackgroundArea)) {
             return;
         }
@@ -603,7 +603,7 @@
      * @param area The area whose content rectangle information should be
      * written.
      */
-    public void outputContentRectangle(final GalleyArea area) {
+    public void outputContentRectangle(final AreaG5 area) {
         final StringBuilder buffer = new StringBuilder();
         outputAttribute(buffer, "x", area.crOriginX());
         outputAttribute(buffer, "y", area.crOriginY());

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

[FOray-commit] SF.net SVN: foray:[12271] trunk/foray

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

Revision: 12271
          http://sourceforge.net/p/foray/code/12271
Author:   victormote
Date:     2021-12-25 16:42:34 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Rename some types to conform to new Galley naming.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.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	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -469,7 +469,7 @@
     }
 
     @Override
-    public org.axsl.galley.BookmarkTree getBookmarkTree() {
+    public BookmarkTreeArea getBookmarkTree() {
         return this.bookmarkTreeArea;
     }
 

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	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -32,6 +32,7 @@
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.Bookmark;
 import org.axsl.fotree.fo.BookmarkTitle;
+import org.axsl.galley.BookmarkG5;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -40,8 +41,7 @@
 /**
  * The AreaTree representation of an fo:bookmark object.
  */
-public final class BookmarkArea extends BookmarkParentArea
-        implements org.axsl.galley.Bookmark {
+public final class BookmarkArea extends BookmarkParentArea implements BookmarkG5 {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private Bookmark generatedBy;

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	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -29,6 +29,7 @@
 package org.foray.area;
 
 import org.axsl.fotree.fo.BookmarkTree;
+import org.axsl.galley.BookmarkTreeG5;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,8 +37,7 @@
 /**
  * A NonArea class for items generated by fo:bookmark-tree.
  */
-public final class BookmarkTreeArea extends BookmarkParentArea
-        implements org.axsl.galley.BookmarkTree {
+public final class BookmarkTreeArea extends BookmarkParentArea implements BookmarkTreeG5 {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private BookmarkTree generatedBy;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -41,7 +41,7 @@
 import org.axsl.galley.BackgroundArea;
 import org.axsl.galley.BeforeFloatArea;
 import org.axsl.galley.BlockContainerArea;
-import org.axsl.galley.BookmarkTree;
+import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.FootnoteArea;
@@ -484,7 +484,7 @@
      * Render the bookmark tree for this document.
      * @param bookmarkTree The bookmark tree to be rendered.
      */
-    public abstract void render(BookmarkTree bookmarkTree);
+    public abstract void render(BookmarkTreeG5 bookmarkTree);
 
     @Override
     public Void visit(final FootnoteArea area) throws GalleyVisitorException {
@@ -519,7 +519,7 @@
      * @throws GalleyVisitorException For errors during rendering.
      */
     protected void renderDocumentNodes() throws GalleyVisitorException {
-        final BookmarkTree bookmarkTree = this.areaTree.getBookmarkTree();
+        final BookmarkTreeG5 bookmarkTree = this.areaTree.getBookmarkTree();
         if (bookmarkTree != null) {
             render(bookmarkTree);
         }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -47,7 +47,7 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
 import org.axsl.font.FontUse;
-import org.axsl.galley.BookmarkTree;
+import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMath;
@@ -744,7 +744,7 @@
     }
 
     @Override
-    public void render(final BookmarkTree area) {
+    public void render(final BookmarkTreeG5 area) {
         return;
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -43,7 +43,7 @@
 import org.axsl.common.sequence.ByteSequence;
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
-import org.axsl.galley.BookmarkTree;
+import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
@@ -715,7 +715,7 @@
     }
 
     @Override
-    public void render(final BookmarkTree area) {
+    public void render(final BookmarkTreeG5 area) {
         return;
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -43,8 +43,8 @@
 import org.axsl.font.Font;
 import org.axsl.font.FontContext;
 import org.axsl.font.FontUse;
-import org.axsl.galley.Bookmark;
-import org.axsl.galley.BookmarkTree;
+import org.axsl.galley.BookmarkG5;
+import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
@@ -609,9 +609,9 @@
     }
 
     @Override
-    public void render(final BookmarkTree area) {
+    public void render(final BookmarkTreeG5 area) {
         for (int i = 0; i < area.getChildren().size(); i++) {
-            final Bookmark child = area.getChildren().get(i);
+            final BookmarkG5 child = area.getChildren().get(i);
             renderBookmark(child, this.pdfDoc.getOutlineRoot());
         }
     }
@@ -622,8 +622,7 @@
      * @param parent The PDF outline object to which the rendered bookmarks
      * should be added.
      */
-    public void renderBookmark(final Bookmark area,
-            final PdfOutlineParent parent) {
+    public void renderBookmark(final BookmarkG5 area, final PdfOutlineParent parent) {
         if (area == null || parent == null) {
             return;
         }
@@ -642,7 +641,7 @@
                 area.getDestination(), color, italic, bold);
         // Recursively handle child bookmarks
         for (int i = 0; i < area.getChildren().size(); i++) {
-            final Bookmark child = area.getChildren().get(i);
+            final BookmarkG5 child = area.getChildren().get(i);
             renderBookmark(child, pdfOutline);
         }
     }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -49,7 +49,7 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
 import org.axsl.font.FontUse;
-import org.axsl.galley.BookmarkTree;
+import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
@@ -1111,7 +1111,7 @@
     }
 
     @Override
-    public void render(final BookmarkTree area) {
+    public void render(final BookmarkTreeG5 area) {
         return;
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -35,7 +35,7 @@
 
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
-import org.axsl.galley.BookmarkTree;
+import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMath;
@@ -328,7 +328,7 @@
 //    }
 
     @Override
-    public void render(final BookmarkTree area) {
+    public void render(final BookmarkTreeG5 area) {
         return;
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -33,7 +33,7 @@
 import org.foray.render.Renderer;
 
 import org.axsl.common.value.RuleStyle;
-import org.axsl.galley.BookmarkTree;
+import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
@@ -520,7 +520,7 @@
     }
 
     @Override
-    public void render(final BookmarkTree area) {
+    public void render(final BookmarkTreeG5 area) {
         return;
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 16:42:34 UTC (rev 12271)
@@ -42,7 +42,7 @@
 import org.axsl.galley.BackgroundArea;
 import org.axsl.galley.BeforeFloatArea;
 import org.axsl.galley.BlockContainerArea;
-import org.axsl.galley.BookmarkTree;
+import org.axsl.galley.BookmarkTreeG5;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.FootnoteArea;
@@ -365,7 +365,7 @@
     }
 
     @Override
-    public void render(final BookmarkTree area) {
+    public void render(final BookmarkTreeG5 area) {
         return;
     }
 

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

[FOray-commit] SF.net SVN: foray:[12270] trunk/foray

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

Revision: 12270
          http://sourceforge.net/p/foray/code/12270
Author:   victormote
Date:     2021-12-25 15:32:41 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Rename some galley types to distinguish them from area-tree types.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java
    trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtPrintRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -683,7 +683,7 @@
     }
 
     @Override
-    public Iterator<org.axsl.galley.AreaNode> iterator() {
+    public Iterator<org.axsl.galley.GalleyNode> iterator() {
         return new ChildIterator();
     }
 
@@ -690,7 +690,7 @@
     /**
      * Private inner class to provide an iterator over the children.
      */
-    private class ChildIterator implements Iterator<org.axsl.galley.AreaNode> {
+    private class ChildIterator implements Iterator<org.axsl.galley.GalleyNode> {
 
         /** Index to the next child element to be returned. */
         private int nextIndex = 0;

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	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -55,7 +55,7 @@
  * and its children should always be PageRa instances.
  */
 public final class PageCollection extends NonArea
-        implements org.axsl.galley.PageCollection,
+        implements org.axsl.galley.GalleyPageCollection,
         org.axsl.area.PageCollection {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */

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	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -50,9 +50,9 @@
 import org.axsl.fotree.fo.RegionStart;
 import org.axsl.fotree.fo.RetrieveMarker;
 import org.axsl.fotree.fo.SimplePageMaster;
+import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.Page;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -63,7 +63,7 @@
 /**
  * Area containing a page.
  */
-public final class PageRa extends AreaFixed implements Page,
+public final class PageRa extends AreaFixed implements GalleyPage,
         org.axsl.area.PageArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
@@ -342,7 +342,7 @@
     }
 
     @Override
-    public org.axsl.galley.AreaNode firstUnresolvedRefId() {
+    public org.axsl.galley.GalleyNode firstUnresolvedRefId() {
         return firstUnresolvedRefId(this);
     }
 

Modified: trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java
===================================================================
--- trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-core/src/main/java/org/foray/core/ForayTarget.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -306,7 +306,7 @@
 
     @Override
     public void pageComplete(final AreaTreeEvent event) {
-        final org.axsl.galley.Page page = event.getPage();
+        final org.axsl.galley.GalleyPage page = event.getPage();
         final Renderer renderer = (Renderer) this.outputTarget;
         try {
             renderer.render(page);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -38,8 +38,6 @@
 import org.foray.output.OutputTarget;
 
 import org.axsl.common.value.RuleStyle;
-import org.axsl.galley.Area;
-import org.axsl.galley.AreaNode;
 import org.axsl.galley.BackgroundArea;
 import org.axsl.galley.BeforeFloatArea;
 import org.axsl.galley.BlockContainerArea;
@@ -52,6 +50,10 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.Galley;
+import org.axsl.galley.GalleyArea;
+import org.axsl.galley.GalleyNode;
+import org.axsl.galley.GalleyPage;
+import org.axsl.galley.GalleyPageCollection;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
@@ -60,8 +62,6 @@
 import org.axsl.galley.LineArea;
 import org.axsl.galley.MainReferenceArea;
 import org.axsl.galley.NormalBlockArea;
-import org.axsl.galley.Page;
-import org.axsl.galley.PageCollection;
 import org.axsl.galley.RegionArea;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
@@ -103,7 +103,7 @@
     }
 
     @Override
-    public abstract void render(Page page) throws GalleyVisitorException;
+    public abstract void render(GalleyPage page) throws GalleyVisitorException;
 
     /**
      * Marks the border, if any, for the given area.
@@ -313,13 +313,13 @@
             Rectangle contentRectangle, Rectangle clipRectangle) throws GalleyVisitorException;
 
     @Override
-    public Void visit(final AreaNode node) throws GalleyVisitorException {
+    public Void visit(final GalleyNode node) throws GalleyVisitorException {
         renderChildren(node);
         return null;
     }
 
     @Override
-    public Void visit(final Area node) throws GalleyVisitorException {
+    public Void visit(final GalleyArea node) throws GalleyVisitorException {
         renderChildren(node);
         return null;
     }
@@ -329,7 +329,7 @@
      * @param page The page whose regions should be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected void renderRegions(final Page page) throws GalleyVisitorException {
+    protected void renderRegions(final GalleyPage page) throws GalleyVisitorException {
         for (RegionArea regionBody : page.getRegionBodies()) {
             visit(regionBody);
         }
@@ -368,9 +368,9 @@
      * @return Void.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    public Void renderChildren(final AreaNode area) throws GalleyVisitorException {
+    public Void renderChildren(final GalleyNode area) throws GalleyVisitorException {
         for (int i = 0; i < area.areaNodeCount(); i++) {
-            final AreaNode child = area.areaNodeAt(i);
+            final GalleyNode child = area.areaNodeAt(i);
             child.acceptVisitor(this);
         }
         return null;
@@ -524,8 +524,8 @@
             render(bookmarkTree);
         }
         for (int i = 0; i < this.areaTree.areaNodeCount(); i++) {
-            final AreaNode atNode = this.areaTree.areaNodeAt(i);
-            if (! (atNode instanceof PageCollection)) {
+            final GalleyNode atNode = this.areaTree.areaNodeAt(i);
+            if (! (atNode instanceof GalleyPageCollection)) {
                 atNode.acceptVisitor(this);
             }
         }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtPrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtPrintRenderer.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtPrintRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -28,8 +28,8 @@
 
 package org.foray.render.awt;
 
+import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.Page;
 import org.axsl.output.OutputConfiguration;
 import org.axsl.output.OutputException;
 
@@ -112,7 +112,7 @@
     }
 
     @Override
-    public void renderPage(final Page page) throws GalleyVisitorException {
+    public void renderPage(final GalleyPage page) throws GalleyVisitorException {
         setPageWidth((int) toPoints(page.getWidth()));
         setPageHeight((int) toPoints(page.getHeight()));
         super.renderPage(page);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -53,11 +53,11 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
-import org.axsl.galley.Page;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.graphic.SvgGraphic;
@@ -108,7 +108,7 @@
     private int pageNumber = 0;
 
     /** The list of pages processed. */
-    private List<Page> pageList = new Vector<Page>();
+    private List<GalleyPage> pageList = new Vector<GalleyPage>();
 
     /** A color cached during processing. This could conceivably become a
      * local variable, but is an instance variable in the hope of reducing
@@ -400,7 +400,7 @@
     }
 
     @Override
-    public void render(final Page page) throws GalleyVisitorException {
+    public void render(final GalleyPage page) throws GalleyVisitorException {
         this.pageWidth = Math.round(toPoints(page.getWidth()));
         this.pageHeight = Math.round(toPoints(page.getHeight()));
 
@@ -430,7 +430,7 @@
      * @param page The page to be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected void renderPage(final Page page) throws GalleyVisitorException {
+    protected void renderPage(final GalleyPage page) throws GalleyVisitorException {
         this.currentFont = null;
         this.currentFontSize = 0;
         renderRegions(page);
@@ -765,7 +765,7 @@
         this.graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
                                    RenderingHints.VALUE_FRACTIONALMETRICS_ON);
 
-        final Page aPage = this.pageList.get(pageIndex);
+        final GalleyPage aPage = this.pageList.get(pageIndex);
         try {
             renderPage(aPage);
         } catch (final GalleyVisitorException e) {
@@ -787,7 +787,7 @@
             return null;
         }
 
-        final Page page = this.pageList.get(pageIndex);
+        final GalleyPage page = this.pageList.get(pageIndex);
         final PageFormat pageFormat = new PageFormat();
         final Paper paper = new Paper();
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -47,10 +47,10 @@
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
+import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
-import org.axsl.galley.Page;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.output.DocumentConfiguration;
@@ -739,7 +739,7 @@
     }
 
     @Override
-    public void render(final Page page) throws GalleyVisitorException {
+    public void render(final GalleyPage page) throws GalleyVisitorException {
         getLogger().debug("PclRenderer.renderPage() page.Height() = "
                 + page.getHeight());
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -43,8 +43,6 @@
 import org.axsl.font.Font;
 import org.axsl.font.FontContext;
 import org.axsl.font.FontUse;
-import org.axsl.galley.Area;
-import org.axsl.galley.AreaNode;
 import org.axsl.galley.Bookmark;
 import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.ForeignContentMath;
@@ -51,11 +49,13 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.Galley;
+import org.axsl.galley.GalleyArea;
+import org.axsl.galley.GalleyNode;
+import org.axsl.galley.GalleyPage;
+import org.axsl.galley.GalleyPageCollection;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
-import org.axsl.galley.Page;
-import org.axsl.galley.PageCollection;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicLink;
 import org.axsl.graphic.MathGraphic;
@@ -110,7 +110,7 @@
     private PdfPage currentPage;
 
     /** The current area tree page being processed. */
-    private Page currentAreaTreePage;
+    private GalleyPage currentAreaTreePage;
 
     /** The total number of pages processed so far. */
     private int pageCount;
@@ -486,7 +486,7 @@
     }
 
     @Override
-    public void render(final Page page) throws GalleyVisitorException {
+    public void render(final GalleyPage page) throws GalleyVisitorException {
         getLogger().debug("Rendering single page to PDF.");
         this.pageCount ++;
         checkPageLabels(page);
@@ -510,8 +510,8 @@
      * If necessary, creates a new page label range entry in the PDF document.
      * @param page The new area tree page being processed.
      */
-    private void checkPageLabels(final Page page) {
-        final PageCollection currentCollection = page.getParent();
+    private void checkPageLabels(final GalleyPage page) {
+        final GalleyPageCollection currentCollection = page.getParent();
         final PositiveIntegerFormatter currentFormatter =
                 currentCollection.getPageNumberFormatter();
         final PdfPageLabelStyle labelStyle = PdfRenderer.convertPageLabelStyle(currentFormatter.getType());
@@ -524,7 +524,7 @@
         }
 
         /* In all other cases, we are looking for changes from the last page. */
-        final PageCollection previousCollection =
+        final GalleyPageCollection previousCollection =
                 this.currentAreaTreePage.getParent();
         if (currentCollection == previousCollection) {
             /* The pages are in the same PageCollection. No new page label range
@@ -570,7 +570,7 @@
      * should be sought.
      * @throws GalleyVisitorException If a destination already exists.
      */
-    private void renderDestinations(final Area area) throws GalleyVisitorException {
+    private void renderDestinations(final GalleyArea area) throws GalleyVisitorException {
         final String destinationName = area.destinationName();
         if (destinationName != null) {
             try {
@@ -584,11 +584,11 @@
             createBasicLink(area);
         }
         for (int i = 0; i < area.areaNodeCount(); i++) {
-            final AreaNode child = area.areaNodeAt(i);
-            if (! (child instanceof Area)) {
+            final GalleyNode child = area.areaNodeAt(i);
+            if (! (child instanceof GalleyArea)) {
                 continue;
             }
-            final Area areaChild = (Area) child;
+            final GalleyArea areaChild = (GalleyArea) child;
             renderDestinations(areaChild);
         }
     }
@@ -597,7 +597,7 @@
      * Marks a specified area as being a link.
      * @param area The area which should be marked as a link.
      */
-    protected void createBasicLink(final Area area) {
+    protected void createBasicLink(final GalleyArea area) {
         boolean externalLink = false;
         if (area.linkType() == LinkType.EXTERNAL) {
             externalLink = true;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -49,17 +49,17 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
 import org.axsl.font.FontUse;
-import org.axsl.galley.Area;
 import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.GalleyArea;
+import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
-import org.axsl.galley.Page;
 import org.axsl.graphic.EpsGraphic;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -509,7 +509,7 @@
      * @throws IOException For errors writing to output.
      */
     protected void renderSVGDocument(final SvgGraphic svgGraphic,
-            final Rectangle2D contentRectangle, final Area area) throws IOException {
+            final Rectangle2D contentRectangle, final GalleyArea area) throws IOException {
         float w = 0;
         float h = 0;
         try {
@@ -945,7 +945,7 @@
      * @param area The area to which the movement should be made.
      * @return The PostScript code to make the specified movement.
      */
-    private String moveTo(final Area area) {
+    private String moveTo(final GalleyArea area) {
         final float xPosition = Math.round(toPoints(area.crOriginX()));
         final float yPosition = Math.round(toPoints(area.crOriginY()));
         return xPosition + " " + yPosition + " M";
@@ -1286,7 +1286,7 @@
     }
 
     @Override
-    public void render(final Page page) throws GalleyVisitorException {
+    public void render(final GalleyPage page) throws GalleyVisitorException {
         try {
             writeSetup();
             this.pagecount++;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -35,7 +35,6 @@
 
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
-import org.axsl.galley.Area;
 import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.ExternalGraphicArea;
@@ -42,11 +41,12 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.GalleyArea;
+import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
-import org.axsl.galley.Page;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.graphic.GraphicServer;
@@ -247,7 +247,7 @@
     }
 
     @Override
-    public void render(final Page page) throws GalleyVisitorException {
+    public void render(final GalleyPage page) throws GalleyVisitorException {
         this.pageNumber++;
         final int lastWidth = this.pageWidth;
         final int lastHeight = this.pageHeight;
@@ -365,7 +365,7 @@
      * @param area The area whose bounds are needed.
      * @return The rectangle for the render rectangle {@code area}.
      */
-    protected Rectangle2D getBounds(final Area area) {
+    protected Rectangle2D getBounds(final GalleyArea area) {
         return new Rectangle2D.Double(area.crOriginX(), area.crOriginY(),
                 area.crIpd(), area.crBpd());
     }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -37,10 +37,10 @@
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
+import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
-import org.axsl.galley.Page;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.output.DocumentConfiguration;
@@ -549,7 +549,7 @@
     }
 
     @Override
-    public void render(final Page page) throws GalleyVisitorException {
+    public void render(final GalleyPage page) throws GalleyVisitorException {
         if (this.firstPage) {
             this.firstPage = false;
         } else {

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-24 19:38:33 UTC (rev 12269)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-25 15:32:41 UTC (rev 12270)
@@ -39,8 +39,6 @@
 
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
-import org.axsl.galley.Area;
-import org.axsl.galley.AreaNode;
 import org.axsl.galley.BackgroundArea;
 import org.axsl.galley.BeforeFloatArea;
 import org.axsl.galley.BlockContainerArea;
@@ -51,6 +49,9 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
+import org.axsl.galley.GalleyArea;
+import org.axsl.galley.GalleyNode;
+import org.axsl.galley.GalleyPage;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GlyphAreaSequence;
@@ -60,7 +61,6 @@
 import org.axsl.galley.LineArea;
 import org.axsl.galley.MainReferenceArea;
 import org.axsl.galley.NormalBlockArea;
-import org.axsl.galley.Page;
 import org.axsl.galley.RegionArea;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
@@ -108,7 +108,7 @@
     }
 
     @Override
-    public void render(final Page page) throws GalleyVisitorException {
+    public void render(final GalleyPage page) throws GalleyVisitorException {
         final RegionArea before = page.getRegionBefore();
         final RegionArea after = page.getRegionAfter();
         final RegionArea start = page.getRegionStart();
@@ -151,7 +151,7 @@
      * @param attributes Text of the attributes to be written.
      * @param content The element content.
      */
-    protected void writeCompleteElement(final Area area,
+    protected void writeCompleteElement(final GalleyArea area,
             final StringBuilder attributes, final String content) {
         writeIndent();
         this.writer.write("<");
@@ -169,7 +169,7 @@
      * @param area The area for whom element is written.
      * @param attributes Text of the attributes to be written.
      */
-    protected void writeEmptyElement(final Area area,
+    protected void writeEmptyElement(final GalleyArea area,
             final StringBuilder attributes) {
         this.writeEmptyElement(area.getAreaName(), attributes);
     }
@@ -195,8 +195,7 @@
      * @param node The area for whom element is written.
      * @param attributes Text of the attributes to be written.
      */
-    protected void writeStartTag(final AreaNode node,
-            final StringBuilder attributes) {
+    protected void writeStartTag(final GalleyNode node, final StringBuilder attributes) {
         writeIndent();
         this.indent++;
         this.writer.write("<");
@@ -211,7 +210,7 @@
      * Write an end tag.
      * @param node The area whose end-tag should be written.
      */
-    protected void writeEndTag(final AreaNode node) {
+    protected void writeEndTag(final GalleyNode node) {
         this.indent--;
         writeIndent();
         this.writer.write("</" + node.getAreaName() + ">\n");
@@ -454,7 +453,7 @@
     }
 
     @Override
-    public Void visit(final AreaNode node) throws GalleyVisitorException {
+    public Void visit(final GalleyNode node) throws GalleyVisitorException {
         writeStartTag(node, null);
         renderChildren(node);
         writeEndTag(node);
@@ -462,7 +461,7 @@
     }
 
     @Override
-    public Void visit(final Area area) throws GalleyVisitorException {
+    public Void visit(final GalleyArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -543,7 +542,7 @@
      * @param area The Area instance whose generatedBy trait is to be output.
      * @param buffer StringBuilder instance in which to append the output.
      */
-    private void outputCommonAttributes(final Area area, final StringBuilder buffer) {
+    private void outputCommonAttributes(final GalleyArea area, final StringBuilder buffer) {
         if (area.generatedByExists()) {
             String idString = "";
             if (area.traitId() != null && ! area.traitId().equals("")) {
@@ -561,7 +560,7 @@
      * Writes information about all of an area's rectangles.
      * @param area The area whose rectangles are to be written.
      */
-    public void outputAllRectangles(final Area area) {
+    public void outputAllRectangles(final GalleyArea area) {
         outputBorderRectangle(area);
         outputPaddingRectangle(area);
         outputContentRectangle(area);
@@ -572,7 +571,7 @@
      * @param area The area whose border rectangle information should be
      * written.
      */
-    public void outputBorderRectangle(final Area area) {
+    public void outputBorderRectangle(final GalleyArea area) {
         final StringBuilder buffer = new StringBuilder();
         outputAttribute(buffer, "x", area.brOriginX());
         outputAttribute(buffer, "y", area.brOriginY());
@@ -586,7 +585,7 @@
      * @param area The area whose padding rectangle information should be
      * written.
      */
-    public void outputPaddingRectangle(final Area area) {
+    public void outputPaddingRectangle(final GalleyArea area) {
         if (! (area instanceof BackgroundArea)) {
             return;
         }
@@ -604,7 +603,7 @@
      * @param area The area whose content rectangle information should be
      * written.
      */
-    public void outputContentRectangle(final Area area) {
+    public void outputContentRectangle(final GalleyArea area) {
         final StringBuilder buffer = new StringBuilder();
         outputAttribute(buffer, "x", area.crOriginX());
         outputAttribute(buffer, "y", area.crOriginY());

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

[FOray-commit] SF.net SVN: foray:[12269] trunk/foray

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

Revision: 12269
          http://sourceforge.net/p/foray/code/12269
Author:   victormote
Date:     2021-12-24 19:38:33 +0000 (Fri, 24 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Rename method for clarity and consistency.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
    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/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/MainRa.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/ScalingValueCitationArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.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/TextArea.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -68,7 +68,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -357,7 +357,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -116,7 +116,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -132,7 +132,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -115,7 +115,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -134,7 +134,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -171,7 +171,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -141,7 +141,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -185,7 +185,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -119,7 +119,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -118,7 +118,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -129,7 +129,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -403,7 +403,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -1258,7 +1258,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -109,7 +109,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -98,7 +98,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -323,7 +323,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -205,7 +205,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -163,7 +163,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -390,7 +390,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -138,7 +138,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -157,7 +157,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -158,7 +158,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -638,7 +638,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -170,7 +170,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -306,7 +306,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -148,7 +148,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -329,7 +329,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

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	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -88,7 +88,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -259,7 +259,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -88,7 +88,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -88,7 +88,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -481,7 +481,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -128,7 +128,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -466,7 +466,7 @@
     }
 
     @Override
-    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
         return visitor.visit(this);
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-24 19:09:13 UTC (rev 12268)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-24 19:38:33 UTC (rev 12269)
@@ -371,7 +371,7 @@
     public Void renderChildren(final AreaNode area) throws GalleyVisitorException {
         for (int i = 0; i < area.areaNodeCount(); i++) {
             final AreaNode child = area.areaNodeAt(i);
-            child.render(this);
+            child.acceptVisitor(this);
         }
         return null;
     }
@@ -526,7 +526,7 @@
         for (int i = 0; i < this.areaTree.areaNodeCount(); i++) {
             final AreaNode atNode = this.areaTree.areaNodeAt(i);
             if (! (atNode instanceof PageCollection)) {
-                atNode.render(this);
+                atNode.acceptVisitor(this);
             }
         }
     }

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

[FOray-commit] SF.net SVN: foray:[12268] trunk/foray

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

Revision: 12268
          http://sourceforge.net/p/foray/code/12268
Author:   victormote
Date:     2021-12-24 19:09:13 +0000 (Fri, 24 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Make visitor class, method, and parameters names more generic.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
    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/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/MainRa.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/ScalingValueCitationArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.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/TextArea.java
    trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -38,8 +38,8 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
 import org.axsl.fotree.fo.Table;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,8 +68,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -45,8 +45,8 @@
 import org.axsl.fotree.fo.PageSequence;
 import org.axsl.fotree.fo.Root;
 import org.axsl.galley.Galley;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.linebreak.LineBreaker;
 import org.axsl.linebreak.LineBreakerFactory;
 import org.axsl.text.TextServer;
@@ -357,8 +357,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     /**

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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -34,8 +34,8 @@
 import org.axsl.common.value.BorderStyle;
 import org.axsl.fotree.fo.BasicLink;
 import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 
@@ -116,8 +116,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -33,8 +33,8 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.Fo;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -132,8 +132,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -33,8 +33,8 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.fotree.fo.BidiOverride;
 import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 
@@ -115,8 +115,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -44,8 +44,8 @@
 import org.axsl.fotree.fo.Table;
 import org.axsl.fotree.fo.prop.CommonPositionPa;
 import org.axsl.galley.BlockContainerArea;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -134,8 +134,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -33,8 +33,8 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.fotree.fo.ExternalGraphic;
 import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -171,8 +171,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -33,8 +33,8 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.Fo;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -141,8 +141,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -37,8 +37,8 @@
 import org.axsl.fotree.foreign.MathElement;
 import org.axsl.fotree.foreign.SvgElement;
 import org.axsl.galley.ForeignContent;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 import java.util.Collections;
@@ -185,8 +185,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -33,8 +33,8 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.IndexPageCitationList;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -35,8 +35,8 @@
 import org.axsl.common.value.BorderStyle;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.Inline;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -118,8 +118,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -39,8 +39,8 @@
 import org.axsl.fotree.fo.InlineContainer;
 import org.axsl.fotree.fo.ListBlock;
 import org.axsl.fotree.fo.Table;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -129,8 +129,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -40,8 +40,8 @@
 import org.axsl.fotree.fo.prop.LeaderAlignmentPa;
 import org.axsl.fotree.fo.prop.LeaderPatternPa;
 import org.axsl.fotree.fo.prop.LeaderPatternWidthPa;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 
@@ -403,8 +403,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -59,9 +59,9 @@
 import org.axsl.fotree.fo.PageNumberCitation;
 import org.axsl.fotree.fo.PageNumberCitationLast;
 import org.axsl.fotree.fo.ScalingValueCitation;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -1258,8 +1258,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     /**

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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -35,8 +35,8 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
 import org.axsl.fotree.fo.ListItem;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -109,8 +109,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -37,8 +37,8 @@
 import org.axsl.fotree.fo.ListItem;
 import org.axsl.fotree.fo.ListItemBody;
 import org.axsl.fotree.fo.ListItemLabel;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -98,8 +98,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -37,9 +37,9 @@
 import org.axsl.fotree.fo.Block;
 import org.axsl.fotree.fo.BlockContainer;
 import org.axsl.fotree.fo.RegionBody;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.MainReferenceArea;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -323,8 +323,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -48,8 +48,8 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
 import org.axsl.fotree.fo.Table;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -205,8 +205,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -39,8 +39,8 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
 import org.axsl.fotree.fo.Table;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -163,8 +163,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -42,8 +42,8 @@
 import org.axsl.fotree.fo.PageMasterResolver;
 import org.axsl.fotree.fo.PageSequence;
 import org.axsl.fotree.fo.SimplePageMaster;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -390,8 +390,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -35,9 +35,9 @@
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.PageNumber;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 
@@ -138,8 +138,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -35,9 +35,9 @@
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.PageNumberCitation;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 
@@ -157,8 +157,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -35,9 +35,9 @@
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.PageNumberCitationLast;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 
@@ -158,8 +158,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -50,9 +50,9 @@
 import org.axsl.fotree.fo.RegionStart;
 import org.axsl.fotree.fo.RetrieveMarker;
 import org.axsl.fotree.fo.SimplePageMaster;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.Page;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -638,8 +638,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -44,9 +44,9 @@
 import org.axsl.fotree.fo.RegionEnd;
 import org.axsl.fotree.fo.RegionStart;
 import org.axsl.fotree.fo.Table;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.RegionArea;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -170,8 +170,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -36,9 +36,9 @@
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.fo.RegionBody;
 import org.axsl.fotree.fo.SimplePageMaster;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.RegionArea;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -306,8 +306,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -37,9 +37,9 @@
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ScalingValueCitation;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
-import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
 import java.util.Collections;
@@ -148,8 +148,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -35,8 +35,8 @@
 import org.axsl.common.value.Span;
 import org.axsl.fotree.fo.RegionBody;
 import org.axsl.fotree.fo.prop.SpanPa;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -329,8 +329,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @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	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -34,8 +34,8 @@
 import org.axsl.common.value.BackgroundRepeat;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableBody;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -88,8 +88,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -43,8 +43,8 @@
 import org.axsl.fotree.fo.ListBlock;
 import org.axsl.fotree.fo.Table;
 import org.axsl.fotree.fo.TableCell;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.galley.TableCellArea;
 import org.axsl.graphic.Graphic;
 
@@ -259,8 +259,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -34,8 +34,8 @@
 import org.axsl.common.value.BackgroundRepeat;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableFooter;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -88,8 +88,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -34,8 +34,8 @@
 import org.axsl.common.value.BackgroundRepeat;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableHeader;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -88,8 +88,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -43,8 +43,8 @@
 import org.axsl.fotree.fo.TableFooter;
 import org.axsl.fotree.fo.TableHeader;
 import org.axsl.galley.BackgroundArea;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.galley.TableArea;
 import org.axsl.graphic.Graphic;
 
@@ -481,8 +481,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -37,8 +37,8 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableCell;
 import org.axsl.fotree.fo.TableRow;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
 import java.awt.Color;
@@ -128,8 +128,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -38,9 +38,9 @@
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.Block;
 import org.axsl.fotree.fo.FoTextCharacters;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.unicode.block.Basic_Latin_Block;
 
 import java.awt.Color;
@@ -466,8 +466,8 @@
     }
 
     @Override
-    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
-        return visitor.render(this);
+    public <T> T render(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
     }
 
     @Override

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -170,7 +170,7 @@
     }
 
     @Override
-    public Void render(final LeaderArea area) throws GalleyVisitorException {
+    public Void visit(final LeaderArea area) throws GalleyVisitorException {
         // Handle text decoration.
         renderGenericSpace(area);
 
@@ -233,7 +233,7 @@
     }
 
     @Override
-    public Void render(final GlyphAreaSequence area) throws GalleyVisitorException {
+    public Void visit(final GlyphAreaSequence area) throws GalleyVisitorException {
         final CharSequence text = area.getText();
         renderGenericSpace(area);
         renderTextSegment(area, text);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -52,6 +52,7 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.Galley;
+import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
@@ -62,7 +63,6 @@
 import org.axsl.galley.Page;
 import org.axsl.galley.PageCollection;
 import org.axsl.galley.RegionArea;
-import org.axsl.galley.RenderVisitor;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
 import org.axsl.graphic.Graphic;
@@ -78,7 +78,7 @@
  * fragment.
  */
 public abstract class Renderer extends OutputTarget
-        implements org.axsl.output.Renderer, RenderVisitor<Void> {
+        implements org.axsl.output.Renderer, GalleyVisitor<Void> {
 
     /** Magic-number constant used in the conversion of color to gray. */
     protected static final float SHADING_WEIGHT_RED = 0.3f;
@@ -313,13 +313,13 @@
             Rectangle contentRectangle, Rectangle clipRectangle) throws GalleyVisitorException;
 
     @Override
-    public Void render(final AreaNode node) throws GalleyVisitorException {
+    public Void visit(final AreaNode node) throws GalleyVisitorException {
         renderChildren(node);
         return null;
     }
 
     @Override
-    public Void render(final Area node) throws GalleyVisitorException {
+    public Void visit(final Area node) throws GalleyVisitorException {
         renderChildren(node);
         return null;
     }
@@ -331,24 +331,24 @@
      */
     protected void renderRegions(final Page page) throws GalleyVisitorException {
         for (RegionArea regionBody : page.getRegionBodies()) {
-            render(regionBody);
+            visit(regionBody);
         }
         if (page.getRegionBefore() != null) {
-            render(page.getRegionBefore());
+            visit(page.getRegionBefore());
         }
         if (page.getRegionAfter() != null) {
-            render(page.getRegionAfter());
+            visit(page.getRegionAfter());
         }
         if (page.getRegionStart() != null) {
-            render(page.getRegionStart());
+            visit(page.getRegionStart());
         }
         if (page.getRegionEnd() != null) {
-            render(page.getRegionEnd());
+            visit(page.getRegionEnd());
         }
     }
 
     @Override
-    public Void render(final BlockContainerArea area) throws GalleyVisitorException {
+    public Void visit(final BlockContainerArea area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
@@ -356,7 +356,7 @@
     }
 
     @Override
-    public Void render(final RegionArea area) throws GalleyVisitorException {
+    public Void visit(final RegionArea area) throws GalleyVisitorException {
         markBackground(area);
         renderChildren(area);
         return null;
@@ -377,7 +377,7 @@
     }
 
     @Override
-    public Void render(final NormalBlockArea area) throws GalleyVisitorException {
+    public Void visit(final NormalBlockArea area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
@@ -399,7 +399,7 @@
     public abstract void render(ForeignContentMath mathContent) throws GalleyVisitorException;
 
     @Override
-    public Void render(final ForeignObjectArea area) throws GalleyVisitorException {
+    public Void visit(final ForeignObjectArea area) throws GalleyVisitorException {
         final ForeignContent foreignContent = area.getContainedForeignObject();
         if (foreignContent == null) {
             this.getLogger().warn("At rendering, ForeignContent area "
@@ -422,7 +422,7 @@
     }
 
     @Override
-    public Void render(final ExternalGraphicArea area) throws GalleyVisitorException {
+    public Void visit(final ExternalGraphicArea area) throws GalleyVisitorException {
         final Graphic graphic = area.getGraphic();
         if (graphic == null) {
             throw new NullPointerException("Null graphic.");
@@ -436,7 +436,7 @@
     }
 
     @Override
-    public Void render(final TableArea area) throws GalleyVisitorException {
+    public Void visit(final TableArea area) throws GalleyVisitorException {
         /* Render background Areas for the table-related background-only
          * areas. */
         final BackgroundArea[] backgroundAreas = area.getBackgroundAreas();
@@ -455,7 +455,7 @@
     }
 
     @Override
-    public Void render(final TableCellArea area) throws GalleyVisitorException {
+    public Void visit(final TableCellArea area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
@@ -475,7 +475,7 @@
             throws GalleyVisitorException;
 
     @Override
-    public Void render(final LineArea area) throws GalleyVisitorException {
+    public Void visit(final LineArea area) throws GalleyVisitorException {
         renderChildren(area);
         return null;
     }
@@ -487,25 +487,25 @@
     public abstract void render(BookmarkTree bookmarkTree);
 
     @Override
-    public Void render(final FootnoteArea area) throws GalleyVisitorException {
+    public Void visit(final FootnoteArea area) throws GalleyVisitorException {
         renderChildren(area);
         return null;
     }
 
     @Override
-    public Void render(final BeforeFloatArea area) throws GalleyVisitorException {
+    public Void visit(final BeforeFloatArea area) throws GalleyVisitorException {
         renderChildren(area);
         return null;
     }
 
     @Override
-    public Void render(final MainReferenceArea area) throws GalleyVisitorException {
+    public Void visit(final MainReferenceArea area) throws GalleyVisitorException {
         renderChildren(area);
         return null;
     }
 
     @Override
-    public Void render(final InlineArea area) throws GalleyVisitorException {
+    public Void visit(final InlineArea area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -472,7 +472,7 @@
     }
 
     @Override
-    public Void render(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicArea area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();
@@ -675,7 +675,7 @@
 
 
     @Override
-    public Void render(final LeaderArea area) {
+    public Void visit(final LeaderArea area) {
         final int rx = area.crOriginX();
         final int ry = area.crOriginY();
         final int w = area.crIpd();
@@ -699,7 +699,7 @@
     }
 
     @Override
-    public Void render(final GlyphAreaSequence area) {
+    public Void visit(final GlyphAreaSequence area) {
         renderTextSegment(area, area.getText());
         return null;
     }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -519,7 +519,7 @@
     }
 
     @Override
-    public Void render(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicArea area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -984,7 +984,7 @@
 //    }
 
     @Override
-    public Void render(final LeaderArea area) throws GalleyVisitorException {
+    public Void visit(final LeaderArea area) throws GalleyVisitorException {
         try {
             writeLeaderArea(area);
         } catch (final IOException e) {

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -377,7 +377,7 @@
     }
 
     @Override
-    public Void render(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicArea area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();
@@ -516,7 +516,7 @@
     }
 
     @Override
-    public Void render(final LeaderArea area) {
+    public Void visit(final LeaderArea area) {
         final int rx = area.crOriginX();
         final int ry = area.crOriginY();
         final int w = area.crIpd();
@@ -526,7 +526,7 @@
     }
 
     @Override
-    public Void render(final GlyphAreaSequence area) {
+    public Void visit(final GlyphAreaSequence area) {
         // TODO: Implement this.
         return null;
     }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -473,7 +473,7 @@
     }
 
     @Override
-    public Void render(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicArea area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-24 19:09:13 UTC (rev 12268)
@@ -117,19 +117,19 @@
         outputAttribute(buffer, "number", page.getFormattedNumber());
         this.writeStartTag(page, buffer);
         if (before != null) {
-            this.render(before);
+            visit(before);
         }
         if (after != null) {
-            this.render(after);
+            visit(after);
         }
         if (start != null) {
-            this.render(start);
+            visit(start);
         }
         if (end != null) {
-            this.render(end);
+            visit(end);
         }
         for (RegionArea regionBody : page.getRegionBodies()) {
-            this.render(regionBody);
+            visit(regionBody);
         }
         this.writeEndTag(page);
     }
@@ -224,7 +224,7 @@
     }
 
     @Override
-    public Void render(final BlockContainerArea area) throws GalleyVisitorException {
+    public Void visit(final BlockContainerArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -235,7 +235,7 @@
     }
 
     @Override
-    public Void render(final MainReferenceArea area) throws GalleyVisitorException {
+    public Void visit(final MainReferenceArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -246,7 +246,7 @@
     }
 
     @Override
-    public Void render(final RegionArea area) throws GalleyVisitorException {
+    public Void visit(final RegionArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -257,7 +257,7 @@
     }
 
     @Override
-    public Void render(final FootnoteArea area) throws GalleyVisitorException {
+    public Void visit(final FootnoteArea area) throws GalleyVisitorException {
         if (area == null
                 || area.areaNodeCount() < 1) {
             return null;
@@ -272,7 +272,7 @@
     }
 
     @Override
-    public Void render(final BeforeFloatArea area) throws GalleyVisitorException {
+    public Void visit(final BeforeFloatArea area) throws GalleyVisitorException {
         if (area == null
                 || area.areaNodeCount() < 1) {
             return null;
@@ -287,7 +287,7 @@
     }
 
     @Override
-    public Void render(final NormalBlockArea area) throws GalleyVisitorException {
+    public Void visit(final NormalBlockArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -311,7 +311,7 @@
     }
 
     @Override
-    public Void render(final ForeignObjectArea area) throws GalleyVisitorException {
+    public Void visit(final ForeignObjectArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -330,7 +330,7 @@
     }
 
     @Override
-    public Void render(final ExternalGraphicArea area) {
+    public Void visit(final ExternalGraphicArea area) {
         final StringBuilder attributes = new StringBuilder();
         outputCommonAttributes(area, attributes);
         final URL url = area.getGraphic().getUrl();
@@ -349,7 +349,7 @@
     }
 
     @Override
-    public Void render(final LineArea area) throws GalleyVisitorException {
+    public Void visit(final LineArea area) throws GalleyVisitorException {
         if (isCoarseXml()) {
             return null;
         }
@@ -371,7 +371,7 @@
     }
 
     @Override
-    public Void render(final LeaderArea area) {
+    public Void visit(final LeaderArea area) {
         if (isCoarseXml()) {
             return null;
         }
@@ -390,7 +390,7 @@
     }
 
     @Override
-    public Void render(final GlyphAreaSequence area) {
+    public Void visit(final GlyphAreaSequence area) {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -421,7 +421,7 @@
     }
 
     @Override
-    public Void render(final InlineArea area) throws GalleyVisitorException {
+    public Void visit(final InlineArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -432,7 +432,7 @@
     }
 
     @Override
-    public Void render(final TableArea area) throws GalleyVisitorException {
+    public Void visit(final TableArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -443,7 +443,7 @@
     }
 
     @Override
-    public Void render(final TableCellArea area) throws GalleyVisitorException {
+    public Void visit(final TableCellArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -454,7 +454,7 @@
     }
 
     @Override
-    public Void render(final AreaNode node) throws GalleyVisitorException {
+    public Void visit(final AreaNode node) throws GalleyVisitorException {
         writeStartTag(node, null);
         renderChildren(node);
         writeEndTag(node);
@@ -462,7 +462,7 @@
     }
 
     @Override
-    public Void render(final Area area) throws GalleyVisitorException {
+    public Void visit(final Area area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);

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

[FOray-commit] SF.net SVN: foray:[12267] trunk/foray

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

Revision: 12267
          http://sourceforge.net/p/foray/code/12267
Author:   victormote
Date:     2021-12-24 18:26:09 +0000 (Fri, 24 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Make RenderVisitor generic.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
    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/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/MainRa.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/ScalingValueCitationArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.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/TextArea.java
    trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -68,8 +68,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -357,8 +357,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     /**

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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -116,8 +116,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -132,8 +132,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -115,8 +115,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -134,8 +134,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -171,8 +171,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -141,8 +141,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -185,8 +185,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -118,8 +118,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -129,8 +129,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -403,8 +403,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -1258,8 +1258,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     /**

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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -109,8 +109,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -98,8 +98,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -323,8 +323,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -205,8 +205,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -163,8 +163,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -390,8 +390,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -138,8 +138,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -157,8 +157,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -158,8 +158,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -638,8 +638,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -170,8 +170,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -306,8 +306,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -148,8 +148,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -329,8 +329,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @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	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -88,8 +88,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -259,8 +259,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -88,8 +88,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -88,8 +88,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -481,8 +481,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -128,8 +128,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -466,8 +466,8 @@
     }
 
     @Override
-    public void render(final RenderVisitor visitor) throws GalleyVisitorException {
-        visitor.render(this);
+    public <T> T render(final RenderVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.render(this);
     }
 
     @Override

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -170,12 +170,12 @@
     }
 
     @Override
-    public void render(final LeaderArea area) throws GalleyVisitorException {
+    public Void render(final LeaderArea area) throws GalleyVisitorException {
         // Handle text decoration.
         renderGenericSpace(area);
 
         if (area.traitLeaderPattern() == LeaderPattern.SPACE) {
-            return;
+            return null;
         }
 
         final int rx = area.crOriginX();
@@ -198,7 +198,7 @@
              * We may need to add a method on the PDF side to do the work. This approach "feels" more correct than
              * doing it with text as above. */
             this.drawLine(rx, ry, tx, ry, th, st, null);
-            return;
+            return null;
         }
 
         // checks whether thickness is = 0, because of bug in pdf (or where?),
@@ -229,13 +229,15 @@
                 drawLine(rx, ry, rx + w, ry, th, st, area.traitColor());
             }
         }
+        return null;
     }
 
     @Override
-    public void render(final GlyphAreaSequence area) throws GalleyVisitorException {
+    public Void render(final GlyphAreaSequence area) throws GalleyVisitorException {
         final CharSequence text = area.getText();
         renderGenericSpace(area);
         renderTextSegment(area, text);
+        return null;
     }
 
     @Override

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -62,6 +62,7 @@
 import org.axsl.galley.Page;
 import org.axsl.galley.PageCollection;
 import org.axsl.galley.RegionArea;
+import org.axsl.galley.RenderVisitor;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
 import org.axsl.graphic.Graphic;
@@ -77,7 +78,7 @@
  * fragment.
  */
 public abstract class Renderer extends OutputTarget
-        implements org.axsl.output.Renderer, org.axsl.galley.RenderVisitor {
+        implements org.axsl.output.Renderer, RenderVisitor<Void> {
 
     /** Magic-number constant used in the conversion of color to gray. */
     protected static final float SHADING_WEIGHT_RED = 0.3f;
@@ -312,13 +313,15 @@
             Rectangle contentRectangle, Rectangle clipRectangle) throws GalleyVisitorException;
 
     @Override
-    public void render(final AreaNode node) throws GalleyVisitorException {
+    public Void render(final AreaNode node) throws GalleyVisitorException {
         renderChildren(node);
+        return null;
     }
 
     @Override
-    public void render(final Area node) throws GalleyVisitorException {
+    public Void render(final Area node) throws GalleyVisitorException {
         renderChildren(node);
+        return null;
     }
 
     /**
@@ -345,35 +348,40 @@
     }
 
     @Override
-    public void render(final BlockContainerArea area) throws GalleyVisitorException {
+    public Void render(final BlockContainerArea area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
+        return null;
     }
 
     @Override
-    public void render(final RegionArea area) throws GalleyVisitorException {
+    public Void render(final RegionArea area) throws GalleyVisitorException {
         markBackground(area);
         renderChildren(area);
+        return null;
     }
 
     /**
      * Render the children of a given node.
      * @param area The area whose children should be rendered.
+     * @return Void.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    public void renderChildren(final AreaNode area) throws GalleyVisitorException {
+    public Void renderChildren(final AreaNode area) throws GalleyVisitorException {
         for (int i = 0; i < area.areaNodeCount(); i++) {
             final AreaNode child = area.areaNodeAt(i);
             child.render(this);
         }
+        return null;
     }
 
     @Override
-    public void render(final NormalBlockArea area) throws GalleyVisitorException {
+    public Void render(final NormalBlockArea area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
+        return null;
     }
 
     /**
@@ -391,12 +399,12 @@
     public abstract void render(ForeignContentMath mathContent) throws GalleyVisitorException;
 
     @Override
-    public void render(final ForeignObjectArea area) throws GalleyVisitorException {
+    public Void render(final ForeignObjectArea area) throws GalleyVisitorException {
         final ForeignContent foreignContent = area.getContainedForeignObject();
         if (foreignContent == null) {
             this.getLogger().warn("At rendering, ForeignContent area "
                     + "has no parsed content");
-            return;
+            return null;
         }
         if (foreignContent instanceof ForeignContentSvg) {
             final ForeignContentSvg svgArea =
@@ -410,10 +418,11 @@
             this.getLogger().warn("At rendering, ForeignContent area "
                     + "is of an unsupported type.");
         }
+        return null;
     }
 
     @Override
-    public void render(final ExternalGraphicArea area) throws GalleyVisitorException {
+    public Void render(final ExternalGraphicArea area) throws GalleyVisitorException {
         final Graphic graphic = area.getGraphic();
         if (graphic == null) {
             throw new NullPointerException("Null graphic.");
@@ -423,10 +432,11 @@
         final Rectangle clipRect = new Rectangle(area.crOriginX(),
                 area.crOriginY(), area.crIpd(), area.crBpd());
         drawGraphic(area, graphic, contentRect, clipRect);
+        return null;
     }
 
     @Override
-    public void render(final TableArea area) throws GalleyVisitorException {
+    public Void render(final TableArea area) throws GalleyVisitorException {
         /* Render background Areas for the table-related background-only
          * areas. */
         final BackgroundArea[] backgroundAreas = area.getBackgroundAreas();
@@ -441,13 +451,15 @@
          * their borders painted at the same time. */
         markBorder(area);
         renderChildren(area);
+        return null;
     }
 
     @Override
-    public void render(final TableCellArea area) throws GalleyVisitorException {
+    public Void render(final TableCellArea area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
+        return null;
     }
 
     /**
@@ -463,8 +475,9 @@
             throws GalleyVisitorException;
 
     @Override
-    public void render(final LineArea area) throws GalleyVisitorException {
+    public Void render(final LineArea area) throws GalleyVisitorException {
         renderChildren(area);
+        return null;
     }
 
     /**
@@ -474,25 +487,29 @@
     public abstract void render(BookmarkTree bookmarkTree);
 
     @Override
-    public void render(final FootnoteArea area) throws GalleyVisitorException {
+    public Void render(final FootnoteArea area) throws GalleyVisitorException {
         renderChildren(area);
+        return null;
     }
 
     @Override
-    public void render(final BeforeFloatArea area) throws GalleyVisitorException {
+    public Void render(final BeforeFloatArea area) throws GalleyVisitorException {
         renderChildren(area);
+        return null;
     }
 
     @Override
-    public void render(final MainReferenceArea area) throws GalleyVisitorException {
+    public Void render(final MainReferenceArea area) throws GalleyVisitorException {
         renderChildren(area);
+        return null;
     }
 
     @Override
-    public void render(final InlineArea area) throws GalleyVisitorException {
+    public Void render(final InlineArea area) throws GalleyVisitorException {
         markBorder(area);
         markBackground(area);
         renderChildren(area);
+        return null;
     }
 
     /**

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -472,7 +472,7 @@
     }
 
     @Override
-    public void render(final ExternalGraphicArea area) {
+    public Void render(final ExternalGraphicArea area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();
@@ -544,6 +544,7 @@
 
             }
         }
+        return null;
     }
 
 
@@ -674,7 +675,7 @@
 
 
     @Override
-    public void render(final LeaderArea area) {
+    public Void render(final LeaderArea area) {
         final int rx = area.crOriginX();
         final int ry = area.crOriginY();
         final int w = area.crIpd();
@@ -694,11 +695,13 @@
         addRect(rx, ry, w, -th, false);    // NB addRect expects negative height
 
         this.graphics.setColor(oldColor);
+        return null;
     }
 
     @Override
-    public void render(final GlyphAreaSequence area) {
+    public Void render(final GlyphAreaSequence area) {
         renderTextSegment(area, area.getText());
+        return null;
     }
 
     @Override

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -519,7 +519,7 @@
     }
 
     @Override
-    public void render(final ExternalGraphicArea area) {
+    public Void render(final ExternalGraphicArea area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();
@@ -543,6 +543,7 @@
             getLogger().error("PclRenderer.renderImageArea() Error printing "
                     + "BMP (" + e.toString() + ")");
         }
+        return null;
     }
 
     @Override

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -984,12 +984,13 @@
 //    }
 
     @Override
-    public void render(final LeaderArea area) throws GalleyVisitorException {
+    public Void render(final LeaderArea area) throws GalleyVisitorException {
         try {
             writeLeaderArea(area);
         } catch (final IOException e) {
             throw new GalleyVisitorException(e);
         }
+        return null;
     }
 
     /**

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -377,7 +377,7 @@
     }
 
     @Override
-    public void render(final ExternalGraphicArea area) {
+    public Void render(final ExternalGraphicArea area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();
@@ -420,6 +420,7 @@
 //                }
             }
         }
+        return null;
     }
 
     @Override
@@ -515,17 +516,19 @@
     }
 
     @Override
-    public void render(final LeaderArea area) {
+    public Void render(final LeaderArea area) {
         final int rx = area.crOriginX();
         final int ry = area.crOriginY();
         final int w = area.crIpd();
         final int th = area.traitRuleThickness();
         addRect(rx, ry, w, th, false);
+        return null;
     }
 
     @Override
-    public void render(final GlyphAreaSequence area) {
+    public Void render(final GlyphAreaSequence area) {
         // TODO: Implement this.
+        return null;
     }
 
     @Override

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -473,7 +473,7 @@
     }
 
     @Override
-    public void render(final ExternalGraphicArea area) {
+    public Void render(final ExternalGraphicArea area) {
         final int x = area.crOriginX();
         final int y = area.crOriginY();
         final int w = area.crIpd();
@@ -488,6 +488,7 @@
                                    + e.toString() + ").");
             getLogger().error(e.getMessage());
         }
+        return null;
     }
 
     @Override

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-24 18:26:09 UTC (rev 12267)
@@ -224,7 +224,7 @@
     }
 
     @Override
-    public void render(final BlockContainerArea area) throws GalleyVisitorException {
+    public Void render(final BlockContainerArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -231,10 +231,11 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void render(final MainReferenceArea area) throws GalleyVisitorException {
+    public Void render(final MainReferenceArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -241,10 +242,11 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void render(final RegionArea area) throws GalleyVisitorException {
+    public Void render(final RegionArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -251,13 +253,14 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void render(final FootnoteArea area) throws GalleyVisitorException {
+    public Void render(final FootnoteArea area) throws GalleyVisitorException {
         if (area == null
                 || area.areaNodeCount() < 1) {
-            return;
+            return null;
         }
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
@@ -265,13 +268,14 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void render(final BeforeFloatArea area) throws GalleyVisitorException {
+    public Void render(final BeforeFloatArea area) throws GalleyVisitorException {
         if (area == null
                 || area.areaNodeCount() < 1) {
-            return;
+            return null;
         }
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
@@ -279,10 +283,11 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void render(final NormalBlockArea area) throws GalleyVisitorException {
+    public Void render(final NormalBlockArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -289,6 +294,7 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     /**
@@ -305,7 +311,7 @@
     }
 
     @Override
-    public void render(final ForeignObjectArea area) throws GalleyVisitorException {
+    public Void render(final ForeignObjectArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -312,6 +318,7 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
@@ -323,7 +330,7 @@
     }
 
     @Override
-    public void render(final ExternalGraphicArea area) {
+    public Void render(final ExternalGraphicArea area) {
         final StringBuilder attributes = new StringBuilder();
         outputCommonAttributes(area, attributes);
         final URL url = area.getGraphic().getUrl();
@@ -333,18 +340,18 @@
         writeStartTag(area, attributes);
         outputAllRectangles(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void renderTextSegment(final GlyphAreaSequence area,
-            final CharSequence text) {
+    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
         /* TODO: Implement this. */
     }
 
     @Override
-    public void render(final LineArea area) throws GalleyVisitorException {
+    public Void render(final LineArea area) throws GalleyVisitorException {
         if (isCoarseXml()) {
-            return;
+            return null;
         }
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
@@ -355,6 +362,7 @@
         outputContentRectangle(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
@@ -363,9 +371,9 @@
     }
 
     @Override
-    public void render(final LeaderArea area) {
+    public Void render(final LeaderArea area) {
         if (isCoarseXml()) {
-            return;
+            return null;
         }
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
@@ -378,10 +386,11 @@
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void render(final GlyphAreaSequence area) {
+    public Void render(final GlyphAreaSequence area) {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -397,6 +406,7 @@
         final CharSequence cookedText = XmlCharacterUtils.expandEntityReferences(rawText);
         renderContent(cookedText);
         writeEndTag(area);
+        return null;
     }
 
     /**
@@ -411,7 +421,7 @@
     }
 
     @Override
-    public void render(final InlineArea area) throws GalleyVisitorException {
+    public Void render(final InlineArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -418,10 +428,11 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void render(final TableArea area) throws GalleyVisitorException {
+    public Void render(final TableArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -428,10 +439,11 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void render(final TableCellArea area) throws GalleyVisitorException {
+    public Void render(final TableCellArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -438,17 +450,19 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     @Override
-    public void render(final AreaNode node) throws GalleyVisitorException {
+    public Void render(final AreaNode node) throws GalleyVisitorException {
         writeStartTag(node, null);
         renderChildren(node);
         writeEndTag(node);
+        return null;
     }
 
     @Override
-    public void render(final Area area) throws GalleyVisitorException {
+    public Void render(final Area area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
@@ -455,6 +469,7 @@
         outputAllRectangles(area);
         renderChildren(area);
         writeEndTag(area);
+        return null;
     }
 
     /**

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

[FOray-commit] SF.net SVN: foray:[12266] trunk/foray

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

Revision: 12266
          http://sourceforge.net/p/foray/code/12266
Author:   victormote
Date:     2021-12-24 15:40:36 +0000 (Fri, 24 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Cleanup of TextArea/GlyphAreaSequence naming and hierarchy.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.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/ScalingValueCitationArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
    trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -31,7 +31,6 @@
 import org.foray.common.FontContext4a;
 
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.GlyphAreaSequence;
 import org.axsl.font.FontContext;
 import org.axsl.fotree.fo.BasicLink;
 import org.axsl.fotree.fo.BidiOverride;
@@ -48,6 +47,7 @@
 import org.axsl.fotree.fo.PageNumberCitation;
 import org.axsl.fotree.fo.PageNumberCitationLast;
 import org.axsl.fotree.fo.ScalingValueCitation;
+import org.axsl.galley.GlyphAreaSequence;
 
 import java.util.ArrayList;
 import java.util.List;

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	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -32,7 +32,6 @@
 import org.foray.common.data.OrderedTreeNode;
 
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.GlyphAreaSequence;
 import org.axsl.area.LineArea;
 import org.axsl.common.value.Conditionality;
 import org.axsl.common.value.LineStackingStrategy;
@@ -61,6 +60,7 @@
 import org.axsl.fotree.fo.PageNumberCitationLast;
 import org.axsl.fotree.fo.ScalingValueCitation;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;

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	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -36,6 +36,7 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.PageNumber;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
@@ -44,7 +45,7 @@
  * The normal inline-area created by an fo:page-number object.
  */
 public final class PageNumberArea extends AbstractAncestralInlineArea
-        implements org.axsl.galley.TextArea,
+        implements GlyphAreaSequence,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -36,6 +36,7 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.PageNumberCitation;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
@@ -44,7 +45,7 @@
  * Area containing all or part of a page-number-citation.
  */
 public final class PageNumberCitationArea extends AbstractAncestralInlineArea
-        implements org.axsl.galley.TextArea,
+        implements GlyphAreaSequence,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -36,6 +36,7 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.PageNumberCitationLast;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
@@ -45,7 +46,7 @@
  */
 public final class PageNumberCitationLastArea
         extends AbstractAncestralInlineArea
-        implements org.axsl.galley.TextArea,
+        implements GlyphAreaSequence,
         org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

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	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -38,6 +38,7 @@
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ScalingValueCitation;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.RenderVisitor;
 
 import java.awt.Color;
@@ -48,7 +49,7 @@
  * The normal inline-area created by an fo:scaling-value-citation object.
  */
 public final class ScalingValueCitationArea extends AbstractInlineArea
-        implements org.axsl.galley.TextArea,
+        implements GlyphAreaSequence,
         org.axsl.area.NormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a}

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -39,6 +39,7 @@
 import org.axsl.fotree.fo.Block;
 import org.axsl.fotree.fo.FoTextCharacters;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.RenderVisitor;
 import org.axsl.unicode.block.Basic_Latin_Block;
 
@@ -64,8 +65,7 @@
  * different Fonts due to overriding).
  * However, a TextSegment always springs from exactly one FOText node.
  */
-public abstract class TextArea extends AbstractInlineArea
-        implements org.axsl.galley.TextArea, org.axsl.area.GlyphAreaSequence {
+public abstract class TextArea extends AbstractInlineArea implements GlyphAreaSequence {
 
     /** The parent of this node. The parent can be either a {@link LineArea4a} or another {@link AbstractInlineArea}. */
     private Area4a parent;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -33,8 +33,8 @@
 import org.axsl.font.Font;
 import org.axsl.galley.BorderPaddingArea;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.LeaderArea;
-import org.axsl.galley.TextArea;
 import org.axsl.output.DocumentConfiguration;
 
 import java.awt.Color;
@@ -108,7 +108,7 @@
      * @param area The area whose "space" features are to be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    protected void renderGenericSpace(final TextArea area) throws GalleyVisitorException {
+    protected void renderGenericSpace(final GlyphAreaSequence area) throws GalleyVisitorException {
         final int startX = area.crOriginX();
         int startY;
         final int endX = area.crOriginX() + area.crIpd();
@@ -138,7 +138,7 @@
      * @param area The area whose metrics should be used for the computation.
      * @return The Y position that should be used for the underline stroke.
      */
-    protected int getUnderlineYPosition(final TextArea area) {
+    protected int getUnderlineYPosition(final GlyphAreaSequence area) {
         final Font font = area.getPrimaryFont().getFont();
         final int underlinePosition = font.underlinePosition(
                 area.traitFontSize());
@@ -150,7 +150,7 @@
      * @param area The area whose metrics should be used for the computation.
      * @return The Y position that should be used for the overline stroke.
      */
-    protected int getOverlineYPosition(final TextArea area) {
+    protected int getOverlineYPosition(final GlyphAreaSequence area) {
         final Font font = area.getPrimaryFont().getFont();
         final int overlinePosition = font.overlinePosition(
                 area.traitFontSize());
@@ -162,7 +162,7 @@
      * @param area The area whose metrics should be used for the computation.
      * @return The Y position that should be used for the through stroke.
      */
-    protected int getThroughYPosition(final TextArea area) {
+    protected int getThroughYPosition(final GlyphAreaSequence area) {
         final Font font = area.getPrimaryFont().getFont();
         final int strikeoutPosition = font.strikeoutPosition(
                 area.traitFontSize());
@@ -232,7 +232,7 @@
     }
 
     @Override
-    public void render(final TextArea area) throws GalleyVisitorException {
+    public void render(final GlyphAreaSequence area) throws GalleyVisitorException {
         final CharSequence text = area.getText();
         renderGenericSpace(area);
         renderTextSegment(area, text);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -53,6 +53,7 @@
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.Galley;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.InlineArea;
 import org.axsl.galley.LineArea;
@@ -63,7 +64,6 @@
 import org.axsl.galley.RegionArea;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
-import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 
@@ -459,7 +459,7 @@
      * @param text The text content to be rendered.
      * @throws GalleyVisitorException For errors during rendering.
      */
-    public abstract void renderTextSegment(TextArea area, CharSequence text)
+    public abstract void renderTextSegment(GlyphAreaSequence area, CharSequence text)
             throws GalleyVisitorException;
 
     @Override

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -54,10 +54,10 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.graphic.SvgGraphic;
@@ -548,7 +548,7 @@
 
 
     @Override
-    public void renderTextSegment(final TextArea area,
+    public void renderTextSegment(final GlyphAreaSequence area,
             final CharSequence text) {
         final FontUse font = area.getPrimaryFont();
         final int size = area.traitFontSize();
@@ -697,7 +697,7 @@
     }
 
     @Override
-    public void render(final TextArea area) {
+    public void render(final GlyphAreaSequence area) {
         renderTextSegment(area, area.getText());
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -48,9 +48,9 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.output.DocumentConfiguration;
@@ -668,8 +668,7 @@
     }
 
     @Override
-    public void renderTextSegment(final TextArea area,
-            final CharSequence text) {
+    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
         /* TODO: Implement this. */
 
 //        Font font = area.getResolvedFont();

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -52,10 +52,10 @@
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.Galley;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.Page;
 import org.axsl.galley.PageCollection;
-import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicLink;
 import org.axsl.graphic.MathGraphic;
@@ -366,8 +366,7 @@
     }
 
     @Override
-    public void renderTextSegment(final TextArea area,
-            final CharSequence text) throws GalleyVisitorException {
+    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) throws GalleyVisitorException {
         if (text == null || text.length() < 1) {
             return;
         }
@@ -425,7 +424,8 @@
      * @param c The next character to be written.
      * @return The appropriate font to use.
      */
-    private FontUse whichFont(final TextArea area, final FontUse primaryFont, final FontUse currentFont, final int c) {
+    private FontUse whichFont(final GlyphAreaSequence area, final FontUse primaryFont, final FontUse currentFont,
+            final int c) {
         /* Trying to avoid unnecessary font selection work on the one hand, and unnecessary switching between fonts in
          * the output on the other.*/
 
@@ -471,7 +471,7 @@
      * @param orthography The orthography that should be used when applying font features like subsitutions.
      * @throws PdfException For errors painting the text.
      */
-    private void paintText(final TextArea area, final FontUse fontUse,
+    private void paintText(final GlyphAreaSequence area, final FontUse fontUse,
             final CharSequence text, final int startIndex, final int size,
             final FontContext fontContext, final Orthography orthography) throws PdfException {
         if (size < 1) {

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -56,10 +56,10 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.TextArea;
 import org.axsl.graphic.EpsGraphic;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -872,7 +872,7 @@
     }*/
 
     @Override
-    public void renderTextSegment(final TextArea area, final CharSequence text)
+    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text)
             throws GalleyVisitorException {
         try {
             writeTextSegment(area, text);
@@ -887,7 +887,7 @@
      * @param text The text segment to be written.
      * @throws IOException For errors writing to the output.
      */
-    private void writeTextSegment(final TextArea area, final CharSequence text) throws IOException {
+    private void writeTextSegment(final GlyphAreaSequence area, final CharSequence text) throws IOException {
         if (text == null || text.length() < 1) {
             return;
         }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -43,10 +43,10 @@
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.graphic.GraphicServer;
@@ -423,8 +423,7 @@
     }
 
     @Override
-    public void renderTextSegment(final TextArea area,
-            final CharSequence text) {
+    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
         /* TODO: Implement this. */
 
 //        char ch;
@@ -525,7 +524,7 @@
     }
 
     @Override
-    public void render(final TextArea area) {
+    public void render(final GlyphAreaSequence area) {
         // TODO: Implement this.
     }
 

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -38,9 +38,9 @@
 import org.axsl.galley.ForeignContentMath;
 import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.output.DocumentConfiguration;
@@ -502,8 +502,7 @@
     }
 
     @Override
-    public void renderTextSegment(final TextArea area,
-            final CharSequence text) {
+    public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
         /* TODO: Implement this. */
 
 //        int rx = this.currentXPosition;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-24 15:19:18 UTC (rev 12265)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-24 15:40:36 UTC (rev 12266)
@@ -53,6 +53,7 @@
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GalleyVisitorException;
 import org.axsl.galley.GeneralInlineArea;
+import org.axsl.galley.GlyphAreaSequence;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.InlineArea;
 import org.axsl.galley.LeaderArea;
@@ -63,7 +64,6 @@
 import org.axsl.galley.RegionArea;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
-import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.output.DocumentAreaConfiguration;
 
@@ -336,7 +336,7 @@
     }
 
     @Override
-    public void renderTextSegment(final TextArea area,
+    public void renderTextSegment(final GlyphAreaSequence area,
             final CharSequence text) {
         /* TODO: Implement this. */
     }
@@ -381,7 +381,7 @@
     }
 
     @Override
-    public void render(final TextArea area) {
+    public void render(final GlyphAreaSequence area) {
         final StringBuilder buffer = new StringBuilder();
         outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);

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

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

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

Revision: 12265
          http://sourceforge.net/p/foray/code/12265
Author:   victormote
Date:     2021-12-24 15:19:18 +0000 (Fri, 24 Dec 2021)
Log Message:
-----------
Set up data structure.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java	2021-12-22 14:02:23 UTC (rev 12264)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java	2021-12-24 15:19:18 UTC (rev 12265)
@@ -30,19 +30,34 @@
 
 import org.foray.area.link.FoTextWordsLink;
 
+import org.axsl.common.para.ParaLeaf;
+
 public class TextAreaWords extends TextArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private FoTextWordsLink generatedBy;
 
+    /** The first leaf index into the backing for {@link #generatedBy} that is part of this text area. */
+    private int startingLeafIndex;
+
+    /** The number of leaf indexes in the backing for {@link #generatedBy} that are part of this text area. */
+    private int qtyLeaves;
+
     /**
      * Constructor.
      * @param parentArea The parent area.
      * @param generatedBy The FO tree linkage.
+     * @param startingLeafIndex The first leaf index into the backing for {@code #generatedBy} that is part of this text
+     * area.
+     * @param qtyLeaves The number of leaf indexes in the backing for {@code #generatedBy} that are part of this text
+     * area.
      */
-    public TextAreaWords(final LineArea4a parentArea, final FoTextWordsLink generatedBy) {
+    public TextAreaWords(final LineArea4a parentArea, final FoTextWordsLink generatedBy, final int startingLeafIndex,
+            final int qtyLeaves) {
         super(parentArea);
         this.generatedBy = generatedBy;
+        this.startingLeafIndex = startingLeafIndex;
+        this.qtyLeaves = qtyLeaves;
     }
 
     /**
@@ -62,8 +77,12 @@
 
     @Override
     public CharSequence getText() {
-        // TODO Auto-generated method stub
-        return null;
+        final StringBuilder builder = new StringBuilder();
+        for (int index = this.startingLeafIndex; index < (this.startingLeafIndex + qtyLeaves); index ++) {
+            final ParaLeaf leaf = this.generatedBy.getGeneratedBy().paraLeafAt(index);
+            builder.append(leaf.getText());
+        }
+        return builder.toString();
     }
 
     @Override

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

[FOray-commit] SF.net SVN: foray:[12264] trunk/foray/foray-fotree/src/main/java/org/foray /fotree

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

Revision: 12264
          http://sourceforge.net/p/foray/code/12264
Author:   victormote
Date:     2021-12-22 14:02:23 +0000 (Wed, 22 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Change return types for all real number values to "double" for consistency and lowest-common-denominator considerations.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-22 12:42:58 UTC (rev 12263)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-22 14:02:23 UTC (rev 12264)
@@ -151,7 +151,6 @@
 
 import java.awt.Color;
 import java.awt.Shape;
-import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -2647,12 +2646,12 @@
     }
 
     @Override
-    public float traitAzimuth(final FoContext context) {
+    public double traitAzimuth(final FoContext context) {
         return getPropertyList().traitAzimuth(this, context);
     }
 
     @Override
-    public float traitElevation(final FoContext context) {
+    public double traitElevation(final FoContext context) {
         return getPropertyList().traitElevation(this, context);
     }
 
@@ -3746,9 +3745,9 @@
     }
 
     @Override
-    public BigDecimal traitIntrinsicScaleValue(final FoContext context) {
+    public double traitIntrinsicScaleValue(final FoContext context) {
         // TODO Auto-generated method stub
-        return null;
+        return 0;
     }
 
     @Override

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java	2021-12-22 12:42:58 UTC (rev 12263)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java	2021-12-22 14:02:23 UTC (rev 12264)
@@ -3787,7 +3787,7 @@
      * @param context An object that knows how to resolve FO Tree context issues.
      * @return The azimuth property.
      */
-    public float traitAzimuth(final FoObj fobj, final FoContext context) {
+    public double traitAzimuth(final FoObj fobj, final FoContext context) {
         final PdAzimuth property = (PdAzimuth) getProperty(FoProperty.AZIMUTH);
         if (property != null) {
             return property.getValue(context, fobj);
@@ -3801,7 +3801,7 @@
      * @param context An object that knows how to resolve FO Tree context issues.
      * @return The elevation property.
      */
-    public float traitElevation(final FoObj fobj, final FoContext context) {
+    public double traitElevation(final FoObj fobj, final FoContext context) {
         final PdElevation property = (PdElevation) getProperty(FoProperty.ELEVATION);
         if (property != null) {
             return property.getValue(context, fobj);

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java	2021-12-22 12:42:58 UTC (rev 12263)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java	2021-12-22 14:02:23 UTC (rev 12264)
@@ -195,7 +195,7 @@
      * @param fobj The FO for which this value is needed.
      * @return The value of this property.
      */
-    public float getValue(final FoContext context, final FoObj fobj) {
+    public double getValue(final FoContext context, final FoObj fobj) {
         if (value() instanceof DtAngle) {
             return ((DtAngle) value()).getValue();
         }
@@ -277,7 +277,7 @@
      * @param fobj The FO for which this value is needed.
      * @return The initial value for this property.
      */
-    public static float getValueNoInstance(final FoContext context,
+    public static double getValueNoInstance(final FoContext context,
             final FoObj fobj) {
         final FoObj parent = fobj.effectiveParent(context);
         if (parent != null) {

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java	2021-12-22 12:42:58 UTC (rev 12263)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java	2021-12-22 14:02:23 UTC (rev 12264)
@@ -113,7 +113,7 @@
      * @param fobj The FO for which this value is needed.
      * @return The value of this property.
      */
-    public float getValue(final FoContext context, final FoObj fobj) {
+    public double getValue(final FoContext context, final FoObj fobj) {
         if (value() instanceof DtAngle) {
             return ((DtAngle) value()).getValue();
         }
@@ -156,7 +156,7 @@
      * @param fobj The FO for which this value is needed.
      * @return The initial value for this property.
      */
-    public static float getValueNoInstance(final FoContext context,
+    public static double getValueNoInstance(final FoContext context,
             final FoObj fobj) {
         final FoObj parent = fobj.effectiveParent(context);
         if (parent != null) {

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

[FOray-commit] SF.net SVN: foray:[12263] trunk/foray/foray-fotree/src/main/java/org/foray /fotree/FoObj.java

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

Revision: 12263
          http://sourceforge.net/p/foray/code/12263
Author:   victormote
Date:     2021-12-22 12:42:58 +0000 (Wed, 22 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Add property accessors previously considered unnecessary.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-22 11:45:21 UTC (rev 12262)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-22 12:42:58 UTC (rev 12263)
@@ -105,6 +105,7 @@
 import org.axsl.common.value.RetrievePosition;
 import org.axsl.common.value.RetrievePositionWithinTable;
 import org.axsl.common.value.RuleStyle;
+import org.axsl.common.value.ScaleOption;
 import org.axsl.common.value.Scaling;
 import org.axsl.common.value.ScalingMethod;
 import org.axsl.common.value.ShadowEffect;
@@ -150,6 +151,7 @@
 
 import java.awt.Color;
 import java.awt.Shape;
+import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -3743,4 +3745,16 @@
         return null;
     }
 
+    @Override
+    public BigDecimal traitIntrinsicScaleValue(final FoContext context) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ScaleOption traitScaleOption(final FoContext context) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

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

[FOray-commit] SF.net SVN: foray:[12262] trunk/foray/foray-fotree/src/main/java/org/foray /fotree

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

Revision: 12262
          http://sourceforge.net/p/foray/code/12262
Author:   victormote
Date:     2021-12-22 11:45:21 +0000 (Wed, 22 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Add property accessors previously considered unnecessary.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLetterValue.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-21 22:18:11 UTC (rev 12261)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-22 11:45:21 UTC (rev 12262)
@@ -84,6 +84,7 @@
 import org.axsl.common.value.IntrusionDisplace;
 import org.axsl.common.value.LeaderAlignment;
 import org.axsl.common.value.LeaderPattern;
+import org.axsl.common.value.LetterValue;
 import org.axsl.common.value.LineHeightShiftAdjustment;
 import org.axsl.common.value.LineStackingStrategy;
 import org.axsl.common.value.LinefeedTreatment;
@@ -1127,8 +1128,8 @@
      * Returns the "letter-value" trait.
      * @return The "letter-value" trait.
      */
-    public FoValue traitLetterValue() {
-        return getPropertyList().getLetterValue();
+    public LetterValue traitLetterValue() {
+        return getPropertyList().getLetterValue(this);
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java	2021-12-21 22:18:11 UTC (rev 12261)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java	2021-12-22 11:45:21 UTC (rev 12262)
@@ -239,6 +239,7 @@
 import org.axsl.common.value.BlankOrNotBlank;
 import org.axsl.common.value.Compass;
 import org.axsl.common.value.Conditionality;
+import org.axsl.common.value.LetterValue;
 import org.axsl.common.value.OddOrEven;
 import org.axsl.common.value.PagePosition;
 import org.axsl.common.value.RelativeAxis;
@@ -1189,12 +1190,13 @@
 
     /**
      * Returns the letter-value property.
+     * @param fobj The FoObj to which the property belongs.
      * @return The letter-value property.
      */
-    public FoValue getLetterValue() {
+    public LetterValue getLetterValue(final FoObj fobj) {
         final PdLetterValue property = (PdLetterValue) getProperty(FoProperty.LETTER_VALUE);
         if (property != null) {
-            return property.getValue();
+            return property.getValue(null, fobj);
         }
         return PdLetterValue.getValueNoInstance();
     }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLetterValue.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLetterValue.java	2021-12-21 22:18:11 UTC (rev 12261)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLetterValue.java	2021-12-22 11:45:21 UTC (rev 12262)
@@ -34,6 +34,9 @@
 import org.foray.fotree.fo.FoValue;
 import org.foray.fotree.value.PropertyValue;
 
+import org.axsl.common.value.LetterValue;
+import org.axsl.fotree.FoContext;
+
 /**
  * The "letter-value" property in XSL-FO.
  * @see "XSL-FO Recommendation 1.1, Section 7.26.4."
@@ -75,12 +78,29 @@
 
     /**
      * Returns the value of this property.
+     * @param context An object that knows how to resolve FO context issues.
+     * @param fobj The FO for which this value is needed.
      * @return The value of this property.
      */
-    public FoValue getValue() {
+    public LetterValue getValue(final FoContext context, final FoObj fobj) {
         if (value().canEvalKeyword()) {
             final FoValue keyword = this.convertValueToFoValue(value());
-            return keyword;
+            switch (keyword) {
+            case AUTO: return LetterValue.AUTO;
+            case ALPHABETIC: return LetterValue.ALPHABETIC;
+            case TRADITIONAL: return LetterValue.TRADITIONAL;
+            case INHERIT: {
+                final FoObj parent = fobj.effectiveParent(null);
+                if (parent == null) {
+                    return getValueNoInstance();
+                } else {
+                    return parent.traitLetterValue();
+                }
+            }
+            default: {
+                break;
+            }
+            }
         }
         throw this.unexpectedRetrieval();
     }
@@ -89,8 +109,8 @@
      * Returns the default (initial) value for this property.
      * @return The initial value for this property.
      */
-    public static FoValue getValueNoInstance() {
-        return FoValue.AUTO;
+    public static LetterValue getValueNoInstance() {
+        return LetterValue.AUTO;
     }
 
     @Override

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

[FOray-commit] SF.net SVN: foray:[12261] trunk/foray/foray-fotree/src/main/java/org/foray /fotree

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

Revision: 12261
          http://sourceforge.net/p/foray/code/12261
Author:   victormote
Date:     2021-12-21 22:18:11 +0000 (Tue, 21 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Add some missing property accessors.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java

Removed Paths:
-------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/enums/

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-21 20:45:48 UTC (rev 12260)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-21 22:18:11 UTC (rev 12261)
@@ -40,8 +40,6 @@
 import org.foray.common.primitive.XmlCharacterUtils;
 import org.foray.fotree.fo.FoProperty;
 import org.foray.fotree.fo.FoValue;
-import org.foray.fotree.fo.enums.Scaling;
-import org.foray.fotree.fo.enums.ScalingMethod;
 import org.foray.fotree.fo.obj.BasicLink4a;
 import org.foray.fotree.fo.obj.Block4a;
 import org.foray.fotree.fo.obj.Flow4a;
@@ -101,9 +99,13 @@
 import org.axsl.common.value.RelativeCompass;
 import org.axsl.common.value.RelativePosition;
 import org.axsl.common.value.RenderingIntent;
+import org.axsl.common.value.RetrieveBoundary;
 import org.axsl.common.value.RetrieveBoundaryWithinTable;
+import org.axsl.common.value.RetrievePosition;
 import org.axsl.common.value.RetrievePositionWithinTable;
 import org.axsl.common.value.RuleStyle;
+import org.axsl.common.value.Scaling;
+import org.axsl.common.value.ScalingMethod;
 import org.axsl.common.value.ShadowEffect;
 import org.axsl.common.value.ShowDestination;
 import org.axsl.common.value.Span;
@@ -3668,4 +3670,76 @@
         return false;
     }
 
+    @Override
+    public int traitContentHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitContentWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public Scaling traitScaling() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public int traitWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public RetrievePosition traitRetrievePosition() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public RetrieveBoundary traitRetrieveBoundary() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String traitRegionName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public int traitColumnWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public double traitColumnWidthTableUnits() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public Boolean traitEndsRow() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Boolean traitStartsRow() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 20:45:48 UTC (rev 12260)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 22:18:11 UTC (rev 12261)
@@ -34,7 +34,6 @@
 import org.foray.fotree.PropertyList;
 
 import org.axsl.common.value.FoPropertyConstants;
-import org.axsl.common.value.Scaling;
 import org.axsl.fotree.FoContext;
 import org.axsl.fotree.FoLineNonText;
 import org.axsl.fotree.FoTreeException;
@@ -283,34 +282,4 @@
         return true;
     }
 
-    @Override
-    public int traitContentHeight(final FoContext context) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public int traitContentWidth(final FoContext context) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public int traitHeight(final FoContext context) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public int traitWidth(final FoContext context) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public Scaling traitScaling() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java	2021-12-21 20:45:48 UTC (rev 12260)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java	2021-12-21 22:18:11 UTC (rev 12261)
@@ -33,7 +33,6 @@
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
-import org.axsl.common.value.Scaling;
 import org.axsl.fotree.FoContext;
 import org.axsl.fotree.FoLineNonText;
 import org.axsl.fotree.FoTreeException;
@@ -244,34 +243,4 @@
         return true;
     }
 
-    @Override
-    public int traitContentHeight(final FoContext context) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public int traitContentWidth(final FoContext context) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public int traitHeight(final FoContext context) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public int traitWidth(final FoContext context) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public Scaling traitScaling() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
 }

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

[FOray-commit] SF.net SVN: foray:[12260] trunk/foray/foray-fotree/src/main/java/org/foray /fotree/fo/obj

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

Revision: 12260
          http://sourceforge.net/p/foray/code/12260
Author:   victormote
Date:     2021-12-21 20:45:48 +0000 (Tue, 21 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Add property accessors previously considered unnecessary.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockContainer4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Inline4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InlineContainer4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCaption4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCell4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableRow4a.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockContainer4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockContainer4a.java	2021-12-21 20:03:54 UTC (rev 12259)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockContainer4a.java	2021-12-21 20:45:48 UTC (rev 12260)
@@ -181,4 +181,16 @@
         return true;
     }
 
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Inline4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Inline4a.java	2021-12-21 20:03:54 UTC (rev 12259)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Inline4a.java	2021-12-21 20:45:48 UTC (rev 12260)
@@ -156,4 +156,16 @@
         return true;
     }
 
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InlineContainer4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InlineContainer4a.java	2021-12-21 20:03:54 UTC (rev 12259)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InlineContainer4a.java	2021-12-21 20:45:48 UTC (rev 12260)
@@ -176,4 +176,16 @@
         return true;
     }
 
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java	2021-12-21 20:03:54 UTC (rev 12259)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java	2021-12-21 20:45:48 UTC (rev 12260)
@@ -423,4 +423,16 @@
         return true;
     }
 
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCaption4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCaption4a.java	2021-12-21 20:03:54 UTC (rev 12259)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCaption4a.java	2021-12-21 20:45:48 UTC (rev 12260)
@@ -171,4 +171,16 @@
         return true;
     }
 
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCell4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCell4a.java	2021-12-21 20:03:54 UTC (rev 12259)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCell4a.java	2021-12-21 20:45:48 UTC (rev 12260)
@@ -286,4 +286,16 @@
         return true;
     }
 
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableRow4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableRow4a.java	2021-12-21 20:03:54 UTC (rev 12259)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableRow4a.java	2021-12-21 20:45:48 UTC (rev 12260)
@@ -180,4 +180,10 @@
         return false;
     }
 
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

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

[FOray-commit] SF.net SVN: foray:[12259] trunk/foray/foray-fotree/src/main/java/org/foray /fotree/fo/obj

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

Revision: 12259
          http://sourceforge.net/p/foray/code/12259
Author:   victormote
Date:     2021-12-21 20:03:54 +0000 (Tue, 21 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Add property accessor previously considered unnecessary.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 19:43:22 UTC (rev 12258)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 20:03:54 UTC (rev 12259)
@@ -34,6 +34,7 @@
 import org.foray.fotree.PropertyList;
 
 import org.axsl.common.value.FoPropertyConstants;
+import org.axsl.common.value.Scaling;
 import org.axsl.fotree.FoContext;
 import org.axsl.fotree.FoLineNonText;
 import org.axsl.fotree.FoTreeException;
@@ -306,4 +307,10 @@
         return 0;
     }
 
+    @Override
+    public Scaling traitScaling() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java	2021-12-21 19:43:22 UTC (rev 12258)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java	2021-12-21 20:03:54 UTC (rev 12259)
@@ -33,6 +33,7 @@
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
+import org.axsl.common.value.Scaling;
 import org.axsl.fotree.FoContext;
 import org.axsl.fotree.FoLineNonText;
 import org.axsl.fotree.FoTreeException;
@@ -267,4 +268,10 @@
         return 0;
     }
 
+    @Override
+    public Scaling traitScaling() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

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

[FOray-commit] SF.net SVN: foray:[12258] trunk/foray/foray-fotree/src/main/java/org/foray /fotree

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

Revision: 12258
          http://sourceforge.net/p/foray/code/12258
Author:   victormote
Date:     2021-12-21 19:43:22 +0000 (Tue, 21 Dec 2021)
Log Message:
-----------
Move and rename class for clarity and consistency.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentHeight.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentWidth.java

Added Paths:
-----------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoScaled4a.java

Removed Paths:
-------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObjScaled.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-21 19:37:33 UTC (rev 12257)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-21 19:43:22 UTC (rev 12258)
@@ -45,6 +45,7 @@
 import org.foray.fotree.fo.obj.BasicLink4a;
 import org.foray.fotree.fo.obj.Block4a;
 import org.foray.fotree.fo.obj.Flow4a;
+import org.foray.fotree.fo.obj.FoScaled4a;
 import org.foray.fotree.fo.obj.FoTextCharacters4a;
 import org.foray.fotree.fo.obj.Leader4a;
 import org.foray.fotree.fo.obj.ListBlock4a;
@@ -3179,7 +3180,7 @@
      * using "inherit".
      * @return The content-height.
      */
-    public float getContentHeight(final FoContext context, final FoObjScaled fobjScaled) {
+    public float getContentHeight(final FoContext context, final FoScaled4a fobjScaled) {
         return getPropertyList().getContentHeight(this, context, fobjScaled);
 
     }
@@ -3201,7 +3202,7 @@
      * using "inherit".
      * @return The content-width.
      */
-    public float getContentWidth(final FoContext context, final FoObjScaled fobjScaled) {
+    public float getContentWidth(final FoContext context, final FoScaled4a fobjScaled) {
         return getPropertyList().getContentWidth(this, context, fobjScaled);
     }
 

Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObjScaled.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObjScaled.java	2021-12-21 19:37:33 UTC (rev 12257)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObjScaled.java	2021-12-21 19:43:22 UTC (rev 12258)
@@ -1,242 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- *      http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- *      Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree;
-
-import org.foray.common.WellKnownConstants;
-
-import org.axsl.common.value.FoPropertyConstants;
-import org.axsl.fotree.FoContext;
-
-/**
- * Abstract base class for inline FOs that are scaleable. This currently
- * includes external-graphic and instream-foreign-object.
- */
-public abstract class FoObjScaled extends FoObj implements org.axsl.fotree.FoScaled {
-
-    /** The property list for this object. */
-    private PropertyList propertyList;
-
-    /**
-     * Constructor.
-     * @param parent The parent FoObj.
-     * @param propertyList The property list for this FoObj.
-     */
-    public FoObjScaled(final FoObj parent, final PropertyList propertyList) {
-        super(parent);
-        this.propertyList = propertyList;
-    }
-
-    /**
-     * Returns the width of the content.
-     * @param context An object that knows how to resolve FO Tree context
-     * issues.
-     * @return The width, in millipoints, of the content of this object, as
-     * reported by the content itself.
-     */
-    public abstract int intrinsicContentWidth(FoContext context);
-
-    /**
-     * Returns the height of the content.
-     * @param context An object that knows how to resolve FO Tree context
-     * issues.
-     * @return The height, in millipoints, of the content of this object, as
-     * reported by the content itself.
-     */
-    public abstract int intrinsicContentHeight(FoContext context);
-
-    @Override
-    public int viewportIpd(final FoContext context) {
-        /* See XSL-FO Standard 1.0, Section 6.6.5 and 6.6.6, Subsection
-         * "Constraints", first paragraph, for explanation of logic. */
-        final int viewportIPD = this.traitIpDimensionOpt(context);
-        if (viewportIPD != FoPropertyConstants.DIMENSION_AUTO) {
-            return viewportIPD;
-        }
-
-        /* The remaining logic is for the "auto" case.
-         * The CSS2 spec says that for replaced inline content, if
-         * width="auto", it should return the intrinsic width.
-         * See http://www.w3.org/TR/REC-CSS2/visudet.html#q5.
-         * However, the documentation on the fo:external-graphic and
-         * fo:instream-foreign-object say that the "content size" should be
-         * used, and then define it. */
-        final int intrinsicWidth = this.intrinsicContentWidth(context);
-
-        /* We already know that the viewport IPD is dependent on the
-         * content-width.
-         * If the content-width is also dependent on the viewport IPD, then we
-         * have a circular dependency. */
-        if (this.isContentWidthDependentOnPd(context)) {
-            /* We have a circular dependency. See if we can use the other
-             * dimension to compute this one. */
-            if (this.isViewportBpdDependent(context)) {
-                /* The viewport BPD is not specified either, so the user has
-                 * given us absolutely nothing by which to compute the
-                 * dimensions of this viewport.
-                 * We punt by returning the smaller of 1) the intrinsic width,
-                 * and 2) the width of the parent area. */
-                return Math.min(intrinsicWidth,
-                        context.ipdAncestorBlockOrRa());
-            } else {
-                /* We can use the other dimension to compute this one. */
-                final int viewportBpd = this.viewportBpd(context);
-                final int intrinsicHeight = this.intrinsicContentWidth(context);
-                final float widthToHeight = (float) intrinsicWidth
-                        / (float) intrinsicHeight;
-                return Math.round(widthToHeight * viewportBpd);
-            }
-        }
-
-        /* The content-width is not dependent on the viewport IPD, so we can
-         * compute it first, then use it to compute the viewport IPD. */
-        final float scalingFactor = this.getContentWidth(context, this);
-        return Math.round(intrinsicWidth * scalingFactor);
-    }
-
-    /**
-     * Indicates whether the viewport IPD for this graphic can be computed
-     * independent of the viewport BPD.
-     * @param context An object that knows how to resolve FO Tree context
-     * issues.
-     * @return True if and only if the viewport BPD needs to be computed before the IPD
-     * can be.
-     */
-    private boolean isViewportIpdDependent(final FoContext context) {
-        final int viewportIPD = this.traitIpDimensionOpt(context);
-        if (viewportIPD != FoPropertyConstants.DIMENSION_AUTO) {
-            return false;
-        }
-        if (this.isContentWidthDependentOnPd(context)) {
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public int viewportBpd(final FoContext context) {
-        /* See XSL-FO Standard 1.0, Section 6.6.5 and 6.6.6, Subsection
-         * "Constraints", first paragraph, for explanation of logic. */
-        final int viewportBPD = this.traitBpDimensionOpt(context);
-        if (viewportBPD != FoPropertyConstants.DIMENSION_AUTO) {
-            return viewportBPD;
-        }
-
-        /* The remaining logic is for the "auto" case.
-         * The CSS2 spec says that for replaced inline content, if
-         * height="auto", it should return the intrinsic height.
-         * See http://www.w3.org/TR/REC-CSS2/visudet.html#q16.
-         * However, the documentation on the fo:external-graphic and
-         * fo:instream-foreign-object say that the "content size" should be
-         * used, and then define it. */
-        final int intrinsicHeight = this.intrinsicContentHeight(context);
-
-        /* We already know that the viewport BPD is dependent on the
-         * content-height.
-         * If the content-height is also dependent on the viewport BPD, then we
-         * have a circular dependency. */
-        if (this.isContentHeightDependentOnPd(context)) {
-            /* We have a circular dependency. See if we can use the other
-             * dimension to compute this one. */
-            if (this.isViewportIpdDependent(context)) {
-                /* The viewport IPD is not specified either, so the user has
-                 * given us absolutely nothing by which to compute the
-                 * dimensions of this viewport.
-                 * We punt by returning the smaller of 1) the intrinsic height,
-                 * and 2) the height of the parent area. */
-                return Math.min(intrinsicHeight,
-                        context.bpdAncestorBlockOrRa());
-            } else {
-                /* We can use the other dimension to compute this one. */
-                final int viewportIpd = this.viewportIpd(context);
-                final int intrinsicWidth = this.intrinsicContentWidth(context);
-                final float heightToWidth = (float) intrinsicHeight
-                        / (float) intrinsicWidth;
-                return Math.round(heightToWidth * viewportIpd);
-            }
-        }
-
-        /* The content-height is not dependent on the viewport BPD, so we can
-         * compute it first, then use it to compute the viewport BPD. */
-        final float scalingFactor = this.getContentHeight(context, this);
-        return Math.round(this.intrinsicContentHeight(context) * scalingFactor);
-    }
-
-    /**
-     * Indicates whether the viewport BPD for this graphic can be computed
-     * independent of the viewport IPD.
-     * @param context An object that knows how to resolve FO Tree context
-     * issues.
-     * @return True if and only if the viewport IPD needs to be computed before the BPD
-     * can be.
-     */
-    private boolean isViewportBpdDependent(final FoContext context) {
-        final int viewportBPD = this.traitBpDimensionOpt(context);
-        if (viewportBPD != FoPropertyConstants.DIMENSION_AUTO) {
-            return false;
-        }
-        if (this.isContentHeightDependentOnPd(context)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Converts a quantity of pixels to a length in millipoints, using the
-     * value passed in pixelsPerInch.
-     * @param pixels The quantity of pixels to be converted to millipoints.
-     * @param pixelsPerInch The resolution, in pixels-per-inch, at which the
-     * conversion should take place.
-     * @return The millipoint equivalent of pixels.
-     */
-    public static int pixelsToMillipoints(final int pixels,
-            final int pixelsPerInch) {
-        return pixels * WellKnownConstants.POINTS_PER_INCH
-                * WellKnownConstants.MILLIUNITS_PER_UNIT / pixelsPerInch;
-    }
-
-    @Override
-    public int referenceIpd(final FoContext context) {
-        final int intrinsicWidth = this.intrinsicContentWidth(context);
-        final float scaling = this.getContentWidth(context, this);
-        return Math.round(intrinsicWidth * scaling);
-    }
-
-    @Override
-    public int referenceBpd(final FoContext context) {
-        final int intrinsicHeight = this.intrinsicContentHeight(context);
-        final float scaling = this.getContentHeight(context, this);
-        return Math.round(intrinsicHeight * scaling);
-    }
-
-    @Override
-    public PropertyList getPropertyList() {
-        return this.propertyList;
-    }
-
-}

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java	2021-12-21 19:37:33 UTC (rev 12257)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java	2021-12-21 19:43:22 UTC (rev 12258)
@@ -32,6 +32,7 @@
 import org.foray.common.i18n.Country4a;
 import org.foray.fotree.fo.FoProperty;
 import org.foray.fotree.fo.FoValue;
+import org.foray.fotree.fo.obj.FoScaled4a;
 import org.foray.fotree.fo.obj.Region4a;
 import org.foray.fotree.fo.prop.AbstractAbsoluteDimension;
 import org.foray.fotree.fo.prop.AbstractAbsoluteOffset;
@@ -1861,7 +1862,7 @@
      * using "inherit".
      * @return The scaling factor that should be applied to the intrinsic width of the content.
      */
-    public float getContentWidth(final FoObj fobj, final FoContext context, final FoObjScaled fobjScaled) {
+    public float getContentWidth(final FoObj fobj, final FoContext context, final FoScaled4a fobjScaled) {
         final PdContentWidth property = (PdContentWidth) getProperty(FoProperty.CONTENT_WIDTH);
         if (property == null) {
             /* Width scaling is not set. If we are scaling uniformly, use the
@@ -1906,7 +1907,7 @@
      * using "inherit".
      * @return The scaling factor that should be applied to the intrinsic height of the content.
      */
-    public float getContentHeight(final FoObj fobj, final FoContext context, final FoObjScaled fobjScaled) {
+    public float getContentHeight(final FoObj fobj, final FoContext context, final FoScaled4a fobjScaled) {
         final PdContentHeight property = (PdContentHeight) getProperty(FoProperty.CONTENT_HEIGHT);
         if (property == null) {
             /* Height scaling is not set. If we are scaling uniformly, use the

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 19:37:33 UTC (rev 12257)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 19:43:22 UTC (rev 12258)
@@ -30,7 +30,6 @@
 
 import org.foray.common.ForayConstants;
 import org.foray.fotree.FoObj;
-import org.foray.fotree.FoObjScaled;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
@@ -49,7 +48,7 @@
 /**
  * An "external-graphic" object in XSL-FO.
  */
-public class ExternalGraphic4a extends FoObjScaled implements ExternalGraphic {
+public class ExternalGraphic4a extends FoScaled4a implements ExternalGraphic {
 
     /** The parent of this node. */
     private FoObj parent;

Copied: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoScaled4a.java (from rev 12256, trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObjScaled.java)
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoScaled4a.java	                        (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoScaled4a.java	2021-12-21 19:43:22 UTC (rev 12258)
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2004 The FOray Project.
+ *      http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.fo.obj;
+
+import org.foray.common.WellKnownConstants;
+import org.foray.fotree.FoObj;
+import org.foray.fotree.PropertyList;
+
+import org.axsl.common.value.FoPropertyConstants;
+import org.axsl.fotree.FoContext;
+import org.axsl.fotree.FoScaled;
+
+/**
+ * Abstract base class for inline FOs that are scaleable. This currently
+ * includes external-graphic and instream-foreign-object.
+ */
+public abstract class FoScaled4a extends FoObj implements FoScaled {
+
+    /** The property list for this object. */
+    private PropertyList propertyList;
+
+    /**
+     * Constructor.
+     * @param parent The parent FoObj.
+     * @param propertyList The property list for this FoObj.
+     */
+    public FoScaled4a(final FoObj parent, final PropertyList propertyList) {
+        super(parent);
+        this.propertyList = propertyList;
+    }
+
+    /**
+     * Returns the width of the content.
+     * @param context An object that knows how to resolve FO Tree context
+     * issues.
+     * @return The width, in millipoints, of the content of this object, as
+     * reported by the content itself.
+     */
+    public abstract int intrinsicContentWidth(FoContext context);
+
+    /**
+     * Returns the height of the content.
+     * @param context An object that knows how to resolve FO Tree context
+     * issues.
+     * @return The height, in millipoints, of the content of this object, as
+     * reported by the content itself.
+     */
+    public abstract int intrinsicContentHeight(FoContext context);
+
+    @Override
+    public int viewportIpd(final FoContext context) {
+        /* See XSL-FO Standard 1.0, Section 6.6.5 and 6.6.6, Subsection
+         * "Constraints", first paragraph, for explanation of logic. */
+        final int viewportIPD = this.traitIpDimensionOpt(context);
+        if (viewportIPD != FoPropertyConstants.DIMENSION_AUTO) {
+            return viewportIPD;
+        }
+
+        /* The remaining logic is for the "auto" case.
+         * The CSS2 spec says that for replaced inline content, if
+         * width="auto", it should return the intrinsic width.
+         * See http://www.w3.org/TR/REC-CSS2/visudet.html#q5.
+         * However, the documentation on the fo:external-graphic and
+         * fo:instream-foreign-object say that the "content size" should be
+         * used, and then define it. */
+        final int intrinsicWidth = this.intrinsicContentWidth(context);
+
+        /* We already know that the viewport IPD is dependent on the
+         * content-width.
+         * If the content-width is also dependent on the viewport IPD, then we
+         * have a circular dependency. */
+        if (this.isContentWidthDependentOnPd(context)) {
+            /* We have a circular dependency. See if we can use the other
+             * dimension to compute this one. */
+            if (this.isViewportBpdDependent(context)) {
+                /* The viewport BPD is not specified either, so the user has
+                 * given us absolutely nothing by which to compute the
+                 * dimensions of this viewport.
+                 * We punt by returning the smaller of 1) the intrinsic width,
+                 * and 2) the width of the parent area. */
+                return Math.min(intrinsicWidth,
+                        context.ipdAncestorBlockOrRa());
+            } else {
+                /* We can use the other dimension to compute this one. */
+                final int viewportBpd = this.viewportBpd(context);
+                final int intrinsicHeight = this.intrinsicContentWidth(context);
+                final float widthToHeight = (float) intrinsicWidth
+                        / (float) intrinsicHeight;
+                return Math.round(widthToHeight * viewportBpd);
+            }
+        }
+
+        /* The content-width is not dependent on the viewport IPD, so we can
+         * compute it first, then use it to compute the viewport IPD. */
+        final float scalingFactor = this.getContentWidth(context, this);
+        return Math.round(intrinsicWidth * scalingFactor);
+    }
+
+    /**
+     * Indicates whether the viewport IPD for this graphic can be computed
+     * independent of the viewport BPD.
+     * @param context An object that knows how to resolve FO Tree context
+     * issues.
+     * @return True if and only if the viewport BPD needs to be computed before the IPD
+     * can be.
+     */
+    private boolean isViewportIpdDependent(final FoContext context) {
+        final int viewportIPD = this.traitIpDimensionOpt(context);
+        if (viewportIPD != FoPropertyConstants.DIMENSION_AUTO) {
+            return false;
+        }
+        if (this.isContentWidthDependentOnPd(context)) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public int viewportBpd(final FoContext context) {
+        /* See XSL-FO Standard 1.0, Section 6.6.5 and 6.6.6, Subsection
+         * "Constraints", first paragraph, for explanation of logic. */
+        final int viewportBPD = this.traitBpDimensionOpt(context);
+        if (viewportBPD != FoPropertyConstants.DIMENSION_AUTO) {
+            return viewportBPD;
+        }
+
+        /* The remaining logic is for the "auto" case.
+         * The CSS2 spec says that for replaced inline content, if
+         * height="auto", it should return the intrinsic height.
+         * See http://www.w3.org/TR/REC-CSS2/visudet.html#q16.
+         * However, the documentation on the fo:external-graphic and
+         * fo:instream-foreign-object say that the "content size" should be
+         * used, and then define it. */
+        final int intrinsicHeight = this.intrinsicContentHeight(context);
+
+        /* We already know that the viewport BPD is dependent on the
+         * content-height.
+         * If the content-height is also dependent on the viewport BPD, then we
+         * have a circular dependency. */
+        if (this.isContentHeightDependentOnPd(context)) {
+            /* We have a circular dependency. See if we can use the other
+             * dimension to compute this one. */
+            if (this.isViewportIpdDependent(context)) {
+                /* The viewport IPD is not specified either, so the user has
+                 * given us absolutely nothing by which to compute the
+                 * dimensions of this viewport.
+                 * We punt by returning the smaller of 1) the intrinsic height,
+                 * and 2) the height of the parent area. */
+                return Math.min(intrinsicHeight,
+                        context.bpdAncestorBlockOrRa());
+            } else {
+                /* We can use the other dimension to compute this one. */
+                final int viewportIpd = this.viewportIpd(context);
+                final int intrinsicWidth = this.intrinsicContentWidth(context);
+                final float heightToWidth = (float) intrinsicHeight
+                        / (float) intrinsicWidth;
+                return Math.round(heightToWidth * viewportIpd);
+            }
+        }
+
+        /* The content-height is not dependent on the viewport BPD, so we can
+         * compute it first, then use it to compute the viewport BPD. */
+        final float scalingFactor = this.getContentHeight(context, this);
+        return Math.round(this.intrinsicContentHeight(context) * scalingFactor);
+    }
+
+    /**
+     * Indicates whether the viewport BPD for this graphic can be computed
+     * independent of the viewport IPD.
+     * @param context An object that knows how to resolve FO Tree context
+     * issues.
+     * @return True if and only if the viewport IPD needs to be computed before the BPD
+     * can be.
+     */
+    private boolean isViewportBpdDependent(final FoContext context) {
+        final int viewportBPD = this.traitBpDimensionOpt(context);
+        if (viewportBPD != FoPropertyConstants.DIMENSION_AUTO) {
+            return false;
+        }
+        if (this.isContentHeightDependentOnPd(context)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Converts a quantity of pixels to a length in millipoints, using the
+     * value passed in pixelsPerInch.
+     * @param pixels The quantity of pixels to be converted to millipoints.
+     * @param pixelsPerInch The resolution, in pixels-per-inch, at which the
+     * conversion should take place.
+     * @return The millipoint equivalent of pixels.
+     */
+    public static int pixelsToMillipoints(final int pixels,
+            final int pixelsPerInch) {
+        return pixels * WellKnownConstants.POINTS_PER_INCH
+                * WellKnownConstants.MILLIUNITS_PER_UNIT / pixelsPerInch;
+    }
+
+    @Override
+    public int referenceIpd(final FoContext context) {
+        final int intrinsicWidth = this.intrinsicContentWidth(context);
+        final float scaling = this.getContentWidth(context, this);
+        return Math.round(intrinsicWidth * scaling);
+    }
+
+    @Override
+    public int referenceBpd(final FoContext context) {
+        final int intrinsicHeight = this.intrinsicContentHeight(context);
+        final float scaling = this.getContentHeight(context, this);
+        return Math.round(intrinsicHeight * scaling);
+    }
+
+    @Override
+    public PropertyList getPropertyList() {
+        return this.propertyList;
+    }
+
+}

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java	2021-12-21 19:37:33 UTC (rev 12257)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java	2021-12-21 19:43:22 UTC (rev 12258)
@@ -29,7 +29,6 @@
 package org.foray.fotree.fo.obj;
 
 import org.foray.fotree.FoObj;
-import org.foray.fotree.FoObjScaled;
 import org.foray.fotree.ForeignXml;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,7 +46,7 @@
 /**
  * An "instream-foreign-object" object in XSL-FO.
  */
-public class InstreamForeignObject4a extends FoObjScaled implements InstreamForeignObject {
+public class InstreamForeignObject4a extends FoScaled4a implements InstreamForeignObject {
 
     /** The parent of this node. */
     private FoObj parent;

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java	2021-12-21 19:37:33 UTC (rev 12257)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java	2021-12-21 19:43:22 UTC (rev 12258)
@@ -30,10 +30,10 @@
 
 import org.foray.common.WellKnownConstants;
 import org.foray.fotree.FoObj;
-import org.foray.fotree.FoObjScaled;
 import org.foray.fotree.PropertyException;
 import org.foray.fotree.fo.AbstractFoProperty;
 import org.foray.fotree.fo.FoValue;
+import org.foray.fotree.fo.obj.FoScaled4a;
 import org.foray.fotree.value.PropertyValue;
 
 import org.axsl.fotree.FoContext;
@@ -104,7 +104,7 @@
      * @return The scaling factor implied or stated by this property.
      */
     public float getValue(final FoContext context, final FoObj fobj,
-            final FoObjScaled fobjScaled) {
+            final FoScaled4a fobjScaled) {
         if (value().canEvalKeyword()) {
             final FoValue keyword = this.convertValueToFoValue(value());
             switch (keyword) {
@@ -159,7 +159,7 @@
      * @param context An object that knows how to resolve FO Tree context
      * issues.
      * @return True if the IPD or BPD must be known in order to for
-     * {@link #getValue(FoContext, FoObj, FoObjScaled)} to return a useful
+     * {@link #getValue(FoContext, FoObj, FoScaled4a)} to return a useful
      * amount.
      */
     public boolean dependsOnPd(final FoObj fobj, final FoContext context) {
@@ -213,7 +213,7 @@
      * value.
      * @return The inherited scaling factor.
      */
-    protected abstract float getInheritedValue(FoContext context, FoObjScaled fobjScaled, FoObj parent);
+    protected abstract float getInheritedValue(FoContext context, FoScaled4a fobjScaled, FoObj parent);
 
     /**
      * Returns either the intrinsic height or intrinsic width of the graphic,
@@ -225,7 +225,7 @@
      * @return The intrinsic dimension of the graphic on the axis being computed
      * (height for content-height, width for content-width).
      */
-    protected abstract int intrinsicContentDimension(FoObjScaled fobjScaled,
+    protected abstract int intrinsicContentDimension(FoScaled4a fobjScaled,
             FoContext context);
 
     /**
@@ -238,7 +238,7 @@
      * @return The intrinsic dimension of the graphic on the axis being computed
      * (height for content-height, width for content-width).
      */
-    protected abstract int viewportDimension(FoObjScaled fobjScaled,
+    protected abstract int viewportDimension(FoScaled4a fobjScaled,
             FoContext context);
 
     /**

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentHeight.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentHeight.java	2021-12-21 19:37:33 UTC (rev 12257)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentHeight.java	2021-12-21 19:43:22 UTC (rev 12258)
@@ -29,9 +29,9 @@
 package org.foray.fotree.fo.prop;
 
 import org.foray.fotree.FoObj;
-import org.foray.fotree.FoObjScaled;
 import org.foray.fotree.PropertyException;
 import org.foray.fotree.fo.FoProperty;
+import org.foray.fotree.fo.obj.FoScaled4a;
 
 import org.axsl.fotree.FoContext;
 
@@ -62,18 +62,18 @@
 
     @Override
     protected float getInheritedValue(final FoContext context,
-            final FoObjScaled fobjScaled, final FoObj parent) {
+            final FoScaled4a fobjScaled, final FoObj parent) {
         return parent.getContentHeight(context, fobjScaled);
     }
 
     @Override
-    protected int intrinsicContentDimension(final FoObjScaled fobjScaled,
+    protected int intrinsicContentDimension(final FoScaled4a fobjScaled,
             final FoContext context) {
         return fobjScaled.intrinsicContentHeight(context);
     }
 
     @Override
-    protected int viewportDimension(final FoObjScaled fobjScaled,
+    protected int viewportDimension(final FoScaled4a fobjScaled,
             final FoContext context) {
         return fobjScaled.viewportBpd(context);
     }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentWidth.java	2021-12-21 19:37:33 UTC (rev 12257)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentWidth.java	2021-12-21 19:43:22 UTC (rev 12258)
@@ -29,9 +29,9 @@
 package org.foray.fotree.fo.prop;
 
 import org.foray.fotree.FoObj;
-import org.foray.fotree.FoObjScaled;
 import org.foray.fotree.PropertyException;
 import org.foray.fotree.fo.FoProperty;
+import org.foray.fotree.fo.obj.FoScaled4a;
 
 import org.axsl.fotree.FoContext;
 
@@ -62,18 +62,18 @@
 
     @Override
     protected float getInheritedValue(final FoContext context,
-            final FoObjScaled fobjScaled, final FoObj parent) {
+            final FoScaled4a fobjScaled, final FoObj parent) {
         return parent.getContentWidth(context, fobjScaled);
     }
 
     @Override
-    protected int intrinsicContentDimension(final FoObjScaled fobjScaled,
+    protected int intrinsicContentDimension(final FoScaled4a fobjScaled,
             final FoContext context) {
         return fobjScaled.intrinsicContentWidth(context);
     }
 
     @Override
-    protected int viewportDimension(final FoObjScaled fobjScaled,
+    protected int viewportDimension(final FoScaled4a fobjScaled,
             final FoContext context) {
         return fobjScaled.viewportBpd(context);
     }

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

[FOray-commit] SF.net SVN: foray:[12257] trunk/foray/foray-fotree/src/main/java/org/foray /fotree/fo/obj

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

Revision: 12257
          http://sourceforge.net/p/foray/code/12257
Author:   victormote
Date:     2021-12-21 19:37:33 +0000 (Tue, 21 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Add some property accessors that have been considered unnecessary.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 17:08:41 UTC (rev 12256)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 19:37:33 UTC (rev 12257)
@@ -283,4 +283,28 @@
         return true;
     }
 
+    @Override
+    public int traitContentHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitContentWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java	2021-12-21 17:08:41 UTC (rev 12256)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java	2021-12-21 19:37:33 UTC (rev 12257)
@@ -244,4 +244,28 @@
         return true;
     }
 
+    @Override
+    public int traitContentHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitContentWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitHeight(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int traitWidth(final FoContext context) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

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

[FOray-commit] SF.net SVN: foray:[12256] trunk/foray

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

Revision: 12256
          http://sourceforge.net/p/foray/code/12256
Author:   victormote
Date:     2021-12-21 17:08:41 +0000 (Tue, 21 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Moved the default value for dimension from Fo to a new constants utility class in common.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObjScaled.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-21 15:22:02 UTC (rev 12255)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-21 17:08:41 UTC (rev 12256)
@@ -32,8 +32,8 @@
 
 import org.axsl.area.AreaTreeException;
 import org.axsl.common.value.BackgroundRepeat;
+import org.axsl.common.value.FoPropertyConstants;
 import org.axsl.common.value.RelativeAxis;
-import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.TableCell;
 import org.axsl.fotree.fo.TableRow;
@@ -94,7 +94,7 @@
 
         /* Non-standard initialization of progression dimension. */
         int startingPD = generatedBy.traitBpDimensionMin(newRow);
-        if (startingPD == Fo.DIMENSION_AUTO) {
+        if (startingPD == FoPropertyConstants.DIMENSION_AUTO) {
             startingPD = 0;
         }
         newRow.setProgressionDimension(startingPD);

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObjScaled.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObjScaled.java	2021-12-21 15:22:02 UTC (rev 12255)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObjScaled.java	2021-12-21 17:08:41 UTC (rev 12256)
@@ -30,6 +30,7 @@
 
 import org.foray.common.WellKnownConstants;
 
+import org.axsl.common.value.FoPropertyConstants;
 import org.axsl.fotree.FoContext;
 
 /**
@@ -74,7 +75,7 @@
         /* See XSL-FO Standard 1.0, Section 6.6.5 and 6.6.6, Subsection
          * "Constraints", first paragraph, for explanation of logic. */
         final int viewportIPD = this.traitIpDimensionOpt(context);
-        if (viewportIPD != FoObj.DIMENSION_AUTO) {
+        if (viewportIPD != FoPropertyConstants.DIMENSION_AUTO) {
             return viewportIPD;
         }
 
@@ -128,7 +129,7 @@
      */
     private boolean isViewportIpdDependent(final FoContext context) {
         final int viewportIPD = this.traitIpDimensionOpt(context);
-        if (viewportIPD != FoObj.DIMENSION_AUTO) {
+        if (viewportIPD != FoPropertyConstants.DIMENSION_AUTO) {
             return false;
         }
         if (this.isContentWidthDependentOnPd(context)) {
@@ -142,7 +143,7 @@
         /* See XSL-FO Standard 1.0, Section 6.6.5 and 6.6.6, Subsection
          * "Constraints", first paragraph, for explanation of logic. */
         final int viewportBPD = this.traitBpDimensionOpt(context);
-        if (viewportBPD != FoObj.DIMENSION_AUTO) {
+        if (viewportBPD != FoPropertyConstants.DIMENSION_AUTO) {
             return viewportBPD;
         }
 
@@ -196,7 +197,7 @@
      */
     private boolean isViewportBpdDependent(final FoContext context) {
         final int viewportBPD = this.traitBpDimensionOpt(context);
-        if (viewportBPD != FoObj.DIMENSION_AUTO) {
+        if (viewportBPD != FoPropertyConstants.DIMENSION_AUTO) {
             return false;
         }
         if (this.isContentHeightDependentOnPd(context)) {

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 15:22:02 UTC (rev 12255)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java	2021-12-21 17:08:41 UTC (rev 12256)
@@ -34,6 +34,7 @@
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
+import org.axsl.common.value.FoPropertyConstants;
 import org.axsl.fotree.FoContext;
 import org.axsl.fotree.FoLineNonText;
 import org.axsl.fotree.FoTreeException;
@@ -134,7 +135,7 @@
     @Override
     public int intrinsicContentWidth(final FoContext context) {
         if (getGraphic(context) == null) {
-            return FoObj.DIMENSION_AUTO;
+            return FoPropertyConstants.DIMENSION_AUTO;
         }
         try {
             if (getGraphic(context).absoluteWidth(this.pixelsPerInch) > 0) {
@@ -143,7 +144,7 @@
             return pixelsToMillipoints(getGraphic(context).pixelWidth(),
                     this.pixelsPerInch);
         } catch (final GraphicException e) {
-            return FoObj.DIMENSION_AUTO;
+            return FoPropertyConstants.DIMENSION_AUTO;
         }
     }
 
@@ -150,7 +151,7 @@
     @Override
     public int intrinsicContentHeight(final FoContext context) {
         if (getGraphic(context) == null) {
-            return FoObj.DIMENSION_AUTO;
+            return FoPropertyConstants.DIMENSION_AUTO;
         }
         try {
             if (getGraphic(context).absoluteHeight(this.pixelsPerInch) > 0) {
@@ -159,7 +160,7 @@
             return pixelsToMillipoints(getGraphic(context).pixelHeight(),
                     this.pixelsPerInch);
         } catch (final GraphicException e) {
-            return FoObj.DIMENSION_AUTO;
+            return FoPropertyConstants.DIMENSION_AUTO;
         }
     }
 

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java	2021-12-21 15:22:02 UTC (rev 12255)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java	2021-12-21 17:08:41 UTC (rev 12256)
@@ -37,6 +37,7 @@
 import org.foray.fotree.value.PropertyValue;
 
 import org.axsl.common.value.AbsoluteAxis;
+import org.axsl.common.value.FoPropertyConstants;
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.FoContext;
 
@@ -130,7 +131,7 @@
             final FoValue keyword = this.convertValueToFoValue(value());
             switch (keyword) {
             case AUTO: {
-                return FoObj.DIMENSION_AUTO;
+                return FoPropertyConstants.DIMENSION_AUTO;
             }
             case INHERIT: {
                 return getInheritValue(context, relativeAxis, fobj);

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java	2021-12-21 15:22:02 UTC (rev 12255)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java	2021-12-21 17:08:41 UTC (rev 12256)
@@ -40,6 +40,7 @@
 import org.foray.fotree.value.DtLengthRange;
 import org.foray.fotree.value.PropertyValue;
 
+import org.axsl.common.value.FoPropertyConstants;
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.FoContext;
 
@@ -123,11 +124,11 @@
                 break;
             }
             default: {
-                return FoObj.DIMENSION_AUTO;
+                return FoPropertyConstants.DIMENSION_AUTO;
             }
             }
             if (length == null) {
-                return FoObj.DIMENSION_AUTO;
+                return FoPropertyConstants.DIMENSION_AUTO;
             }
             return length.evalLength(fobj.traitFontSize(context));
         }
@@ -140,7 +141,7 @@
                 base = context.ipdAncestorBlockOrRa();
             }
             if (base < 0) {
-                return FoObj.DIMENSION_AUTO;
+                return FoPropertyConstants.DIMENSION_AUTO;
             }
             final float percentage = value().evalPercentage();
             return Math.round(percentage * base
@@ -152,7 +153,7 @@
         if (value().canEvalKeyword()) {
             final FoValue foValue = this.convertValueToFoValue(value());
             if (foValue == FoValue.AUTO) {
-                return FoObj.DIMENSION_AUTO;
+                return FoPropertyConstants.DIMENSION_AUTO;
             }
             if (foValue == FoValue.INHERIT) {
                 switch (subProperty) {
@@ -188,7 +189,7 @@
      * @return The initial value for this property.
      */
     public static int getValueNoInstance() {
-        return FoObj.DIMENSION_AUTO;
+        return FoPropertyConstants.DIMENSION_AUTO;
     }
 
     @Override

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

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

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

Revision: 12255
          http://sourceforge.net/p/foray/code/12255
Author:   victormote
Date:     2021-12-21 15:22:02 +0000 (Tue, 21 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Remove FoText dependency on traitSpaceStart and traitSpaceEnd.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-21 15:13:31 UTC (rev 12254)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2021-12-21 15:22:02 UTC (rev 12255)
@@ -524,38 +524,16 @@
         }
     }
 
-    /**
-     * Returns the "generated-by" cast as a Character formatting object if it
-     * is one.
-     * @return The "generated-by" Character, or null if this area was not
-     * generated by an fo:character.
-     */
-    private FoTextCharacters generatedByCharacter() {
-        final Fo generatedBy = this.traitGeneratedBy();
-        if (generatedBy instanceof FoTextCharacters) {
-            return (FoTextCharacters) generatedBy;
-        }
-        return null;
-    }
-
     @Override
     public int traitSpaceStartOptimum() {
-        final FoTextCharacters character = this.generatedByCharacter();
-        if (character == null) {
-            return 0;
-        } else {
-            return character.traitSpaceStartOptimum(this);
-        }
+        /* This trait is not applicable to a text area. */
+        return 0;
     }
 
     @Override
     public int traitSpaceEndOptimum() {
-        final FoTextCharacters character = this.generatedByCharacter();
-        if (character == null) {
-            return 0;
-        } else {
-            return character.traitSpaceEndOptimum(this);
-        }
+        /* This trait is not applicable to a text area. */
+        return 0;
     }
 
     /**

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

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

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

Revision: 12254
          http://sourceforge.net/p/foray/code/12254
Author:   victormote
Date:     2021-12-21 15:13:31 +0000 (Tue, 21 Dec 2021)
Log Message:
-----------
Move global dependency on space-start and space-end to AbstractInlineArea, as it only affects those objects/areas.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaFlexible.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.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/MainRa.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/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/SpanRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.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

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -229,4 +229,16 @@
         return this == lastLeaf;
     }
 
+    /**
+     * Returns the space-start optimum trait for this area.
+     * @return The space-start optimum trait for this area.
+     */
+    public abstract int traitSpaceStartOptimum();
+
+    /**
+     * Returns the space-end optimum trait for this area.
+     * @return The space-end optimum trait for this area.
+     */
+    public abstract int traitSpaceEndOptimum();
+
 }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -147,16 +147,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return 0;
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return 0;
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return -1;
     }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -573,18 +573,6 @@
     public abstract int traitSpaceAfterOptimum();
 
     /**
-     * Returns the space-start optimum trait for this area.
-     * @return The space-start optimum trait for this area.
-     */
-    public abstract int traitSpaceStartOptimum();
-
-    /**
-     * Returns the space-end optimum trait for this area.
-     * @return The space-end optimum trait for this area.
-     */
-    public abstract int traitSpaceEndOptimum();
-
-    /**
      * Tells which axis (horizontal or vertical) is the block-progression axis.
      * @return Either {@link AbsoluteAxis#HORIZONTAL} or
      * {@link AbsoluteAxis#VERTICAL}, or null if writing-mode is invalid.

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaFlexible.java	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaFlexible.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -219,15 +219,15 @@
         if (previous != null) {
             if (isBlockArea()) {
                 this.setAnteriorSpace(previous.traitSpaceAfterOptimum());
-            } else {
-                this.setAnteriorSpace(previous.traitSpaceEndOptimum());
+            } else if (previous instanceof AbstractInlineArea) {
+                this.setAnteriorSpace(((AbstractInlineArea) previous).traitSpaceEndOptimum());
             }
         }
         int spaceThisArea = 0;
         if (isBlockArea()) {
             spaceThisArea = traitSpaceBeforeOptimum();
-        } else {
-            spaceThisArea = traitSpaceStartOptimum();
+        } else if (this instanceof AbstractInlineArea) {
+            spaceThisArea = ((AbstractInlineArea) this).traitSpaceStartOptimum();
         }
         if (spaceThisArea > this.anteriorSpace) {
             this.setAnteriorSpace(spaceThisArea);

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -242,14 +242,4 @@
         return 0;
     }
 
-    @Override
-    public int traitSpaceStartOptimum() {
-        return 0;
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return 0;
-    }
-
 }

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -429,16 +429,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return traitGeneratedBy().traitSpaceStartOptimum(this);
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return traitGeneratedBy().traitSpaceEndOptimum(this);
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return traitGeneratedBy().traitIpDimensionOpt(this);
     }

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -251,14 +251,4 @@
         return 0;
     }
 
-    @Override
-    public int traitSpaceStartOptimum() {
-        return 0;
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return 0;
-    }
-
 }

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -1418,16 +1418,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return traitGeneratedBy().traitSpaceStartOptimum(this);
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return traitGeneratedBy().traitSpaceEndOptimum(this);
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return -1;
     }

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -243,16 +243,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return traitGeneratedBy().traitSpaceStartOptimum(this);
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return traitGeneratedBy().traitSpaceEndOptimum(this);
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return -1;
     }

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -320,16 +320,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return traitGeneratedBy().traitSpaceStartOptimum(this);
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return traitGeneratedBy().traitSpaceEndOptimum(this);
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return -1;
     }

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -423,14 +423,4 @@
         return 0;
     }
 
-    @Override
-    public int traitSpaceStartOptimum() {
-        return 0;
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return 0;
-    }
-
 }

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -452,16 +452,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return traitGeneratedBy().traitSpaceStartOptimum(this);
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return traitGeneratedBy().traitSpaceEndOptimum(this);
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return -1;
     }

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -336,16 +336,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return 0;
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return 0;
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return -1;
     }

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -379,7 +379,8 @@
         } else {
             viewportIpd = traitPageHeight();
         }
-        return viewportIpd - traitSpaceStartOptimum() - traitSpaceEndOptimum();
+//        return viewportIpd - traitSpaceStartOptimum() - traitSpaceEndOptimum();
+        return viewportIpd;
     }
 
     @Override
@@ -413,9 +414,9 @@
                 getWritingMode().getIpDirectionOdd();
         if (bpDirection.isVertical()) {
             if (ipDirection == AbsoluteDirection.LEFT_TO_RIGHT) {
-                return traitSpaceStartOptimum();
+                return traitStartIndent();
             } else {
-                return this.traitPageWidth() - traitSpaceStartOptimum();
+                return this.traitPageWidth() - traitStartIndent();
             }
         } else {
             /* Block-progression direction is horizontal. */
@@ -434,9 +435,9 @@
                 getWritingMode().getIpDirectionOdd();
         if (bpDirection.isHorizontal()) {
             if (ipDirection == AbsoluteDirection.TOP_TO_BOTTOM) {
-                return traitPageHeight() - traitSpaceStartOptimum();
+                return traitPageHeight() - traitStartIndent();
             } else {
-                return traitSpaceStartOptimum();
+                return traitStartIndent();
             }
         } else {
             /* Block-progression direction is vertical. */
@@ -810,16 +811,6 @@
         return traitGeneratedBy().traitStartIndent(this);
     }
 
-    @Override
-    public int traitSpaceStartOptimum() {
-        return traitGeneratedBy().traitSpaceStartOptimum(this);
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return traitGeneratedBy().traitSpaceEndOptimum(this);
-    }
-
     /**
      * Returns the page-width trait of this area.
      * @return The page-width trait of this area.

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -335,16 +335,6 @@
         return 0;
     }
 
-    @Override
-    public int traitSpaceStartOptimum() {
-        return 0;
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return 0;
-    }
-
     /**
      * Returns the extent trait for this area.
      * @return The extent trait for this area.

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -137,8 +137,8 @@
     @Override
     public int crIpd() {
         int dimension = ancestorArea().brIpd();
-        dimension -= traitSpaceStartOptimum();
-        dimension -= traitSpaceEndOptimum();
+        dimension -= traitStartIndent();
+        dimension -= traitEndIndent();
         return dimension;
     }
 
@@ -427,16 +427,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return traitGeneratedBy().traitSpaceStartOptimum(this);
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return traitGeneratedBy().traitSpaceEndOptimum(this);
-    }
-
-    @Override
     public int traitExtent() {
         /* TODO: Eliminate the need for this in the parent interface. */
         return 0;

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	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -492,16 +492,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return 0;
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return 0;
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return -1;
     }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -627,16 +627,6 @@
         return 0;
     }
 
-    @Override
-    public int traitSpaceStartOptimum() {
-        return 0;
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return 0;
-    }
-
     /**
      * Returns the display-align trait for this Area.
      * @return The display-align trait.

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -763,16 +763,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return traitGeneratedBy().traitSpaceStartOptimum(this);
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return traitGeneratedBy().traitSpaceEndOptimum(this);
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return -1;
     }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-21 05:24:46 UTC (rev 12253)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java	2021-12-21 15:13:31 UTC (rev 12254)
@@ -306,16 +306,6 @@
     }
 
     @Override
-    public int traitSpaceStartOptimum() {
-        return 0;
-    }
-
-    @Override
-    public int traitSpaceEndOptimum() {
-        return 0;
-    }
-
-    @Override
     public int traitIPDimensionOpt() {
         return -1;
     }

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

[FOray-commit] SF.net SVN: foray:[12253] trunk/foray/foray-fotree/src/main/java/org/foray /fotree/fo/obj/Character4a.java

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

Revision: 12253
          http://sourceforge.net/p/foray/code/12253
Author:   victormote
Date:     2021-12-21 05:24:46 +0000 (Tue, 21 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Adjust property inheritance in text-related classes and properties.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character4a.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character4a.java	2021-12-20 17:18:39 UTC (rev 12252)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character4a.java	2021-12-21 05:24:46 UTC (rev 12253)
@@ -35,17 +35,10 @@
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
-import org.axsl.common.value.WrapOption;
-import org.axsl.font.Font;
-import org.axsl.font.FontContext;
-import org.axsl.font.FontUse;
 import org.axsl.fotree.FoContext;
 import org.axsl.fotree.FoTreeException;
 import org.axsl.fotree.FoVisitor;
 import org.axsl.fotree.fo.Character;
-import org.axsl.fotree.fo.GraftingPoint;
-import org.axsl.orthography.Orthography;
-import org.axsl.text.line.LineText;
 
 import java.util.List;
 
@@ -118,12 +111,12 @@
         return this.getFoTree().getFONamespace();
     }
 
-    @Override
-    public CharSequence getAreaTreeText(final FoContext context) {
-        final FoTextCharacters4a text =
-                (FoTextCharacters4a) this.getChildren().get(0);
-        return text.getAreaTreeText(context);
-    }
+//    @Override
+//    public CharSequence getAreaTreeText(final FoContext context) {
+//        final FoTextCharacters4a text =
+//                (FoTextCharacters4a) this.getChildren().get(0);
+//        return text.getAreaTreeText(context);
+//    }
 
     @Override
     public <T> T acceptVisitor(final FoVisitor<T> visitor) {
@@ -157,94 +150,94 @@
         return this.propertyList;
     }
 
-    @Override
-    public CharSequence inlineText() {
-        return this.inlineText(null);
-    }
-
-    @Override
-    public CharSequence inlineText(final FoContext context) {
-        return getAreaTreeText(context);
-    }
-
-    @Override
-    public FontUse inlinePrimaryFont() {
-        return this.inlinePrimaryFont(null);
-    }
-
-    @Override
-    public FontUse inlinePrimaryFont(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.getPrimaryFont(context);
-    }
-
-    @Override
-    public FontUse inlineSecondaryFont(final char c) {
-        return this.inlineSecondaryFont(null, c);
-    }
-
-    @Override
-    public FontUse inlineSecondaryFont(final FoContext context, final char c) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.getSecondaryFont(context, c);
-    }
-
-    @Override
-    public int inlineFontSize() {
-        return this.inlineFontSize(null);
-    }
-
-    @Override
-    public int inlineFontSize(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.traitFontSize(context);
-    }
-
-    @Override
-    public int inlineLetterSpacingOptimum() {
-        return this.inlineLetterSpacingOptimum(null);
-    }
-
-    @Override
-    public int inlineLetterSpacingOptimum(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.traitLetterSpacingOpt(context);
-    }
-
-    @Override
-    public int inlineWordSpacingOptimum() {
-        return this.inlineWordSpacingOptimum(null);
-    }
-
-    @Override
-    public int inlineWordSpacingOptimum(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.traitWordSpacingOpt(context);
-    }
-
-    @Override
-    public boolean inlineWrapOption() {
-        return this.inlineWrapOption(null);
-    }
-
-    @Override
-    public boolean inlineWrapOption(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.traitWrapOption(context)
-                == WrapOption.WRAP;
-    }
-
-    @Override
-    public boolean inlineHyphenate() {
-        return this.inlineHyphenate(null);
-    }
-
-    @Override
-    public boolean inlineHyphenate(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.traitHyphenate(context);
-    }
-
+//    @Override
+//    public CharSequence inlineText() {
+//        return this.inlineText(null);
+//    }
+//
+//    @Override
+//    public CharSequence inlineText(final FoContext context) {
+//        return getAreaTreeText(context);
+//    }
+//
+//    @Override
+//    public FontUse inlinePrimaryFont() {
+//        return this.inlinePrimaryFont(null);
+//    }
+//
+//    @Override
+//    public FontUse inlinePrimaryFont(final FoContext context) {
+//        final FoObj effectiveParent = effectiveParent(context);
+//        return effectiveParent.getPrimaryFont(context);
+//    }
+//
+//    @Override
+//    public FontUse inlineSecondaryFont(final char c) {
+//        return this.inlineSecondaryFont(null, c);
+//    }
+//
+//    @Override
+//    public FontUse inlineSecondaryFont(final FoContext context, final char c) {
+//        final FoObj effectiveParent = effectiveParent(context);
+//        return effectiveParent.getSecondaryFont(context, c);
+//    }
+//
+//    @Override
+//    public int inlineFontSize() {
+//        return this.inlineFontSize(null);
+//    }
+//
+//    @Override
+//    public int inlineFontSize(final FoContext context) {
+//        final FoObj effectiveParent = effectiveParent(context);
+//        return effectiveParent.traitFontSize(context);
+//    }
+//
+//    @Override
+//    public int inlineLetterSpacingOptimum() {
+//        return this.inlineLetterSpacingOptimum(null);
+//    }
+//
+//    @Override
+//    public int inlineLetterSpacingOptimum(final FoContext context) {
+//        final FoObj effectiveParent = effectiveParent(context);
+//        return effectiveParent.traitLetterSpacingOpt(context);
+//    }
+//
+//    @Override
+//    public int inlineWordSpacingOptimum() {
+//        return this.inlineWordSpacingOptimum(null);
+//    }
+//
+//    @Override
+//    public int inlineWordSpacingOptimum(final FoContext context) {
+//        final FoObj effectiveParent = effectiveParent(context);
+//        return effectiveParent.traitWordSpacingOpt(context);
+//    }
+//
+//    @Override
+//    public boolean inlineWrapOption() {
+//        return this.inlineWrapOption(null);
+//    }
+//
+//    @Override
+//    public boolean inlineWrapOption(final FoContext context) {
+//        final FoObj effectiveParent = effectiveParent(context);
+//        return effectiveParent.traitWrapOption(context)
+//                == WrapOption.WRAP;
+//    }
+//
+//    @Override
+//    public boolean inlineHyphenate() {
+//        return this.inlineHyphenate(null);
+//    }
+//
+//    @Override
+//    public boolean inlineHyphenate(final FoContext context) {
+//        final FoObj effectiveParent = effectiveParent(context);
+//        return effectiveParent.traitHyphenate(context);
+//    }
+//
     /**
      * Returns the language code for this node.
      * @return The language code for this node.
@@ -272,113 +265,8 @@
         return effectiveParent.traitScript(null);
     }
 
-    @Override
-    public Orthography inlineOrthography() {
-        return this.getOrthography();
-    }
 
     @Override
-    public int inlineHyphenationRemainCount() {
-        return this.inlineHyphenationRemainCount(null);
-    }
-
-    @Override
-    public int inlineHyphenationRemainCount(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.traitHyphenationRemainCharacterCount(context);
-    }
-
-    @Override
-    public int inlineHyphenationPushCount() {
-        return this.inlineHyphenationPushCount(null);
-    }
-
-    @Override
-    public int inlineHyphenationPushCount(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.traitHyphenationPushCharacterCount(context);
-    }
-
-    @Override
-    public int inlineHyphenationCharacter() {
-        return this.inlineHyphenationCharacter(null);
-    }
-
-    @Override
-    public int inlineHyphenationCharacter(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.traitHyphenationCharacter(context);
-    }
-
-    @Override
-    public boolean inlineIsFauxSmallCaps() {
-        return this.inlineIsFauxSmallCaps(null);
-    }
-
-    @Override
-    public boolean inlineIsFauxSmallCaps(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        if (effectiveParent.traitFontVariant(context)
-                != Font.Variant.SMALL_CAPS) {
-            return false;
-        }
-        /*
-         * TODO: The other thing we would like to do here is see whether the
-         * font itself handles small-caps. If so, we should use that instead of
-         * the faux version. Right now, for this to work, the user needs to
-         * select a font with small-caps support and then turn
-         * font-variant="normal".
-         */
-        return true;
-    }
-
-    @Override
-    public int inlineFauxSmallCapsFontSize() {
-        return this.inlineFauxSmallCapsFontSize(null);
-    }
-
-    @Override
-    public int inlineFauxSmallCapsFontSize(final FoContext context) {
-        final FoObj effectiveParent = effectiveParent(context);
-        return effectiveParent.getFauxSmallCapFontSize(context);
-    }
-
-    @Override
-    public LineText nextContiguousLineText() {
-        return getNextContiguousTextInBlock();
-    }
-
-    @Override
-    public LineText previousContiguousLineText() {
-        return getPreviousContiguousTextInBlock();
-    }
-
-    @Override
-    public boolean isLastItemInBlock() {
-        return this.getNextSibling() == null;
-    }
-
-    @Override
-    public org.axsl.fotree.FoLineText getContextWrapper(final FoContext context) {
-        final org.axsl.fotree.fo.Marker marker = this.ancestorMarker();
-        if (marker == null) {
-            return this;
-        }
-        return new org.foray.fotree.FoLineText(this, context);
-    }
-
-    @Override
-    public org.axsl.fotree.FoLineText getWrapped() {
-        /* This is the wrapped item. */
-        return this;
-    }
-
-    @Override
-    public GraftingPoint getGraftingPoint() {
-        return null;
-    }
-
-    @Override
     public org.axsl.font.FontUse getPrimaryFont(final FoContext context) {
         if (this.resolvedFont == null) {
             this.resolvedFont = resolvePrimaryFont(context);
@@ -397,12 +285,6 @@
     }
 
     @Override
-    public FontContext inlineFontContext() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
     public boolean canHaveMarkerChildren() {
         return false;
     }

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