aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/fotree/testcases/column-number_cells_body.fo2
-rw-r--r--test/fotree/testcases/column-number_cells_body2.fo6
-rw-r--r--test/fotree/testcases/column-number_cells_out-of-order.fo2
-rw-r--r--test/fotree/testcases/column-number_cells_rows.fo2
-rw-r--r--test/fotree/testcases/column-number_columns_special.fo2
-rw-r--r--test/fotree/testcases/column-number_negative-or-zero.fo53
6 files changed, 62 insertions, 5 deletions
diff --git a/test/fotree/testcases/column-number_cells_body.fo b/test/fotree/testcases/column-number_cells_body.fo
index 4d9de6672..f6012f838 100644
--- a/test/fotree/testcases/column-number_cells_body.fo
+++ b/test/fotree/testcases/column-number_cells_body.fo
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: $ -->
+<!-- $Id:$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:test="http://xmlgraphics.apache.org/fop/test">
<fo:layout-master-set>
diff --git a/test/fotree/testcases/column-number_cells_body2.fo b/test/fotree/testcases/column-number_cells_body2.fo
index 3b5d0617a..4bd71fe7d 100644
--- a/test/fotree/testcases/column-number_cells_body2.fo
+++ b/test/fotree/testcases/column-number_cells_body2.fo
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: $ -->
+<!-- $Id:$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:test="http://xmlgraphics.apache.org/fop/test">
<fo:layout-master-set>
@@ -58,6 +58,10 @@
<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>
diff --git a/test/fotree/testcases/column-number_cells_out-of-order.fo b/test/fotree/testcases/column-number_cells_out-of-order.fo
index 841d71f7b..39ecd2a5d 100644
--- a/test/fotree/testcases/column-number_cells_out-of-order.fo
+++ b/test/fotree/testcases/column-number_cells_out-of-order.fo
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: $ -->
+<!-- $Id:$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:test="http://xmlgraphics.apache.org/fop/test">
<fo:layout-master-set>
diff --git a/test/fotree/testcases/column-number_cells_rows.fo b/test/fotree/testcases/column-number_cells_rows.fo
index 62b3b620f..ad453b3cd 100644
--- a/test/fotree/testcases/column-number_cells_rows.fo
+++ b/test/fotree/testcases/column-number_cells_rows.fo
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: $ -->
+<!-- $Id:$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:test="http://xmlgraphics.apache.org/fop/test">
<fo:layout-master-set>
diff --git a/test/fotree/testcases/column-number_columns_special.fo b/test/fotree/testcases/column-number_columns_special.fo
index 7787b9d91..035864a34 100644
--- a/test/fotree/testcases/column-number_columns_special.fo
+++ b/test/fotree/testcases/column-number_columns_special.fo
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: $ -->
+<!-- $Id:$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:test="http://xmlgraphics.apache.org/fop/test">
<fo:layout-master-set>
diff --git a/test/fotree/testcases/column-number_negative-or-zero.fo b/test/fotree/testcases/column-number_negative-or-zero.fo
new file mode 100644
index 000000000..98294efb4
--- /dev/null
+++ b/test/fotree/testcases/column-number_negative-or-zero.fo
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed 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>
+