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 2008/03/06 14:34:59 UTC
svn commit: r634267 [39/39] - in
/xmlgraphics/fop/branches/Temp_ProcessingFeedback: ./ examples/embedding/
examples/embedding/java/embedding/
examples/embedding/java/embedding/intermediate/ examples/embedding/xml/xml/
examples/fo/ examples/fo/advanced/...
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml Thu Mar 6 05:33:44 2008
@@ -31,10 +31,9 @@
</fo:layout-master-set>
<fo:page-sequence master-reference="normal">
<fo:flow flow-name="xsl-region-body">
- <fo:block>block1</fo:block>
- <fo:table table-layout="fixed">
- <fo:table-column/>
- <fo:table-column/>
+ <fo:block space-after="1.5*14.4pt">block1</fo:block>
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-row keep-with-previous.within-page="always">
<fo:table-cell id="cell1">
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-stepper_colspan_border-before.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_background-image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_background-image.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_background-image.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_background-image.xml Thu Mar 6 05:33:44 2008
@@ -1,113 +1,113 @@
-<?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 background image on a fo:table.
- </p>
- </info>
- <variables>
- <img>../../resources/images/bgimg300dpi.jpg</img>
- </variables>
- <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" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:table table-layout="fixed" background-color="yellow"
- background-repeat="no-repeat"
- background-position-horizontal="center"
- background-position-vertical="center"
- background-image="##img">
- <fo:table-column column-number="1" />
- <fo:table-column column-number="2" />
- <fo:table-column column-number="3" />
- <fo:table-header>
- <fo:table-row>
- <fo:table-cell>
- <fo:block>Header Col 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Header Col 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Header Col 3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-header>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell>
- <fo:block>Row 1 Col 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 1 Col 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 1 Col 3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block>Row 2 Col 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 2 Col 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 2 Col 3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block>Row 3 Col 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 3 Col 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 3 Col 3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block>Row 4 Col 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 4 Col 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 4 Col 3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- <fo:block>Table with centered background image</fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block[1]/@background"/>
- </checks>
-</testcase>
+<?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 background image on a fo:table.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <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" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table table-layout="fixed" background-color="yellow"
+ background-repeat="no-repeat"
+ background-position-horizontal="center"
+ background-position-vertical="center"
+ background-image="##img">
+ <fo:table-column column-number="1" />
+ <fo:table-column column-number="2" />
+ <fo:table-column column-number="3" />
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Header Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 3 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 3 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 3 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 4 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 4 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 4 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>Table with centered background image</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block[1]/@background"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_background-image.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_background-image.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_basic.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_1r1c.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_1r2c.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_2r1c.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_conditionals.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_conditionals.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_conditionals.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_conditionals.xml Thu Mar 6 05:33:44 2008
@@ -34,9 +34,9 @@
<!-- table 1 -->
<fo:block
- space-after.minimum="30pt"
- space-after.optimum="40pt"
- space-after.maximum="50pt"
+ space-after.minimum="44pt"
+ space-after.optimum="45pt"
+ space-after.maximum="46pt"
>Before the table</fo:block>
<fo:table width="100%" table-layout="fixed" border="6pt solid black">
<fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_nrnc.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_nrnc_no-col.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_omitHF.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_omitHF.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_omitHF.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_omitHF.xml Thu Mar 6 05:33:44 2008
@@ -34,9 +34,9 @@
<fo:flow flow-name="xsl-region-body">
<fo:block
- space-after.minimum="20pt"
- space-after.optimum="30pt"
- space-after.maximum="40pt"
+ space-after.minimum="25pt"
+ space-after.optimum="35pt"
+ space-after.maximum="45pt"
>Before the table</fo:block>
<fo:table width="100%" table-layout="fixed" border="6pt solid black"
table-omit-header-at-break="true" table-omit-footer-at-break="true">
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_resolution.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_resolution_no-col.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_2_no-col.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_separate_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_2.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_2.xml Thu Mar 6 05:33:44 2008
@@ -134,19 +134,17 @@
<box w="0"/>
<penalty w="0" p="INF"/>
<glue w="7500"/>
- <box w="2500"/>
- <penalty w="10000" p="900"/>
- <box w="12500"/>
- <penalty w="0"/>
- <box w="7500"/>
- <penalty w="0" p="900"/>
- <box w="0"/>
- <penalty w="5000"/>
<box w="12500"/>
- <penalty w="0"/>
+ <penalty w="2500" p="0"/>
<box w="2500"/>
- <penalty w="0" p="900"/>
- <box w="12500"/>
+ <penalty w="7500" p="0"/>
+ <box w="7500"/>
+ <penalty w="5000" p="0"/>
+ <box w="5000"/>
+ <penalty w="7500"/>
+ <box w="7500"/>
+ <penalty w="2500"/>
+ <box w="15000"/>
<penalty w="0" p="INF"/>
<glue w="7500"/>
@@ -156,19 +154,17 @@
<box w="0"/>
<penalty w="0" p="INF"/>
<glue w="7500"/>
- <box w="2500"/>
- <penalty w="10000" p="900"/>
- <box w="12500"/>
- <penalty w="0"/>
- <box w="7500"/>
- <penalty w="0" p="900"/>
- <box w="0"/>
- <penalty w="5000"/>
<box w="12500"/>
- <penalty w="0"/>
+ <penalty w="2500" p="0"/>
<box w="2500"/>
- <penalty w="0" p="900"/>
- <box w="12500"/>
+ <penalty w="7500" p="0"/>
+ <box w="7500"/>
+ <penalty w="5000" p="0"/>
+ <box w="5000"/>
+ <penalty w="7500"/>
+ <box w="7500"/>
+ <penalty w="2500"/>
+ <box w="15000"/>
<box w="0"/> <!-- with SpaceHandlingPosition -->
<penalty w="0" p="INF"/>
<glue w="7500"/>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-width_conditionality.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border_padding.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border_padding_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border_padding_2.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border_padding_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border_padding_2.xml Thu Mar 6 05:33:44 2008
@@ -97,17 +97,16 @@
<penalty w="0" p="INF"/>
<glue w="25000"/>
- <box w="0"/>
-
+ <box w="28800"/>
<penalty w="0" p="INF"/>
<glue w="25000"/>
- <penalty w="14400"/> <!-- p is not of interest here -->
+ <penalty w="0"/> <!-- p is not of interest here -->
<glue w="-50000"/>
<box w="0"/>
<penalty w="0" p="INF"/>
<glue w="25000"/>
- <box w="28800"/>
+ <box w="14400"/>
<penalty w="0" p="INF"/>
<glue w="25000"/>
@@ -124,7 +123,6 @@
<skip>8</skip>
<skip>8</skip>
<skip>8</skip>
- <skip>8</skip>
<penalty w="0" p="INF"/>
<glue w="25000"/>
@@ -148,10 +146,8 @@
<box w="0"/> <!-- Helper box used to notify the LM for the addAreas stage about the discarded spaces -->
<penalty w="0" p="INF"/>
<glue w="25000"/>
- <box w="0"/>
- <penalty w="14400"/> <!-- p is not of interest here -->
<box w="28800"/>
- <penalty w="0" p="0"/>
+ <penalty w="0"/> <!-- p is not of interest here -->
<box w="14400"/>
<penalty w="0" p="0"/>
<box w="14400"/>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border_padding_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_break-before_break-after.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_break-before_break-after.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_break-before_break-after.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_break-before_break-after.xml Thu Mar 6 05:33:44 2008
@@ -55,11 +55,9 @@
<eval expected="5" xpath="count(//pageViewport)"/>
<!-- table -->
<eval expected="18400" xpath="//pageViewport[@nr=3]//flow/block[1]/@bpd"/>
- <!--
- <eval expected="26400" xpath="//pageViewport[@nr=3]//flow/block[1]/@bpda"/>
- <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[1]/@border-before"/>
- <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[1]/@border-after"/>
- -->
+ <!--eval expected="26400" xpath="//pageViewport[@nr=3]//flow/block[1]/@bpda"/-->
+ <!--eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[1]/@border-before"/-->
+ <!--eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[1]/@border-after"/-->
<!-- cell 1 -->
<eval expected="14400" xpath="//pageViewport[@nr=3]//flow/block[1]/block[1]/@bpd"/>
<eval expected="18400" xpath="//pageViewport[@nr=3]//flow/block[1]/block[1]/@bpda"/>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_break-before_break-after.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug36403.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug36403.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug36403.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug36403.xml Thu Mar 6 05:33:44 2008
@@ -79,22 +79,17 @@
</fo>
<checks>
<element-list category="breaker" id="skipped-step">
- <box w="14400"/>
- <penalty w="0" p="INF"/> <!-- Skipped step has an INFINITE penalty -->
- <glue w="3600"/>
- <box w="32400"/>
+ <box w="50400"/>
<skip>3</skip>
</element-list>
<element-list category="breaker" id="backtrack">
- <box w="2000"/>
- <penalty w="8000" p="900"/> <!-- p > 0 && p <= INF -->
- <box w="16400"/>
+ <box w="18400"/>
<penalty w="0" p="0"/>
<box w="0"/>
- <penalty w="1600"/> <!-- p = ??? --> <!-- I'm not sure here what the penalty values should be for these two. -->
- <box w="5000"/>
- <penalty w="6600"/> <!-- p = ??? -->
- <box w="19400"/>
+ <penalty w="1600" p="0"/>
+ <box w="0"/>
+ <penalty w="11600"/>
+ <box w="24400"/>
<skip>3</skip>
</element-list>
</checks>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug36403.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug37270.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug37270.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug37270.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug37270.xml Thu Mar 6 05:33:44 2008
@@ -73,9 +73,9 @@
<!-- Simply check that FOP doesn't fail with an IndexOutOfBoundsException or an NPE -->
<element-list category="breaker">
<box w="0"/>
- <penalty w="14400"/> <!-- p > 0 && p <= INF -->
+ <penalty w="0" p="INF"/>
<box w="14400"/>
- <penalty w="14400"/> <!-- p > 0 && p <= INF -->
+ <penalty w="0" p="INF"/>
<box w="40000"/>
<skip>3</skip>
</element-list>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug37270.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_empty-cells.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_empty-cells.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_empty-cells.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_empty-cells.xml Thu Mar 6 05:33:44 2008
@@ -87,15 +87,19 @@
<eval expected="2" xpath="count(//pageViewport)"/>
<element-list category="breaker">
<skip>6</skip>
- <box w="1000"/>
- <penalty p="900" w="1000"/>
- <box w="14400"/>
+ <box w="15400"/>
<penalty p="0" w="0"/>
<box w="14400"/>
<penalty p="0" w="0"/>
<box w="15400"/>
<penalty p="0" w="0"/>
- <skip>16</skip>
+ <box w="16400"/>
+ <penalty p="0" w="0"/>
+ <box w="16400"/>
+ <penalty p="0" w="0"/>
+ <box w="16400"/>
+ <penalty p="0" w="0"/>
+ <skip>10</skip>
</element-list>
</checks>
</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_empty-cells.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_fox_orphan-content-limit_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_fox_widow-content-limit_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_fox_widow-content-limit_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_in_footnote.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_in_marker_bug39560.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-together.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-next.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-next.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-next.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-next.xml Thu Mar 6 05:33:44 2008
@@ -73,5 +73,30 @@
<!-- Line "Before the table" plus the table itself on the second page -->
<eval expected="2" xpath="count(//pageViewport[@nr=2]//flow/block)"/>
<eval expected="After the table" xpath="//pageViewport[@nr=2]//flow/block[2]/lineArea/text[1]"/>
+ <!-- table -->
+ <eval expected="75200" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpd"/>
+ <eval expected="83200" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpda"/>
+ <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-before"/>
+ <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-after"/>
+ <!-- cell 1.1 -->
+ <eval expected="33600" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpd"/>
+ <eval expected="37600" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpda"/>
+ <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@border-before"/>
+ <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@border-after"/>
+ <!-- cell 1.2 -->
+ <eval expected="33600" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpd"/>
+ <eval expected="37600" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpda"/>
+ <eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@border-before"/>
+ <eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@border-after"/>
+ <!-- cell 2.1 -->
+ <eval expected="33600" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@bpd"/>
+ <eval expected="37600" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@bpda"/>
+ <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@border-before"/>
+ <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@border-after"/>
+ <!-- cell 2.2 -->
+ <eval expected="33600" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@bpd"/>
+ <eval expected="37600" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@bpda"/>
+ <eval expected="(solid,#808000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@border-before"/>
+ <eval expected="(solid,#808000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@border-after"/>
</checks>
</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-next.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-previous.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-previous.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-previous.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-previous.xml Thu Mar 6 05:33:44 2008
@@ -73,5 +73,30 @@
<!-- Line "Before the table" plus the table itself on the second page -->
<eval expected="2" xpath="count(//pageViewport[@nr=2]//flow/block)"/>
<eval expected="Before the table" xpath="//pageViewport[@nr=2]//flow/block[1]/lineArea/text[1]"/>
+ <!-- table -->
+ <eval expected="75200" xpath="//pageViewport[@nr=2]//flow/block[2]/@bpd"/>
+ <eval expected="83200" xpath="//pageViewport[@nr=2]//flow/block[2]/@bpda"/>
+ <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[2]/@border-before"/>
+ <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[2]/@border-after"/>
+ <!-- cell 1.1 -->
+ <eval expected="33600" xpath="//pageViewport[@nr=2]//flow/block[2]/block[1]/@bpd"/>
+ <eval expected="37600" xpath="//pageViewport[@nr=2]//flow/block[2]/block[1]/@bpda"/>
+ <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=2]//flow/block[2]/block[1]/@border-before"/>
+ <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=2]//flow/block[2]/block[1]/@border-after"/>
+ <!-- cell 1.2 -->
+ <eval expected="33600" xpath="//pageViewport[@nr=2]//flow/block[2]/block[2]/@bpd"/>
+ <eval expected="37600" xpath="//pageViewport[@nr=2]//flow/block[2]/block[2]/@bpda"/>
+ <eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=2]//flow/block[2]/block[2]/@border-before"/>
+ <eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=2]//flow/block[2]/block[2]/@border-after"/>
+ <!-- cell 2.1 -->
+ <eval expected="33600" xpath="//pageViewport[@nr=2]//flow/block[2]/block[3]/@bpd"/>
+ <eval expected="37600" xpath="//pageViewport[@nr=2]//flow/block[2]/block[3]/@bpda"/>
+ <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[2]/block[3]/@border-before"/>
+ <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[2]/block[3]/@border-after"/>
+ <!-- cell 2.2 -->
+ <eval expected="33600" xpath="//pageViewport[@nr=2]//flow/block[2]/block[4]/@bpd"/>
+ <eval expected="37600" xpath="//pageViewport[@nr=2]//flow/block[2]/block[4]/@bpda"/>
+ <eval expected="(solid,#808000,2000)" xpath="//pageViewport[@nr=2]//flow/block[2]/block[4]/@border-before"/>
+ <eval expected="(solid,#808000,2000)" xpath="//pageViewport[@nr=2]//flow/block[2]/block[4]/@border-after"/>
</checks>
</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_keep-with-previous.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_margin_space-before_space-after.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_overconstrained_ipd.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_padding_percentages.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_padding_percentages.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_padding_percentages.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_padding_percentages.xml Thu Mar 6 05:33:44 2008
@@ -1,76 +1,76 @@
-<?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 relative padding on a fo:table.
- </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" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:table table-layout="fixed" margin="0pt" padding="5%"
- background-color="yellow" border-collapse="separate">
- <fo:table-column column-number="1" />
- <fo:table-column column-number="2" />
- <fo:table-column column-number="3" />
- <fo:table-header>
- <fo:table-row>
- <fo:table-cell>
- <fo:block>Header Col 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Header Col 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Header Col 3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-header>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell>
- <fo:block>Row 1 Col 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 1 Col 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>Row 1 Col 3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- <fo:block>Table on yellow background with 5% padding</fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="18000" xpath="//flow/block/@start-indent"/>
- <eval expected="18000" xpath="//flow/block/@end-indent"/>
- <eval expected="color=#ffff00" xpath="//flow/block/@background"/>
- </checks>
-</testcase>
+<?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 relative padding on a fo:table.
+ </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" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table table-layout="fixed" margin="0pt" padding="5%"
+ background-color="yellow" border-collapse="separate">
+ <fo:table-column column-number="1" />
+ <fo:table-column column-number="2" />
+ <fo:table-column column-number="3" />
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Header Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>Table on yellow background with 5% padding</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="18000" xpath="//flow/block/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block/@end-indent"/>
+ <eval expected="color=#ffff00" xpath="//flow/block/@background"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_padding_percentages.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_padding_percentages.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_row-span_missing-cell_bug43633.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_space-before_space-after_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_space-before_space-after_1.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_space-before_space-after_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_space-before_space-after_1.xml Thu Mar 6 05:33:44 2008
@@ -95,11 +95,11 @@
<penalty w="0" p="INF"/>
<glue w="20000"/>
- <box w="0"/>
+ <box w="28800"/>
- <penalty w="14400"/> <!-- p is not of interest here -->
+ <penalty w="0" p="0"/>
- <box w="28800"/>
+ <box w="14400"/>
<penalty w="0" p="0"/>
@@ -110,7 +110,6 @@
<skip>2</skip>
<skip>2</skip>
<skip>2</skip>
- <skip>2</skip>
<penalty w="0" p="0"/>
@@ -137,8 +136,6 @@
</element-list>
<element-list category="breaker" id="discard">
<box w="0"/> <!-- Helper box used to notify the LM for the addAreas stage about the discarded spaces -->
- <box w="0"/>
- <penalty w="14400"/> <!-- p is not of interest here -->
<box w="28800"/>
<penalty w="0" p="0"/>
<box w="14400"/>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_space-before_space-after_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_space-before_space-after_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_stepper_bug43616.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_table-layout_fixed_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_table-layout_fixed_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_table-layout_fixed_3.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_table-row_break-before.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_table-row_empty.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_width.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_width.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_width.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_width.xml Thu Mar 6 05:33:44 2008
@@ -1,98 +1,98 @@
-<?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 table width in certain situations.
- </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" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block-container width="100%" height="10pt" background-color="lightgray">
- <fo:block/>
- </fo:block-container>
- <fo:table table-layout="fixed" width="100%" border-collapse="separate">
- <fo:table-column column-width="proportional-column-width(3)"/>
- <fo:table-column column-width="proportional-column-width(2)"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell>
- <fo:block>cell1</fo:block>
- </fo:table-cell>
- <fo:table-cell background-color="yellow">
- <fo:block>cell2</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- <fo:block start-indent="1in" end-indent="1in">
- <fo:block-container width="100%" height="10pt" background-color="lightgray">
- <fo:block/>
- </fo:block-container>
- <fo:table table-layout="fixed" width="100%" border-collapse="separate" background-color="gray">
- <fo:table-column column-width="proportional-column-width(3)"/>
- <fo:table-column column-width="proportional-column-width(2)"/>
- <fo:table-body start-indent="0cm" end-indent="0cm">
- <fo:table-row>
- <fo:table-cell>
- <fo:block>cell1</fo:block>
- </fo:table-cell>
- <fo:table-cell background-color="yellow">
- <fo:block>cell2</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <!-- width of the first block-container -->
- <eval expected="360000" xpath="//flow/block[1]/@ipd"/>
-
- <!-- width of the first table -->
- <eval expected="360000" xpath="//flow/block[2]/@ipd"/>
- <eval expected="216000" xpath="//flow/block[2]/block[1]/@ipd"/>
- <eval expected="144000" xpath="//flow/block[2]/block[2]/@ipd"/>
-
- <!-- width of the enclosing block establishing the indents -->
- <eval expected="216000" xpath="//flow/block[3]/@ipd"/>
- <eval expected="72000" xpath="//flow/block[3]/@start-indent"/>
- <eval expected="72000" xpath="//flow/block[3]/@end-indent"/>
-
- <!-- width of the second block-container -->
- <eval expected="216000" xpath="//flow/block[3]/block[1]/@ipd"/>
- <eval expected="72000" xpath="//flow/block[3]/block[1]/@start-indent"/>
- <eval expected="72000" xpath="//flow/block[3]/block[1]/@end-indent"/>
-
- <!-- width of the second table -->
- <eval expected="216000" xpath="//flow/block[3]/block[2]/@ipd"/>
- <eval expected="129600" xpath="//flow/block[3]/block[2]/block[1]/@ipd"/>
- <eval expected="86400" xpath="//flow/block[3]/block[2]/block[2]/@ipd"/>
- </checks>
-</testcase>
+<?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 table width in certain situations.
+ </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" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block-container width="100%" height="10pt" background-color="lightgray">
+ <fo:block/>
+ </fo:block-container>
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate">
+ <fo:table-column column-width="proportional-column-width(3)"/>
+ <fo:table-column column-width="proportional-column-width(2)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell background-color="yellow">
+ <fo:block>cell2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block start-indent="1in" end-indent="1in">
+ <fo:block-container width="100%" height="10pt" background-color="lightgray">
+ <fo:block/>
+ </fo:block-container>
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate" background-color="gray">
+ <fo:table-column column-width="proportional-column-width(3)"/>
+ <fo:table-column column-width="proportional-column-width(2)"/>
+ <fo:table-body start-indent="0cm" end-indent="0cm">
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell background-color="yellow">
+ <fo:block>cell2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- width of the first block-container -->
+ <eval expected="360000" xpath="//flow/block[1]/@ipd"/>
+
+ <!-- width of the first table -->
+ <eval expected="360000" xpath="//flow/block[2]/@ipd"/>
+ <eval expected="216000" xpath="//flow/block[2]/block[1]/@ipd"/>
+ <eval expected="144000" xpath="//flow/block[2]/block[2]/@ipd"/>
+
+ <!-- width of the enclosing block establishing the indents -->
+ <eval expected="216000" xpath="//flow/block[3]/@ipd"/>
+ <eval expected="72000" xpath="//flow/block[3]/@start-indent"/>
+ <eval expected="72000" xpath="//flow/block[3]/@end-indent"/>
+
+ <!-- width of the second block-container -->
+ <eval expected="216000" xpath="//flow/block[3]/block[1]/@ipd"/>
+ <eval expected="72000" xpath="//flow/block[3]/block[1]/@start-indent"/>
+ <eval expected="72000" xpath="//flow/block[3]/block[1]/@end-indent"/>
+
+ <!-- width of the second table -->
+ <eval expected="216000" xpath="//flow/block[3]/block[2]/@ipd"/>
+ <eval expected="129600" xpath="//flow/block[3]/block[2]/block[1]/@ipd"/>
+ <eval expected="86400" xpath="//flow/block[3]/block[2]/block[2]/@ipd"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_width.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_width.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/text-decoration_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/text-decoration_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/title_empty.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/title_linefeed-treatment.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/title_non-empty.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/wrapper_block.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/wrapper_block_id.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/wrapper_inline.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/wrapper_inline_block.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/wrapper_text-transform_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/wrapper_text-transform_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/resources/fonts/glb12.ttf.ansi.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/resources/fonts/glb12.ttf.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/resources/fop/image/corrupt.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/xml/1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/xml/bbo1a1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/xml/bbo1b1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org