pietsch 2003/03/06 15:24:41
Modified: src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java
Log:
Fixed problem with page-number-citations referring to blocks
with a break-before="page".
Revision Changes Path
No revision
No revision
1.41.2.17 +12 -9 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.41.2.16
retrieving revision 1.41.2.17
diff -u -r1.41.2.16 -r1.41.2.17
--- Block.java 2 Mar 2003 13:47:44 -0000 1.41.2.16
+++ Block.java 6 Mar 2003 23:24:40 -0000 1.41.2.17
@@ -101,6 +101,7 @@
String id;
int span;
+ boolean breakStatusBeforeChecked = false;
// this may be helpful on other FOs too
boolean anythingLaidOut = false;
@@ -119,6 +120,16 @@
}
public int layout(Area area) throws FOPException {
+ if (!breakStatusBeforeChecked) {
+ breakStatusBeforeChecked = true;
+ // no break if first in area tree, or leading in context
+ // area
+ int breakBeforeStatus = propMgr.checkBreakBefore(area);
+ if (breakBeforeStatus != Status.OK) {
+ return breakBeforeStatus;
+ }
+ }
+
BlockArea blockArea;
if (!anythingLaidOut) {
@@ -190,14 +201,6 @@
}
this.marker = 0;
-
- // no break if first in area tree, or leading in context
- // area
- int breakBeforeStatus = propMgr.checkBreakBefore(area);
- if (breakBeforeStatus != Status.OK) {
- return breakBeforeStatus;
- }
-
}
if ((spaceBefore != 0) && (this.marker == 0)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
