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:54:07 UTC
svn commit: r386025 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
status.xml
test/layoutengine/standard-testcases/table-header_table-footer_3.xml
Author: jeremias
Date: Wed Mar 15 01:54:04 2006
New Revision: 386025
URL: http://svn.apache.org/viewcvs?rev=386025&view=rev
Log:
Bugfix: Fixed a copy/paste error in the table layout code that caused wrong page break decisions when table-headers and/or table-footers are used.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_table-footer_3.xml (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=386025&r1=386024&r2=386025&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java Wed Mar 15 01:54:04 2006
@@ -120,7 +120,7 @@
/** @return the net footer height */
protected int getFooterNetHeight() {
- return this.headerNetHeight;
+ return this.footerNetHeight;
}
/** @return the header element list */
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=386025&r1=386024&r2=386025&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Wed Mar 15 01:54:04 2006
@@ -28,6 +28,10 @@
<changes>
<release version="FOP Trunk">
<action context="Code" dev="JM" type="fix">
+ Bugfix: Fixed a copy/paste error in the table layout code that caused wrong page
+ break decisions when table-headers and/or table-footers are used.
+ </action>
+ <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">
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_table-footer_3.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_table-footer_3.xml?rev=386025&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_table-footer_3.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_table-footer_3.xml Wed Mar 15 01:54:04 2006
@@ -0,0 +1,77 @@
+<?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 checks element list generation for table-header and table-footer, or more specifically
+ a copy/past error that was in the code (regression check).
+ </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="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:table table-layout="fixed" width="100%">
+ <fo:table-column number-columns-repeated="1"/>
+ <fo:table-header>
+ <fo:table-row background-color="yellow" height="50pt">
+ <fo:table-cell>
+ <fo:block>header</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row background-color="orange" height="60pt">
+ <fo:table-cell>
+ <fo:block>footer</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell background-color="lightgray">
+ <fo:block>cell2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box w="14400"/>
+ <penalty w="110000" p="0"/>
+ <box w="14400"/>
+ <box w="50000"/> <!--header-->
+ <box w="60000"/> <!--footer-->
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_table-footer_3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_table-footer_3.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