Added the problem with whitespace around markers as a disabled test case, changed...

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

diff --git a/examples/fo/markers/hide.fo b/examples/fo/markers/hide.fo
index 9e54df3fdcc3016c3efb76761d5dff8c991904b3..94dfa2c8be2cfd5d40c82b4841277d00d2048a38 100644 (file)
--- a/examples/fo/markers/hide.fo
+++ b/examples/fo/markers/hide.fo
@@ -42,12 +42,10 @@ ref-id="end-seq1"/>)
 
     <fo:flow flow-name="xsl-region-body">
 <fo:block><fo:marker
-    marker-class-name="message">
-    <fo:block>
+    marker-class-name="message"><fo:block>
 WARNING: Page sequence contains:  <fo:page-number-citation
 ref-id="end-seq1"/> pages.
-      </fo:block>
-</fo:marker>
+      </fo:block></fo:marker>
   </fo:block>
 
   <fo:block text-align="start" font-size="12pt" font-family="sans-serif">
@@ -61,13 +59,11 @@ This page sequence only has one page so you will not see the message.
   </fo:block>
 
 <fo:block id="end-seq1"><fo:marker
-    marker-class-name="term">
-<fo:instream-foreign-object>
+    marker-class-name="term"><fo:instream-foreign-object>
 <svg xmlns="http://www.w3.org/2000/svg" width="15cm" height="1cm" xml:space="preserve">
      <rect style="fill:white;stroke:white" x="0" y="0" width="15cm" height="1cm"/>
 </svg>
-</fo:instream-foreign-object>
-</fo:marker>
+</fo:instream-foreign-object></fo:marker>
   </fo:block>
 
     </fo:flow>
@@ -99,12 +95,10 @@ ref-id="end-of-document"/>)
 
     <fo:flow flow-name="xsl-region-body">
 <fo:block><fo:marker
-    marker-class-name="message">
-    <fo:block>
+    marker-class-name="message"><fo:block>
 WARNING: Page sequence contains:  <fo:page-number-citation
 ref-id="end-of-document"/> pages.
-      </fo:block>
-</fo:marker>
+      </fo:block></fo:marker>
   </fo:block>
 
   <fo:block text-align="start" font-size="12pt" font-family="sans-serif">
@@ -124,12 +118,10 @@ Some more text on last page.
   </fo:block>
 
 <fo:block id="end-of-document"><fo:marker
-    marker-class-name="term">
-<fo:instream-foreign-object>
+    marker-class-name="term"><fo:instream-foreign-object>
 <svg xmlns="http://www.w3.org/2000/svg" width="15cm" height="1cm" xml:space="preserve">     <rect style="fill:white;stroke:white" x="0" y="0" width="15cm" height="1cm"/>
 </svg>
-</fo:instream-foreign-object>
-</fo:marker>
+</fo:instream-foreign-object></fo:marker>
   </fo:block>
 
     </fo:flow>

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index 7fc92925859c187715a4f464ff45ec053f5cdd78..8bb23ac87e38c7bd7019e149a8cf2dac63ef97a3 100644 (file)
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -22,6 +22,7 @@ leader-alignment.xml
 leader_leader-pattern_use-content_bug.xml
 list-block_keep-with-previous.xml
 list-item_block_keep-with-previous.xml
+marker_bug.xml
 page-breaking_4.xml
 page-breaking_6.xml
 page-height_indefinite_simple.xml

diff --git a/test/layoutengine/standard-testcases/marker_bug.xml b/test/layoutengine/standard-testcases/marker_bug.xml
new file mode 100755 (executable)
index 0000000..4dc5cfd
--- /dev/null
+++ b/test/layoutengine/standard-testcases/marker_bug.xml
@@ -0,0 +1,68 @@
+<?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 for a bug with markers where white space is not removed.
+    </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">
+            <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">
+            <fo:retrieve-marker retrieve-class-name="m2" />
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="red">
+            <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 no whitespace around</fo:block></fo:marker></fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="72000" xpath="//regionBefore/@bpd"/>
+    <eval expected="14400" xpath="//regionBefore/block/@bpd"/>
+    <eval expected="14400" xpath="//regionBefore/block/block/@bpd"/>
+    <eval expected="1" xpath="count(//regionBefore/block/*/lineArea)"/>
+
+    <eval expected="72000" xpath="//regionAfter/@bpd"/>
+    <eval expected="14400" xpath="//regionAfter/block/@bpd"/>
+    <eval expected="14400" xpath="//regionAfter/block/block/@bpd"/>
+    <eval expected="1" xpath="count(//regionAfter/block/*/lineArea)"/>
+  </checks>
+</testcase>