Added testcases for recently identified problems with markers

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

diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml
index ab223260dfa914c78f8084d103b919d74b506ffc..3858f446e4331f2df3c6593bdda47f67ca58da07 100755 (executable)
--- a/test/layoutengine/disabled-testcases.xml
+++ b/test/layoutengine/disabled-testcases.xml
@@ -199,6 +199,20 @@
     <description>Keep-with-previous doesn't work inside tables and
     lists, yet.</description>
   </testcase>
+  <testcase>
+    <name>Whitespace around markers is not handled correctly</name>
+    <file>marker_white-space-collapse.xml</file>
+    <description>Whitespace within markers is handled according to the value of
+    the white-space-collapse property in the context of the fo:marker and not according to
+    the value of the property in the fo:retrieve-marker context.</description>
+  </testcase>
+  <testcase>
+    <name>Relative font sizes within markers are not handled correctly</name>
+    <file>marker_font-size.xml</file>
+    <description>Relative font sizes within markers are evaluated according to the
+    font size in the fo:marker context and not the font size in the fo:retrieve-marker
+    context.</description>
+  </testcase>
   <testcase>
     <name>Page breaking doesn't deal with IPD changes</name>
     <file>page-breaking_4.xml</file>

diff --git a/test/layoutengine/standard-testcases/marker_font-size.xml b/test/layoutengine/standard-testcases/marker_font-size.xml
new file mode 100644 (file)
index 0000000..b7619f8
--- /dev/null
+++ b/test/layoutengine/standard-testcases/marker_font-size.xml
@@ -0,0 +1,71 @@
+<?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 markers and font-size inheritance.
+      This is currently incorrectly handled in that for relative font sizes
+      the base value of the fo:marker context is used and not the font size
+      from the fo:retrieve-marker context.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body margin-top="1in" margin-bottom="1in"/>
+          <fo:region-before extent="1in"/>
+          <fo:region-after extent="1in"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block background-color="yellow" font-size="16pt">
+            1. Marker <fo:retrieve-marker retrieve-class-name="m1" />
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block background-color="yellow" font-size="10pt">
+            2. Marker <fo:retrieve-marker retrieve-class-name="m2" />
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="red" white-space-collapse="false">
+            <fo:marker marker-class-name="m1">
+              <fo:block font-size=".5em">
+                First marker with small font 
+              </fo:block>
+            </fo:marker>
+          </fo:block>
+          <fo:block background-color="green">
+            <fo:marker marker-class-name="m2">
+              <fo:block font-size="2em">
+                Second marker big font
+              </fo:block>
+            </fo:marker>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="8000" xpath="//regionBefore/block[1]/block/lineArea/text/@font-size"/>
+
+    <eval expected="20000" xpath="//regionBefore/block[1]/block/lineArea/text/@font-size"/>
+  </checks>
+</testcase>

diff --git a/test/layoutengine/standard-testcases/marker_white-space-collapse.xml b/test/layoutengine/standard-testcases/marker_white-space-collapse.xml
new file mode 100644 (file)
index 0000000..d4e8192
--- /dev/null
+++ b/test/layoutengine/standard-testcases/marker_white-space-collapse.xml
@@ -0,0 +1,80 @@
+<?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 markers and white-space-collapse inheritance.
+      This is currently incorrectly handled in that the white-space-collapse property
+      value active in the fo:marker context is applied instead of the value of the
+      white-space-collapse property the fo:retrieve-marker-context.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body margin-top="1in" margin-bottom="1in"/>
+          <fo:region-before extent="1in"/>
+          <fo:region-after extent="1in"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block background-color="yellow" white-space-collapse="false">
+            1. Marker <fo:retrieve-marker retrieve-class-name="m1" />
+          </fo:block>
+          <fo:block background-color="yellow">
+            1. Marker <fo:retrieve-marker retrieve-class-name="m1" />
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block background-color="yellow" white-space-collapse="false">
+            2. Marker <fo:retrieve-marker retrieve-class-name="m2" />
+          </fo:block>
+          <fo:block background-color="yellow">
+            2. Marker <fo:retrieve-marker retrieve-class-name="m2" />
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="red" white-space-collapse="false">
+            <fo:marker marker-class-name="m1">
+              <fo:block>
+                First   marker  with  whitespace  around
+              </fo:block>
+            </fo:marker>
+          </fo:block>
+          <fo:block background-color="green">
+            <fo:marker marker-class-name="m2">
+              <fo:block>
+                Second  marker  with  whitespace  around
+              </fo:block>
+            </fo:marker>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- These checks do not have the correct values -->
+    <eval expected="1" xpath="count(//regionBefore/block[1]/block/lineArea/text/space)"/>
+    <eval expected="4" xpath="count(//regionBefore/block[2]/block/lineArea/text/space)"/>
+
+    <eval expected="1" xpath="count(//regionAfter/block[1]/block/lineArea/text/space)"/>
+    <eval expected="4" xpath="count(//regionAfter/block[2]/block/lineArea/text/space)"/>
+  </checks>
+</testcase>