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 2002/11/21 08:49:34 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBlockContainer.java FoFloat.java FoFootnoteBody.java FoFootnote.java FoInlineContainer.java FoInline.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoRetrieveMarker.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoWrapper.java
pbwest 2002/11/20 23:49:34
Modified: src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBlockContainer.java FoFloat.java
FoFootnoteBody.java FoFootnote.java
FoInlineContainer.java FoInline.java FoLeader.java
FoListBlock.java FoListItemBody.java
FoListItem.java FoListItemLabel.java FoMarker.java
FoMultiCase.java FoMultiProperties.java
FoMultiPropertySet.java FoMultiSwitch.java
FoMultiToggle.java FoRetrieveMarker.java
FoTableAndCaption.java FoTableBody.java
FoTableCaption.java FoTableCell.java
FoTableFooter.java FoTableHeader.java FoTable.java
FoTableRow.java FoWrapper.java
Log:
Added subtree processing.
Revision Changes Path
No revision
No revision
1.1.2.6 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoBasicLink.java 17 Nov 2002 09:50:08 -0000 1.1.2.5
+++ FoBasicLink.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -130,10 +130,10 @@
ev = xmlevents.getEndElement(ev);
}
} catch(UnexpectedStartElementException e) {
+ ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getStartElement();
ev = xmlevents.getEndElement(ev);
}
} while (ev != null);
1.1.2.7 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
1.1.2.6 +4 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoFloat.java 17 Nov 2002 09:50:08 -0000 1.1.2.5
+++ FoFloat.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -102,7 +102,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev == null)
throw new FOPException
- ("%block; not found in fo:table-cell");
+ ("%block; not found in fo:float");
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags | FONode.MC_FLOAT);
@@ -123,7 +123,7 @@
} while (ev != null);
} catch(UnexpectedStartElementException e) {
throw new FOPException
- ("Block not found or unexpected non-block in fo:table-cell");
+ ("Block not found or unexpected non-block in fo:float");
}
makeSparsePropsSet();
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java
Index: FoFootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +18 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java
Index: FoFootnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoFootnote.java 17 Nov 2002 09:50:08 -0000 1.1.2.5
+++ FoFootnote.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -28,6 +28,17 @@
/**
* Implements the fo:footnote flow object.
+ * <p>Footnote is an extremely messy flow object. The only absolute
+ * prohibition seem sto be that it may not be a descendant of another
+ * fo:footnote. <b>6.10.3 fo:footnote</b> <i>Constraints</i> states:
+* <p><tt>"It is an error if the fo:footnote occurs as a
+ * descendant of a flow that is not assigned to a region-body, or of an
+ * fo:block-container that generates absolutely positioned areas. In either
+ * case, the block-areas generated by the fo:footnote-body child of the
+ * fo:footnote shall be returned to the parent of the fo:footnote and placed
+ * in the area tree as though they were normal block-level areas."</tt>
+ * <p>In other words, it's wrong, but you can do it anyway. The end result
+ * is that fo:footnote can appear almost anywhere.
*/
public class FoFootnote extends FONode {
@@ -87,12 +98,15 @@
{
super(foTree, FObjectNames.FOOTNOTE, parent, event,
stateFlags, sparsePropsMap, sparseIndices);
+ if ((stateFlags & FONode.MC_FOOTNOTE) != 0)
+ throw new FOPException
+ ("fo:footnote not allowed as child of fo:footnote.");
FoXMLEvent ev;
xmlevents = foTree.getXmlevents();
try {
// Look for the inline
if ((ev = xmlevents.expectStartElement
- (FObjectNames.INLINE, XMLEvent.RETAIN_W_SPACE))
+ (FObjectNames.INLINE, XMLEvent.DISCARD_W_SPACE))
== null)
throw new FOPException("No inline in footnote.");
new FoInline
@@ -101,7 +115,7 @@
// Look for the footnote-body
if ((ev = xmlevents.expectStartElement
- (FObjectNames.FOOTNOTE_BODY, XMLEvent.RETAIN_W_SPACE))
+ (FObjectNames.FOOTNOTE_BODY, XMLEvent.DISCARD_W_SPACE))
== null)
throw new FOPException("No footnote-body in footnote.");
new FoFootnoteBody
1.1.2.6 +4 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java
Index: FoInlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoInlineContainer.java 17 Nov 2002 09:50:08 -0000 1.1.2.5
+++ FoInlineContainer.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -106,11 +106,11 @@
* attribute set information.
*/
public FoInlineContainer
- (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet)
+ (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.INLINE_CONTAINER, parent, event,
- attrSet, sparsePropsMap, sparseIndices);
+ stateFlags, sparsePropsMap, sparseIndices);
xmlevents = foTree.getXmlevents();
FoXMLEvent ev = null;
try {
1.1.2.6 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java
Index: FoInline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoInline.java 17 Nov 2002 09:50:08 -0000 1.1.2.5
+++ FoInline.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -131,10 +131,10 @@
ev = xmlevents.getEndElement(ev);
}
} catch(UnexpectedStartElementException e) {
+ ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getStartElement();
ev = xmlevents.getEndElement(ev);
}
} while (ev != null);
1.1.2.6 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java
Index: FoLeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoLeader.java 17 Nov 2002 09:50:08 -0000 1.1.2.5
+++ FoLeader.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -134,10 +134,10 @@
ev = xmlevents.getEndElement(ev);
}
} catch(UnexpectedStartElementException e) {
+ ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getStartElement();
ev = xmlevents.getEndElement(ev);
}
} while (ev != null);
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java
Index: FoListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java
Index: FoListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java
Index: FoListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java
Index: FoListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java
Index: FoMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoMarker.java 17 Nov 2002 09:50:08 -0000 1.1.2.5
+++ FoMarker.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -102,10 +102,10 @@
ev = xmlevents.getEndElement(ev);
}
} catch(UnexpectedStartElementException e) {
+ ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getStartElement();
ev = xmlevents.getEndElement(ev);
}
} while (ev != null);
1.1.2.6 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java
Index: FoMultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoMultiCase.java 17 Nov 2002 09:50:08 -0000 1.1.2.5
+++ FoMultiCase.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -114,10 +114,10 @@
ev = xmlevents.getEndElement(ev);
}
} catch(UnexpectedStartElementException e) {
+ ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getStartElement();
ev = xmlevents.getEndElement(ev);
}
} while (ev != null);
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java
Index: FoMultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java
Index: FoMultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java
Index: FoMultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java
Index: FoMultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoMultiToggle.java 17 Nov 2002 09:50:08 -0000 1.1.2.5
+++ FoMultiToggle.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -111,10 +111,10 @@
ev = xmlevents.getEndElement(ev);
}
} catch(UnexpectedStartElementException e) {
+ ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getStartElement();
ev = xmlevents.getEndElement(ev);
}
} while (ev != null);
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java
Index: FoRetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java
Index: FoTableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java
Index: FoTableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java
Index: FoTableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java
Index: FoTableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java
Index: FoTableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java
Index: FoTableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java
Index: FoTable.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java
Index: FoTableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java
Index: FoWrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoWrapper.java 17 Nov 2002 09:50:09 -0000 1.1.2.5
+++ FoWrapper.java 21 Nov 2002 07:49:33 -0000 1.1.2.6
@@ -99,10 +99,10 @@
ev = xmlevents.getEndElement(ev);
}
} catch(UnexpectedStartElementException e) {
+ ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getStartElement();
ev = xmlevents.getEndElement(ev);
}
} while (ev != null);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org