Documenting what's still missing:

- border and padding conditionality on table-cell
- empty blocks break stacking constraints (form a fence) although they shouldn't.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_SpaceResolution@326053 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index 50ae73126dfc6bc820e4bd5783bfd10c27f50db0..665a568c84efeecc82bf74cabac3ecfd7a403585 100644 (file)
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -2,6 +2,7 @@ block-container_reference-orientation_bug36391.xml
 block-container_space-before_space-after_3.xml
 block_font-stretch.xml
 block_padding_2.xml
+block_space-before_space-after_8.xml
 block_word-spacing.xml
 block_word-spacing_text-align_justify.xml
 external-graphic_oversized.xml
@@ -30,6 +31,7 @@ table_border-collapse_collapse_1.xml
 table_border-collapse_collapse_2.xml
 table_border_padding.xml
 table-cell_block_keep-with-previous.xml
+table-cell_border_padding_conditionality.xml
 table-column_first-row-width.xml
 table-header_background-image.xml
 table-row_keep-with-previous.xml

diff --git a/test/layoutengine/testcases/block_space-before_space-after_8.xml b/test/layoutengine/testcases/block_space-before_space-after_8.xml
new file mode 100644 (file)
index 0000000..6a96007
--- /dev/null
+++ b/test/layoutengine/testcases/block_space-before_space-after_8.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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 if the special case is properly handled when an empty block is between two 
+      space-specifiers which should form a stacking constraint.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="1in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" id="ex8">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block space-after="10pt">
+            first line
+          </fo:block>
+          <fo:block id="empty-block"/>
+          <fo:block space-before="10pt">
+            second line
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <true xpath="not(boolean(//flow/block[1]/@space-after))"/>
+    <eval expected="10000" xpath="//flow/block[2]/@space-before"/>
+  </checks>
+</testcase>

diff --git a/test/layoutengine/testcases/table-cell_border_padding_conditionality.xml b/test/layoutengine/testcases/table-cell_border_padding_conditionality.xml
new file mode 100644 (file)
index 0000000..f3a1892
--- /dev/null
+++ b/test/layoutengine/testcases/table-cell_border_padding_conditionality.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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 border and padding conditionality on table.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" id="retain">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:table table-layout="fixed" width="100%" border-collapse="separate" border-spacing="5pt">
+            <fo:table-column column-width="proportional-column-width(1)"/>
+            <fo:table-column column-width="proportional-column-width(9)"/>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="yellow"
+                    padding-before="20pt" padding-before.conditionality="retain" 
+                    padding-after="20pt" padding-after.conditionality="retain" 
+                    border-before-style="solid" border-before-width="5pt" border-before-width.conditionality="retain"
+                    border-after-style="solid" border-after-width="5pt" border-after-width.conditionality="retain">
+                  <fo:block>cell1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="orange"
+                    padding-before="20pt" padding-before.conditionality="retain" 
+                    padding-after="20pt" padding-after.conditionality="retain" 
+                    border-before-style="solid" border-before-width="5pt" border-before-width.conditionality="retain"
+                    border-after-style="solid" border-after-width="5pt" border-after-width.conditionality="retain">
+                  <fo:block text-align="justify">
+In olden times when wishing still helped one, there lived a king whose daughters 
+were all beautiful; and the youngest was so beautiful that the sun itself, which 
+has seen so much, was astonished whenever it shone in her face. Close by the king's 
+castle lay a great dark forest, and under an old lime-tree in the forest was a well, 
+and when the day was very warm, the king's child went out into the forest and sat 
+down by the side of the cool fountain; and when she was bored she took a golden ball, 
+and threw it up on high and caught it; and this ball was her favorite plaything.
+                  </fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+      <fo:page-sequence master-reference="normal" id="discard">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:table table-layout="fixed" width="100%" border-collapse="separate" border-spacing="5pt">
+            <fo:table-column column-width="proportional-column-width(1)"/>
+            <fo:table-column column-width="proportional-column-width(9)"/>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="yellow"
+                    padding-before="20pt" padding-before.conditionality="discard" 
+                    padding-after="20pt" padding-after.conditionality="discard" 
+                    border-before-style="solid" border-before-width="5pt" border-before-width.conditionality="discard"
+                    border-after-style="solid" border-after-width="5pt" border-after-width.conditionality="discard">
+                  <fo:block>cell1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="orange"
+                    padding-before="20pt" padding-before.conditionality="discard" 
+                    padding-after="20pt" padding-after.conditionality="discard" 
+                    border-before-style="solid" border-before-width="5pt" border-before-width.conditionality="discard"
+                    border-after-style="solid" border-after-width="5pt" border-after-width.conditionality="discard">
+                  <fo:block text-align="justify">
+In olden times when wishing still helped one, there lived a king whose daughters 
+were all beautiful; and the youngest was so beautiful that the sun itself, which 
+has seen so much, was astonished whenever it shone in her face. Close by the king's 
+castle lay a great dark forest, and under an old lime-tree in the forest was a well, 
+and when the day was very warm, the king's child went out into the forest and sat 
+down by the side of the cool fountain; and when she was bored she took a golden ball, 
+and threw it up on high and caught it; and this ball was her favorite plaything.
+                  </fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- retain case -->
+    <eval expected="(solid,#000000,5000)" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@border-before"/>
+    <eval expected="20000" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@padding-before"/>
+
+    <eval expected="(solid,#000000,5000)" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@border-after"/>
+    <eval expected="20000" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@padding-after"/>
+
+    <eval expected="(solid,#000000,5000)" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@border-before"/>
+    <eval expected="20000" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@padding-before"/>
+
+    <eval expected="(solid,#000000,5000)" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@border-after"/>
+    <eval expected="20000" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@padding-after"/>
+
+    <!-- discard case -->
+    <eval expected="(solid,#000000,5000)" xpath="//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@border-before"/>
+    <eval expected="20000" xpath="//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@padding-before"/>
+    
+    <true xpath="not(boolean(//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@border-after))"/>
+    <true xpath="not(boolean(//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@padding-after))"/>
+
+    <true xpath="not(boolean(//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@border-before))"/>
+    <true xpath="not(boolean(//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@padding-before))"/>
+
+    <eval expected="(solid,#000000,5000)" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@border-after"/>
+    <eval expected="20000" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/@padding-after"/>
+  </checks>
+</testcase>