Added region-body_display-align to demonstrate the default behaviour for adjustable spaces when display-align is set to "auto".

Reactivated proprietary display-align="distribute" so a block-container can cause its content to be "justified" in the reference area if it's large enough and the adjustable elements (min/opt/max) allow for it. I may be misusing the original intended behaviour of "distribute" but for block-container this seemed suitable since it's destined to produce only one viewport/reference pair if possible. Test added that demonstrates the proprietary value on block-container. Note: on normal region-body elements, display-align="distribute" has currently no effect since the code did not evolve with the changes in the layout engine.

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

1 files changed, 108 insertions, 0 deletions

diff --git a/test/layoutengine/standard-testcases/block-container_display-align_distribute.xml b/test/layoutengine/standard-testcases/block-container_display-align_distribute.xml
new file mode 100644
index 000000000..58137ce56
--- /dev/null
+++ b/test/layoutengine/standard-testcases/block-container_display-align_distribute.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 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 display-align="distribute" (The value "distribute" is a proprietary extension to XSL-FO).
+    </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="5in">
+          <fo:region-body column-count="4" column-gap="5pt"/>
+        </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-container width="100%" height="4.2in" display-align="distribute" background-color="yellow">
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              "distribute" 4.2in
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              <!-- last -->
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+          </fo:block-container>
+          <fo:block-container width="100%" height="4.8in" display-align="distribute" background-color="yellow">
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              "distribute" 4.8in
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              <!-- last -->
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+          </fo:block-container>
+          <fo:block-container width="100%" height="3.85in" display-align="distribute" background-color="yellow">
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              "distribute" 3.85in
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              <!-- last -->
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+          </fo:block-container>
+          <fo:block-container width="100%" height="4.2in" display-align="auto" background-color="orange">
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              "auto"
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+            <fo:block space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
+              <!-- last -->
+              Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1 Text 1
+            </fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- check with 3 mpt tolerance -->
+    <eval expected="0" xpath="//flow[1]/block[1]/@bpd - //flow[1]/block[1]/block[1]/@bpd" tolerance="3"/>
+    <eval expected="14400" xpath="//flow[2]/block[1]/@bpd - //flow[2]/block[1]/block[1]/@bpd" tolerance="3"/>
+    <eval expected="0" xpath="//flow[3]/block[1]/@bpd - //flow[3]/block[1]/block[1]/@bpd" tolerance="3"/>
+    <eval expected="21600" xpath="//flow[4]/block[1]/@bpd - //flow[4]/block[1]/block[1]/@bpd" tolerance="3"/>
+  </checks>
+</testcase>