You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2004/05/08 15:01:41 UTC
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoBidiOverride.java FoLeader.java FoTableCell.java FoBlockContainer.java FoMultiCase.java FoMultiToggle.java FoWrapper.java FoPageSequence.java FoFloat.java FoListItemLabel.java FoStaticContent.java FoFootnoteBody.java FoBlock.java FoListItemBody.java FoInline.java FoTitle.java FoTableCaption.java FoBasicLink.java FoFlow.java FoInlineContainer.java
pbwest 2004/05/08 06:01:41
Modified: src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBidiOverride.java FoLeader.java FoTableCell.java
FoBlockContainer.java FoMultiCase.java
FoMultiToggle.java FoWrapper.java
FoPageSequence.java FoFloat.java
FoListItemLabel.java FoStaticContent.java
FoFootnoteBody.java FoBlock.java
FoListItemBody.java FoInline.java FoTitle.java
FoTableCaption.java FoBasicLink.java FoFlow.java
FoInlineContainer.java
Log:
Methods in FObjects made static
Revision Changes Path
No revision
No revision
1.1.2.13 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoBidiOverride.java 8 Mar 2004 21:14:50 -0000 1.1.2.12
+++ FoBidiOverride.java 8 May 2004 13:01:40 -0000 1.1.2.13
@@ -123,7 +123,7 @@
ev = xmlevents.expectOutOfLinePcdataOrInlineOrBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, ev, stateFlags);
if (ev.getType() != XmlEvent.CHARACTERS)
ev = xmlevents.getEndElement(
1.1.2.13 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java
Index: FoLeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoLeader.java 8 Mar 2004 21:14:49 -0000 1.1.2.12
+++ FoLeader.java 8 May 2004 13:01:40 -0000 1.1.2.13
@@ -147,7 +147,7 @@
ev = xmlevents.expectOutOfLinePcdataOrInline();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this,
ev, stateFlags | FONode.MC_LEADER);
if (ev.getType() != XmlEvent.CHARACTERS) {
1.1.2.11 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java
Index: FoTableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableCell.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoTableCell.java 8 May 2004 13:01:40 -0000 1.1.2.11
@@ -137,7 +137,7 @@
throw new FOPException
("%block; not found in fo:table-cell");
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this,
(FoXmlEvent)ev, stateFlags);
// Clear the blockage
@@ -151,7 +151,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this,
(FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
1.1.2.11 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoBlockContainer.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoBlockContainer.java 8 May 2004 13:01:40 -0000 1.1.2.11
@@ -142,7 +142,7 @@
throw new FOPException
("%block; not found in fo:block-container");
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
@@ -155,7 +155,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev,
stateFlags);
ev = xmlevents.getEndElement(
1.1.2.13 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java
Index: FoMultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoMultiCase.java 8 Mar 2004 21:14:50 -0000 1.1.2.12
+++ FoMultiCase.java 8 May 2004 13:01:40 -0000 1.1.2.13
@@ -124,7 +124,7 @@
if (ev != null) {
// Generate the flow object
//System.out.println("Generating flow object for " + ev);
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, ev, stateFlags);
if (ev.getType() != XmlEvent.CHARACTERS) {
ev = xmlevents.getEndElement(
1.1.2.13 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java
Index: FoMultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoMultiToggle.java 8 Mar 2004 21:14:50 -0000 1.1.2.12
+++ FoMultiToggle.java 8 May 2004 13:01:40 -0000 1.1.2.13
@@ -116,7 +116,7 @@
ev = xmlevents.expectOutOfLinePcdataOrInlineOrBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, ev, stateFlags);
if (ev.getType() != XmlEvent.CHARACTERS) {
ev = xmlevents.getEndElement(
1.1.2.13 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java
Index: FoWrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoWrapper.java 8 Mar 2004 21:14:50 -0000 1.1.2.12
+++ FoWrapper.java 8 May 2004 13:01:40 -0000 1.1.2.13
@@ -102,7 +102,7 @@
ev = xmlevents.expectOutOfLinePcdataOrInlineOrBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, ev, stateFlags);
if (ev.getType() != XmlEvent.CHARACTERS)
ev = xmlevents.getEndElement(
1.1.2.14 +28 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoPageSequence.java 4 May 2004 07:45:29 -0000 1.1.2.13
+++ FoPageSequence.java 8 May 2004 13:01:40 -0000 1.1.2.14
@@ -33,6 +33,7 @@
import java.util.Set;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.area.Area;
import org.apache.fop.area.Page;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.fo.FONode;
@@ -121,6 +122,15 @@
public Map staticContents = null;
/** Child index of fo:flow child. */
private int flowChild = -1;
+ /** The page currently being processed by this page-sequence */
+ private Page page = null;
+ /**
+ * Gets the current page of this page-sequence
+ * @return the page
+ */
+ public Page getPage() {
+ return page;
+ }
/**
* @param foTree the FO tree being built
@@ -137,6 +147,7 @@
FONode.PAGESEQ_SET, sparsePropsMap, sparseIndices);
XmlEvent ev;
// Look for optional title
+ log.finer("page-sequence title");
String nowProcessing = "title";
try {
ev = xmlevents.expectStartElement
@@ -150,6 +161,7 @@
} // else ignore
// Look for zero or more static-content subtrees
+ log.finer("static-content");
nowProcessing = "static-content";
while ((ev = xmlevents.expectStartElement
(FObjectNames.STATIC_CONTENT, XmlEvent.DISCARD_W_SPACE))
@@ -192,12 +204,13 @@
staticContents = Collections.unmodifiableMap(staticSubtrees);
}
// Generate a null page for the flow(s)
- Page page = Page.setupNullPage(this, foTree.getNextPageId());
+ page = Page.setupNullPage(this, foTree.getNextPageId());
// Look for one or more fo:flow
// must have at least one: N.B. in 1.0, only one is allowed,
// but in 1.1. multiple flows are allowed with different
// flow maps
+ log.finer("flow");
nowProcessing = "flow";
ev = xmlevents.expectStartElement
(FObjectNames.FLOW, XmlEvent.DISCARD_W_SPACE);
@@ -225,6 +238,17 @@
}
makeSparsePropsSet();
+ }
+
+ public Area getReferenceRectangle() throws FOPException {
+ // TODO Reference rectangle is assumed to be equivalent to the
+ // "auto" value on "page-height" and "page-width". The
+ // inline-progression-dimension and block-progression-dimension are
+ // calculated according to the computed values of the
+ // reference-orientation and writing-mode of the FO for which the
+ // percentage is calculated. See
+ // 7.3 Reference Rectangle for Percentage Computations
+ throw new FOPException("Called from FoPageSequence");
}
}
1.1.2.10 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoFloat.java 25 Feb 2004 23:40:28 -0000 1.1.2.9
+++ FoFloat.java 8 May 2004 13:01:40 -0000 1.1.2.10
@@ -117,7 +117,7 @@
throw new FOPException
("%block; not found in fo:float");
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev,
stateFlags | FONode.MC_FLOAT);
// Clear the blockage
@@ -131,7 +131,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev,
stateFlags | FONode.MC_FLOAT);
ev = xmlevents.getEndElement(
1.1.2.11 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemLabel.java
Index: FoListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemLabel.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoListItemLabel.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoListItemLabel.java 8 May 2004 13:01:40 -0000 1.1.2.11
@@ -117,7 +117,7 @@
throw new FOPException
("%block; not found in fo:list-item-label");
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
@@ -130,7 +130,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
namespaces.relinquishEvent(ev);
1.1.2.12 +12 -2 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java
Index: FoStaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoStaticContent.java 16 Apr 2004 05:12:34 -0000 1.1.2.11
+++ FoStaticContent.java 8 May 2004 13:01:40 -0000 1.1.2.12
@@ -28,6 +28,7 @@
import java.util.BitSet;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.area.Area;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.NCName;
import org.apache.fop.fo.FONode;
@@ -150,6 +151,15 @@
*/
public String getFlowName() {
return flowName;
+ }
+
+ public Area getReferenceRectangle() throws FOPException {
+ // TODO Reference rectangle is assumed to be the content rectangle of
+ // the first region into which the content is flowed. For region-body
+ // it is normal-flow reference-area; for other regions it is the
+ // region-reference-area. See
+ // 7.3 Reference Rectangle for Percentage Computations
+ throw new FOPException("Called from FoStaticContent");
}
}
1.1.2.10 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java
Index: FoFootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoFootnoteBody.java 25 Feb 2004 23:40:28 -0000 1.1.2.9
+++ FoFootnoteBody.java 8 May 2004 13:01:40 -0000 1.1.2.10
@@ -115,7 +115,7 @@
throw new FOPException
("%block; not found in fo:footnote-body");
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
@@ -128,7 +128,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this,
(FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(
1.1.2.15 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- FoBlock.java 8 Mar 2004 21:14:50 -0000 1.1.2.14
+++ FoBlock.java 8 May 2004 13:01:40 -0000 1.1.2.15
@@ -147,7 +147,7 @@
ev = xmlevents.expectOutOfLinePcdataOrInlineOrBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, ev, stateFlags);
if (ev.getType() != XmlEvent.CHARACTERS) {
ev = xmlevents.getEndElement(
1.1.2.11 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemBody.java
Index: FoListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemBody.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoListItemBody.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoListItemBody.java 8 May 2004 13:01:40 -0000 1.1.2.11
@@ -118,7 +118,7 @@
throw new FOPException
("%block; not found in fo:list-item-body");
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
@@ -131,7 +131,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this,
(FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
1.1.2.14 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInline.java
Index: FoInline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInline.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoInline.java 8 Mar 2004 21:14:50 -0000 1.1.2.13
+++ FoInline.java 8 May 2004 13:01:40 -0000 1.1.2.14
@@ -138,7 +138,7 @@
if (ev != null) {
// Generate the flow object
//System.out.println("Generating flow object for " + ev);
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, ev, stateFlags);
if (ev.getType() != XmlEvent.CHARACTERS) {
ev = xmlevents.getEndElement(
1.1.2.13 +18 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java
Index: FoTitle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoTitle.java 8 Mar 2004 21:14:50 -0000 1.1.2.12
+++ FoTitle.java 8 May 2004 13:01:40 -0000 1.1.2.13
@@ -27,6 +27,7 @@
import java.util.Arrays;
import java.util.BitSet;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.area.Area;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOPageSeqNode;
@@ -119,7 +120,7 @@
ev = xmlevents.expectOutOfLinePcdataOrInline();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, parent, this, ev, FONode.TITLE_SET);
if (ev.getType() != XmlEvent.CHARACTERS)
ev = xmlevents.getEndElement(
@@ -138,6 +139,20 @@
} while (ev != null);
makeSparsePropsSet();
+ }
+
+ public Area getReferenceRectangle() throws FOPException {
+ // TODO Reference rectangle is assumed to be equivalent to the
+ // "auto" value on "page-height" and "page-width". The
+ // inline-progression-dimension and block-progression-dimension are
+ // calculated according to the computed values of the
+ // reference-orientation and writing-mode of the FO for which the
+ // percentage is calculated. See
+ // 7.3 Reference Rectangle for Percentage Computations
+ // This applies to all descendants of fo:title, except that for
+ // descendants, the relevant reference-orientation and writing-mode are
+ // those applying to fo:title.
+ throw new FOPException("Called from FoTitle");
}
}
1.1.2.11 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCaption.java
Index: FoTableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCaption.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableCaption.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoTableCaption.java 8 May 2004 13:01:40 -0000 1.1.2.11
@@ -128,7 +128,7 @@
throw new FOPException
("%block; not found in fo:table-caption");
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
@@ -141,7 +141,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this,
(FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(
1.1.2.13 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoBasicLink.java 8 Mar 2004 21:14:50 -0000 1.1.2.12
+++ FoBasicLink.java 8 May 2004 13:01:40 -0000 1.1.2.13
@@ -136,7 +136,7 @@
ev = xmlevents.expectOutOfLinePcdataOrInlineOrBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, ev, stateFlags);
if (ev.getType() != XmlEvent.CHARACTERS)
ev = xmlevents.getEndElement(
1.1.2.12 +20 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java
Index: FoFlow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoFlow.java 25 Feb 2004 23:40:28 -0000 1.1.2.11
+++ FoFlow.java 8 May 2004 13:01:40 -0000 1.1.2.12
@@ -28,6 +28,7 @@
import java.util.BitSet;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.area.Area;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOPageSeqNode;
@@ -98,7 +99,7 @@
if ((ev = xmlevents.expectBlock()) == null)
throw new FOPException("%block; not found in fo:flow");
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev,
FONode.FLOW_SET);
// Clear the blockage
@@ -109,7 +110,7 @@
ev = xmlevents.expectBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, parent, this, (FoXmlEvent)ev,
FONode.FLOW_SET);
ev = xmlevents.getEndElement(
@@ -124,4 +125,19 @@
makeSparsePropsSet();
}
+ public Area getReferenceRectangle() throws FOPException {
+ // TODO Reference rectangle is assumed to be the content rectangle of
+ // the first region into which the content is flowed. For region-body
+ // it is normal-flow reference-area; for other regions it is the
+ // region-reference-area. See
+ // 7.3 Reference Rectangle for Percentage Computations
+ throw new FOPException("Called from FoFlow");
+ }
+
+ public Area getLayoutContext() {
+ // The layout context for fo:flow is is the region-body-reference-area.
+ // TODO - the real version
+ Area context = null;
+ return context;
+ }
}
1.1.2.11 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInlineContainer.java
Index: FoInlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInlineContainer.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoInlineContainer.java 25 Feb 2004 23:40:29 -0000 1.1.2.10
+++ FoInlineContainer.java 8 May 2004 13:01:40 -0000 1.1.2.11
@@ -138,7 +138,7 @@
throw new FOPException
("%block; not found in fo:inline-container");
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(
@@ -152,7 +152,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev != null) {
// Generate the flow object
- FObjects.fobjects.makePageSeqFOChild(
+ FObjects.makePageSeqFOChild(
foTree, pageSequence, this,
(FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org