You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ad...@apache.org on 2007/06/23 22:32:00 UTC
svn commit: r550098 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/fo/flow/RetrieveMarker.java
test/layoutengine/standard-testcases/marker_inline_white-space.xml
Author: adelmelle
Date: Sat Jun 23 13:31:59 2007
New Revision: 550098
URL: http://svn.apache.org/viewvc?view=rev&rev=550098
Log:
Bugzilla 42703: white-space incorrectly handled in retrieved markers
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_inline_white-space.xml (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java?view=diff&rev=550098&r1=550097&r2=550098
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveMarker.java Sat Jun 23 13:31:59 2007
@@ -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 @@
}
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);
+ }
}
}
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_inline_white-space.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_inline_white-space.xml?view=auto&rev=550098
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_inline_white-space.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_inline_white-space.xml Sat Jun 23 13:31:59 2007
@@ -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>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_inline_white-space.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org