arved 01/07/16 03:45:08
Modified: src/org/apache/fop/fo/pagination Root.java PageSequence.java
Log:
AHS: initial marker support
Revision Changes Path
1.12 +2 -1 xml-fop/src/org/apache/fop/fo/pagination/Root.java
Index: Root.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Root.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Root.java 2001/07/09 03:03:24 1.11
+++ Root.java 2001/07/16 10:45:08 1.12
@@ -1,4 +1,4 @@
-/*-- $Id: Root.java,v 1.11 2001/07/09 03:03:24 arved Exp $ --
+/*-- $Id: Root.java,v 1.12 2001/07/16 10:45:08 arved Exp $ --
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -48,6 +48,7 @@
this.name = "fo:root";
pageSequences = new Vector();
+
if (parent != null) {
throw new FOPException("root must be root element");
}
1.32 +5 -3 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- PageSequence.java 2001/07/09 03:01:12 1.31
+++ PageSequence.java 2001/07/16 10:45:08 1.32
@@ -1,4 +1,4 @@
-/*-- $Id: PageSequence.java,v 1.31 2001/07/09 03:01:12 arved Exp $ --
+/*-- $Id: PageSequence.java,v 1.32 2001/07/16 10:45:08 arved Exp $ --
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -241,8 +241,6 @@
MessageHandler.log(" [" + currentPageNumber);
- formatStaticContent(areaTree);
-
if ((status.getCode() == Status.FORCE_PAGE_BREAK_EVEN) &&
((currentPageNumber % 2) == 1)) {
} else if ( (status.getCode() == Status.FORCE_PAGE_BREAK_ODD) &&
@@ -265,6 +263,10 @@
}
}
+
+ // because of markers, do after fo:flow
+ formatStaticContent(areaTree);
+
MessageHandler.log("]");
areaTree.addPage(currentPage);
this.pageCount++; // used for 'force-page-count'
calculations
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
