Update for initial-values of column-number + some pending style-violation corrections

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@290540 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 165 insertions, 0 deletions

diff --git a/test/fotree/testcases/column-number_cells_body.fo b/test/fotree/testcases/column-number_cells_body.fo
index 97cfb2e1e..4d9de6672 100644
--- a/test/fotree/testcases/column-number_cells_body.fo
+++ b/test/fotree/testcases/column-number_cells_body.fo
@@ -1,4 +1,20 @@
 <?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>
diff --git a/test/fotree/testcases/column-number_cells_body2.fo b/test/fotree/testcases/column-number_cells_body2.fo
new file mode 100644
index 000000000..3b5d0617a
--- /dev/null
+++ b/test/fotree/testcases/column-number_cells_body2.fo
@@ -0,0 +1,101 @@
+<?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="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 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>
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 83f0dec4b..841d71f7b 100644
--- a/test/fotree/testcases/column-number_cells_out-of-order.fo
+++ b/test/fotree/testcases/column-number_cells_out-of-order.fo
@@ -1,4 +1,20 @@
 <?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>
diff --git a/test/fotree/testcases/column-number_cells_rows.fo b/test/fotree/testcases/column-number_cells_rows.fo
index b7f901cd5..62b3b620f 100644
--- a/test/fotree/testcases/column-number_cells_rows.fo
+++ b/test/fotree/testcases/column-number_cells_rows.fo
@@ -1,4 +1,20 @@
 <?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>
diff --git a/test/fotree/testcases/column-number_columns_special.fo b/test/fotree/testcases/column-number_columns_special.fo
index 5adceca9b..7787b9d91 100644
--- a/test/fotree/testcases/column-number_columns_special.fo
+++ b/test/fotree/testcases/column-number_columns_special.fo
@@ -1,4 +1,20 @@
 <?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>