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 ga...@apache.org on 2012/04/03 18:33:30 UTC
svn commit: r1309024 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/fo/FObj.java
src/java/org/apache/fop/fo/flow/Inline.java status.xml
test/layoutengine/standard-testcases/footnote_bug53005.xml
Author: gadams
Date: Tue Apr 3 16:33:30 2012
New Revision: 1309024
URL: http://svn.apache.org/viewvc?rev=1309024&view=rev
Log:
Bugzilla #53005: Fix incorrect treatment of fo:wrapper as %block in fo:footnote
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_bug53005.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=1309024&r1=1309023&r2=1309024&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Tue Apr 3 16:33:30 2012
@@ -501,7 +501,7 @@ public abstract class FObj extends FONod
* @param lName local name (i.e., no prefix) of incoming node
* @return true if a member, false if not
*/
- boolean isNeutralItem(String nsURI, String lName) {
+ protected boolean isNeutralItem(String nsURI, String lName) {
return (FO_URI.equals(nsURI)
&& ("multi-switch".equals(lName)
|| "multi-properties".equals(lName)
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java?rev=1309024&r1=1309023&r2=1309024&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java Tue Apr 3 16:33:30 2012
@@ -116,7 +116,8 @@ public class Inline extends InlineLevel
}
} else if (!isBlockOrInlineItem(nsURI, localName)) {
invalidChildError(loc, nsURI, localName);
- } else if (!canHaveBlockLevelChildren && isBlockItem(nsURI, localName)) {
+ } else if (!canHaveBlockLevelChildren && isBlockItem(nsURI, localName)
+ && !isNeutralItem(nsURI, localName)) {
invalidChildError(loc, getParent().getName(), nsURI, getName(),
"rule.inlineContent");
} else {
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1309024&r1=1309023&r2=1309024&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue Apr 3 16:33:30 2012
@@ -62,12 +62,15 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Code" dev="GA" type="fix" fixes-bug="53005" due-to="Alberto Simões">
+ Fixed incorrect rejection of fo:wrapper inside fo:inline inside fo:footnote-body.
+ </action>
<action context="Code" dev="PH,VH" type="add">
Added support for PDF Object Streams. When accessibility is enabled and PDF version 1.5
selected, the structure tree will be stored in object streams in order to reduce the size of
the final PDF.
</action>
- <action context="Code" dev="VH" type="add" fixes-bug="46962" due-to="Alexios Giotis">
+ <action context="Code" dev="VH" type="fix" fixes-bug="46962" due-to="Alexios Giotis">
Fixed deadlock in PropertyCache.
</action>
<action context="Code" dev="VH" type="add" fixes-bug="51385" due-to="Mehdi Houshmand">
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_bug53005.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_bug53005.xml?rev=1309024&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_bug53005.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_bug53005.xml Tue Apr 3 16:33:30 2012
@@ -0,0 +1,55 @@
+<?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>
+ This test verifies that fo:wrapper may appear in fo:inline inside an fo:footnote, for which
+ bug #53005 was reported.
+ </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="3in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:footnote>
+ <fo:inline>1</fo:inline>
+ <fo:footnote-body>
+ <fo:block>
+ <fo:inline>
+ <fo:wrapper id="foo"/>
+ </fo:inline>
+ </fo:block>
+ </fo:footnote-body>
+ </fo:footnote>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="foo" xpath="//footnote//inline[1]/@prod-id"/>
+ </checks>
+</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org