You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2008/04/25 12:08:04 UTC
svn commit: r651558 [2/2] - in /xmlgraphics/fop/trunk: ./
src/java/org/apache/fop/fo/flow/table/ src/java/org/apache/fop/layoutmgr/
src/java/org/apache/fop/layoutmgr/inline/
src/java/org/apache/fop/layoutmgr/list/
src/java/org/apache/fop/layoutmgr/tabl...
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-previous_integers_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-previous_integers_1.xml?rev=651558&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-previous_integers_1.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-previous_integers_1.xml Fri Apr 25 03:07:58 2008
@@ -0,0 +1,116 @@
+<?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 keep-with-previous.wuithin-column with integer values.
+ </p>
+ <p>
+ Widows and Orphans are disabled in this test to avoid side-effects.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" widows="0" orphans="0">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="4.5 * 14.4pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>block1</fo:block>
+ <fo:block keep-with-previous.within-column="always">block2</fo:block>
+ <fo:block keep-with-previous.within-column="1">block3</fo:block>
+ <fo:block>block4</fo:block>
+ <fo:block keep-with-previous.within-column="1">
+ <fo:block>block5</fo:block>
+ <fo:block>block6</fo:block>
+ </fo:block>
+ <fo:block>block7</fo:block>
+ <fo:block keep-with-previous.within-column="1">
+ <fo:block keep-with-previous.within-column="always">block8</fo:block>
+ <fo:block>block9</fo:block>
+ </fo:block>
+ <fo:block>block10</fo:block>
+ <fo:block keep-with-previous.within-column="always">
+ <fo:block keep-with-previous.within-column="1">block11</fo:block>
+ <fo:block>block12</fo:block>
+ </fo:block>
+ <fo:block>block13</fo:block>
+ <fo:block>
+ <fo:block>block14</fo:block>
+ <fo:block keep-with-previous.within-column="1">block15</fo:block>
+ </fo:block>
+ <fo:block>block16</fo:block>
+ <fo:block keep-with-previous.within-column="1">
+ <fo:block>block17</fo:block>
+ <fo:block break-before="page">block18</fo:block>
+ <fo:block>block19</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker" index="0">
+ <box/> <!-- 1 -->
+ <penalty w="0" p="INF"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/> <!-- 5 -->
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="INF"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/> <!-- 10 -->
+ <penalty w="0" p="INF"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/> <!-- 15 -->
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+
+ <skip>3</skip>
+ </element-list>
+ <element-list category="breaker" index="1">
+ <box/> <!-- 18 -->
+ <penalty w="0" p="0"/>
+ <box/>
+
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-previous_integers_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-previous_integers_1.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-next_integers_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-next_integers_1.xml?rev=651558&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-next_integers_1.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-next_integers_1.xml Fri Apr 25 03:07:58 2008
@@ -0,0 +1,155 @@
+<?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 keep-with-next with lists.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" widows="0" orphans="0">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="10 * 14.4pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>block1</fo:block>
+ <fo:list-block
+ provisional-distance-between-starts="25mm"
+ provisional-label-separation="5mm"
+ keep-with-next.within-column="1">
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item1</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label2</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:block>block2</fo:block>
+ <fo:list-block
+ provisional-distance-between-starts="25mm"
+ provisional-label-separation="5mm">
+ <fo:list-item keep-with-next.within-column="1">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item1</fo:block>
+ <fo:block keep-with-next.within-column="1">item1</fo:block>
+ <fo:block>item1</fo:block>
+ <fo:block>item1</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label2</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:block>block3</fo:block>
+ <fo:list-block keep-with-next.within-column="1"
+ provisional-distance-between-starts="25mm"
+ provisional-label-separation="5mm">
+ <fo:list-item keep-with-next.within-column="2">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block keep-with-next.within-column="always">label1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item1</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:block>block4</fo:block>
+ <fo:list-block
+ provisional-distance-between-starts="25mm"
+ provisional-label-separation="5mm">
+ <fo:list-item >
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block keep-with-next.within-column="1">label1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item1</fo:block>
+ <fo:block>item1</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:block>block5</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- list 1 starts -->
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <!-- list 1 end -->
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- list 2 starts -->
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <!-- list 2 end -->
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- list 3 starts -->
+ <box/>
+ <!-- list 3 end -->
+ <penalty w="0" p="INF"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- list 4 starts -->
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <!-- list 4 end -->
+ <penalty w="0" p="999"/>
+ <box/>
+
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-next_integers_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-next_integers_1.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml?rev=651558&r1=651557&r2=651558&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml Fri Apr 25 03:07:58 2008
@@ -63,7 +63,6 @@
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>item1</fo:block>
- <fo:block>item1</fo:block>
</fo:list-item-body>
</fo:list-item>
<fo:list-item keep-with-previous.within-page="always">
@@ -114,8 +113,6 @@
<box w="14400"/>
<penalty w="0" p="0"/>
<!-- list 2 starts -->
- <box w="14400"/>
- <penalty w="0" p="INF"/>
<box w="14400"/>
<penalty w="0" p="INF"/>
<box w="14400"/>
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous_integers_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous_integers_1.xml?rev=651558&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous_integers_1.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous_integers_1.xml Fri Apr 25 03:07:58 2008
@@ -0,0 +1,127 @@
+<?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 keep-with-previous with lists.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" widows="0" orphans="0">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="10 * 14.4pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>block1</fo:block>
+ <fo:list-block
+ provisional-distance-between-starts="25mm"
+ provisional-label-separation="5mm"
+ keep-with-previous.within-column="1">
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item1</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label2</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:block>block2</fo:block>
+ <fo:list-block
+ provisional-distance-between-starts="25mm"
+ provisional-label-separation="5mm">
+ <fo:list-item keep-with-previous.within-column="1">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item1</fo:block>
+ <fo:block>item1</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item keep-with-previous.within-column="1">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label2</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:block>block3</fo:block>
+ <fo:list-block keep-with-previous.within-column="1"
+ provisional-distance-between-starts="25mm"
+ provisional-label-separation="5mm">
+ <fo:list-item keep-with-previous.within-column="2">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block keep-with-previous.within-column="always">label1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>item1</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:block>block4</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box/>
+ <penalty w="0" p="999"/>
+ <!-- list 1 starts -->
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <!-- list 1 end -->
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <!-- list 2 starts -->
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <!-- list 2 end -->
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="INF"/>
+ <!-- list 3 starts -->
+ <box/>
+ <!-- list 3 end -->
+ <penalty w="0" p="0"/>
+ <box/>
+
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous_integers_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous_integers_1.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml?rev=651558&r1=651557&r2=651558&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml Fri Apr 25 03:07:58 2008
@@ -41,7 +41,6 @@
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>item1</fo:block>
- <fo:block>item2</fo:block>
</fo:list-item-body>
</fo:list-item>
<fo:list-item>
@@ -85,8 +84,6 @@
<box w="14400"/>
<penalty w="0" p="0"/>
<!-- list 1 starts -->
- <box w="14400"/>
- <penalty w="0" p="INF"/>
<box w="14400"/>
<penalty w="0" p="INF"/>
<box w="14400"/>
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next_integers_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next_integers_1.xml?rev=651558&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next_integers_1.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next_integers_1.xml Fri Apr 25 03:07:58 2008
@@ -0,0 +1,184 @@
+<?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 keep-with-next works on tables.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" widows="0" orphans="0">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="10 * 14.4pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>block1</fo:block>
+ <fo:table width="100%" table-layout="fixed" keep-with-next.within-column="1">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>block2</fo:block>
+ <fo:table width="100%" table-layout="fixed">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row keep-with-next.within-column="1">
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block keep-with-next.within-column="1">cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row keep-with-next.within-column="1">
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>block3</fo:block>
+ <fo:table width="100%" table-layout="fixed">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block keep-with-next.within-column="1">cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>block4</fo:block>
+ <fo:table width="100%" table-layout="fixed" keep-with-next.within-column="1">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row keep-with-next.within-column="2">
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block keep-with-next.within-column="always">cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>block5</fo:block>
+ <fo:table width="100%" table-layout="fixed">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <!-- Check that keeps are processed correctly inside the cell -->
+ <fo:block keep-with-next.within-column="1">cell1/2</fo:block>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <!-- This cell stops earlier than the one next to it -->
+ <fo:block keep-with-next.within-column="1">cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>block6</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- table 1 starts -->
+ <box/>
+ <!-- table 1 end -->
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- table 2 starts -->
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <!-- table 2 end -->
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- table 3 starts -->
+ <box/>
+ <!-- table 3 end -->
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- table 4 starts -->
+ <box/>
+ <!-- table 4 end -->
+ <penalty w="0" p="INF"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- table 5 starts -->
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <!-- table 5 end -->
+ <penalty w="0" p="999"/>
+ <box/>
+
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next_integers_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next_integers_1.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous_integers_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous_integers_1.xml?rev=651558&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous_integers_1.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous_integers_1.xml Fri Apr 25 03:07:58 2008
@@ -0,0 +1,146 @@
+<?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 keep-with-previous works on tables.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" widows="0" orphans="0">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="10 * 14.4pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>block1</fo:block>
+ <fo:table width="100%" table-layout="fixed" keep-with-previous.within-column="1">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>block2</fo:block>
+ <fo:table width="100%" table-layout="fixed">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row keep-with-previous.within-column="1">
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block keep-with-previous.within-column="1">cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>block3</fo:block>
+ <fo:table width="100%" table-layout="fixed">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block keep-with-previous.within-column="1">block4</fo:block>
+ <fo:table width="100%" table-layout="fixed" keep-with-previous.within-column="1">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row keep-with-previous.within-column="2">
+ <fo:table-cell>
+ <fo:block keep-with-previous.within-column="3">cell1/1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block keep-with-previous.within-column="always">cell1/2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>block5</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box/>
+ <penalty w="0" p="999"/>
+ <!-- table 1 starts -->
+ <box/>
+ <!-- table 1 end -->
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- table 2 starts -->
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <!-- table 2 end -->
+ <penalty w="0" p="0"/>
+ <box/>
+ <penalty w="0" p="0"/>
+ <!-- table 3 starts -->
+ <box/>
+ <!-- table 3 end -->
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="INF"/>
+ <!-- table 4 starts -->
+ <box/>
+ <!-- table 4 end -->
+ <penalty w="0" p="0"/>
+ <box/>
+
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous_integers_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous_integers_1.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org