Author: lbernardo
Date: Wed Oct 15 13:15:06 2014
New Revision: 1632007
URL: http://svn.apache.org/r1632007
Log:
FOP-2060: adjoining blocks with break-before="page" break-after="page" cause
extra empty page
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_1.xml
(with props)
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_2.xml
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListUtils.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java?rev=1632007&r1=1632006&r2=1632007&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
Wed Oct 15 13:15:06 2014
@@ -680,6 +680,9 @@ public abstract class AbstractBreaker {
throw new IllegalStateException("Invalid break class: "
+ breakPenalty.getBreakClass());
}
+ if (ElementListUtils.isEmptyBox(returnedList)) {
+ ListUtil.removeLast(returnedList);
+ }
}
blockList.addAll(returnedList);
BlockSequence seq;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListUtils.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListUtils.java?rev=1632007&r1=1632006&r2=1632007&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListUtils.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListUtils.java
Wed Oct 15 13:15:06 2014
@@ -226,4 +226,13 @@ public final class ElementListUtils {
return prevBreak;
}
+ public static boolean isEmptyBox(List elements) {
+ if (elements.size() == 1 && elements.get(0) instanceof KnuthBox) {
+ KnuthBox kb = (KnuthBox) elements.get(0);
+ if (kb.getWidth() == 0) {
+ return true;
+ }
+ }
+ return false;
+ }
}
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_1.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_1.xml?rev=1632007&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_1.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_1.xml
Wed Oct 15 13:15:06 2014
@@ -0,0 +1,49 @@
+<?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 basic breaks.
+ </p>
+ </info>
+ <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in"
page-height="3in">
+ <fo:region-body margin="0.5in"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:block break-after="page">
+ page 1
+ <fo:block break-before="page"/>
+ </fo:block>
+ <fo:block>page 2</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+ </fo>
+ <checks>
+ <eval expected="page 1" xpath="//pageViewport[1]//lineArea"/>
+ <eval expected="page 2" xpath="//pageViewport[2]//lineArea"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_1.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_2.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_2.xml?rev=1632007&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_2.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_2.xml
Wed Oct 15 13:15:06 2014
@@ -0,0 +1,50 @@
+<?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 basic breaks.
+ </p>
+ </info>
+ <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in"
page-height="3in">
+ <fo:region-body margin="0.5in"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:block>page 1</fo:block>
+ <fo:block break-before="page" break-after="page">page 2</fo:block>
+ <fo:block break-before="page" break-after="page">page 3</fo:block>
+ <fo:block>page 4</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+ </fo>
+ <checks>
+ <eval expected="page 1" xpath="//pageViewport[1]//lineArea"/>
+ <eval expected="page 2" xpath="//pageViewport[2]//lineArea"/>
+ <eval expected="page 3" xpath="//pageViewport[3]//lineArea"/>
+ <eval expected="page 4" xpath="//pageViewport[4]//lineArea"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_2.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
