aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/java/org/apache/fop/layoutmgr/ElementListUtils.java3
-rw-r--r--test/layoutengine/standard-testcases/page-position-last_break-before_bugzilla46489.xml210
2 files changed, 94 insertions, 119 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/ElementListUtils.java b/src/java/org/apache/fop/layoutmgr/ElementListUtils.java
index 7e337dc6b..d3403cd6b 100644
--- a/src/java/org/apache/fop/layoutmgr/ElementListUtils.java
+++ b/src/java/org/apache/fop/layoutmgr/ElementListUtils.java
@@ -199,8 +199,7 @@ public final class ElementListUtils {
* @return true if the list starts with a forced break
*/
public static boolean startsWithForcedBreak(List elems) {
- return !elems.isEmpty()
- && ((ListElement) elems.get(0)).isForcedBreak();
+ return !elems.isEmpty() && ((ListElement) elems.get(0)).isForcedBreak();
}
/**
diff --git a/test/layoutengine/standard-testcases/page-position-last_break-before_bugzilla46489.xml b/test/layoutengine/standard-testcases/page-position-last_break-before_bugzilla46489.xml
index d3c106852..d855ffd76 100644
--- a/test/layoutengine/standard-testcases/page-position-last_break-before_bugzilla46489.xml
+++ b/test/layoutengine/standard-testcases/page-position-last_break-before_bugzilla46489.xml
@@ -1,117 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks page-masters (reference orientation).
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="OTCTermsheetPageMasterFrontPage" page-width="210mm" page-height="297mm" margin-bottom="12.7mm" margin-right="12.7mm" margin-top="12.7mm" margin-left="12.7mm">
- <fo:region-body margin-bottom="30mm" margin-top="42.3mm" region-name="PageBody"/>
- <fo:region-before region-name="PageHeaderFrontPage" extent="42.3mm"/>
- <fo:region-after precedence="true" region-name="PageFooter" extent="30mm"/>
- </fo:simple-page-master>
- <fo:simple-page-master master-name="OTCTermsheetPageMasterFollowing" page-width="210mm" page-height="297mm" margin-bottom="12.7mm" margin-right="12.7mm" margin-top="12.7mm" margin-left="12.7mm">
- <fo:region-body margin-bottom="30mm" margin-top="20mm" region-name="PageBody"/>
- <fo:region-before region-name="PageHeaderFollowing" extent="20mm"/>
- <fo:region-after precedence="true" region-name="PageFooter" extent="30mm"/>
- </fo:simple-page-master>
- <fo:page-sequence-master master-name="OTCTermsheetPageSeq">
- <fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference page-position="first" master-reference="OTCTermsheetPageMasterFrontPage"/>
- <fo:conditional-page-master-reference page-position="rest" master-reference="OTCTermsheetPageMasterFollowing"/>
- <fo:conditional-page-master-reference page-position="last" master-reference="OTCTermsheetPageMasterFollowing"/>
- </fo:repeatable-page-master-alternatives>
- </fo:page-sequence-master>
- </fo:layout-master-set>
- <fo:page-sequence initial-page-number="1" force-page-count="no-force" master-reference="OTCTermsheetPageSeq">
- <fo:flow flow-name="PageBody" font-family="Times New Roman" font-size="10pt" line-height="12pt">
- <fo:block>
- <fo:table table-layout="fixed" width="100%">
- <fo:table-column column-width="proportional-column-width(32.36)" column-number="1"/>
- <fo:table-column column-width="proportional-column-width(67.64)" column-number="2"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell padding="4pt">
- <fo:block>
- <fo:block>
- <fo:inline color="#6D6E71">Some text</fo:inline>
- </fo:block>
- </fo:block>
- </fo:table-cell>
- <fo:table-cell padding="4pt">
- <fo:block>
- <fo:block text-align="justify">More text before break. More text before break. More text before break.</fo:block>
- <fo:block>
- <fo:leader/>
- </fo:block>
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- <fo:table table-layout="fixed" width="100%">
- <fo:table-column column-width="proportional-column-width(100)" column-number="1"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell padding="4pt">
- <fo:block>
- <fo:block id="the-block" line-height="14pt" color="#6D6E71" font-size="11pt" font-family="Arial" text-align="left" page-break-before="always">TEXT AFTER BREAK</fo:block>
- <fo:block>
- <fo:leader/>
- </fo:block>
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- <fo:table table-layout="fixed" width="100%">
- <fo:table-column column-width="proportional-column-width(100)" column-number="1"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell padding="4pt">
- <fo:block>
- <fo:block>
- <fo:leader/>
- </fo:block>
- <fo:block>
- <fo:leader/>
- </fo:block>
- <fo:block text-align="justify">blah blah blah</fo:block>
- <fo:block>
- <fo:leader/>
- </fo:block>
- <fo:block text-align="justify">blah blah blah</fo:block>
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <true xpath="count(//page) = 2" />
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks page-masters (reference orientation).
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="FrontPage"
+ page-width="210mm" page-height="297mm" margin="12.7mm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ <fo:simple-page-master master-name="Following"
+ page-width="210mm" page-height="297mm" margin="12.7mm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ <fo:page-sequence-master master-name="pages">
+ <fo:repeatable-page-master-alternatives>
+ <fo:conditional-page-master-reference page-position="first"
+ master-reference="FrontPage"/>
+ <fo:conditional-page-master-reference page-position="rest"
+ master-reference="Following"/>
+ <fo:conditional-page-master-reference page-position="last"
+ master-reference="Following"/>
+ </fo:repeatable-page-master-alternatives>
+ </fo:page-sequence-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="pages">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-column column-width="proportional-column-width(30)"/>
+ <fo:table-column column-width="proportional-column-width(70)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell padding="4pt">
+ <fo:block color="#6D6E71">Some text</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="4pt">
+ <fo:block>More text before break. More text before break. More text before
+ break.</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell padding="4pt">
+ <fo:block id="the-block" color="#6D6E71" page-break-before="always">TEXT AFTER
+ BREAK</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell padding="4pt">
+ <fo:block>blah blah blah</fo:block>
+ <fo:block>blah blah blah</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <true xpath="count(//page) = 2" />
+ </checks>
+</testcase>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 13:36:46 +0000