From: Jeremias Maerki <jeremias@apache.org>
Date: Tue, 26 Jul 2005 07:44:22 +0000 (+0000)
Subject: Test space-after, too, in list4.
X-Git-Tag: fop-0_90-alpha1~477
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fce67cde95574b4fe4d263c5fe5dba3df92ae7bf;p=xmlgraphics-fop.git

Test space-after, too, in list4.
Cloned list4 to list4a which is modified slightly to check for differing min/opt/max values. This one currently breaks as it is not properly handled, yet.
Updated disabled testcases.

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

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index 1ee4231b6..989b5dcc9 100644
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -5,7 +5,7 @@ keep-with-previous2.xml
 keep-with-previous3.xml
 keep-with-previous4.xml
 keep-with-previous5.xml
-list4.xml
+list4a.xml
 multi-column3.xml
 normal-breaking4.xml
 table-border-collapse1.xml
diff --git a/test/layoutengine/testcases/list4.xml b/test/layoutengine/testcases/list4.xml
index 10ab1c936..e863593ae 100644
--- a/test/layoutengine/testcases/list4.xml
+++ b/test/layoutengine/testcases/list4.xml
@@ -18,7 +18,7 @@
 <testcase>
   <info>
     <p>
-      This test checks lists. Checks for the presence of space-before on list-items.
+      This test checks lists. Checks for the presence of space-before and space-after on list-items.
     </p>
   </info>
   <fo>
@@ -49,7 +49,7 @@
                 <fo:block>here is text in the list item body</fo:block>
               </fo:list-item-body>
             </fo:list-item>
-            <fo:list-item space-before="1em">
+            <fo:list-item space-before="1em" space-after="1em">
               <fo:list-item-label end-indent="label-end()">
                 <fo:block>•</fo:block>
               </fo:list-item-label>
@@ -57,7 +57,7 @@
                 <fo:block>here is text in the list item body</fo:block>
               </fo:list-item-body>
             </fo:list-item>
-            <fo:list-item space-before="1em">
+            <fo:list-item space-after="1em">
               <fo:list-item-label end-indent="label-end()">
                 <fo:block>•</fo:block>
               </fo:list-item-label>
@@ -65,7 +65,7 @@
                 <fo:block>here is text in the list item body</fo:block>
               </fo:list-item-body>
             </fo:list-item>
-            <fo:list-item space-before="1em">
+            <fo:list-item>
               <fo:list-item-label end-indent="label-end()">
                 <fo:block>•</fo:block>
               </fo:list-item-label>
@@ -91,10 +91,8 @@
       <penalty w="0" p="0"/>
       <glue w="12000"/>
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <glue w="12000"/>
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <glue w="12000"/>
       <box w="14400"/>
       <skip>3</skip>
diff --git a/test/layoutengine/testcases/list4a.xml b/test/layoutengine/testcases/list4a.xml
new file mode 100644
index 000000000..544414d8e
--- /dev/null
+++ b/test/layoutengine/testcases/list4a.xml
@@ -0,0 +1,110 @@
+<?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 lists. Checks for the presence of space-before and space-after 
+      on list-items. In this case, min/opt/max don't have the same value.
+    </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" 
+              margin="20pt">
+          <fo:region-body background-color="yellow"/>
+        </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:block>test</fo:block>
+          <fo:list-block provisional-distance-between-starts="50pt" provisional-label-separation="5pt">
+            <fo:list-item space-before.optimum="1em">
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>•</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>here is text in the list item body</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+            <fo:list-item space-before.optimum="1em">
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>•</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>here is text in the list item body</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+            <fo:list-item space-before.optimum="1em" space-after.optimum="1em">
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>•</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>here is text in the list item body</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+            <fo:list-item space-after.optimum="1em">
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>•</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>here is text in the list item body</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+            <fo:list-item>
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>•</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>here is text in the list item body</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+          </fo:list-block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2" xpath="count(//pageViewport)"/>
+    
+    <!-- The following check makes sure that the content doesn't overlap the available region -->
+    <true xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/@bpda &lt;= //pageViewport[@nr=1]/page/regionViewport/regionBody/@bpda"
+        fail-msg="The span content must not exceed the available space given by the region-body!"/>
+    <!-- This check currently breaks because the breaker uses the minimum values (0pt) 
+      instead of optimum and the addAreas stage doesn't create smaller space-before/after 
+      spacers. -->
+    
+    <element-list category="breaker">
+      <box w="14400"/>
+      <penalty w="0" p="0"/>
+      <glue w="12000"/> <!-- TODO Check shrink/stretch -->
+      <box w="14400"/>
+      <penalty w="0" p="0"/>
+      <glue w="12000"/>
+      <box w="14400"/>
+      <penalty w="0" p="0"/>
+      <glue w="12000"/>
+      <box w="14400"/>
+      <glue w="12000"/>
+      <box w="14400"/>
+      <glue w="12000"/>
+      <box w="14400"/>
+      <skip>3</skip>
+    </element-list>
+  </checks>
+</testcase>