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 vh...@apache.org on 2008/03/17 18:48:48 UTC
svn commit: r637993 - in /xmlgraphics/fop/branches/fop-0_95:
src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
test/layoutengine/standard-testcases/table_bug44621.xml
test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml
Author: vhennebert
Date: Mon Mar 17 10:48:44 2008
New Revision: 637993
URL: http://svn.apache.org/viewvc?rev=637993&view=rev
Log:
Bugzilla #44621: when the after border of a cell, in the trailing case, is bigger than in the normal case, the generated sequence of Knuth elements was wrong, leading to content being swallowed
This is a partial fix only: the content is no longer swallowed, but the penalty is wrong (shorter than it should be). This will lead to the table overflowing the region-body without warning.
Added:
xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_bug44621.xml (with props)
Modified:
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml
Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java?rev=637993&r1=637992&r2=637993&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java (original)
+++ xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java Mon Mar 17 10:48:44 2008
@@ -337,14 +337,22 @@
}
/**
- * Returns the last step for this cell.
+ * Returns the last step for this cell. This includes the normal border- and
+ * padding-before, the whole content, the normal padding-after, and the
+ * <em>trailing</em> after border. Indeed, if the normal border is taken instead,
+ * and appears to be smaller than the trailing one, the last step may be smaller than
+ * the current step (see TableStepper#considerRowLastStep). This will produce a wrong
+ * infinite penalty, plus the cell's content won't be taken into account since the
+ * final step will be smaller than the current one (see {@link #signalNextStep(int)}).
+ * This actually means that the content will be swallowed.
*
- * @return the step including all of the cell's content plus the normal borders and paddings
+ * @return the length of last step
*/
int getLastStep() {
assert nextStep.end == elementList.size() - 1;
assert nextStep.contentLength == totalLength && nextStep.penaltyLength == 0;
- int lastStep = bpBeforeNormal + totalLength + bpAfterNormal;
+ int lastStep = bpBeforeNormal + totalLength + paddingAfterNormal
+ + pgu.getAfterBorderWidth(ConditionalBorder.LEADING_TRAILING);
log.debug(this + ": last step = " + lastStep);
return lastStep;
}
@@ -466,8 +474,12 @@
*/
void endRow(int rowIndex) {
if (endsOnRow(rowIndex)) {
+ // Subtract the old value of bpAfterTrailing...
+ nextStep.totalLength -= bpAfterTrailing;
bpAfterTrailing = paddingAfterNormal
+ pgu.getAfterBorderWidth(ConditionalBorder.LEADING_TRAILING);
+ // ... and add the new one
+ nextStep.totalLength += bpAfterTrailing;
lastCellPart = true;
} else {
bpBeforeLeading = paddingBeforeLeading
Added: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_bug44621.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_bug44621.xml?rev=637993&view=auto
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_bug44621.xml (added)
+++ xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_bug44621.xml Mon Mar 17 10:48:44 2008
@@ -0,0 +1,105 @@
+<?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 is a testcase for bug #44621: when the width of the after border of a cell, in the
+ trailing case, is bigger than in the normal case, a wrong sequence of Knuth elements was
+ generated, leading to some content being 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="page" page-height="4in" page-width="5in" margin="0.5in">
+ <fo:region-body background-color="#F0F0F0"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-size="12pt">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block space-after="10pt">The after borders of the bodyâs cells, in the trailing case,
+ are thicker than in the normal case.</fo:block>
+ <fo:table width="100%" table-layout="fixed"
+ font-size="8pt" line-height="10pt">
+ <fo:table-column column-width="proportional-column-width(1)"
+ number-columns-repeated="2"/>
+ <fo:table-footer>
+ <fo:table-cell border="4pt solid blue">
+ <fo:block>Footer 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="4pt solid blue">
+ <fo:block>Footer 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="2pt solid black">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="2pt solid black">
+ <fo:block>Cell 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="2pt solid black">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="2pt solid black">
+ <fo:block>Cell 2.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+
+ <eval expected="39000" xpath="//pageViewport//flow/block[2]/@bpd"/>
+ <eval expected="39000" xpath="//pageViewport//flow/block[2]/@bpda"/>
+ <!-- cell 1.1 -->
+ <eval expected="10000" xpath="//pageViewport//flow/block[2]/block[1]/@bpd"/>
+ <eval expected="14000" xpath="//pageViewport//flow/block[2]/block[1]/@bpda"/>
+ <!-- cell 1.2 -->
+ <eval expected="10000" xpath="//pageViewport//flow/block[2]/block[2]/@bpd"/>
+ <eval expected="14000" xpath="//pageViewport//flow/block[2]/block[2]/@bpda"/>
+ <!-- cell 2.1 -->
+ <eval expected="10000" xpath="//pageViewport//flow/block[2]/block[3]/@bpd"/>
+ <eval expected="16000" xpath="//pageViewport//flow/block[2]/block[3]/@bpda"/>
+ <!-- cell 2.2 -->
+ <eval expected="10000" xpath="//pageViewport//flow/block[2]/block[4]/@bpd"/>
+ <eval expected="16000" xpath="//pageViewport//flow/block[2]/block[4]/@bpda"/>
+ <!-- footer 1.1 -->
+ <eval expected="10000" xpath="//pageViewport//flow/block[2]/block[5]/@bpd"/>
+ <eval expected="18000" xpath="//pageViewport//flow/block[2]/block[5]/@bpda"/>
+ <!-- footer 1.2 -->
+ <eval expected="10000" xpath="//pageViewport//flow/block[2]/block[6]/@bpd"/>
+ <eval expected="18000" xpath="//pageViewport//flow/block[2]/block[6]/@bpda"/>
+
+ <element-list category="breaker">
+ <skip>4</skip>
+ <box w="12000"/>
+ <penalty w="14000" p="0"/><!-- should be 15000 -->
+ <box w="13000"/>
+ <box w="14000"/>
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_bug44621.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_bug44621.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
Modified: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml?rev=637993&r1=637992&r2=637993&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml (original)
+++ xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml Mon Mar 17 10:48:44 2008
@@ -145,7 +145,7 @@
<element-list category="breaker">
<skip>3</skip>
<box w="17000"/>
- <penalty w="18000" p="0"/>
+ <penalty w="15000" p="0"/>
<box w="16800"/>
<penalty w="1800" p="0"/>
<box w="31200"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org