Author: vhennebert
Date: Tue Sep 4 16:12:52 2012
New Revision: 1380726
URL: http://svn.apache.org/viewvc?rev=1380726&view=rev
Log:
Bugzilla #45715: Restored support for break-before on fo:table.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_break-before.xml
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=1380726&r1=1380725&r2=1380726&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Tue Sep 4 16:12:52 2012
@@ -39,6 +39,7 @@ import org.apache.fop.fo.properties.Keep
import org.apache.fop.layoutmgr.BlockLevelEventProducer;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.BreakElement;
+import org.apache.fop.layoutmgr.BreakOpportunity;
import org.apache.fop.layoutmgr.ConditionalElementListener;
import org.apache.fop.layoutmgr.KnuthElement;
import org.apache.fop.layoutmgr.KnuthGlue;
@@ -62,7 +63,7 @@ import org.apache.fop.util.BreakUtil;
* the render background.
*/
public class TableLayoutManager extends BlockStackingLayoutManager
- implements ConditionalElementListener {
+ implements ConditionalElementListener, BreakOpportunity {
/**
* logging instance
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1380726&r1=1380725&r2=1380726&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue Sep 4 16:12:52 2012
@@ -62,6 +62,9 @@
documents. Example: the fix of marks layering will be such a case when
it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Layout" dev="VH" type="fix" fixes-bug="45715"
due-to="Luis Bernardo">
+ Restored support for break-before on fo:table.
+ </action>
<action context="Layout" dev="VH" type="fix" fixes-bug="53827">
When an fo:block has a non-zero value for its text-indent property and
is broken over two
pages of different widths, then the first line on the second page is
missing one word and
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_break-before.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_break-before.xml?rev=1380726&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_break-before.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_break-before.xml
Tue Sep 4 16:12:52 2012
@@ -0,0 +1,75 @@
+<?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 works on fo:table.
+ </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-width="200pt"
page-height="100pt"
+ margin="10pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <!-- Table as first child of parent element -->
+ <fo:page-sequence master-reference="page">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Page 1</fo:block>
+ <fo:block>
+ <fo:table break-before="page" width="100%" table-layout="fixed">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Page 2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ <!-- Table not as first child of parent element -->
+ <fo:page-sequence master-reference="page">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Page 3</fo:block>
+ <fo:table break-before="page" width="100%" table-layout="fixed">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Page 4</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2" xpath="count(//pageSequence[1]/pageViewport)"/>
+ <eval expected="1" xpath="//lineArea[starts-with(., 'Page
1')]/ancestor::pageViewport/@nr" />
+ <eval expected="2" xpath="//lineArea[starts-with(., 'Page
2')]/ancestor::pageViewport/@nr" />
+ <eval expected="2" xpath="count(//pageSequence[2]/pageViewport)"/>
+ <eval expected="3" xpath="//lineArea[starts-with(., 'Page
3')]/ancestor::pageViewport/@nr" />
+ <eval expected="4" xpath="//lineArea[starts-with(., 'Page
4')]/ancestor::pageViewport/@nr" />
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_break-before.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_break-before.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
