aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Hennebert <vhennebert@apache.org>2011-03-22 14:55:21 +0000
committerVincent Hennebert <vhennebert@apache.org>2011-03-22 14:55:21 +0000
commit823d0e968d25875f9774f62f2f5264863cb35ba9 (patch)
treecc995c8eceeb717d64c6da5ab0c9acc228265460
parent23a5eabe532f30bf0a84ff4dd31fe79c35c0220f (diff)
downloadxmlgraphics-fop-823d0e968d25875f9774f62f2f5264863cb35ba9.tar.gz
xmlgraphics-fop-823d0e968d25875f9774f62f2f5264863cb35ba9.zip
Bugfix: keep-together does not apply to fo:table-cell
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1084205 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java8
-rw-r--r--status.xml3
-rw-r--r--test/layoutengine/standard-testcases/table-row_keep-together.xml2
-rw-r--r--test/layoutengine/standard-testcases/table-row_keep-together_2.xml74
-rw-r--r--test/layoutengine/standard-testcases/table-row_keep-with-next2.xml4
-rw-r--r--test/layoutengine/standard-testcases/table_keep-together.xml4
6 files changed, 85 insertions, 10 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
index ded18384d..d5f259b38 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
@@ -553,12 +553,8 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager
/** {@inheritDoc} */
public Keep getKeepTogether() {
- Keep keep = Keep.KEEP_AUTO;
- if (primaryGridUnit.getRow() != null) {
- keep = Keep.getKeep(primaryGridUnit.getRow().getKeepTogether());
- }
- keep = keep.compare(getParentKeepTogether());
- return keep;
+ // keep-together does not apply to fo:table-cell
+ return Keep.KEEP_AUTO;
}
/** {@inheritDoc} */
diff --git a/status.xml b/status.xml
index 337164b31..304c08173 100644
--- a/status.xml
+++ b/status.xml
@@ -60,6 +60,9 @@
-->
<release version="FOP Trunk" date="TBD">
<action context="Layout" dev="VH" type="fix">
+ Bugfix: keep-together does not apply to fo:table-cell.
+ </action>
+ <action context="Layout" dev="VH" type="fix">
Bugfix: keep-together on a table containing row-spanning cells was not honored.
</action>
<action context="Layout" dev="VH" type="fix" fixes-bug="50196" due-to="Matthias Reischenbacher">
diff --git a/test/layoutengine/standard-testcases/table-row_keep-together.xml b/test/layoutengine/standard-testcases/table-row_keep-together.xml
index 0cf04bf37..73a334c6d 100644
--- a/test/layoutengine/standard-testcases/table-row_keep-together.xml
+++ b/test/layoutengine/standard-testcases/table-row_keep-together.xml
@@ -55,7 +55,7 @@
<checks>
<element-list category="table-cell" id="cell1">
<box w="14400"/>
- <penalty w="0" p="INF"/> <!-- the keep-together on the table-row has to result in an INFINITE penalty here -->
+ <penalty w="0" p="0"/>
<box w="14400"/>
</element-list>
<element-list category="table-cell" id="cell2">
diff --git a/test/layoutengine/standard-testcases/table-row_keep-together_2.xml b/test/layoutengine/standard-testcases/table-row_keep-together_2.xml
index 0e2867b2e..db75e4063 100644
--- a/test/layoutengine/standard-testcases/table-row_keep-together_2.xml
+++ b/test/layoutengine/standard-testcases/table-row_keep-together_2.xml
@@ -128,6 +128,38 @@
</fo:flow>
</fo:page-sequence>
+ <!-- table 4 -->
+ <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block space-after="110pt">4. Before the table</fo:block>
+ <fo:table width="100%" table-layout="fixed"
+ border-collapse="collapse" border="4pt solid black">
+ <fo:table-column number-columns-repeated="2"
+ column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row keep-together.within-page="always">
+ <fo:table-cell border="2pt solid blue" number-rows-spanned="2">
+ <fo:block>Cell 1.1 Line 1</fo:block>
+ <fo:block>Cell 1.1 Line 2</fo:block>
+ <fo:block>Cell 1.1 Line 3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="2pt solid teal">
+ <fo:block>Cell 1.2 Line 1</fo:block>
+ <fo:block>Cell 1.2 Line 2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="2pt solid olive">
+ <fo:block>Cell 2.2 Line 1</fo:block>
+ <fo:block>Cell 2.2 Line 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>
@@ -199,5 +231,47 @@
<eval expected="(solid,#808000,2000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-before"/>
<eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-after"/>
+ <!-- table 4 -->
+ <eval expected="2" xpath="count(//pageSequence[4]/pageViewport)"/>
+ <!-- page 1 -->
+ <eval expected="2" xpath="count(//pageViewport[@nr=7]//flow/block)"/>
+ <eval expected="4. Before the table" xpath="//pageViewport[@nr=7]//flow/block[1]/lineArea"/>
+ <eval expected="23000" xpath="//pageViewport[@nr=7]//flow/block[2]/@bpd"/>
+ <eval expected="23000" xpath="//pageViewport[@nr=7]//flow/block[2]/@bpda"/>
+ <!-- cell 1.1 -->
+ <eval expected="21000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@bpd"/>
+ <eval expected="25000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@bpda"/>
+ <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@border-before"/>
+ <eval expected="" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@border-after"/>
+ <eval expected="21000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/@bpd"/>
+ <eval expected="21000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/@bpda"/>
+ <eval expected="2" xpath="count(//pageViewport[@nr=7]//flow/block[2]/block[2]/block)"/>
+ <eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/block[1]/lineArea"/>
+ <eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/block[2]/lineArea"/>
+ <!-- cell 1.2 -->
+ <eval expected="20000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@bpd"/>
+ <eval expected="26000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@bpda"/>
+ <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@border-before"/>
+ <eval expected="(solid,#008080,2000,collapse-outer)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@border-after"/>
+ <!-- page 2 -->
+ <eval expected="2" xpath="count(//pageViewport[@nr=8]//flow/block)"/>
+ <eval expected="After the table" xpath="//pageViewport[@nr=8]//flow/block[2]/lineArea"/>
+ <eval expected="23000" xpath="//pageViewport[@nr=8]//flow/block[1]/@bpd"/>
+ <eval expected="23000" xpath="//pageViewport[@nr=8]//flow/block[1]/@bpda"/>
+ <!-- cell 1.1 -->
+ <eval expected="21000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@bpd"/>
+ <eval expected="25000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@bpda"/>
+ <eval expected="" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@border-before"/>
+ <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@border-after"/>
+ <eval expected="21000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[2]/@bpd"/>
+ <eval expected="21000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[2]/@bpda"/>
+ <eval expected="1" xpath="count(//pageViewport[@nr=8]//flow/block[1]/block[2]/block)"/>
+ <eval expected="Cell 1.1 Line 3" xpath="//pageViewport[@nr=8]//flow/block[1]/block[2]/block[1]/lineArea"/>
+ <!-- cell 2.2 -->
+ <eval expected="20000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@bpd"/>
+ <eval expected="26000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@bpda"/>
+ <eval expected="(solid,#808000,2000,collapse-outer)" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@border-before"/>
+ <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@border-after"/>
+
</checks>
</testcase>
diff --git a/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml b/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml
index 3b3b89384..845744e85 100644
--- a/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml
+++ b/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml
@@ -60,7 +60,9 @@
<element-list category="breaker">
<box w="14400"/>
<penalty w="0" p="INF"/>
- <box w="28800"/>
+ <box w="14400"/>
+ <penalty w="0" p="INF"/>
+ <box w="14400"/>
<penalty w="0" p="0"/>
<box w="14400"/>
<skip>3</skip>
diff --git a/test/layoutengine/standard-testcases/table_keep-together.xml b/test/layoutengine/standard-testcases/table_keep-together.xml
index a904a144a..927ea64e6 100644
--- a/test/layoutengine/standard-testcases/table_keep-together.xml
+++ b/test/layoutengine/standard-testcases/table_keep-together.xml
@@ -92,7 +92,7 @@
<checks>
<element-list category="table-cell" id="cell1">
<box w="14400"/>
- <penalty w="0" p="INF"/> <!-- the keep-together on the table-row has to result in an INFINITE penalty here -->
+ <penalty w="0" p="0"/>
<box w="14400"/>
</element-list>
<element-list category="table-cell" id="cell2">
@@ -114,7 +114,7 @@
<!-- the same again but this time with keep="1" -->
<element-list category="table-cell" id="cell1b">
<box w="14400"/>
- <penalty w="0" p="999"/>
+ <penalty w="0" p="0"/>
<box w="14400"/>
</element-list>
<element-list category="table-cell" id="cell2b">