diff options
Diffstat (limited to 'test/layoutengine')
12 files changed, 1090 insertions, 18 deletions
diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml index b4de16ef4..12d7ed1aa 100644 --- a/test/layoutengine/disabled-testcases.xml +++ b/test/layoutengine/disabled-testcases.xml @@ -165,18 +165,6 @@ <reference>http://www.nabble.com/leaders-with-leader-pattern%3D%22use-content%22-t546244.html</reference> </testcase> <testcase> - <name>keep-with-previous doesn't work in lists</name> - <file>list-block_keep-with-previous.xml</file> - <description>Keep-with-previous doesn't work inside tables and - lists, yet.</description> - </testcase> - <testcase> - <name>keep-with-previous doesn't work in lists</name> - <file>list-item_block_keep-with-previous.xml</file> - <description>Keep-with-previous doesn't work inside tables and - lists, yet.</description> - </testcase> - <testcase> <name>Page breaking doesn't deal with IPD changes</name> <file>page-breaking_4.xml</file> <description>Page breaking currently doesn't support changing available IPD diff --git a/test/layoutengine/standard-testcases/block-container_keep-with-next_1.xml b/test/layoutengine/standard-testcases/block-container_keep-with-next_1.xml new file mode 100644 index 000000000..c43e06359 --- /dev/null +++ b/test/layoutengine/standard-testcases/block-container_keep-with-next_1.xml @@ -0,0 +1,101 @@ +<?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 on fo:block-container. + </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="12 * 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-container keep-with-next.within-column="always"> + <fo:block>block1</fo:block> + <fo:block>block2</fo:block> + </fo:block-container> + <fo:block-container keep-with-next.within-column="1"> + <fo:block>block3</fo:block> + <fo:block>block4</fo:block> + </fo:block-container> + <fo:block-container> + <fo:block>block5</fo:block> + </fo:block-container> + <fo:block-container> + <fo:block>block6</fo:block> + <fo:block keep-with-next.within-column="1">block7</fo:block> + </fo:block-container> + <fo:block keep-with-next.within-column="always">block8</fo:block> + <fo:block-container keep-with-next.within-column="1"> + <fo:block>block9</fo:block> + <fo:block keep-with-next.within-column="always">block10</fo:block> + </fo:block-container> + <fo:block>block11</fo:block> + <fo:block-container keep-with-next.within-column="always"> + <fo:block>block12</fo:block> + <fo:block keep-with-next.within-column="1">block13</fo:block> + </fo:block-container> + <fo:block>block14</fo:block> + </fo:flow> + </fo:page-sequence> + </fo:root> + </fo> + <checks> + <element-list category="breaker"> + <box/> <!-- 1 --> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="INF"/> + <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="999"/> + <box/> + <penalty w="0" p="INF"/> + <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="INF"/> + <box/> + + <skip>3</skip> + </element-list> + + </checks> +</testcase> diff --git a/test/layoutengine/standard-testcases/block-container_keep-with-previous_1.xml b/test/layoutengine/standard-testcases/block-container_keep-with-previous_1.xml new file mode 100644 index 000000000..1c318ca0c --- /dev/null +++ b/test/layoutengine/standard-testcases/block-container_keep-with-previous_1.xml @@ -0,0 +1,101 @@ +<?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 on fo:block-container. + </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="12 * 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-container keep-with-previous.within-column="always"> + <fo:block>block2</fo:block> + <fo:block>block3</fo:block> + </fo:block-container> + <fo:block-container keep-with-previous.within-column="1"> + <fo:block>block4</fo:block> + <fo:block>block5</fo:block> + </fo:block-container> + <fo:block-container> + <fo:block>block6</fo:block> + </fo:block-container> + <fo:block-container> + <fo:block keep-with-previous.within-column="1">block7</fo:block> + <fo:block>block8</fo:block> + </fo:block-container> + <fo:block keep-with-previous.within-column="always">block9</fo:block> + <fo:block-container keep-with-previous.within-column="1"> + <fo:block keep-with-previous.within-column="always">block10</fo:block> + <fo:block>block11</fo:block> + </fo:block-container> + <fo:block>block12</fo:block> + <fo:block-container keep-with-previous.within-column="always"> + <fo:block keep-with-previous.within-column="1">block13</fo:block> + <fo:block>block14</fo:block> + </fo:block-container> + </fo:flow> + </fo:page-sequence> + </fo:root> + </fo> + <checks> + <element-list category="breaker"> + <box/> <!-- 1 --> + <penalty w="0" p="INF"/> + <box/> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="999"/> + <box/> + <penalty w="0" p="0"/> + <box/> <!-- 5 --> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="999"/> + <box/> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="INF"/> + <box/> + <penalty w="0" p="INF"/> + <box/> <!-- 10 --> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="INF"/> + <box/> + <penalty w="0" p="0"/> + <box/> + + <skip>3</skip> + </element-list> + + </checks> +</testcase> diff --git a/test/layoutengine/standard-testcases/block_keep-with-next_integers_1.xml b/test/layoutengine/standard-testcases/block_keep-with-next_integers_1.xml new file mode 100644 index 000000000..a1e89f3c2 --- /dev/null +++ b/test/layoutengine/standard-testcases/block_keep-with-next_integers_1.xml @@ -0,0 +1,99 @@ +<?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.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-next.within-column="always">block2</fo:block> + <fo:block keep-with-next.within-column="1">block3</fo:block> + <fo:block>block4</fo:block> + <fo:block keep-with-next.within-column="1"> + <fo:block>block5</fo:block> + <fo:block>block6</fo:block> + </fo:block> + <fo:block>block7</fo:block> + <fo:block keep-with-next.within-column="1"> + <fo:block>block8</fo:block> + <fo:block keep-with-next.within-column="always">block9</fo:block> + </fo:block> + <fo:block>block10</fo:block> + <fo:block keep-with-next.within-column="always"> + <fo:block>block11</fo:block> + <fo:block keep-with-next.within-column="1">block12</fo:block> + </fo:block> + <fo:block>block13</fo:block> + <fo:block> + <fo:block keep-with-next.within-column="1">block14</fo:block> + <fo:block>block15</fo:block> + </fo:block> + </fo:flow> + </fo:page-sequence> + </fo:root> + </fo> + <checks> + <element-list category="breaker"> + <box/> <!-- 1 --> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="INF"/> + <box/> + <penalty w="0" p="999"/> + <box/> + <penalty w="0" p="0"/> + <box/> <!-- 5 --> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="999"/> + <box/> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="0"/> + <box/> + <penalty w="0" p="INF"/> + <box/> <!-- 10 --> + <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="999"/> + <box/> + + <skip>3</skip> + </element-list> + </checks> +</testcase> diff --git a/test/layoutengine/standard-testcases/block_keep-with-previous_integers_1.xml b/test/layoutengine/standard-testcases/block_keep-with-previous_integers_1.xml new file mode 100644 index 000000000..d43d45608 --- /dev/null +++ b/test/layoutengine/standard-testcases/block_keep-with-previous_integers_1.xml @@ -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> diff --git a/test/layoutengine/standard-testcases/list-block_keep-with-next_integers_1.xml b/test/layoutengine/standard-testcases/list-block_keep-with-next_integers_1.xml new file mode 100644 index 000000000..2c02806a3 --- /dev/null +++ b/test/layoutengine/standard-testcases/list-block_keep-with-next_integers_1.xml @@ -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> diff --git a/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml b/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml index 62b0f634c..cec98836a 100644 --- a/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml +++ b/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml @@ -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"> @@ -117,8 +116,6 @@ <box w="14400"/> <penalty w="0" p="INF"/> <box w="14400"/> - <penalty w="0" p="INF"/> - <box w="14400"/> <!-- list 2 end --> <penalty w="0" p="0"/> <box w="14400"/> diff --git a/test/layoutengine/standard-testcases/list-block_keep-with-previous_integers_1.xml b/test/layoutengine/standard-testcases/list-block_keep-with-previous_integers_1.xml new file mode 100644 index 000000000..7b9c9fb0f --- /dev/null +++ b/test/layoutengine/standard-testcases/list-block_keep-with-previous_integers_1.xml @@ -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> diff --git a/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml b/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml index 5c0a5da16..d2f5a18a8 100644 --- a/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml +++ b/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml @@ -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> @@ -88,8 +87,6 @@ <box w="14400"/> <penalty w="0" p="INF"/> <box w="14400"/> - <penalty w="0" p="INF"/> - <box w="14400"/> <!-- list 1 end --> <penalty w="0" p="0"/> <box w="14400"/> diff --git a/test/layoutengine/standard-testcases/table-cell_table-units_mixed.xml b/test/layoutengine/standard-testcases/table-cell_table-units_mixed.xml new file mode 100644 index 000000000..868b14388 --- /dev/null +++ b/test/layoutengine/standard-testcases/table-cell_table-units_mixed.xml @@ -0,0 +1,61 @@ +<?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 the calculation of table units when the column + widths are a mixture of fixed and proportional widths. + </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="5in"> + <fo:region-body/> + </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:table table-layout="fixed" width="100%"> + <fo:table-column column-number="1" column-width="2pt + proportional-column-width(1)" /> + <fo:table-column column-number="2" column-width="proportional-column-width(1) + 2pt" /> + <fo:table-column column-number="3" + column-width="proportional-column-width(.5) + 2pt + proportional-column-width(.5)" /> + <fo:table-body> + <fo:table-cell border="solid 0.5pt black" starts-row="true"> + <fo:block>Cell 1.1</fo:block> + </fo:table-cell> + <fo:table-cell border="solid 0.5pt red"> + <fo:block>Cell 2.2</fo:block> + </fo:table-cell> + <fo:table-cell border="solid 0.5pt yellow" ends-row="true"> + <fo:block>Cell 3.3</fo:block> + </fo:table-cell> + </fo:table-body> + </fo:table> + </fo:flow> + </fo:page-sequence> + </fo:root> + </fo> + <checks> + <eval expected="119500" xpath="//flow/block/block[1]/@ipd"/> + <eval expected="119500" xpath="//flow/block/block[2]/@ipd"/> + <eval expected="119500" xpath="//flow/block/block[3]/@ipd"/> + </checks> +</testcase> diff --git a/test/layoutengine/standard-testcases/table_keep-with-next_integers_1.xml b/test/layoutengine/standard-testcases/table_keep-with-next_integers_1.xml new file mode 100644 index 000000000..9774feb53 --- /dev/null +++ b/test/layoutengine/standard-testcases/table_keep-with-next_integers_1.xml @@ -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> diff --git a/test/layoutengine/standard-testcases/table_keep-with-previous_integers_1.xml b/test/layoutengine/standard-testcases/table_keep-with-previous_integers_1.xml new file mode 100644 index 000000000..ea5fada5f --- /dev/null +++ b/test/layoutengine/standard-testcases/table_keep-with-previous_integers_1.xml @@ -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> |