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/08/02 16:49:00 UTC
svn commit: r428011 - in /xmlgraphics/fop/trunk: ./
src/java/org/apache/fop/layoutmgr/list/ test/layoutengine/standard-testcases/
Author: jeremias
Date: Wed Aug 2 07:49:00 2006
New Revision: 428011
URL: http://svn.apache.org/viewvc?rev=428011&view=rev
Log:
Bugfix: Table headers and footers were swallowed when a table was nested in a list-block.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_in_list_bug.xml (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java?rev=428011&r1=428010&r2=428011&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java Wed Aug 2 07:49:00 2006
@@ -30,6 +30,7 @@
import org.apache.fop.layoutmgr.Position;
import org.apache.fop.layoutmgr.NonLeafPosition;
import org.apache.fop.layoutmgr.TraitSetter;
+import org.apache.fop.layoutmgr.SpaceResolver.SpaceHandlingBreakPosition;
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
@@ -145,6 +146,8 @@
if (firstLM == null) {
firstLM = lastLM;
}
+ } else if (pos instanceof SpaceHandlingBreakPosition) {
+ positionList.add(pos);
} else {
// pos was created by this ListBlockLM, so it must be ignored
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=428011&r1=428010&r2=428011&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java Wed Aug 2 07:49:00 2006
@@ -288,7 +288,21 @@
int penaltyHeight = step
+ getMaxRemainingHeight(fullHeights, partialHeights)
- totalHeight;
+
+ //Additional penalty height from penalties in the source lists
+ int additionalPenaltyHeight = 0;
+ KnuthElement endEl = (KnuthElement)elementLists[0].get(end[0]);
+ if (endEl instanceof KnuthPenalty) {
+ additionalPenaltyHeight = ((KnuthPenalty)endEl).getW();
+ }
+ endEl = (KnuthElement)elementLists[1].get(end[1]);
+ if (endEl instanceof KnuthPenalty) {
+ additionalPenaltyHeight = Math.max(
+ additionalPenaltyHeight, ((KnuthPenalty)endEl).getW());
+ }
+
int boxHeight = step - addedBoxHeight - penaltyHeight;
+ penaltyHeight += additionalPenaltyHeight; //Add AFTER calculating boxHeight!
// add the new elements
addedBoxHeight += boxHeight;
@@ -300,7 +314,6 @@
if (keepWithNextActive || mustKeepTogether()) {
p = KnuthPenalty.INFINITE;
}
- //returnList.add(new KnuthPenalty(penaltyHeight, p, false, stepPosition, false));
returnList.add(new BreakElement(stepPosition, penaltyHeight, p, -1, context));
}
}
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=428011&r1=428010&r2=428011&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Wed Aug 2 07:49:00 2006
@@ -29,6 +29,9 @@
<changes>
<release version="FOP Trunk">
<action context="Code" dev="JM" type="fix">
+ Bugfix: Table headers and footers were swallowed when a table was nested in a list-block.
+ </action>
+ <action context="Code" dev="JM" type="fix">
Fixed a bug with indent handling when margins are used on a surrounding block and
not start/end-indent.
</action>
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_in_list_bug.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_in_list_bug.xml?rev=428011&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_in_list_bug.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_in_list_bug.xml Wed Aug 2 07:49:00 2006
@@ -0,0 +1,115 @@
+<?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 checks lists with nested fo:tables. Table headers used to be
+ swallowed.
+ </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="3in" page-height="1in">
+ <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:list-block>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate" id="table">
+ <fo:table-column column-width="100pt" text-align="right"/>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm" id="header-cell">
+ <fo:block text-align="center">Header</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+ <fo:block text-align="right">1</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+ <fo:block text-align="right">2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+ <fo:block text-align="right">3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+ <fo:block text-align="right">4</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+ <fo:block text-align="right">5</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+ <fo:block text-align="right">6</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+ <fo:block text-align="right">7</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+ <fo:block text-align="right">8</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:block font-size="8pt">
+ <fo:block>trailing text...</fo:block>
+ <fo:block>trailing text...</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <true xpath="boolean(//pageViewport[@nr='1']//block[@prod-id='header-cell'])"/>
+ <eval expected="4" xpath="count(//pageViewport[@nr='1']//block[@prod-id='table']/block)"/>
+
+ <true xpath="boolean(//pageViewport[@nr='2']//block[@prod-id='header-cell'])"/>
+ <eval expected="4" xpath="count(//pageViewport[@nr='2']//block[@prod-id='table']/block)"/>
+
+ <true xpath="boolean(//pageViewport[@nr='3']//block[@prod-id='header-cell'])"/>
+ <eval expected="3" xpath="count(//pageViewport[@nr='3']//block[@prod-id='table']/block)"/>
+
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_in_list_bug.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-header_in_list_bug.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