vhennebert
Mon, 05 May 2008 10:47:52 -0700
Author: vhennebert Date: Mon May 5 10:47:28 2008 New Revision: 653537 URL: http://svn.apache.org/viewvc?rev=653537&view=rev Log: Bugfix: the before border of cells below a column-spanning cell had their value taken from the leading case, instead of the normal one. Added: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_3.xml (with props) Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/RowPainter.java Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/RowPainter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/RowPainter.java?rev=653537&r1=653536&r2=653537&view=diff ============================================================================== --- xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/RowPainter.java (original) +++ xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/table/RowPainter.java Mon May 5 10:47:28 2008 @@ -229,8 +229,12 @@ // Then add areas for cells finishing on the current row for (int i = 0; i < colCount; i++) { - GridUnit currentGU = currentRow.getGridUnit(i); - if (!currentGU.isEmpty() && currentGU.getColSpanIndex() == 0 + GridUnit currentGU = currentRow.getGridUnit(i); + if (currentGU.isEmpty()) { + // TODO remove once missing cells are properly implemented (i.e., replaced + // by an fo:table-cell element containing an empty fo:block) + firstCellOnPage[i] = false; + } else if (currentGU.getColSpanIndex() == 0 && (lastInPart || currentGU.isLastGridUnitRowSpan()) && firstCellParts[i] != null) { assert firstCellParts[i].pgu == currentGU.getPrimary(); @@ -260,7 +264,8 @@ actualRowHeight, borderBeforeWhich, borderAfterWhich, lastOnPage); firstCellParts[i] = null; - firstCellOnPage[i] = false; + Arrays.fill(firstCellOnPage, i, i + currentGU.getCell().getNumberColumnsSpanned(), + false); } } currentRowOffset += actualRowHeight; Added: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_3.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_3.xml?rev=653537&view=auto ============================================================================== --- xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_3.xml (added) +++ xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_3.xml Mon May 5 10:47:28 2008 @@ -0,0 +1,79 @@ +<?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 tables with collapsing-border model and complex spanning cells. + </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="4in" margin="0.5in"> + <fo:region-body margin="0pt"/> + </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="2" column-width="proportional-column-width(1)"/> + <fo:table-header border-bottom="1pt solid black"> + <fo:table-cell> + <fo:block>Header 1.1</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>Header 1.2</fo:block> + </fo:table-cell> + </fo:table-header> + <fo:table-body> + <fo:table-row> + <fo:table-cell number-columns-spanned="2"> + <fo:block>Cell 1.1</fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell> + <fo:block>Cell 2.1</fo:block> + </fo:table-cell> + <fo:table-cell> + <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="" xpath="//flow/block[1]/block[1]/@border-before"/> + <eval expected="(solid,#000000,1000,collapse-inner)" xpath="//flow/block[1]/block[1]/@border-after"/> + <eval expected="" xpath="//flow/block[1]/block[2]/@border-before"/> + <eval expected="(solid,#000000,1000,collapse-inner)" xpath="//flow/block[1]/block[2]/@border-after"/> + <eval expected="(solid,#000000,1000,collapse-inner)" xpath="//flow/block[1]/block[3]/@border-before"/> + <eval expected="" xpath="//flow/block[1]/block[3]/@border-after"/> + <eval expected="(solid,#000000,1000,collapse-inner)" xpath="//flow/block[1]/block[4]/@border-before"/> + <eval expected="" xpath="//flow/block[1]/block[4]/@border-after"/> + <eval expected="" xpath="//flow/block[1]/block[6]/@border-before"/> + <eval expected="" xpath="//flow/block[1]/block[6]/@border-after"/> + <eval expected="" xpath="//flow/block[1]/block[7]/@border-before"/> + <eval expected="" xpath="//flow/block[1]/block[7]/@border-after"/> + </checks> +</testcase> Propchange: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_3.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_3.xml ------------------------------------------------------------------------------ svn:keywords = Revision Id --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]