diff options
| author | arved <arved@unknown> | 2001-07-16 10:46:14 +0000 |
|---|---|---|
| committer | arved <arved@unknown> | 2001-07-16 10:46:14 +0000 |
| commit | 20c03ca3c9b9a0492cc780292f01c64aa3098b36 (patch) | |
| tree | 0e6c2088f0ffd2e21e2f609032689f8363b63822 /src/org/apache/fop/fo/pagination | |
| parent | 01a159e579254407dfed6c9b7e7c9f430080d201 (diff) | |
| download | xmlgraphics-fop-20c03ca3c9b9a0492cc780292f01c64aa3098b36.tar.gz xmlgraphics-fop-20c03ca3c9b9a0492cc780292f01c64aa3098b36.zip | |
AHS: initial marker support
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194356 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/org/apache/fop/fo/pagination')
| -rw-r--r-- | src/org/apache/fop/fo/pagination/PageSequence.java | 6 | ||||
| -rw-r--r-- | src/org/apache/fop/fo/pagination/Root.java | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/org/apache/fop/fo/pagination/PageSequence.java b/src/org/apache/fop/fo/pagination/PageSequence.java index d24b988f5..6e5cd65e8 100644 --- a/src/org/apache/fop/fo/pagination/PageSequence.java +++ b/src/org/apache/fop/fo/pagination/PageSequence.java @@ -241,8 +241,6 @@ public class PageSequence extends FObj { 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 @@ public class PageSequence extends FObj { } } + + // because of markers, do after fo:flow + formatStaticContent(areaTree); + MessageHandler.log("]"); areaTree.addPage(currentPage); this.pageCount++; // used for 'force-page-count' calculations diff --git a/src/org/apache/fop/fo/pagination/Root.java b/src/org/apache/fop/fo/pagination/Root.java index 9d5a8b899..14192eed1 100644 --- a/src/org/apache/fop/fo/pagination/Root.java +++ b/src/org/apache/fop/fo/pagination/Root.java @@ -48,6 +48,7 @@ public class Root extends FObj { this.name = "fo:root"; pageSequences = new Vector(); + if (parent != null) { throw new FOPException("root must be root element"); } |