pbwest 2002/11/13 07:29:36
Modified: src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
SyncedFoXmlEventsBuffer.java
Log:
Adjusted for reversal of sense of normal and outOfLine in FObjectSets.
Removed Normal from name of expectNormal... methods.
Added expectOutOfLineBlock().
Revision Changes Path
No revision
No revision
1.1.2.4 +71 -5
xml-fop/src/org/apache/fop/xml/Attic/SyncedFoXmlEventsBuffer.java
Index: SyncedFoXmlEventsBuffer.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/xml/Attic/SyncedFoXmlEventsBuffer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SyncedFoXmlEventsBuffer.java 11 Nov 2002 17:24:18 -0000 1.1.2.3
+++ SyncedFoXmlEventsBuffer.java 13 Nov 2002 15:29:36 -0000 1.1.2.4
@@ -825,6 +825,15 @@
("Unexpected START element: " + ev.getQName());
}
+ /**
+ * Expect that the next element will be a STARTELEMENT for one of the
+ * flow objects which are members of %block; from
+ * <b>6.2 Formatting Object Content</b>, including out-of-line flow
+ * objects which may occur except as descendents of out-of-line formatting
+ * objects. White space is discarded.
+ * @return the <tt>FoXMLEvent found. If any other events are encountered
+ * return <tt>null</tt>.
+ */
public FoXMLEvent expectBlock()
throws FOPException, UnexpectedStartElementException
{
@@ -832,7 +841,33 @@
(FObjectSets.blockEntity, XMLEvent.DISCARD_W_SPACE);
}
- public FoXMLEvent expectNormalPcdataOrInline()
+ /**
+ * Expect that the next element will be a STARTELEMENT for one of the
+ * flow objects which are members of %block; from
+ * <b>6.2 Formatting Object Content</b>, excluding out-of-line flow
+ * objects which may not occur as descendents of out-of-line formatting
+ * objects. White space is discarded.
+ * @return the <tt>FoXMLEvent found. If any other events are encountered
+ * return <tt>null</tt>.
+ */
+ public FoXMLEvent expectOutOfLineBlock()
+ throws FOPException, UnexpectedStartElementException
+ {
+ return expectStartElement
+ (FObjectSets.outOfLineBlockSet, XMLEvent.DISCARD_W_SPACE);
+ }
+
+ /**
+ * Expect that the next element will be a STARTELEMENT for one of the
+ * flow objects which are members of (#PCDATA|%inline;) from
+ * <b>6.2 Formatting Object Content</b>, including out-of-line flow
+ * objects which may occur except as descendents of out-of-line
+ * formatting objects. White space is retained, and
+ * will appear as #PCDATA, i.e, as an instance of FoCharacters.
+ * @return the <tt>FoXMLEvent found. If any other events are encountered
+ * return <tt>null</tt>.
+ */
+ public FoXMLEvent expectPcdataOrInline()
throws FOPException, UnexpectedStartElementException
{
FoXMLEvent ev = expectStartElement
@@ -842,6 +877,16 @@
return ev;
}
+ /**
+ * Expect that the next element will be a STARTELEMENT for one of the
+ * flow objects which are members of (#PCDATA|%inline;) from
+ * <b>6.2 Formatting Object Content</b>, excluding out-of-line flow
+ * objects which may not occur as descendents of out-of-line formatting
+ * objects. White space is retained, and
+ * will appear as #PCDATA, i.e, as an instance of FoCharacters.
+ * @return the <tt>FoXMLEvent found. If any other events are encountered
+ * return <tt>null</tt>.
+ */
public FoXMLEvent expectOutOfLinePcdataOrInline()
throws FOPException, UnexpectedStartElementException
{
@@ -852,7 +897,17 @@
return ev;
}
- public FoXMLEvent expectNormalPcdataOrInlineOrBlock()
+ /**
+ * Expect that the next element will be a STARTELEMENT for one of the
+ * flow objects which are members of (#PCDATA|%inline;|%block;) from
+ * <b>6.2 Formatting Object Content</b>, including out-of-line flow
+ * objects which may occur except as descendents of out-of-line
+ * formatting objects. White space is retained, and
+ * will appear as #PCDATA, i.e, as an instance of FoCharacters.
+ * @return the <tt>FoXMLEvent</tt> found. If any other events are
+ * encountered return <tt>null</tt>.
+ */
+ public FoXMLEvent expectPcdataOrInlineOrBlock()
throws FOPException, UnexpectedStartElementException
{
FoXMLEvent ev = expectStartElement
@@ -862,11 +917,22 @@
return ev;
}
+ /**
+ * Expect that the next element will be a STARTELEMENT for one of the
+ * flow objects which are members of (#PCDATA|%inline;|%block;) from
+ * <b>6.2 Formatting Object Content</b>, excluding out-of-line flow
+ * objects which may not occur as descendents of out-of-line formatting
+ * objects. White space is retained, and
+ * will appear as #PCDATA, i.e, as an instance of FoCharacters.
+ * @return the <tt>FoXMLEvent</tt> found. If any other events are
+ * encountered return <tt>null</tt>.
+ */
public FoXMLEvent expectOutOfLinePcdataOrInlineOrBlock()
throws FOPException, UnexpectedStartElementException
{
FoXMLEvent ev = expectStartElement
- (FObjectSets.pcdataBlockInlineSet, XMLEvent.RETAIN_W_SPACE);
+ (FObjectSets.outOfLinePcdataBlockInlineSet,
+ XMLEvent.RETAIN_W_SPACE);
if (ev == null)
ev = expectCharacters();
return ev;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
