[FOray-commit] SF.net SVN: foray:[12167] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[12167] trunk/foray
|
From: <vic...@us...> - 2021-12-02 15:43:13
|
Revision: 12167
http://sourceforge.net/p/foray/code/12167
Author: victormote
Date: 2021-12-02 15:43:07 +0000 (Thu, 02 Dec 2021)
Log Message:
-----------
(partial) Rename some FOray FO implementation classes for clarity.
Modified Paths:
--------------
trunk/foray/foray-app/src/test/java/org/foray/app/fo/AbstractFoTreeTest.java
trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestFont.java
trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestGraphic.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/ObjectMakerFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractPageReference.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageMasterResolver.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequence.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/RegionNameSpecifier.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/RepeatablePmAlternatives.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Root.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Title.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentAdjust.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextDecoration.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/MathObjectMaker.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/obj/InstreamMathElement.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/ObjectMakerSvg.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/obj/InstreamSvgElement.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java
Added Paths:
-----------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java
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/Bookmark4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTree4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarBegin4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarEnd4a.java
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/ColorProfile4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Declarations4a.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/Float4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Flow4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowAssignment4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowMap4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowNameSpecifier4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowSourceList4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowTargetList4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FolioPrefix4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FolioSuffix4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Footnote4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FootnoteBody4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexKeyReference4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationList4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationListSeparator4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationRangeSeparator4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageNumberPrefix4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageNumberSuffix4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeBegin4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeEnd4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InitialPropertySet4a.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/InstreamForeignObject4a.java
Removed Paths:
-------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockContainer.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Bookmark.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTree.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarBegin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarEnd.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ColorProfile.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Declarations.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Float.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Flow.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowAssignment.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowMap.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowNameSpecifier.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowSourceList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowTargetList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FolioPrefix.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FolioSuffix.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Footnote.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FootnoteBody.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexKeyReference.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationListSeparator.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationRangeSeparator.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageNumberPrefix.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageNumberSuffix.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeBegin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeEnd.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InitialPropertySet.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Inline.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InlineContainer.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/fo/AbstractFoTreeTest.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/fo/AbstractFoTreeTest.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/fo/AbstractFoTreeTest.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -30,7 +30,7 @@
import org.foray.fotree.FoObj;
import org.foray.fotree.FoTree4a;
-import org.foray.fotree.fo.obj.Flow;
+import org.foray.fotree.fo.obj.Flow4a;
import org.foray.fotree.fo.obj.PageSequence;
import org.foray.fotree.fo.obj.Root;
@@ -46,14 +46,14 @@
* @param foTree The fo tree whose first flow is needed.
* @return The first flow in {@code foTree}.
*/
- protected Flow getFlow(final FoTree4a foTree) {
+ protected Flow4a getFlow(final FoTree4a foTree) {
final Root root = foTree.getRootFo();
FoObj node = root.getChildAt(1);
Assert.assertTrue(node instanceof PageSequence);
final PageSequence sequence = (PageSequence) node;
node = sequence.getChildAt(0);
- Assert.assertTrue(node instanceof Flow);
- final Flow flow = (Flow) node;
+ Assert.assertTrue(node instanceof Flow4a);
+ final Flow4a flow = (Flow4a) node;
return flow;
}
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestFont.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestFont.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestFont.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -31,8 +31,8 @@
import org.foray.core.ForayException;
import org.foray.fotree.FoObj;
import org.foray.fotree.FoTree4a;
-import org.foray.fotree.fo.obj.Block;
-import org.foray.fotree.fo.obj.Flow;
+import org.foray.fotree.fo.obj.Block4a;
+import org.foray.fotree.fo.obj.Flow4a;
import org.axsl.font.Font;
@@ -57,11 +57,11 @@
final FoDocumentReader reader = FoDocumentReader.getInstance();
final FoTree4a foTree = reader.buildFoTree(
"fo/font-family-001.fo");
- final Flow flow = this.getFlow(foTree);
+ final Flow4a flow = this.getFlow(foTree);
FoObj node = flow.getChildAt(0);
- Assert.assertTrue(node instanceof Block);
- Block block = (Block) node;
+ Assert.assertTrue(node instanceof Block4a);
+ Block4a block = (Block4a) node;
List<String> fontFamilies = block.traitFontFamily(null);
Assert.assertEquals(1, fontFamilies.size());
/* The default font-family is "serif". */
@@ -68,8 +68,8 @@
Assert.assertEquals("serif", fontFamilies.get(0));
node = flow.getChildAt(1);
- Assert.assertTrue(node instanceof Block);
- block = (Block) node;
+ Assert.assertTrue(node instanceof Block4a);
+ block = (Block4a) node;
fontFamilies = block.traitFontFamily(null);
Assert.assertEquals(1, fontFamilies.size());
Assert.assertEquals("Base14-Courier", fontFamilies.get(0));
@@ -87,24 +87,24 @@
public void testFontSize001() throws ForayException {
final FoDocumentReader reader = FoDocumentReader.getInstance();
final FoTree4a foTree = reader.buildFoTree("fo/font-size-001.fo");
- final Flow flow = this.getFlow(foTree);
+ final Flow4a flow = this.getFlow(foTree);
FoObj node = flow.getChildAt(0);
- Assert.assertTrue(node instanceof Block);
- Block block = (Block) node;
+ Assert.assertTrue(node instanceof Block4a);
+ Block4a block = (Block4a) node;
int fontSize = block.traitFontSize(null);
/* The default font size is 12 points. */
Assert.assertEquals(12000, fontSize);
node = flow.getChildAt(1);
- Assert.assertTrue(node instanceof Block);
- block = (Block) node;
+ Assert.assertTrue(node instanceof Block4a);
+ block = (Block4a) node;
fontSize = block.traitFontSize(null);
Assert.assertEquals(8000, fontSize);
node = flow.getChildAt(2);
- Assert.assertTrue(node instanceof Block);
- block = (Block) node;
+ Assert.assertTrue(node instanceof Block4a);
+ block = (Block4a) node;
final Font font = node.getPrimaryFont(null).getFont();
Assert.assertEquals("Courier", font.getFamilyName());
Assert.assertEquals(426, font.getXheight(1000));
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestGraphic.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestGraphic.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestGraphic.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -31,9 +31,9 @@
import org.foray.core.ForayException;
import org.foray.fotree.FoObj;
import org.foray.fotree.FoTree4a;
-import org.foray.fotree.fo.obj.Block;
-import org.foray.fotree.fo.obj.Flow;
-import org.foray.fotree.fo.obj.InstreamForeignObject;
+import org.foray.fotree.fo.obj.Block4a;
+import org.foray.fotree.fo.obj.Flow4a;
+import org.foray.fotree.fo.obj.InstreamForeignObject4a;
import org.foray.fotree.svg.obj.InstreamSvgElement;
import org.junit.Assert;
@@ -52,17 +52,17 @@
final FoDocumentReader reader = FoDocumentReader.getInstance();
final FoTree4a foTree = reader.buildFoTree(
"fo/graphic-001.fo");
- final Flow flow = this.getFlow(foTree);
+ final Flow4a flow = this.getFlow(foTree);
/* The second child should be a block ... */
FoObj node = flow.getChildAt(1);
- Assert.assertTrue(node instanceof Block);
- final Block block = (Block) node;
+ Assert.assertTrue(node instanceof Block4a);
+ final Block4a block = (Block4a) node;
/* ... which contains an InstreamForeignObject ... */
node = block.getChildAt(0);
- Assert.assertTrue(node instanceof InstreamForeignObject);
- final InstreamForeignObject ifo = (InstreamForeignObject) node;
+ Assert.assertTrue(node instanceof InstreamForeignObject4a);
+ final InstreamForeignObject4a ifo = (InstreamForeignObject4a) node;
/* ... which contains an SVGElement ... */
node = ifo.getChildAt(0);
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-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -43,10 +43,10 @@
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.BasicLink;
-import org.foray.fotree.fo.obj.Block;
+import org.foray.fotree.fo.obj.BasicLink4a;
+import org.foray.fotree.fo.obj.Block4a;
import org.foray.fotree.fo.obj.CharacterSequence4a;
-import org.foray.fotree.fo.obj.Flow;
+import org.foray.fotree.fo.obj.Flow4a;
import org.foray.fotree.fo.obj.Leader;
import org.foray.fotree.fo.obj.ListBlock;
import org.foray.fotree.fo.obj.ListItem;
@@ -636,18 +636,18 @@
* the nearest ancestor that is a Block, or null if there is no ancestor
* Block.
*/
- public Block getContainingBlock(final FoContext context) {
+ public Block4a getContainingBlock(final FoContext context) {
return effectiveParent(context).getContainingBlock(context);
}
/**
- * Returns the ancestor {@link Flow}, if any.
+ * Returns the ancestor {@link Flow4a}, if any.
* @param context An object that knows how to resolve FO Tree context
* issues.
- * @return The ancestor {@link Flow}, or null if this object does not
- * descend from a {@link Flow}.
+ * @return The ancestor {@link Flow4a}, or null if this object does not
+ * descend from a {@link Flow4a}.
*/
- public Flow ancestorFlow(final FoContext context) {
+ public Flow4a ancestorFlow(final FoContext context) {
if (getParent() == null) {
return null;
}
@@ -685,7 +685,7 @@
}
@Override
- public BasicLink ancestorBasicLink(final FoContext context) {
+ public BasicLink4a ancestorBasicLink(final FoContext context) {
return effectiveParent(context).ancestorBasicLink(context);
}
@@ -3697,9 +3697,9 @@
if (thisLeader != testLeader) {
return null;
}
- final Block thisBlock =
+ final Block4a thisBlock =
this.effectiveParent(context).getContainingBlock(context);
- final Block testBlock = leafToTest.effectiveParent(context)
+ final Block4a testBlock = leafToTest.effectiveParent(context)
.getContainingBlock(context);
if (thisBlock != testBlock) {
return null;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -28,7 +28,7 @@
package org.foray.fotree;
-import org.foray.fotree.fo.obj.InstreamForeignObject;
+import org.foray.fotree.fo.obj.InstreamForeignObject4a;
import org.axsl.fo.FoContext;
import org.axsl.fo.FoTreeException;
@@ -60,12 +60,12 @@
* All other elements of the foreign XML are added to the DOM instance, which
* is encapsulated in the ForeignXml instance.</p>
*
- * @see InstreamForeignObject
+ * @see InstreamForeignObject4a
*/
public abstract class ForeignXml extends FoObj implements org.axsl.fo.FoForeignXml {
/** The parent of this node. */
- private InstreamForeignObject parent;
+ private InstreamForeignObject4a parent;
/** The property list for this object. */
private PropertyList propertyList;
@@ -92,7 +92,7 @@
* @param propertyList The property list for this FoObj.
* @throws FoTreeException For errors during construction.
*/
- public ForeignXml(final InstreamForeignObject parent,
+ public ForeignXml(final InstreamForeignObject4a parent,
final PropertyListUnparsed propertyList) throws FoTreeException {
super(parent);
this.parent = parent;
@@ -256,7 +256,7 @@
public abstract int intrinsicContentHeight();
@Override
- public InstreamForeignObject getParent() {
+ public InstreamForeignObject4a getParent() {
return this.parent;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -38,7 +38,7 @@
import org.foray.fotree.axsl.prop.AxslEnumerated;
import org.foray.fotree.fo.obj.AbstractCharacterSequence;
import org.foray.fotree.fo.obj.CharacterSequence4a;
-import org.foray.fotree.fo.obj.Declarations;
+import org.foray.fotree.fo.obj.Declarations4a;
import org.axsl.common.value.LinefeedTreatment;
import org.axsl.common.value.TextTransform;
@@ -74,7 +74,7 @@
@Override
protected void validateAncestry() throws FoTreeException {
- if (! (this.parent instanceof Declarations)) {
+ if (! (this.parent instanceof Declarations4a)) {
throwException(this.getFullName()
+ " must be child of fo:declarations.");
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/ObjectMakerFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/ObjectMakerFo.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/ObjectMakerFo.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -32,43 +32,43 @@
import org.foray.fotree.FoTree4a;
import org.foray.fotree.PropertyList;
import org.foray.fotree.fo.obj.AbstractTablePart;
-import org.foray.fotree.fo.obj.BasicLink;
-import org.foray.fotree.fo.obj.BidiOverride;
-import org.foray.fotree.fo.obj.Block;
-import org.foray.fotree.fo.obj.BlockContainer;
-import org.foray.fotree.fo.obj.Bookmark;
-import org.foray.fotree.fo.obj.BookmarkTitle;
-import org.foray.fotree.fo.obj.BookmarkTree;
-import org.foray.fotree.fo.obj.ChangeBarBegin;
-import org.foray.fotree.fo.obj.ChangeBarEnd;
-import org.foray.fotree.fo.obj.Character;
-import org.foray.fotree.fo.obj.ColorProfile;
-import org.foray.fotree.fo.obj.ConditionalPageMasterReference;
-import org.foray.fotree.fo.obj.Declarations;
-import org.foray.fotree.fo.obj.ExternalGraphic;
-import org.foray.fotree.fo.obj.Float;
-import org.foray.fotree.fo.obj.Flow;
-import org.foray.fotree.fo.obj.FlowAssignment;
-import org.foray.fotree.fo.obj.FlowMap;
-import org.foray.fotree.fo.obj.FlowNameSpecifier;
-import org.foray.fotree.fo.obj.FlowSourceList;
-import org.foray.fotree.fo.obj.FlowTargetList;
-import org.foray.fotree.fo.obj.FolioPrefix;
-import org.foray.fotree.fo.obj.FolioSuffix;
-import org.foray.fotree.fo.obj.Footnote;
-import org.foray.fotree.fo.obj.FootnoteBody;
-import org.foray.fotree.fo.obj.IndexKeyReference;
-import org.foray.fotree.fo.obj.IndexPageCitationList;
-import org.foray.fotree.fo.obj.IndexPageCitationListSeparator;
-import org.foray.fotree.fo.obj.IndexPageCitationRangeSeparator;
-import org.foray.fotree.fo.obj.IndexPageNumberPrefix;
-import org.foray.fotree.fo.obj.IndexPageNumberSuffix;
-import org.foray.fotree.fo.obj.IndexRangeBegin;
-import org.foray.fotree.fo.obj.IndexRangeEnd;
-import org.foray.fotree.fo.obj.InitialPropertySet;
-import org.foray.fotree.fo.obj.Inline;
-import org.foray.fotree.fo.obj.InlineContainer;
-import org.foray.fotree.fo.obj.InstreamForeignObject;
+import org.foray.fotree.fo.obj.BasicLink4a;
+import org.foray.fotree.fo.obj.BidiOverride4a;
+import org.foray.fotree.fo.obj.Block4a;
+import org.foray.fotree.fo.obj.BlockContainer4a;
+import org.foray.fotree.fo.obj.Bookmark4a;
+import org.foray.fotree.fo.obj.BookmarkTitle4a;
+import org.foray.fotree.fo.obj.BookmarkTree4a;
+import org.foray.fotree.fo.obj.ChangeBarBegin4a;
+import org.foray.fotree.fo.obj.ChangeBarEnd4a;
+import org.foray.fotree.fo.obj.Character4a;
+import org.foray.fotree.fo.obj.ColorProfile4a;
+import org.foray.fotree.fo.obj.ConditionalPageMasterReference4a;
+import org.foray.fotree.fo.obj.Declarations4a;
+import org.foray.fotree.fo.obj.ExternalGraphic4a;
+import org.foray.fotree.fo.obj.Float4a;
+import org.foray.fotree.fo.obj.Flow4a;
+import org.foray.fotree.fo.obj.FlowAssignment4a;
+import org.foray.fotree.fo.obj.FlowMap4a;
+import org.foray.fotree.fo.obj.FlowNameSpecifier4a;
+import org.foray.fotree.fo.obj.FlowSourceList4a;
+import org.foray.fotree.fo.obj.FlowTargetList4a;
+import org.foray.fotree.fo.obj.FolioPrefix4a;
+import org.foray.fotree.fo.obj.FolioSuffix4a;
+import org.foray.fotree.fo.obj.Footnote4a;
+import org.foray.fotree.fo.obj.FootnoteBody4a;
+import org.foray.fotree.fo.obj.IndexKeyReference4a;
+import org.foray.fotree.fo.obj.IndexPageCitationList4a;
+import org.foray.fotree.fo.obj.IndexPageCitationListSeparator4a;
+import org.foray.fotree.fo.obj.IndexPageCitationRangeSeparator4a;
+import org.foray.fotree.fo.obj.IndexPageNumberPrefix4a;
+import org.foray.fotree.fo.obj.IndexPageNumberSuffix4a;
+import org.foray.fotree.fo.obj.IndexRangeBegin4a;
+import org.foray.fotree.fo.obj.IndexRangeEnd4a;
+import org.foray.fotree.fo.obj.InitialPropertySet4a;
+import org.foray.fotree.fo.obj.Inline4a;
+import org.foray.fotree.fo.obj.InlineContainer4a;
+import org.foray.fotree.fo.obj.InstreamForeignObject4a;
import org.foray.fotree.fo.obj.LayoutMasterSet;
import org.foray.fotree.fo.obj.Leader;
import org.foray.fotree.fo.obj.ListBlock;
@@ -150,126 +150,126 @@
}
switch (enumeration) {
case BASIC_LINK: {
- return new BasicLink(parent, propertyList);
+ return new BasicLink4a(parent, propertyList);
}
case BIDI_OVERRIDE: {
- return new BidiOverride(parent, propertyList);
+ return new BidiOverride4a(parent, propertyList);
}
case BLOCK: {
- return new Block(parent, propertyList);
+ return new Block4a(parent, propertyList);
}
case BLOCK_CONTAINER: {
- return new BlockContainer(parent, propertyList);
+ return new BlockContainer4a(parent, propertyList);
}
case BOOKMARK: {
- return new Bookmark(parent, propertyList);
+ return new Bookmark4a(parent, propertyList);
}
case BOOKMARK_TITLE: {
- return new BookmarkTitle(parent, propertyList);
+ return new BookmarkTitle4a(parent, propertyList);
}
case BOOKMARK_TREE: {
- return new BookmarkTree(parent, propertyList);
+ return new BookmarkTree4a(parent, propertyList);
}
case CHANGE_BAR_BEGIN: {
- return new ChangeBarBegin(parent, propertyList);
+ return new ChangeBarBegin4a(parent, propertyList);
}
case CHANGE_BAR_END: {
- return new ChangeBarEnd(parent, propertyList);
+ return new ChangeBarEnd4a(parent, propertyList);
}
case CHARACTER: {
- return new Character(parent, propertyList);
+ return new Character4a(parent, propertyList);
}
case COLOR_PROFILE: {
- return new ColorProfile(parent, propertyList);
+ return new ColorProfile4a(parent, propertyList);
}
case CONDITIONAL_PAGE_MASTER_REFERENCE: {
- return new ConditionalPageMasterReference(parent, propertyList);
+ return new ConditionalPageMasterReference4a(parent, propertyList);
}
case DECLARATIONS: {
- return new Declarations(parent, propertyList);
+ return new Declarations4a(parent, propertyList);
}
case EXTERNAL_GRAPHIC: {
- return new ExternalGraphic(parent, propertyList);
+ return new ExternalGraphic4a(parent, propertyList);
}
case FLOAT: {
- return new Float(parent, propertyList);
+ return new Float4a(parent, propertyList);
}
case FLOW: {
final PageSequence pageSequence = parentPageSequence(enumeration,
parent, locator);
- return new Flow(pageSequence, propertyList);
+ return new Flow4a(pageSequence, propertyList);
}
case FLOW_ASSIGNMENT: {
- final FlowMap flowMap = parentFlowMap(enumeration, parent, locator);
- return new FlowAssignment(flowMap, propertyList);
+ final FlowMap4a flowMap = parentFlowMap(enumeration, parent, locator);
+ return new FlowAssignment4a(flowMap, propertyList);
}
case FLOW_MAP: {
final LayoutMasterSet layoutMasterSet = parentLayoutMasterSet(
enumeration, parent, locator);
- return new FlowMap(layoutMasterSet, propertyList);
+ return new FlowMap4a(layoutMasterSet, propertyList);
}
case FLOW_NAME_SPECIFIER: {
- final FlowSourceList flowSourceList = parentFlowSourceList(
+ final FlowSourceList4a flowSourceList = parentFlowSourceList(
enumeration, parent, locator);
- return new FlowNameSpecifier(flowSourceList, propertyList);
+ return new FlowNameSpecifier4a(flowSourceList, propertyList);
}
case FLOW_SOURCE_LIST: {
- final FlowAssignment flowAssignment = parentFlowAssignment(
+ final FlowAssignment4a flowAssignment = parentFlowAssignment(
enumeration, parent, locator);
- return new FlowSourceList(flowAssignment, propertyList);
+ return new FlowSourceList4a(flowAssignment, propertyList);
}
case FLOW_TARGET_LIST: {
- final FlowAssignment flowAssignment = parentFlowAssignment(
+ final FlowAssignment4a flowAssignment = parentFlowAssignment(
enumeration, parent, locator);
- return new FlowTargetList(flowAssignment, propertyList);
+ return new FlowTargetList4a(flowAssignment, propertyList);
}
case FOLIO_PREFIX: {
- return new FolioPrefix(parent, propertyList);
+ return new FolioPrefix4a(parent, propertyList);
}
case FOLIO_SUFFIX: {
- return new FolioSuffix(parent, propertyList);
+ return new FolioSuffix4a(parent, propertyList);
}
case FOOTNOTE: {
- return new Footnote(parent, propertyList);
+ return new Footnote4a(parent, propertyList);
}
case FOOTNOTE_BODY: {
- return new FootnoteBody(parent, propertyList);
+ return new FootnoteBody4a(parent, propertyList);
}
case INDEX_KEY_REFERENCE: {
- return new IndexKeyReference(parent, propertyList);
+ return new IndexKeyReference4a(parent, propertyList);
}
case INDEX_PAGE_CITATION_LIST: {
- return new IndexPageCitationList(parent, propertyList);
+ return new IndexPageCitationList4a(parent, propertyList);
}
case INDEX_PAGE_CITATION_LIST_SEPARATOR: {
- return new IndexPageCitationListSeparator(parent, propertyList);
+ return new IndexPageCitationListSeparator4a(parent, propertyList);
}
case INDEX_PAGE_CITATION_RANGE_SEPARATOR: {
- return new IndexPageCitationRangeSeparator(parent, propertyList);
+ return new IndexPageCitationRangeSeparator4a(parent, propertyList);
}
case INDEX_PAGE_NUMBER_PREFIX: {
- return new IndexPageNumberPrefix(parent, propertyList);
+ return new IndexPageNumberPrefix4a(parent, propertyList);
}
case INDEX_PAGE_NUMBER_SUFFIX: {
- return new IndexPageNumberSuffix(parent, propertyList);
+ return new IndexPageNumberSuffix4a(parent, propertyList);
}
case INDEX_RANGE_BEGIN: {
- return new IndexRangeBegin(parent, propertyList);
+ return new IndexRangeBegin4a(parent, propertyList);
}
case INDEX_RANGE_END: {
- return new IndexRangeEnd(parent, propertyList);
+ return new IndexRangeEnd4a(parent, propertyList);
}
case INITIAL_PROPERTY_SET: {
- return new InitialPropertySet(parent, propertyList);
+ return new InitialPropertySet4a(parent, propertyList);
}
case INLINE: {
- return new Inline(parent, propertyList);
+ return new Inline4a(parent, propertyList);
}
case INLINE_CONTAINER: {
- return new InlineContainer(parent, propertyList);
+ return new InlineContainer4a(parent, propertyList);
}
case INSTREAM_FOREIGN_OBJECT: {
- return new InstreamForeignObject(parent, propertyList);
+ return new InstreamForeignObject4a(parent, propertyList);
}
case LAYOUT_MASTER_SET: {
final Root root = parentRoot(enumeration, parent, locator);
@@ -348,7 +348,7 @@
return new RegionEnd(simplePageMaster, propertyList);
}
case REGION_NAME_SPECIFIER: {
- final FlowTargetList flowTargetList = parentFlowTargetList(
+ final FlowTargetList4a flowTargetList = parentFlowTargetList(
enumeration, parent, locator);
return new RegionNameSpecifier(flowTargetList, propertyList);
}
@@ -574,21 +574,21 @@
}
/**
- * Converts the parent object to a {@link FlowMap} if it can, or
+ * Converts the parent object to a {@link FlowMap4a} if it can, or
* throws an exception otherwise.
* @param newObject The type of the new object to be created.
* @param parent The parent object.
* @param locator The SAX locator describing the location of the object
* that is trying to be constructed.
- * @return The parent object cast as a {@link FlowMap}.
+ * @return The parent object cast as a {@link FlowMap4a}.
* @throws FoTreeException If parent cannot be converted to a
- * {@link FlowMap}.
+ * {@link FlowMap4a}.
*/
- private static FlowMap parentFlowMap(
+ private static FlowMap4a parentFlowMap(
final FoObject newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
- if (parent instanceof FlowMap) {
- return (FlowMap) parent;
+ if (parent instanceof FlowMap4a) {
+ return (FlowMap4a) parent;
}
throwException(locator, "fo:" + newObject.toXslFo()
+ " must be child of fo:flow-map.");
@@ -596,21 +596,21 @@
}
/**
- * Converts the parent object to a {@link FlowTargetList} if it can, or
+ * Converts the parent object to a {@link FlowTargetList4a} if it can, or
* throws an exception otherwise.
* @param newObject The type of the new object to be created.
* @param parent The parent object.
* @param locator The SAX locator describing the location of the object
* that is trying to be constructed.
- * @return The parent object cast as a {@link FlowTargetList}.
+ * @return The parent object cast as a {@link FlowTargetList4a}.
* @throws FoTreeException If parent cannot be converted to a
- * {@link FlowTargetList}.
+ * {@link FlowTargetList4a}.
*/
- private static FlowAssignment parentFlowAssignment(
+ private static FlowAssignment4a parentFlowAssignment(
final FoObject newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
- if (parent instanceof FlowAssignment) {
- return (FlowAssignment) parent;
+ if (parent instanceof FlowAssignment4a) {
+ return (FlowAssignment4a) parent;
}
throwException(locator, "fo:" + newObject.toXslFo()
+ " must be child of fo:flow-assignment.");
@@ -618,21 +618,21 @@
}
/**
- * Converts the parent object to a {@link FlowTargetList} if it can, or
+ * Converts the parent object to a {@link FlowTargetList4a} if it can, or
* throws an exception otherwise.
* @param newObject The type of the new object to be created.
* @param parent The parent object.
* @param locator The SAX locator describing the location of the object
* that is trying to be constructed.
- * @return The parent object cast as a {@link FlowTargetList}.
+ * @return The parent object cast as a {@link FlowTargetList4a}.
* @throws FoTreeException If parent cannot be converted to a
- * {@link FlowTargetList}.
+ * {@link FlowTargetList4a}.
*/
- private static FlowTargetList parentFlowTargetList(
+ private static FlowTargetList4a parentFlowTargetList(
final FoObject newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
- if (parent instanceof FlowTargetList) {
- return (FlowTargetList) parent;
+ if (parent instanceof FlowTargetList4a) {
+ return (FlowTargetList4a) parent;
}
throwException(locator, "fo:" + newObject.toXslFo()
+ " must be child of fo:flow-target-list.");
@@ -640,21 +640,21 @@
}
/**
- * Converts the parent object to a {@link FlowSourceList} if it can, or
+ * Converts the parent object to a {@link FlowSourceList4a} if it can, or
* throws an exception otherwise.
* @param newObject The type of the new object to be created.
* @param parent The parent object.
* @param locator The SAX locator describing the location of the object
* that is trying to be constructed.
- * @return The parent object cast as a {@link FlowSourceList}.
+ * @return The parent object cast as a {@link FlowSourceList4a}.
* @throws FoTreeException If parent cannot be converted to a
- * {@link FlowSourceList}.
+ * {@link FlowSourceList4a}.
*/
- private static FlowSourceList parentFlowSourceList(
+ private static FlowSourceList4a parentFlowSourceList(
final FoObject newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
- if (parent instanceof FlowSourceList) {
- return (FlowSourceList) parent;
+ if (parent instanceof FlowSourceList4a) {
+ return (FlowSourceList4a) parent;
}
throwException(locator, "fo:" + newObject.toXslFo()
+ " must be child of fo:flow-source-list.");
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractPageReference.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractPageReference.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractPageReference.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -43,8 +43,7 @@
* Abstract superclass for page-number, page-number-citation, and
* page-number-citation-last.
*/
-public abstract class AbstractPageReference extends FoObj
- implements org.axsl.fo.FoLineNonText {
+public abstract class AbstractPageReference extends FoObj implements FoLineNonText {
/** The number of placeholder digits that should be used when we do not yet
* know what the actual page-number is. */
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -1,169 +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.fo.obj;
-
-import org.foray.fotree.FoObj;
-import org.foray.fotree.FoObjMixed;
-import org.foray.fotree.Namespace;
-import org.foray.fotree.PropertyList;
-
-import org.axsl.fo.FoContext;
-import org.axsl.fo.FoTreeException;
-import org.axsl.fo.ProxyFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A "basic-link" object in XSL-FO.
- */
-public class BasicLink extends FoObjMixed implements org.axsl.fo.fo.BasicLink {
-
- /** The parent of this node. */
- private FoObj parent;
-
- /** The children of this object. */
- private List<FoObj> children = new ArrayList<FoObj>();
-
- /**
- * Constructor.
- * @param parent The parent FoObj.
- * @param propertyList The property list for this FoObj.
- */
- public BasicLink(final FoObj parent, final PropertyList propertyList) {
- super(parent, propertyList);
- this.parent = parent;
- }
-
- @Override
- protected void validateAncestry() throws FoTreeException {
- return;
- }
-
- @Override
- protected void validateProperties() throws FoTreeException {
- if (! isValid()) {
- throwException(getFullName() + " must specify internal-destination "
- + "or external-destination.");
- }
- }
-
- @Override
- public void setup() throws FoTreeException {
- return;
- }
-
- @Override
- protected void validateDescendants() throws FoTreeException {
- return;
- }
-
- @Override
- public boolean isValid() {
- if (this.getLinkType() == null) {
- return false;
- }
- return true;
- }
-
- @Override
- public String getName() {
- return "basic-link";
- }
-
- /**
- * {@inheritDoc}
- * Override the FONode method, because "this" is the object being sought.
- */
- @Override
- public BasicLink ancestorBasicLink(final FoContext context) {
- return this;
- }
-
- @Override
- public boolean isContentInline() {
- return true;
- }
-
- @Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
- }
-
- @Override
- public boolean blockMustEnclosePCDATA() {
- return true;
- }
-
- @Override
- public Object acceptProxyFactory(final ProxyFactory factory) {
- return factory.makeProxy(this);
- }
-
- @Override
- public FoObj getParent() {
- return this.parent;
- }
-
- @Override
- public List<FoObj> getChildren() {
- return this.children;
- }
-
- @Override
- public void addTextNode(final AbstractCharacterSequence textNode) {
- this.children.add(textNode);
- }
-
- @Override
- public void addNonTextNode(final FoObj nonTextNode) {
- this.children.add(nonTextNode);
- }
-
- @Override
- public boolean isContentBlock() {
- return false;
- }
-
- @Override
- public boolean isContentPcdata() {
- return false;
- }
-
- @Override
- public org.axsl.font.FontUse getPrimaryFont(final FoContext context) {
- return this.getParent().getPrimaryFont(context);
- }
-
- @Override
- public FoObj getChildAt(final int index) {
- return this.children.get(index);
- }
-
-}
Copied: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink4a.java (from rev 12032, trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink.java)
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink4a.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink4a.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -0,0 +1,170 @@
+/*
+ * 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.fotree.FoObj;
+import org.foray.fotree.FoObjMixed;
+import org.foray.fotree.Namespace;
+import org.foray.fotree.PropertyList;
+
+import org.axsl.fo.FoContext;
+import org.axsl.fo.FoTreeException;
+import org.axsl.fo.ProxyFactory;
+import org.axsl.fo.fo.BasicLink;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A "basic-link" object in XSL-FO.
+ */
+public class BasicLink4a extends FoObjMixed implements BasicLink {
+
+ /** The parent of this node. */
+ private FoObj parent;
+
+ /** The children of this object. */
+ private List<FoObj> children = new ArrayList<FoObj>();
+
+ /**
+ * Constructor.
+ * @param parent The parent FoObj.
+ * @param propertyList The property list for this FoObj.
+ */
+ public BasicLink4a(final FoObj parent, final PropertyList propertyList) {
+ super(parent, propertyList);
+ this.parent = parent;
+ }
+
+ @Override
+ protected void validateAncestry() throws FoTreeException {
+ return;
+ }
+
+ @Override
+ protected void validateProperties() throws FoTreeException {
+ if (! isValid()) {
+ throwException(getFullName() + " must specify internal-destination "
+ + "or external-destination.");
+ }
+ }
+
+ @Override
+ public void setup() throws FoTreeException {
+ return;
+ }
+
+ @Override
+ protected void validateDescendants() throws FoTreeException {
+ return;
+ }
+
+ @Override
+ public boolean isValid() {
+ if (this.getLinkType() == null) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public String getName() {
+ return "basic-link";
+ }
+
+ /**
+ * {@inheritDoc}
+ * Override the FONode method, because "this" is the object being sought.
+ */
+ @Override
+ public BasicLink4a ancestorBasicLink(final FoContext context) {
+ return this;
+ }
+
+ @Override
+ public boolean isContentInline() {
+ return true;
+ }
+
+ @Override
+ public Namespace getNamespace() {
+ return this.getFoTree().getFONamespace();
+ }
+
+ @Override
+ public boolean blockMustEnclosePCDATA() {
+ return true;
+ }
+
+ @Override
+ public Object acceptProxyFactory(final ProxyFactory factory) {
+ return factory.makeProxy(this);
+ }
+
+ @Override
+ public FoObj getParent() {
+ return this.parent;
+ }
+
+ @Override
+ public List<FoObj> getChildren() {
+ return this.children;
+ }
+
+ @Override
+ public void addTextNode(final AbstractCharacterSequence textNode) {
+ this.children.add(textNode);
+ }
+
+ @Override
+ public void addNonTextNode(final FoObj nonTextNode) {
+ this.children.add(nonTextNode);
+ }
+
+ @Override
+ public boolean isContentBlock() {
+ return false;
+ }
+
+ @Override
+ public boolean isContentPcdata() {
+ return false;
+ }
+
+ @Override
+ public org.axsl.font.FontUse getPrimaryFont(final FoContext context) {
+ return this.getParent().getPrimaryFont(context);
+ }
+
+ @Override
+ public FoObj getChildAt(final int index) {
+ return this.children.get(index);
+ }
+
+}
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -1,166 +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.fo.obj;
-
-import org.foray.fotree.FoObj;
-import org.foray.fotree.FoObjMixed;
-import org.foray.fotree.Namespace;
-import org.foray.fotree.PropertyList;
-
-import org.axsl.fo.FoContext;
-import org.axsl.fo.FoTreeException;
-import org.axsl.fo.ProxyFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A "bidi-override" object in XSL-FO.
- */
-public class BidiOverride extends FoObjMixed
- implements org.axsl.fo.fo.BidiOverride {
-
- /** The parent of this node. */
- private FoObj parent;
-
- /** The children of this object. */
- private List<FoObj> children = new ArrayList<FoObj>();
-
- /** The resolved primary Font. */
- private org.axsl.font.FontUse resolvedFont = null;
-
- /**
- * Constructor.
- * @param parent The parent FoObj.
- * @param propertyList The property list for this FoObj.
- */
- public BidiOverride(final FoObj parent, final PropertyList propertyList) {
- super(parent, propertyList);
- this.parent = parent;
- }
-
- @Override
- protected void validateAncestry() throws FoTreeException {
- return;
- }
-
- @Override
- protected void validateProperties() throws FoTreeException {
- return;
- }
-
- @Override
- protected void setup() throws FoTreeException {
- return;
- }
-
- @Override
- protected void end() throws FoTreeException {
- return;
- }
-
- @Override
- protected void validateDescendants() throws FoTreeException {
- return;
- }
-
- @Override
- public String getName() {
- return "bidi-override";
- }
-
- @Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
- }
-
- @Override
- public boolean isContentInline() {
- return true;
- }
-
- @Override
- public boolean blockMustEnclosePCDATA() {
- return true;
- }
-
- @Override
- public Object acceptProxyFactory(final ProxyFactory factory) {
- return factory.makeProxy(this);
- }
-
- @Override
- public FoObj getParent() {
- return this.parent;
- }
-
- @Override
- public List<FoObj> getChildren() {
- return this.children;
- }
-
- @Override
- public void addTextNode(final AbstractCharacterSequence textNode) {
- this.children.add(textNode);
- }
-
- @Override
- public void addNonTextNode(final FoObj nonTextNode) {
- this.children.add(nonTextNode);
- }
-
- @Override
- public boolean isContentBlock() {
- return false;
- }
-
- @Override
- public boolean isContentPcdata() {
- return false;
- }
-
- @Override
- public org.axsl.font.FontUse getPrimaryFont(final FoContext context) {
- if (this.resolvedFont == null) {
- this.resolvedFont = resolvePrimaryFont(context);
- }
- return this.resolvedFont;
- }
-
- @Override
- public FoObj getChildAt(final int index) {
- return this.children.get(index);
- }
-
- @Override
- public boolean isValid() {
- return true;
- }
-
-}
Copied: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride4a.java (from rev 12032, trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride.java)
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride4a.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride4a.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -0,0 +1,166 @@
+/*
+ * 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.fotree.FoObj;
+import org.foray.fotree.FoObjMixed;
+import org.foray.fotree.Namespace;
+import org.foray.fotree.PropertyList;
+
+import org.axsl.fo.FoContext;
+import org.axsl.fo.FoTreeException;
+import org.axsl.fo.ProxyFactory;
+import org.axsl.fo.fo.BidiOverride;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A "bidi-override" object in XSL-FO.
+ */
+public class BidiOverride4a extends FoObjMixed implements BidiOverride {
+
+ /** The parent of this node. */
+ private FoObj parent;
+
+ /** The children of this object. */
+ private List<FoObj> children = new ArrayList<FoObj>();
+
+ /** The resolved primary Font. */
+ private org.axsl.font.FontUse resolvedFont = null;
+
+ /**
+ * Constructor.
+ * @param parent The parent FoObj.
+ * @param propertyList The property list for this FoObj.
+ */
+ public BidiOverride4a(final FoObj parent, final PropertyList propertyList) {
+ super(parent, propertyList);
+ this.parent = parent;
+ }
+
+ @Override
+ protected void validateAncestry() throws FoTreeException {
+ return;
+ }
+
+ @Override
+ protected void validateProperties() throws FoTreeException {
+ return;
+ }
+
+ @Override
+ protected void setup() throws FoTreeException {
+ return;
+ }
+
+ @Override
+ protected void end() throws FoTreeException {
+ return;
+ }
+
+ @Override
+ protected void validateDescendants() throws FoTreeException {
+ return;
+ }
+
+ @Override
+ public String getName() {
+ return "bidi-override";
+ }
+
+ @Override
+ public Namespace getNamespace() {
+ return this.getFoTree().getFONamespace();
+ }
+
+ @Override
+ public boolean isContentInline() {
+ return true;
+ }
+
+ @Override
+ public boolean blockMustEnclosePCDATA() {
+ return true;
+ }
+
+ @Override
+ public Object acceptProxyFactory(final ProxyFactory factory) {
+ return factory.makeProxy(this);
+ }
+
+ @Override
+ public FoObj getParent() {
+ return this.parent;
+ }
+
+ @Override
+ public List<FoObj> getChildren() {
+ return this.children;
+ }
+
+ @Override
+ public void addTextNode(final AbstractCharacterSequence textNode) {
+ this.children.add(textNode);
+ }
+
+ @Override
+ public void addNonTextNode(final FoObj nonTextNode) {
+ this.children.add(nonTextNode);
+ }
+
+ @Override
+ public boolean isContentBlock() {
+ return false;
+ }
+
+ @Override
+ public boolean isContentPcdata() {
+ return false;
+ }
+
+ @Override
+ public org.axsl.font.FontUse getPrimaryFont(final FoContext context) {
+ if (this.resolvedFont == null) {
+ this.resolvedFont = resolvePrimaryFont(context);
+ }
+ return this.resolvedFont;
+ }
+
+ @Override
+ public FoObj getChildAt(final int index) {
+ return this.children.get(index);
+ }
+
+ @Override
+ public boolean isValid() {
+ return true;
+ }
+
+}
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block.java 2021-12-02 14:34:53 UTC (rev 12166)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block.java 2021-12-02 15:43:07 UTC (rev 12167)
@@ -1,174 +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.fo.obj;
-
-import org.foray.fotree.FoObj;
-import org.foray.fotree.FoObjMixed;
-import org.foray.fotree.Namespace;
-import org.foray.fotree.PropertyList;
-
-import org.axsl.fo.FoContext;
-import org.axsl.fo.FoTreeException;
-import org.axsl.fo.ProxyFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A "block" object in XSL-FO.
- */
-public class Block extends FoObjMixed implements org.axsl.fo.fo.Block {
-
- /** The parent of this node. */
- private FoObj parent;
-
- /** The children of this object. */
- private List<FoObj> children = new ArrayList<FoObj>();
-
- /** The resolved primary Font. */
- private org.axsl.font.FontUse resolvedFont = null;
-
- /**
- * Constructor.
- * @param parent The parent FoObj.
- * @param propertyList The property list for this FoObj.
- */
- public Block(final FoObj parent, final PropertyList propertyList) {
- super(parent, propertyList);
- this.parent = parent;
- }
-
- @Override
- protected void validateAncestry() throws FoTreeException {
- return;
- }
-
- @Override
- protected void validateProperties() throws FoTreeException {
- return;
- }
-
- @Override
- protected void setup() throws FoTreeException {
- return;
- }
-
- @Override
- protected void validateDescendants() throws FoTreeException {
- return;
- }
-
- @Override
- public String getName() {
- return "block";
- }
-
- @Override
- public boolean isBlockLevelFo() {
- return true;
- }
-
- /**
- * {@inheritDoc}
- * Overrides the method in FoObj, because this is the containing block.
- */
- @Override
- public Block getContainingBlock(final FoContext context) {
- return this;
- }
-
- @Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
- }
-
- @Override
- public boolean...
[truncated message content] |
