Check spaces on content inside block-containers.

block-containers without height currently behave like blocks which was easy to implement but wrong in terms of conditionals handling.

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

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index 71c7cb857a7952dc6466e0fbfda17b610fbb8f5a..569bd4c6e558dbf87b55d210163f719dd103b652 100644 (file)
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -1,4 +1,5 @@
 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_2.xml

diff --git a/test/layoutengine/testcases/block-container_space-before_space-after_3.xml b/test/layoutengine/testcases/block-container_space-before_space-after_3.xml
new file mode 100644 (file)
index 0000000..cbae2a4
--- /dev/null
+++ b/test/layoutengine/testcases/block-container_space-before_space-after_3.xml
@@ -0,0 +1,126 @@
+<?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 space properties on block-containers. The focus is on space properties on content inside the block-containers.
+    </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="no-height">
+        <fo:flow flow-name="xsl-region-body" line-height="10pt" font-size="9pt">
+          <fo:block-container space-before="1em" background-color="yellow" id="page1-bc1">
+            <fo:block space-before="1em">line 1</fo:block>
+            <fo:block>line 2</fo:block>
+          </fo:block-container>
+          <fo:block>A block between block-containers.</fo:block>
+          <fo:block-container background-color="yellow" id="page1-bc1">
+            <!-- ATM, the block-container without height behaves like a block which is wrong. It generates a viewport/reference pair. -->
+            <fo:block space-before="1em">line 1</fo:block>
+            <fo:block>line 2</fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+      <fo:page-sequence master-reference="normal" id="with-height">
+        <fo:flow flow-name="xsl-region-body" line-height="10pt" font-size="9pt">
+          <fo:block-container space-before="1em" height="50pt" background-color="yellow" id="page2-bc1">
+            <fo:block space-before="1em">line 1</fo:block>
+            <fo:block>line 2</fo:block>
+          </fo:block-container>
+          <fo:block>A block between block-containers.</fo:block>
+          <fo:block-container height="50pt" background-color="yellow" id="page2-bc2">
+            <fo:block space-before="1em">line 1</fo:block>
+            <fo:block>line 2</fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <element-list category="breaker" id="no-height">
+      <box w="0"/> <!-- SpaceHandlingPosition -->
+      
+      <box w="10000"/>
+      <penalty w="0" p="0"/>
+      <box w="10000"/>
+      
+      <penalty w="0" p="0"/>
+      <box w="10000"/> <!-- block between block-containers -->
+      <penalty w="0" p="0"/>
+      
+      <box w="10000"/>
+      <penalty w="0" p="0"/>
+      <box w="10000"/>
+      
+      <skip>3</skip>
+    </element-list>
+    <element-list category="block-container" id="page1-bc1">
+      <box w="0"/> <!-- SpaceHandlingPosition -->
+      
+      <box w="10000"/>
+      <penalty w="0" p="0"/>
+      <box w="10000"/>
+      
+      <skip>3</skip>
+    </element-list>
+    <element-list category="block-container" id="page1-bc2">
+      <box w="0"/> <!-- SpaceHandlingPosition -->
+      
+      <box w="10000"/>
+      <penalty w="0" p="0"/>
+      <box w="10000"/>
+      
+      <skip>3</skip>
+    </element-list>
+    <element-list category="breaker" id="no-height">
+      <box w="0"/> <!-- SpaceHandlingPosition -->
+      
+      <box w="50000"/>
+      
+      <penalty w="0" p="0"/>
+      <box w="10000"/> <!-- block between block-containers -->
+      <penalty w="0" p="0"/>
+      
+      <box w="50000"/>
+      
+      <skip>3</skip>
+    </element-list>
+    <element-list category="block-container" id="page2-bc1">
+      <box w="0"/> <!-- SpaceHandlingPosition -->
+      
+      <box w="10000"/>
+      <box w="10000"/>
+      
+      <skip>3</skip>
+    </element-list>
+    <element-list category="block-container" id="page2-bc2">
+      <box w="0"/> <!-- SpaceHandlingPosition -->
+      
+      <box w="10000"/>
+      <box w="10000"/>
+      
+      <skip>3</skip>
+    </element-list>
+  </checks>
+</testcase>