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 je...@apache.org on 2006/04/23 13:35:22 UTC
svn commit: r396256 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java status.xml
test/layoutengine/standard-testcases/marker_white-space_static-content.xml
Author: jeremias
Date: Sun Apr 23 04:35:19 2006
New Revision: 396256
URL: http://svn.apache.org/viewcvs?rev=396256&view=rev
Log:
Bugfix: Fixed ClassCastException when retrieve-marker is used as a direct child if static-content in which case leading and trailing white space is not properly removed.
Note: This is probably more a hack than anything else, but it fixes the problem for now. If anyone has a better solution, please feel free to improve.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space_static-content.xml (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java?rev=396256&r1=396255&r2=396256&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java Sun Apr 23 04:35:19 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -30,6 +30,7 @@
import org.apache.fop.fo.pagination.SideRegion;
import org.apache.fop.fo.pagination.StaticContent;
import org.apache.fop.layoutmgr.inline.InlineLevelLayoutManager;
+import org.apache.fop.layoutmgr.inline.TextLayoutManager;
import org.apache.fop.traits.MinOptMax;
/**
@@ -302,10 +303,12 @@
childLC.setWritingMode(context.getWritingMode());
LinkedList returnedList = null;
+ //The following is a HACK! Ignore leading and trailing white space
+ boolean ignore = curLM instanceof TextLayoutManager;
if (!curLM.isFinished()) {
returnedList = curLM.getNextKnuthElements(childLC, alignment);
}
- if (returnedList != null) {
+ if (returnedList != null && !ignore) {
lm.wrapPositionElements(returnedList, returnList);
}
}
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=396256&r1=396255&r2=396256&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Sun Apr 23 04:35:19 2006
@@ -27,6 +27,11 @@
<changes>
<release version="FOP Trunk">
+ <action context="Code" dev="JM" type="fix">
+ Bugfix: Fixed ClassCastException when retrieve-marker is used as a direct child
+ if static-content in which case leading and trailing white space is not properly
+ removed.
+ </action>
<action context="Code" dev="JM" type="fix" fixes-bug="39285">
Bugfix: Fixed OutOfMemoryException with long data URLs (RFC 2397).
</action>
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space_static-content.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space_static-content.xml?rev=396256&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space_static-content.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space_static-content.xml Sun Apr 23 04:35:19 2006
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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 is a regression check for a ClassCastException which occured because
+ white-space before and after a block in a marker wasn't removed when it's
+ copied into a static-contant element through retrieve-marker. The element list
+ returned contained InlineKnuthSequences which cause the ClassCastException in
+ wrapPositionElements().
+ </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="8.5in" page-height="14in" margin="36pt">
+ <fo:region-body margin-top="18pt" margin-bottom="0pt"/>
+ <fo:region-before extent="11in"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:retrieve-marker retrieve-class-name="header" retrieve-position="first-including-carryover" retrieve-boundary="page"/>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:marker marker-class-name="header">
+ <fo:block>x</fo:block>
+ </fo:marker>
+ <fo:block>Blah blah</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- Only check that a page is produced. The bug originally caused a ClassCastException in StaticContentLayoutManager.StaticContentBreaker. -->
+ <eval expected="1" xpath="count(//pageViewport)"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space_static-content.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space_static-content.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