Merged changes from Trunk up to revision 824832

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

17 files changed, 210 insertions, 0 deletions

diff --git a/test/layoutengine/disabled-testcase2filename.xsl b/test/layoutengine/disabled-testcase2filename.xsl
index 68b9a7f47..68b9a7f47 100755..100644
--- a/test/layoutengine/disabled-testcase2filename.xsl
+++ b/test/layoutengine/disabled-testcase2filename.xsl
diff --git a/test/layoutengine/disabled-testcases.dtd b/test/layoutengine/disabled-testcases.dtd
index ae53e2b40..ae53e2b40 100755..100644
--- a/test/layoutengine/disabled-testcases.dtd
+++ b/test/layoutengine/disabled-testcases.dtd
diff --git a/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml b/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml
index 8a0d4e4c2..8a0d4e4c2 100755..100644
--- a/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml
+++ b/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml
diff --git a/test/layoutengine/hyphenation-testcases/block_shy_linebreaking_hyph.xml b/test/layoutengine/hyphenation-testcases/block_shy_linebreaking_hyph.xml
index 0174e9c08..0174e9c08 100755..100644
--- a/test/layoutengine/hyphenation-testcases/block_shy_linebreaking_hyph.xml
+++ b/test/layoutengine/hyphenation-testcases/block_shy_linebreaking_hyph.xml
diff --git a/test/layoutengine/hyphenation-testcases/block_uax14_linebreaking_hyph.xml b/test/layoutengine/hyphenation-testcases/block_uax14_linebreaking_hyph.xml
index e5bd5841c..e5bd5841c 100755..100644
--- a/test/layoutengine/hyphenation-testcases/block_uax14_linebreaking_hyph.xml
+++ b/test/layoutengine/hyphenation-testcases/block_uax14_linebreaking_hyph.xml
diff --git a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml
index 4c1c81189..4c1c81189 100755..100644
--- a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml
+++ b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml
diff --git a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml
index 6eda5a058..6eda5a058 100755..100644
--- a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml
+++ b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml
diff --git a/test/layoutengine/standard-testcases/block_bug39414.xml b/test/layoutengine/standard-testcases/block_bug39414.xml
index 921e12256..921e12256 100755..100644
--- a/test/layoutengine/standard-testcases/block_bug39414.xml
+++ b/test/layoutengine/standard-testcases/block_bug39414.xml
diff --git a/test/layoutengine/standard-testcases/block_line-height-shift-adjustment.xml b/test/layoutengine/standard-testcases/block_line-height-shift-adjustment.xml
index 65b6b7749..65b6b7749 100755..100644
--- a/test/layoutengine/standard-testcases/block_line-height-shift-adjustment.xml
+++ b/test/layoutengine/standard-testcases/block_line-height-shift-adjustment.xml
diff --git a/test/layoutengine/standard-testcases/block_shy_linebreaking.xml b/test/layoutengine/standard-testcases/block_shy_linebreaking.xml
index 3e48c0e99..3e48c0e99 100755..100644
--- a/test/layoutengine/standard-testcases/block_shy_linebreaking.xml
+++ b/test/layoutengine/standard-testcases/block_shy_linebreaking.xml
diff --git a/test/layoutengine/standard-testcases/block_text-align_3.xml b/test/layoutengine/standard-testcases/block_text-align_3.xml
index 432e15072..432e15072 100755..100644
--- a/test/layoutengine/standard-testcases/block_text-align_3.xml
+++ b/test/layoutengine/standard-testcases/block_text-align_3.xml
diff --git a/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml b/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
index 715a9364a..715a9364a 100755..100644
--- a/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
+++ b/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
diff --git a/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml b/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml
index 35e875190..35e875190 100755..100644
--- a/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml
+++ b/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml
diff --git a/test/layoutengine/standard-testcases/block_white-space.xml b/test/layoutengine/standard-testcases/block_white-space.xml
index f46f36d8a..f46f36d8a 100755..100644
--- a/test/layoutengine/standard-testcases/block_white-space.xml
+++ b/test/layoutengine/standard-testcases/block_white-space.xml
diff --git a/test/layoutengine/standard-testcases/external-graphic_breaking.xml b/test/layoutengine/standard-testcases/external-graphic_breaking.xml
index 18d58173e..18d58173e 100755..100644
--- a/test/layoutengine/standard-testcases/external-graphic_breaking.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_breaking.xml
diff --git a/test/layoutengine/standard-testcases/list_provisional-distance-between-starts_percentage.xml b/test/layoutengine/standard-testcases/list_provisional-distance-between-starts_percentage.xml
new file mode 100644
index 000000000..d184fac29
--- /dev/null
+++ b/test/layoutengine/standard-testcases/list_provisional-distance-between-starts_percentage.xml
@@ -0,0 +1,104 @@
+<?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 provisional-distance-between-starts works correctly when specified as a 
+      percentage.
+    </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="page" page-width="320pt" page-height="220pt" 
+          margin="10pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="page">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:list-block provisional-distance-between-starts="10%">
+            <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>list item 1</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>list item 2</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+          </fo:list-block>
+          <fo:block space-before="10pt">Inside a block-container:</fo:block>
+          <fo:block-container width="150pt" background-color="#F0F0F0">
+            <fo:list-block provisional-distance-between-starts="10%">
+              <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>list item 1</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>list item 2</fo:block>
+                </fo:list-item-body>
+              </fo:list-item>
+            </fo:list-block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- List 1 -->
+    <!-- List item 1 -->
+    <eval expected="24000"  xpath="//flow/block[1]/block[1]/block[1]/block[1]/@ipd"/>
+    <eval expected="276000" xpath="//flow/block[1]/block[1]/block[1]/block[1]/@end-indent"/>
+    <eval expected="270000" xpath="//flow/block[1]/block[1]/block[2]/block[1]/@ipd"/>
+    <eval expected="30000"  xpath="//flow/block[1]/block[1]/block[2]/block[1]/@start-indent"/>
+    <!-- List item 2 -->
+    <eval expected="24000"  xpath="//flow/block[1]/block[2]/block[1]/block[1]/@ipd"/>
+    <eval expected="276000" xpath="//flow/block[1]/block[2]/block[1]/block[1]/@end-indent"/>
+    <eval expected="270000" xpath="//flow/block[1]/block[2]/block[2]/block[1]/@ipd"/>
+    <eval expected="30000"  xpath="//flow/block[1]/block[2]/block[2]/block[1]/@start-indent"/>
+
+    <!-- List 2 -->
+    <!-- List item 1 -->
+    <eval expected="9000"   xpath="//flow/block[3]/block[1]/block[1]/block[1]/block[1]/block[1]/@ipd"/>
+    <eval expected="141000" xpath="//flow/block[3]/block[1]/block[1]/block[1]/block[1]/block[1]/@end-indent"/>
+    <eval expected="135000" xpath="//flow/block[3]/block[1]/block[1]/block[1]/block[2]/block[1]/@ipd"/>
+    <eval expected="15000"  xpath="//flow/block[3]/block[1]/block[1]/block[1]/block[2]/block[1]/@start-indent"/>
+    <!-- List item 2 -->
+    <eval expected="9000"   xpath="//flow/block[3]/block[1]/block[1]/block[2]/block[1]/block[1]/@ipd"/>
+    <eval expected="141000" xpath="//flow/block[3]/block[1]/block[1]/block[2]/block[1]/block[1]/@end-indent"/>
+    <eval expected="135000" xpath="//flow/block[3]/block[1]/block[1]/block[2]/block[2]/block[1]/@ipd"/>
+    <eval expected="15000"  xpath="//flow/block[3]/block[1]/block[1]/block[2]/block[2]/block[1]/@start-indent"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/list_provisional-label-separation_percentage.xml b/test/layoutengine/standard-testcases/list_provisional-label-separation_percentage.xml
new file mode 100644
index 000000000..41a1d9413
--- /dev/null
+++ b/test/layoutengine/standard-testcases/list_provisional-label-separation_percentage.xml
@@ -0,0 +1,106 @@
+<?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 provisional-label-separation works correctly when specified as a 
+      percentage.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="page" page-width="320pt" page-height="220pt" 
+          margin="10pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="page">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:list-block provisional-distance-between-starts="20%" 
+            provisional-label-separation="10%">
+            <fo:list-item>
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block background-color="yellow">•</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>list item 1</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+            <fo:list-item>
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block background-color="yellow">•</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>list item 2</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+          </fo:list-block>
+          <fo:block space-before="10pt">Inside a block-container:</fo:block>
+          <fo:block-container width="150pt" background-color="#F0F0F0">
+            <fo:list-block provisional-distance-between-starts="20%" 
+              provisional-label-separation="10%">
+              <fo:list-item>
+                <fo:list-item-label end-indent="label-end()">
+                  <fo:block background-color="yellow">•</fo:block>
+                </fo:list-item-label>
+                <fo:list-item-body start-indent="body-start()">
+                  <fo:block>list item 1</fo:block>
+                </fo:list-item-body>
+              </fo:list-item>
+              <fo:list-item>
+                <fo:list-item-label end-indent="label-end()">
+                  <fo:block background-color="yellow">•</fo:block>
+                </fo:list-item-label>
+                <fo:list-item-body start-indent="body-start()">
+                  <fo:block>list item 2</fo:block>
+                </fo:list-item-body>
+              </fo:list-item>
+            </fo:list-block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- List 1 -->
+    <!-- List item 1 -->
+    <eval expected="30000"  xpath="//flow/block[1]/block[1]/block[1]/block[1]/@ipd"/>
+    <eval expected="270000" xpath="//flow/block[1]/block[1]/block[1]/block[1]/@end-indent"/>
+    <eval expected="240000" xpath="//flow/block[1]/block[1]/block[2]/block[1]/@ipd"/>
+    <eval expected="60000"  xpath="//flow/block[1]/block[1]/block[2]/block[1]/@start-indent"/>
+    <!-- List item 2 -->
+    <eval expected="30000"  xpath="//flow/block[1]/block[2]/block[1]/block[1]/@ipd"/>
+    <eval expected="270000" xpath="//flow/block[1]/block[2]/block[1]/block[1]/@end-indent"/>
+    <eval expected="240000" xpath="//flow/block[1]/block[2]/block[2]/block[1]/@ipd"/>
+    <eval expected="60000"  xpath="//flow/block[1]/block[2]/block[2]/block[1]/@start-indent"/>
+
+    <!-- List 2 -->
+    <!-- List item 1 -->
+    <eval expected="15000"  xpath="//flow/block[3]/block[1]/block[1]/block[1]/block[1]/block[1]/@ipd"/>
+    <eval expected="135000" xpath="//flow/block[3]/block[1]/block[1]/block[1]/block[1]/block[1]/@end-indent"/>
+    <eval expected="120000" xpath="//flow/block[3]/block[1]/block[1]/block[1]/block[2]/block[1]/@ipd"/>
+    <eval expected="30000"  xpath="//flow/block[3]/block[1]/block[1]/block[1]/block[2]/block[1]/@start-indent"/>
+    <!-- List item 2 -->
+    <eval expected="15000"  xpath="//flow/block[3]/block[1]/block[1]/block[2]/block[1]/block[1]/@ipd"/>
+    <eval expected="135000" xpath="//flow/block[3]/block[1]/block[1]/block[2]/block[1]/block[1]/@end-indent"/>
+    <eval expected="120000" xpath="//flow/block[3]/block[1]/block[1]/block[2]/block[2]/block[1]/@ipd"/>
+    <eval expected="30000"  xpath="//flow/block[3]/block[1]/block[1]/block[2]/block[2]/block[1]/@start-indent"/>
+  </checks>
+</testcase>