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 sp...@apache.org on 2007/11/08 22:27:35 UTC
svn commit: r593328 [6/7] - in
/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking: ./
src/codegen/fonts/ src/documentation/ src/documentation/content/xdocs/
src/documentation/content/xdocs/dev/ src/documentation/content/xdocs/trunk/
src/java...
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_body2.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_body2.fo?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_body2.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_body2.fo Thu Nov 8 13:27:19 2007
@@ -1,106 +1,98 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <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" border-collapse="separate">
- <fo:table-column column-width="2in">
- <test:assert property="column-number" expected="1" />
- </fo:table-column>
- <fo:table-column column-width="1in">
- <test:assert property="column-number" expected="2" />
- </fo:table-column>
- <fo:table-column column-width="1in">
- <test:assert property="column-number" expected="3" />
- </fo:table-column>
- <fo:table-column column-width="1in">
- <test:assert property="column-number" expected="4" />
- </fo:table-column>
- <fo:table-body>
- <fo:table-cell>
- <test:assert property="column-number" expected="1" />
- <fo:block>cell1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>cell2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell3</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="4" />
- <fo:block>cell4</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>cell5</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="6" />
- <fo:block>cell5b</fo:block>
- </fo:table-cell>
- <fo:table-cell starts-row="true">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell6</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>cell7</fo:block>
- </fo:table-cell>
- <fo:table-cell ends-row="true">
- <test:assert property="column-number" expected="3" />
- <fo:block>cell8</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="1" />
- <fo:block>cell9</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>cell10</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell11</fo:block>
- </fo:table-cell>
- <fo:table-cell ends-row="true">
- <test:assert property="column-number" expected="4" />
- <fo:block>cell12</fo:block>
- </fo:table-cell>
- <fo:table-cell starts-row="true" ends-row="true">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell13</fo:block>
- </fo:table-cell>
- <fo:table-cell ends-row="true">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell14</fo:block>
- </fo:table-cell>
- </fo:table-body>
- </fo:table>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <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" border-collapse="separate">
+ <fo:table-column column-width="2in">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-column column-width="1in">
+ <test:assert property="column-number" expected="2" />
+ </fo:table-column>
+ <fo:table-column column-width="1in">
+ <test:assert property="column-number" expected="3" />
+ </fo:table-column>
+ <fo:table-column column-width="1in">
+ <test:assert property="column-number" expected="4" />
+ </fo:table-column>
+ <fo:table-body>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell 1.2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell 1.3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell 1.4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell 2.2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell 2.3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell 3.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell 3.2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell 3.3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell 3.4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true" ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell 4.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell 5.1</fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_body2.fo
('svn:eol' removed)
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_body2.fo
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_out-of-order.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_out-of-order.fo?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_out-of-order.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_out-of-order.fo Thu Nov 8 13:27:19 2007
@@ -1,217 +1,217 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
- margin="20pt">
- <fo:region-body />
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal">
- <fo:flow flow-name="xsl-region-body">
- <!-- table with explicit columns -->
- <fo:table table-layout="fixed" border-collapse="separate">
- <fo:table-column column-width="proportional-column-width(1)"
- number-columns-repeated="5">
- <test:assert property="column-number" expected="1" />
- </fo:table-column>
- <fo:table-header>
- <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true">
- <test:assert property="column-number" expected="1" />
- <fo:block>header cell</fo:block>
- </fo:table-cell>
- </fo:table-header>
- <fo:table-footer>
- <fo:table-cell starts-row="true" column-number="4">
- <test:assert property="column-number" expected="4" />
- <fo:block>footer cell 4</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>footer cell 5</fo:block>
- </fo:table-cell>
- <fo:table-cell column-number="1">
- <test:assert property="column-number" expected="1" />
- <fo:block>footer cell 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>footer cell 2</fo:block>
- </fo:table-cell>
- <fo:table-cell ends-row="true">
- <test:assert property="column-number" expected="3" />
- <fo:block>footer cell 3</fo:block>
- </fo:table-cell>
- </fo:table-footer>
- <fo:table-body>
- <fo:table-cell number-columns-spanned="2" starts-row="true">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell column-number="4">
- <test:assert property="column-number" expected="4" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell column-number="3">
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell number-rows-spanned="3" starts-row="true">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="4" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell number-rows-spanned="2"
- number-columns-spanned="2"
- starts-row="true">
- <test:assert property="column-number" expected="2" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="4" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell starts-row="true">
- <test:assert property="column-number" expected="4" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell ends-row="true">
- <test:assert property="column-number" expected="5" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-body>
- </fo:table>
- <!-- table with implicit columns -->
- <fo:table table-layout="fixed" border-collapse="separate">
- <fo:table-header>
- <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true">
- <test:assert property="column-number" expected="1" />
- <fo:block>header cell</fo:block>
- </fo:table-cell>
- </fo:table-header>
- <fo:table-footer>
- <fo:table-cell starts-row="true" column-number="4">
- <test:assert property="column-number" expected="4" />
- <fo:block>footer cell 4</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>footer cell 5</fo:block>
- </fo:table-cell>
- <fo:table-cell column-number="1">
- <test:assert property="column-number" expected="1" />
- <fo:block>footer cell 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>footer cell 2</fo:block>
- </fo:table-cell>
- <fo:table-cell ends-row="true">
- <test:assert property="column-number" expected="3" />
- <fo:block>footer cell 3</fo:block>
- </fo:table-cell>
- </fo:table-footer>
- <fo:table-body>
- <fo:table-cell number-columns-spanned="2" starts-row="true">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell column-number="4">
- <test:assert property="column-number" expected="4" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell column-number="3">
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell number-rows-spanned="3" starts-row="true">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="4" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell number-rows-spanned="2"
- number-columns-spanned="2"
- starts-row="true">
- <test:assert property="column-number" expected="2" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="4" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell starts-row="true">
- <test:assert property="column-number" expected="4" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell ends-row="true">
- <test:assert property="column-number" expected="5" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-body>
- </fo:table>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- table with explicit columns -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-column column-width="proportional-column-width(1)"
+ number-columns-repeated="5">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-header>
+ <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true" column-number="4">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>footer cell 4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>footer cell 5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="1">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell number-columns-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="4">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="3">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="3" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="2"
+ number-columns-spanned="2"
+ starts-row="true">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ <!-- table with implicit columns -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-header>
+ <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true" column-number="4">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>footer cell 4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>footer cell 5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="1">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell number-columns-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="4">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="3">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="3" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="2"
+ number-columns-spanned="2"
+ starts-row="true">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_out-of-order.fo
('svn:eol' removed)
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_out-of-order.fo
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_rows.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_rows.fo?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_rows.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_rows.fo Thu Nov 8 13:27:19 2007
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
- margin="20pt">
- <fo:region-body background-color="yellow"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal">
- <fo:flow flow-name="xsl-region-body">
- <!-- table with explicit columns -->
- <fo:table table-layout="fixed" border-collapse="separate">
- <fo:table-column column-width="proportional-column-width(1)">
- <test:assert property="column-number" expected="1" />
- </fo:table-column>
- <fo:table-column column-width="proportional-column-width(2)">
- <test:assert property="column-number" expected="2" />
- </fo:table-column>
- <fo:table-column column-width="proportional-column-width(1)">
- <test:assert property="column-number" expected="3" />
- </fo:table-column>
- <fo:table-header>
- <fo:table-row>
- <fo:table-cell number-columns-spanned="3">
- <test:assert property="column-number" expected="1" />
- <fo:block>header cell</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-header>
- <fo:table-footer>
- <fo:table-row>
- <fo:table-cell>
- <test:assert property="column-number" expected="1" />
- <fo:block>footer cell 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>footer cell 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>footer cell 3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-footer>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell number-columns-spanned="2">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell number-rows-spanned="2">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell number-rows-spanned="2">
- <test:assert property="column-number" expected="2" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- <!-- table with implicit columns -->
- <fo:table table-layout="fixed" border-collapse="separate">
- <fo:table-header>
- <fo:table-row>
- <fo:table-cell number-columns-spanned="3">
- <test:assert property="column-number" expected="1" />
- <fo:block>header cell</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-header>
- <fo:table-footer>
- <fo:table-row>
- <fo:table-cell>
- <test:assert property="column-number" expected="1" />
- <fo:block>footer cell 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>footer cell 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>footer cell 3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-footer>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell number-columns-spanned="2">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell number-rows-spanned="2">
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell number-rows-spanned="2">
- <test:assert property="column-number" expected="2" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <test:assert property="column-number" expected="1" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell-content</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body background-color="yellow"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- table with explicit columns -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(2)">
+ <test:assert property="column-number" expected="2" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="3" />
+ </fo:table-column>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="3">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="2">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell number-rows-spanned="2">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell number-rows-spanned="2">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <!-- table with implicit columns -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="3">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="2">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell number-rows-spanned="2">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell number-rows-spanned="2">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_rows.fo
('svn:eol' removed)
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_rows.fo
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_columns_special.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_columns_special.fo?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_columns_special.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_columns_special.fo Thu Nov 8 13:27:19 2007
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
- margin="20pt">
- <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" border-collapse="separate">
- <!-- 6 columns, of which one repeated, and one unused column-number (= 4) -->
- <fo:table-column column-width="proportional-column-width(1)"
- number-columns-repeated="2">
- <test:assert property="column-number" expected="1" />
- </fo:table-column>
- <fo:table-column column-width="proportional-column-width(1)">
- <test:assert property="column-number" expected="3" />
- </fo:table-column>
- <fo:table-column column-width="proportional-column-width(1)"
- column-number="5">
- <test:assert property="column-number" expected="5" />
- </fo:table-column>
- <fo:table-column column-width="proportional-column-width(1)">
- <test:assert property="column-number" expected="6" />
- </fo:table-column>
- <fo:table-column column-width="proportional-column-width(1)">
- <test:assert property="column-number" expected="7" />
- </fo:table-column>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell number-columns-spanned="5">
- <test:assert property="column-number" expected="1" />
- <fo:block>This cell should span columns 1, 2, 3, 5, 6</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="7" />
- <fo:block>cell for column 7</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <test:assert property="column-number" expected="1" />
- <fo:block>cell for column 1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="2" />
- <fo:block>cell for column 2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="3" />
- <fo:block>cell for column 3</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="5" />
- <fo:block>cell for column 5</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="6" />
- <fo:block>cell for column 6</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <test:assert property="column-number" expected="7" />
- <fo:block>cell for column 7</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <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" border-collapse="separate">
+ <!-- 6 columns, of which one repeated, and one unused column-number (= 4) -->
+ <fo:table-column column-width="proportional-column-width(1)"
+ number-columns-repeated="2">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="3" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)"
+ column-number="5">
+ <test:assert property="column-number" expected="5" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="6" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="7" />
+ </fo:table-column>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="5">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>This cell should span columns 1, 2, 3, 4, 5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="6" />
+ <fo:block>cell for column 6</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell for column 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell for column 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell for column 3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell for column 4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell for column 5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="6" />
+ <fo:block>cell for column 6</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_columns_special.fo
('svn:eol' removed)
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_columns_special.fo
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_negative-or-zero.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_negative-or-zero.fo?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_negative-or-zero.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_negative-or-zero.fo Thu Nov 8 13:27:19 2007
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
- margin="20pt">
- <fo:region-body />
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal">
- <fo:flow flow-name="xsl-region-body">
- <!-- testcase for specified negative or zero values -->
- <fo:table border-collapse="separate" table-layout="fixed" width="7.5in">
- <fo:table-column column-width="60pt" column-number="0">
- <test:assert property="column-number" expected="1" />
- </fo:table-column>
- <fo:table-column column-width="7in" column-number="-1">
- <test:assert property="column-number" expected="2" />
- </fo:table-column>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell column-number="-3">
- <test:assert property="column-number" expected="1" />
- <fo:block>Cell1</fo:block>
- </fo:table-cell>
- <fo:table-cell column-number="0">
- <test:assert property="column-number" expected="2" />
- <fo:block>Cell2
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- testcase for specified negative or zero values -->
+ <fo:table border-collapse="separate" table-layout="fixed" width="7.5in">
+ <fo:table-column column-width="60pt" column-number="0">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-column column-width="7in" column-number="-1">
+ <test:assert property="column-number" expected="2" />
+ </fo:table-column>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell column-number="-3">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>Cell1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="0">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>Cell2
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_negative-or-zero.fo
('svn:eol' removed)
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_negative-or-zero.fo
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-failure.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-failure.fo?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-failure.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-failure.fo Thu Nov 8 13:27:19 2007
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simpleA4" page-height="29.7cm" page-width="21cm" margin-top="2cm" margin-bottom="2cm" margin-left="2cm" margin-right="2cm">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="simpleA4">
- <fo:flow flow-name="xsl-region-body">
- <fo:block font-size="14pt">Hello World!
- <test:assert property="font-family" expected="sans-serif"/>
- <test:assert property="font-size" expected="12000mpt"/>
- </fo:block>
- <fo:block font-family="ZapfDingbats">઎</fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simpleA4" page-height="29.7cm" page-width="21cm" margin-top="2cm" margin-bottom="2cm" margin-left="2cm" margin-right="2cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="simpleA4">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font-size="14pt">Hello World!
+ <test:assert property="font-family" expected="sans-serif"/>
+ <test:assert property="font-size" expected="12000mpt"/>
+ </fo:block>
+ <fo:block font-family="ZapfDingbats">઎</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-failure.fo
('svn:eol' removed)
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-failure.fo
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-success.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-success.fo?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-success.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-success.fo Thu Nov 8 13:27:19 2007
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simpleA4" page-height="29.7cm" page-width="21cm" margin-top="2cm" margin-bottom="2cm" margin-left="2cm" margin-right="2cm">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="simpleA4">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>Hello World!
- <test:assert property="font-family" expected="[sans-serif]"/>
- <test:assert property="font-size" expected="12000mpt"/>
- </fo:block>
- <fo:block font-family="ZapfDingbats">઎</fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simpleA4" page-height="29.7cm" page-width="21cm" margin-top="2cm" margin-bottom="2cm" margin-left="2cm" margin-right="2cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="simpleA4">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Hello World!
+ <test:assert property="font-family" expected="[sans-serif]"/>
+ <test:assert property="font-size" expected="12000mpt"/>
+ </fo:block>
+ <fo:block font-family="ZapfDingbats">઎</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-success.fo
('svn:eol' removed)
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-success.fo
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo Thu Nov 8 13:27:19 2007
@@ -1,75 +1,75 @@
-<?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$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simpleA4" page-height="29.7cm" page-width="21cm" margin-top="2cm" margin-bottom="2cm" margin-left="2cm" margin-right="2cm">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="simpleA4">
- <fo:flow flow-name="xsl-region-body">
- <fo:block font="bold 10pt 'Times New Roman'">
- <test:assert property="font-family" expected="[Times New Roman]"/>
- <test:assert property="font-size" expected="10000mpt"/>
- <test:assert property="font-weight" expected="700" />
- <test:assert property="font-style" expected="NORMAL" />
- <test:assert property="line-height.optimum" expected="120.0%" />
- <test:assert property="font-variant" expected="NORMAL" />
- </fo:block>
- <fo:block font="italic small-caps 14pt 'Times New Roman', serif">
- <test:assert property="font-family" expected="[Times New Roman, serif]"/>
- <test:assert property="font-size" expected="14000mpt"/>
- <test:assert property="font-weight" expected="400" />
- <test:assert property="font-style" expected="ITALIC" />
- <test:assert property="line-height.optimum" expected="120.0%" />
- <test:assert property="font-variant" expected="SMALL_CAPS" />
- Test font shorthand
- </fo:block>
- <fo:block font="bold italic 14pt/80% Helvetica, sans-serif">
- <test:assert property="font-family" expected="[Helvetica, sans-serif]"/>
- <test:assert property="font-size" expected="14000mpt"/>
- <test:assert property="font-weight" expected="700" />
- <test:assert property="font-style" expected="ITALIC" />
- <test:assert property="line-height.optimum" expected="80.0%" />
- <test:assert property="font-variant" expected="NORMAL" />
- Test font shorthand
- </fo:block>
- <fo:block font="xx-large/1.4 Helvetica, sans-serif">
- <test:assert property="font-family" expected="[Helvetica, sans-serif]"/>
- <test:assert property="font-size" expected="20736mpt"/>
- <test:assert property="font-weight" expected="400" />
- <test:assert property="font-style" expected="NORMAL" />
- <test:assert property="line-height.optimum" expected="140.0%" />
- <test:assert property="font-variant" expected="NORMAL" />
- Test font shorthand
- </fo:block>
- <fo:block font="bold italic 14pt/80% Helvetica, sans-serif">
- <fo:block font="inherit">
- <test:assert property="font-family" expected="[Helvetica, sans-serif]"/>
- <test:assert property="font-size" expected="14000mpt"/>
- <test:assert property="font-weight" expected="700" />
- <test:assert property="font-style" expected="ITALIC" />
- <test:assert property="line-height.optimum" expected="80.0%" />
- <test:assert property="font-variant" expected="NORMAL" />
- Test font shorthand inheritance
- </fo:block>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simpleA4" page-height="29.7cm" page-width="21cm" margin-top="2cm" margin-bottom="2cm" margin-left="2cm" margin-right="2cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="simpleA4">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font="bold 10pt 'Times New Roman'">
+ <test:assert property="font-family" expected="[Times New Roman]"/>
+ <test:assert property="font-size" expected="10000mpt"/>
+ <test:assert property="font-weight" expected="700" />
+ <test:assert property="font-style" expected="NORMAL" />
+ <test:assert property="line-height.optimum" expected="120.0%" />
+ <test:assert property="font-variant" expected="NORMAL" />
+ </fo:block>
+ <fo:block font="italic small-caps 14pt 'Times New Roman', serif">
+ <test:assert property="font-family" expected="[Times New Roman, serif]"/>
+ <test:assert property="font-size" expected="14000mpt"/>
+ <test:assert property="font-weight" expected="400" />
+ <test:assert property="font-style" expected="ITALIC" />
+ <test:assert property="line-height.optimum" expected="120.0%" />
+ <test:assert property="font-variant" expected="SMALL_CAPS" />
+ Test font shorthand
+ </fo:block>
+ <fo:block font="bold italic 14pt/80% Helvetica, sans-serif">
+ <test:assert property="font-family" expected="[Helvetica, sans-serif]"/>
+ <test:assert property="font-size" expected="14000mpt"/>
+ <test:assert property="font-weight" expected="700" />
+ <test:assert property="font-style" expected="ITALIC" />
+ <test:assert property="line-height.optimum" expected="80.0%" />
+ <test:assert property="font-variant" expected="NORMAL" />
+ Test font shorthand
+ </fo:block>
+ <fo:block font="xx-large/1.4 Helvetica, sans-serif">
+ <test:assert property="font-family" expected="[Helvetica, sans-serif]"/>
+ <test:assert property="font-size" expected="20736mpt"/>
+ <test:assert property="font-weight" expected="400" />
+ <test:assert property="font-style" expected="NORMAL" />
+ <test:assert property="line-height.optimum" expected="140.0%" />
+ <test:assert property="font-variant" expected="NORMAL" />
+ Test font shorthand
+ </fo:block>
+ <fo:block font="bold italic 14pt/80% Helvetica, sans-serif">
+ <fo:block font="inherit">
+ <test:assert property="font-family" expected="[Helvetica, sans-serif]"/>
+ <test:assert property="font-size" expected="14000mpt"/>
+ <test:assert property="font-weight" expected="700" />
+ <test:assert property="font-style" expected="ITALIC" />
+ <test:assert property="line-height.optimum" expected="80.0%" />
+ <test:assert property="font-variant" expected="NORMAL" />
+ Test font shorthand inheritance
+ </fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/from-table-column_marker.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/from-table-column_marker.fo?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/from-table-column_marker.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/from-table-column_marker.fo Thu Nov 8 13:27:19 2007
@@ -1,102 +1,102 @@
-<?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$ -->
-<!-- This test serves to demonstrate an error when evaluating the function
- for a descendant of a retrieved marker. -->
-
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
- <fo:region-body/>
- <fo:region-before/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal">
- <fo:static-content flow-name="xsl-region-before">
- <fo:table border-collapse="separate" table-layout="fixed" width="100%">
- <fo:table-column column-width="proportional-column-width(1)"
- text-align="start" />
- <fo:table-column column-width="proportional-column-width(1)"
- text-align="center" />
- <fo:table-column column-width="proportional-column-width(1)"
- text-align="end" />
- <fo:table-body>
- <fo:table-cell starts-row="true">
- <fo:block text-align="from-table-column()">
- <test:assert property="text-align" expected="START" />
- Start-aligned
- </fo:block>
- </fo:table-cell>
- <fo:table-cell text-align="from-table-column()" column-number="3">
- <test:assert property="text-align" expected="END" />
- <fo:block>
- <test:assert property="text-align" expected="END" />
- End-aligned
- </fo:block>
- </fo:table-cell>
- <fo:table-cell column-number="2">
- <fo:block>
- <fo:retrieve-marker retrieve-class-name="test" retrieve-boundary="page"
- retrieve-position="first-starting-within-page" />
- </fo:block>
- </fo:table-cell>
- </fo:table-body>
- </fo:table>
- </fo:static-content>
- <fo:flow flow-name="xsl-region-body">
- <fo:table border-collapse="separate" table-layout="fixed" width="100%">
- <fo:table-column column-width="proportional-column-width(1)"
- text-align="start" />
- <fo:table-column column-width="proportional-column-width(1)"
- text-align="center" />
- <fo:table-column column-width="proportional-column-width(1)"
- text-align="end" />
- <fo:table-body>
- <fo:table-cell starts-row="true">
- <fo:block>
- <fo:marker marker-class-name="test">
- <fo:block text-align="from-table-column()">
- <test:assert property="text-align" expected="CENTER" />
- Center-aligned
- </fo:block>
- </fo:marker>
- </fo:block>
- <fo:block text-align="from-table-column()">
- <test:assert property="text-align" expected="START" />
- Start-aligned
- </fo:block>
- </fo:table-cell>
- <fo:table-cell text-align="from-table-column()" column-number="3">
- <test:assert property="text-align" expected="END" />
- <fo:block>
- <test:assert property="text-align" expected="END" />
- End-aligned
- </fo:block>
- </fo:table-cell>
- <fo:table-cell column-number="2">
- <fo:block text-align="from-table-column()">
- <test:assert property="text-align" expected="CENTER" />
- Center-aligned
- </fo:block>
- </fo:table-cell>
- </fo:table-body>
- </fo:table>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
-
+<?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$ -->
+<!-- This test serves to demonstrate an error when evaluating the function
+ for a descendant of a retrieved marker. -->
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ <fo:region-before/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="start" />
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="center" />
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="end" />
+ <fo:table-body>
+ <fo:table-cell starts-row="true">
+ <fo:block text-align="from-table-column()">
+ <test:assert property="text-align" expected="START" />
+ Start-aligned
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="from-table-column()" column-number="3">
+ <test:assert property="text-align" expected="END" />
+ <fo:block>
+ <test:assert property="text-align" expected="END" />
+ End-aligned
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="2">
+ <fo:block>
+ <fo:retrieve-marker retrieve-class-name="test" retrieve-boundary="page"
+ retrieve-position="first-starting-within-page" />
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="start" />
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="center" />
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="end" />
+ <fo:table-body>
+ <fo:table-cell starts-row="true">
+ <fo:block>
+ <fo:marker marker-class-name="test">
+ <fo:block text-align="from-table-column()">
+ <test:assert property="text-align" expected="CENTER" />
+ Center-aligned
+ </fo:block>
+ </fo:marker>
+ </fo:block>
+ <fo:block text-align="from-table-column()">
+ <test:assert property="text-align" expected="START" />
+ Start-aligned
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="from-table-column()" column-number="3">
+ <test:assert property="text-align" expected="END" />
+ <fo:block>
+ <test:assert property="text-align" expected="END" />
+ End-aligned
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="2">
+ <fo:block text-align="from-table-column()">
+ <test:assert property="text-align" expected="CENTER" />
+ Center-aligned
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/from-table-column_marker.fo
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org