Bugzilla 42703: white-space incorrectly handled in retrieved markers

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

2 files changed, 73 insertions, 12 deletions

diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
index 8665ed810..6cdd359f9 100644
--- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
+++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
@@ -19,26 +19,17 @@
 
 package org.apache.fop.fo.flow;
 
-import java.util.HashMap;
 import java.util.Iterator;
 
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOPropertyMapping;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.FOText;
 import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.StaticPropertyList;
 import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.properties.PropertyMaker;
-import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 
-
-
 /**
  * The retrieve-marker formatting object.
  * This will create a layout manager that will retrieve
@@ -145,14 +136,14 @@ public class RetrieveMarker extends FObjMixed {
                 }
                 cloneSubtree(child.getChildNodes(), newChild,
                         marker, newPropertyList);
-                if (newChild instanceof FObjMixed) {
-                    handleWhiteSpaceFor((FObjMixed) newChild);
-                }
             } else if (child instanceof FOText) {
                 FOText ft = (FOText) newChild;
                 ft.bind(parentPropertyList);
             }
             addChildTo(newChild, (FObj) newParent);
+            if (newChild instanceof FObjMixed) {
+                handleWhiteSpaceFor((FObjMixed) newChild);
+            }
         }
     }
     
diff --git a/test/layoutengine/standard-testcases/marker_inline_white-space.xml b/test/layoutengine/standard-testcases/marker_inline_white-space.xml
new file mode 100644
index 000000000..286ddc2bf
--- /dev/null
+++ b/test/layoutengine/standard-testcases/marker_inline_white-space.xml
@@ -0,0 +1,70 @@
+<?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>
+      Test for Bugzilla 42703: incorrect white-space handling during
+      marker-retrieval.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" >
+       <fo:layout-master-set>
+          <fo:simple-page-master master-name="all-pages">
+             <fo:region-body region-name="xsl-region-body" margin-top="10cm"/>
+             <fo:region-before region-name="xsl-region-before" extent="29cm" display-align="before" />
+             <fo:region-after region-name="xsl-region-after" extent="10cm" display-align="before" />
+          </fo:simple-page-master>
+       </fo:layout-master-set>
+       <fo:page-sequence master-reference="all-pages">
+          <fo:static-content flow-name="xsl-region-before">
+          <fo:block color="blue" font-size="25pt">
+            <fo:block>marker1 content:
+              <fo:inline color="green"><fo:retrieve-marker 
+              retrieve-class-name="marker1" 
+              retrieve-boundary="page"					
+              /></fo:inline>
+            </fo:block>
+            <fo:block>marker1 content:
+              <fo:inline color="green"><fo:retrieve-marker 
+              retrieve-class-name="marker1" 
+              retrieve-boundary="page"					
+              /></fo:inline>
+            </fo:block>
+          </fo:block>
+          </fo:static-content>
+          <fo:flow flow-name="xsl-region-body">
+             <fo:block font-size="20pt">
+          <fo:block margin-top="2cm">
+            <fo:marker marker-class-name="marker1">
+              <fo:block>Block<fo:inline> with inline element </fo:inline>.</fo:block>
+            </fo:marker>
+            text with the marker
+          </fo:block>
+         </fo:block>
+          </fo:flow>
+       </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- preserve leading white-space of the inline in the retrieved marker -->
+    <eval expected="4" 
+          xpath="count(//regionBefore/*[1]/*[1]/*[2]/*/*/*/inlineparent/text/space)"/>
+  </checks>
+</testcase>