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/03/15 10:28:52 UTC
svn commit: r386015 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java status.xml
test/layoutengine/standard-testcases/table_in_footnote.xml
Author: jeremias
Date: Wed Mar 15 01:28:49 2006
New Revision: 386015
URL: http://svn.apache.org/viewcvs?rev=386015&view=rev
Log:
Bugfix: Fixed an NPE that was thrown when a table was used inside a footnote-body.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_in_footnote.xml (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=386015&r1=386014&r2=386015&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java Wed Mar 15 01:28:49 2006
@@ -242,6 +242,7 @@
// element represents a line with footnote citations
bFootnotesPresent = true;
LayoutContext footnoteContext = new LayoutContext(context);
+ footnoteContext.setStackLimit(context.getStackLimit());
footnoteContext.setRefIPD(getCurrentPV()
.getRegionReference(Constants.FO_REGION_BODY).getIPD());
LinkedList footnoteBodyLMs = ((KnuthBlockBox) element).getFootnoteBodyLMs();
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=386015&r1=386014&r2=386015&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Wed Mar 15 01:28:49 2006
@@ -28,6 +28,9 @@
<changes>
<release version="FOP Trunk">
<action context="Code" dev="JM" type="fix">
+ Bugfix: Fixed an NPE that was thrown when a table was used inside a footnote-body.
+ </action>
+ <action context="Code" dev="JM" type="fix">
Bugfix: Fixed a problem with certain TrueType fonts which are missing the "PCLT"
table, where a baseline-shift="sub" had no effect due to a missing x-height value.
(Note: This only affects TTFReader, so the font metric file has to be regenerated.)
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_in_footnote.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_in_footnote.xml?rev=386015&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_in_footnote.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_in_footnote.xml Wed Mar 15 01:28:49 2006
@@ -0,0 +1,64 @@
+<?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 an NPE that occured when a table is placed in a footnote-body.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <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 font-size="14pt" line-height="17pt">
+ A table within a
+ <fo:footnote>
+ <fo:inline>footnote</fo:inline>
+ <fo:footnote-body>
+ <fo:block>
+ <fo:table table-layout="fixed">
+ <fo:table-column column-width="100pt"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>
+ One cell shouldn't be too hard to render.
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
+ </fo:footnote-body>
+ </fo:footnote>
+ shouldn't be a problem.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="1" xpath="count(//pageViewport)"/>
+ <eval expected="1" xpath="count(//footnote/block)"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_in_footnote.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_in_footnote.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