diff options
3 files changed, 80 insertions, 16 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java index c3e1a41da..9794c7310 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java @@ -69,7 +69,6 @@ public class TableContentLayoutManager implements PercentBaseContext { private LinkedList footerList; private int headerNetHeight = 0; private int footerNetHeight = 0; - private boolean firstBreakBeforeServed = false; private int startXOffset; private int usedBPD; @@ -220,16 +219,10 @@ public class TableContentLayoutManager implements PercentBaseContext { breakPoss.setBreakClass(rowFO.getBreakBefore()); } } else { - if (!firstBreakBeforeServed) { - returnList.add(new BreakElement(new Position(getTableLM()), - 0, -KnuthPenalty.INFINITE, rowFO.getBreakBefore(), context)); - iter.backToPreviousRow(); - firstBreakBeforeServed = true; - break; - } + returnList.add(new BreakElement(new Position(getTableLM()), + 0, -KnuthPenalty.INFINITE, rowFO.getBreakBefore(), context)); } } - firstBreakBeforeServed = true; //Border resolution if (!isSeparateBorderModel()) { diff --git a/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java b/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java index f8cedd7de..0f7604f20 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java @@ -212,13 +212,6 @@ public class TableRowIterator { } /** - * Sets the iterator to the previous row. - */ - public void backToPreviousRow() { - iteratorIndex--; - } - - /** * Returns the first effective row. * @return the requested effective row. */ diff --git a/test/layoutengine/standard-testcases/table-row_break-before_row-span.xml b/test/layoutengine/standard-testcases/table-row_break-before_row-span.xml new file mode 100644 index 000000000..2bc054565 --- /dev/null +++ b/test/layoutengine/standard-testcases/table-row_break-before_row-span.xml @@ -0,0 +1,78 @@ +<?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 that break-before on the first row of a table, when it contains row-spanning + cells, works correctly. + </p> + </info> + <fo> + <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <fo:layout-master-set> + <fo:simple-page-master master-name="page" page-height="10cm" page-width="15cm" + margin-top="1cm" margin-bottom="0" margin-left="1cm" margin-right="1cm"> + <fo:region-body/> + </fo:simple-page-master> + </fo:layout-master-set> + <fo:page-sequence master-reference="page" font-family="serif" font-size="14pt"> + <fo:flow flow-name="xsl-region-body"> + <fo:block>Before the table</fo:block> + <fo:table width="100%" table-layout="fixed" border-collapse="separate" border="4pt solid black"> + <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/> + <fo:table-body> + <fo:table-row break-before="page"> + <fo:table-cell border="2pt solid blue" number-rows-spanned="2"> + <fo:block>Cell 1.1</fo:block> + </fo:table-cell> + <fo:table-cell border="2pt solid teal"> + <fo:block>Cell 1.2</fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell border="2pt solid olive"> + <fo:block>Cell 2.2</fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell border="2pt solid red"> + <fo:block>Cell 3.1</fo:block> + </fo:table-cell> + <fo:table-cell border="2pt solid fuchsia"> + <fo:block>Cell 3.2</fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> + <fo:block>After the table</fo:block> + </fo:flow> + </fo:page-sequence> + </fo:root> + </fo> + <checks> + <!-- Two pages --> + <eval expected="2" xpath="count(//pageViewport)"/> + <!-- Only one line on the first page --> + <eval expected="1" xpath="count(//pageViewport[@nr=1]//flow/block)"/> + <eval expected="Before the table" xpath="//pageViewport[@nr=1]//flow/block[1]/lineArea/text[1]"/> + <!-- Table plus line "After the table" on the second page --> + <eval expected="2" xpath="count(//pageViewport[@nr=2]//flow/block)"/> + <eval expected="After the table" xpath="//pageViewport[@nr=2]//flow/block[2]/lineArea/text[1]"/> + </checks> +</testcase> |