From 76468ee6d7c2c21b2e02a80c44d47e11ba6a09ea Mon Sep 17 00:00:00 2001
From: Vincent Hennebert <vhennebert@apache.org>
Date: Wed, 31 Oct 2007 15:20:43 +0000
Subject: Replaced svn:eol property with svn:eol-style or set that latter to
 native

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@590714 13f79535-47bb-0310-9956-ffa450edef68
---
 test/fotree/testcases/column-number_cells_body.fo  | 324 +++++++--------
 test/fotree/testcases/column-number_cells_body2.fo | 196 +++++-----
 .../testcases/column-number_cells_out-of-order.fo  | 434 ++++++++++-----------
 test/fotree/testcases/column-number_cells_rows.fo  | 372 +++++++++---------
 .../testcases/column-number_columns_special.fo     | 178 ++++-----
 .../testcases/column-number_negative-or-zero.fo    | 108 ++---
 test/fotree/testcases/demo-test-failure.fo         |  34 +-
 test/fotree/testcases/demo-test-success.fo         |  34 +-
 test/fotree/testcases/font-shorthand-test.fo       | 150 +++----
 test/fotree/testcases/from-table-column_marker.fo  | 204 +++++-----
 .../testcases/page-break_shorthand-expansion.fo    | 168 ++++----
 .../testcases/page-dimension_auto_fallback.fo      |  72 ++--
 .../testcases/page-dimension_both_indefinite.fo    | 150 +++----
 .../testcases/white-space_shorthand-expansion.fo   | 102 ++---
 14 files changed, 1263 insertions(+), 1263 deletions(-)

(limited to 'test/fotree')

diff --git a/test/fotree/testcases/column-number_cells_body.fo b/test/fotree/testcases/column-number_cells_body.fo
index 48066c0a1..f36d8ede2 100644
--- a/test/fotree/testcases/column-number_cells_body.fo
+++ b/test/fotree/testcases/column-number_cells_body.fo
@@ -1,162 +1,162 @@
-<?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)">
-          <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-cell number-columns-spanned="3" 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">
-            <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>
-            <test:assert property="column-number" expected="3" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell number-rows-spanned="2" 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 ends-row="true">
-            <test:assert property="column-number" expected="3" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell number-rows-spanned="2" starts-row="true">
-            <test:assert property="column-number" expected="2" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell ends-row="true">
-            <test:assert property="column-number" expected="3" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell starts-row="true">
-            <test:assert property="column-number" expected="1" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell ends-row="true">
-            <test:assert property="column-number" expected="3" />
-            <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="3" 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">
-            <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 ends-row="true">
-            <test:assert property="column-number" expected="3" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell number-rows-spanned="2" 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 ends-row="true">
-            <test:assert property="column-number" expected="3" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell number-rows-spanned="2" starts-row="true">
-            <test:assert property="column-number" expected="2" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell ends-row="true">
-            <test:assert property="column-number" expected="3" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell starts-row="true">
-            <test:assert property="column-number" expected="1" />
-            <fo:block>cell-content</fo:block>
-          </fo:table-cell>
-          <fo:table-cell ends-row="true">
-            <test:assert property="column-number" expected="3" />
-            <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)">
+          <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-cell number-columns-spanned="3" 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">
+            <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>
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" 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 ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <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="3" 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">
+            <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 ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" 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 ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</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_body2.fo b/test/fotree/testcases/column-number_cells_body2.fo
index ef9d9ad75..63e310d28 100644
--- a/test/fotree/testcases/column-number_cells_body2.fo
+++ b/test/fotree/testcases/column-number_cells_body2.fo
@@ -1,98 +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>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>
+<?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>
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 1238dd1cf..a38c6e49f 100644
--- a/test/fotree/testcases/column-number_cells_out-of-order.fo
+++ b/test/fotree/testcases/column-number_cells_out-of-order.fo
@@ -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>
diff --git a/test/fotree/testcases/column-number_cells_rows.fo b/test/fotree/testcases/column-number_cells_rows.fo
index c6946f653..2d48e8ceb 100644
--- a/test/fotree/testcases/column-number_cells_rows.fo
+++ b/test/fotree/testcases/column-number_cells_rows.fo
@@ -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>
diff --git a/test/fotree/testcases/column-number_columns_special.fo b/test/fotree/testcases/column-number_columns_special.fo
index 5793de73f..f426ffa83 100644
--- a/test/fotree/testcases/column-number_columns_special.fo
+++ b/test/fotree/testcases/column-number_columns_special.fo
@@ -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, 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>
+<?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>
diff --git a/test/fotree/testcases/column-number_negative-or-zero.fo b/test/fotree/testcases/column-number_negative-or-zero.fo
index bbc6ce1d1..0270c70e3 100644
--- a/test/fotree/testcases/column-number_negative-or-zero.fo
+++ b/test/fotree/testcases/column-number_negative-or-zero.fo
@@ -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>
+
diff --git a/test/fotree/testcases/demo-test-failure.fo b/test/fotree/testcases/demo-test-failure.fo
index b3784b4f3..103f20d40 100644
--- a/test/fotree/testcases/demo-test-failure.fo
+++ b/test/fotree/testcases/demo-test-failure.fo
@@ -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">&#2702;</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">&#2702;</fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/demo-test-success.fo b/test/fotree/testcases/demo-test-success.fo
index b80ad7807..6d4696ebc 100644
--- a/test/fotree/testcases/demo-test-success.fo
+++ b/test/fotree/testcases/demo-test-success.fo
@@ -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">&#2702;</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">&#2702;</fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/font-shorthand-test.fo b/test/fotree/testcases/font-shorthand-test.fo
index 19093038c..b6666087f 100644
--- a/test/fotree/testcases/font-shorthand-test.fo
+++ b/test/fotree/testcases/font-shorthand-test.fo
@@ -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>
diff --git a/test/fotree/testcases/from-table-column_marker.fo b/test/fotree/testcases/from-table-column_marker.fo
index fc19c424e..70eb7aac5 100644
--- a/test/fotree/testcases/from-table-column_marker.fo
+++ b/test/fotree/testcases/from-table-column_marker.fo
@@ -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>
+
diff --git a/test/fotree/testcases/page-break_shorthand-expansion.fo b/test/fotree/testcases/page-break_shorthand-expansion.fo
index db51f31fa..bfd2f9288 100644
--- a/test/fotree/testcases/page-break_shorthand-expansion.fo
+++ b/test/fotree/testcases/page-break_shorthand-expansion.fo
@@ -1,84 +1,84 @@
-<?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="normal" page-width="5in" page-height="5in">
-        <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:block page-break-before="avoid">
-          <test:assert property="break-before" expected="AUTO" />
-          <test:assert property="keep-with-previous.within-page" expected="ALWAYS" />
-          Block 1: testing page-break-before="avoid"
-        </fo:block>
-        <fo:block page-break-before="always">
-          <test:assert property="break-before" expected="PAGE" />
-          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
-          Block 2: testing page-break-before="always"
-        </fo:block>
-        <fo:block page-break-before="left">
-          <test:assert property="break-before" expected="EVEN_PAGE" />
-          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
-          Block 3: testing page-break-before="left"
-        </fo:block>
-        <fo:block page-break-before="right">
-          <test:assert property="break-before" expected="ODD_PAGE" />
-          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
-          Block 4: testing page-break-before="right"
-        </fo:block>
-        <fo:block page-break-after="avoid">
-          <test:assert property="break-after" expected="AUTO" />
-          <test:assert property="keep-with-next.within-page" expected="ALWAYS" />
-          Block 5: testing page-break-after="avoid"
-        </fo:block>
-        <fo:block page-break-after="always">
-          <test:assert property="break-after" expected="PAGE" />
-          <test:assert property="keep-with-next.within-page" expected="AUTO" />
-          Block 6: testing page-break-after="always"
-        </fo:block>
-        <fo:block page-break-after="left">
-          <test:assert property="break-after" expected="EVEN_PAGE" />
-          <test:assert property="keep-with-next.within-page" expected="AUTO" />
-          Block 7: testing page-break-after="left"
-        </fo:block>
-        <fo:block page-break-after="right">
-          <test:assert property="break-after" expected="ODD_PAGE" />
-          <test:assert property="keep-with-next.within-page" expected="AUTO" />
-          Block 8: testing page-break-after="right"
-        </fo:block>
-        <fo:block page-break-inside="avoid">
-          <test:assert property="keep-together.within-page" expected="ALWAYS" />
-          Block 9: testing page-break-inside="avoid"
-        </fo:block>
-        <fo:block page-break-before="left" page-break-inside="avoid"
-                  page-break-after="right">
-          <test:assert property="break-before" expected="EVEN_PAGE" />
-          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
-          <test:assert property="break-after" expected="ODD_PAGE" />
-          <test:assert property="keep-with-next.within-page" expected="AUTO" />
-          <test:assert property="keep-together.within-page" expected="ALWAYS" />
-         Block 10: testing page-break-before="left", page-break-inside="avoid"
-          and page-break-after="right"
-        </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="normal" page-width="5in" page-height="5in">
+        <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:block page-break-before="avoid">
+          <test:assert property="break-before" expected="AUTO" />
+          <test:assert property="keep-with-previous.within-page" expected="ALWAYS" />
+          Block 1: testing page-break-before="avoid"
+        </fo:block>
+        <fo:block page-break-before="always">
+          <test:assert property="break-before" expected="PAGE" />
+          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
+          Block 2: testing page-break-before="always"
+        </fo:block>
+        <fo:block page-break-before="left">
+          <test:assert property="break-before" expected="EVEN_PAGE" />
+          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
+          Block 3: testing page-break-before="left"
+        </fo:block>
+        <fo:block page-break-before="right">
+          <test:assert property="break-before" expected="ODD_PAGE" />
+          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
+          Block 4: testing page-break-before="right"
+        </fo:block>
+        <fo:block page-break-after="avoid">
+          <test:assert property="break-after" expected="AUTO" />
+          <test:assert property="keep-with-next.within-page" expected="ALWAYS" />
+          Block 5: testing page-break-after="avoid"
+        </fo:block>
+        <fo:block page-break-after="always">
+          <test:assert property="break-after" expected="PAGE" />
+          <test:assert property="keep-with-next.within-page" expected="AUTO" />
+          Block 6: testing page-break-after="always"
+        </fo:block>
+        <fo:block page-break-after="left">
+          <test:assert property="break-after" expected="EVEN_PAGE" />
+          <test:assert property="keep-with-next.within-page" expected="AUTO" />
+          Block 7: testing page-break-after="left"
+        </fo:block>
+        <fo:block page-break-after="right">
+          <test:assert property="break-after" expected="ODD_PAGE" />
+          <test:assert property="keep-with-next.within-page" expected="AUTO" />
+          Block 8: testing page-break-after="right"
+        </fo:block>
+        <fo:block page-break-inside="avoid">
+          <test:assert property="keep-together.within-page" expected="ALWAYS" />
+          Block 9: testing page-break-inside="avoid"
+        </fo:block>
+        <fo:block page-break-before="left" page-break-inside="avoid"
+                  page-break-after="right">
+          <test:assert property="break-before" expected="EVEN_PAGE" />
+          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
+          <test:assert property="break-after" expected="ODD_PAGE" />
+          <test:assert property="keep-with-next.within-page" expected="AUTO" />
+          <test:assert property="keep-together.within-page" expected="ALWAYS" />
+         Block 10: testing page-break-before="left", page-break-inside="avoid"
+          and page-break-after="right"
+        </fo:block>
+      </fo:flow>
+    </fo:page-sequence>
+  </fo:root>
+
diff --git a/test/fotree/testcases/page-dimension_auto_fallback.fo b/test/fotree/testcases/page-dimension_auto_fallback.fo
index 2e11f14f6..4c438a11c 100644
--- a/test/fotree/testcases/page-dimension_auto_fallback.fo
+++ b/test/fotree/testcases/page-dimension_auto_fallback.fo
@@ -1,36 +1,36 @@
-<?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="auto" page-height="auto" 
-          margin="20pt">
-      <!-- page-width should properly fall back to 8.26 * 72000 -->
-      <test:assert property="page-width" expected="594720mpt" />
-      <!-- page-height should properly fall back to 11 * 72000 -->
-      <test:assert property="page-height" expected="792000mpt" />
-      <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:block>Testing page-height="auto" / page-width="auto"</fo:block>
-    </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="auto" page-height="auto" 
+          margin="20pt">
+      <!-- page-width should properly fall back to 8.26 * 72000 -->
+      <test:assert property="page-width" expected="594720mpt" />
+      <!-- page-height should properly fall back to 11 * 72000 -->
+      <test:assert property="page-height" expected="792000mpt" />
+      <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:block>Testing page-height="auto" / page-width="auto"</fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/page-dimension_both_indefinite.fo b/test/fotree/testcases/page-dimension_both_indefinite.fo
index abc64b69b..3761f09e0 100644
--- a/test/fotree/testcases/page-dimension_both_indefinite.fo
+++ b/test/fotree/testcases/page-dimension_both_indefinite.fo
@@ -1,75 +1,75 @@
-<?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="lr-tb-0"
-          page-width="indefinite" page-height="indefinite"
-          writing-mode="lr-tb"
-          margin="20pt">
-      <!-- page-width should properly fall back to 8.26 * 72000 -->
-      <test:assert property="page-width" expected="594720mpt" />
-      <fo:region-body />
-    </fo:simple-page-master>
-    <fo:simple-page-master master-name="lr-tb-90" 
-          page-width="indefinite" page-height="indefinite"
-          writing-mode="lr-tb" reference-orientation="90"
-          margin="20pt">
-      <!-- page-height should properly fall back to 11 * 72000 -->
-      <test:assert property="page-height" expected="792000mpt" />
-      <fo:region-body />
-    </fo:simple-page-master>
-    <fo:simple-page-master master-name="tb-rl-0"
-          page-width="indefinite" page-height="indefinite"
-          writing-mode="tb-rl" reference-orientation="0"
-          margin="20pt">
-      <!-- page-height should properly fall back to 11 * 72000 -->
-      <test:assert property="page-height" expected="792000mpt" />
-      <fo:region-body />
-    </fo:simple-page-master>
-    <fo:simple-page-master master-name="tb-rl-90"
-          page-width="indefinite" page-height="indefinite"
-          writing-mode="tb-rl" reference-orientation="90"
-          margin="20pt">
-      <!-- page-width should properly fall back to 8.26 * 72000 -->
-      <test:assert property="page-width" expected="594720mpt" />
-      <fo:region-body />
-    </fo:simple-page-master>
-  </fo:layout-master-set>
-  <fo:page-sequence master-reference="lr-tb-0">
-    <fo:flow flow-name="xsl-region-body">
-      <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
-    </fo:flow>
-  </fo:page-sequence>
-  <fo:page-sequence master-reference="lr-tb-90">
-    <fo:flow flow-name="xsl-region-body">
-      <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
-    </fo:flow>
-  </fo:page-sequence>
-  <fo:page-sequence master-reference="tb-rl-0">
-    <fo:flow flow-name="xsl-region-body">
-      <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
-    </fo:flow>
-  </fo:page-sequence>
-  <fo:page-sequence master-reference="tb-rl-90">
-    <fo:flow flow-name="xsl-region-body">
-      <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
-    </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="lr-tb-0"
+          page-width="indefinite" page-height="indefinite"
+          writing-mode="lr-tb"
+          margin="20pt">
+      <!-- page-width should properly fall back to 8.26 * 72000 -->
+      <test:assert property="page-width" expected="594720mpt" />
+      <fo:region-body />
+    </fo:simple-page-master>
+    <fo:simple-page-master master-name="lr-tb-90" 
+          page-width="indefinite" page-height="indefinite"
+          writing-mode="lr-tb" reference-orientation="90"
+          margin="20pt">
+      <!-- page-height should properly fall back to 11 * 72000 -->
+      <test:assert property="page-height" expected="792000mpt" />
+      <fo:region-body />
+    </fo:simple-page-master>
+    <fo:simple-page-master master-name="tb-rl-0"
+          page-width="indefinite" page-height="indefinite"
+          writing-mode="tb-rl" reference-orientation="0"
+          margin="20pt">
+      <!-- page-height should properly fall back to 11 * 72000 -->
+      <test:assert property="page-height" expected="792000mpt" />
+      <fo:region-body />
+    </fo:simple-page-master>
+    <fo:simple-page-master master-name="tb-rl-90"
+          page-width="indefinite" page-height="indefinite"
+          writing-mode="tb-rl" reference-orientation="90"
+          margin="20pt">
+      <!-- page-width should properly fall back to 8.26 * 72000 -->
+      <test:assert property="page-width" expected="594720mpt" />
+      <fo:region-body />
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="lr-tb-0">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+  <fo:page-sequence master-reference="lr-tb-90">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+  <fo:page-sequence master-reference="tb-rl-0">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+  <fo:page-sequence master-reference="tb-rl-90">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/white-space_shorthand-expansion.fo b/test/fotree/testcases/white-space_shorthand-expansion.fo
index f49b7146c..dfa783ede 100644
--- a/test/fotree/testcases/white-space_shorthand-expansion.fo
+++ b/test/fotree/testcases/white-space_shorthand-expansion.fo
@@ -1,51 +1,51 @@
-<?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="normal" page-width="5in" page-height="5in">
-        <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:block white-space="normal">
-          <test:assert property="linefeed-treatment" expected="TREAT_AS_SPACE" />
-          <test:assert property="white-space-treatment" expected="IGNORE_IF_SURROUNDING_LINEFEED" />
-          <test:assert property="white-space-collapse" expected="TRUE" />
-          <test:assert property="wrap-option" expected="WRAP" />
-          Block 1: testing white-space="normal"
-        </fo:block>
-        <fo:block white-space="pre">
-          <test:assert property="linefeed-treatment" expected="PRESERVE" />
-          <test:assert property="white-space-treatment" expected="PRESERVE" />
-          <test:assert property="white-space-collapse" expected="FALSE" />
-          <test:assert property="wrap-option" expected="NO_WRAP" />
-          Block 2: testing white-space="pre"
-        </fo:block>
-        <fo:block white-space="nowrap">
-          <test:assert property="linefeed-treatment" expected="TREAT_AS_SPACE" />
-          <test:assert property="white-space-treatment" expected="IGNORE_IF_SURROUNDING_LINEFEED" />
-          <test:assert property="white-space-collapse" expected="TRUE" />
-          <test:assert property="wrap-option" expected="NO_WRAP" />
-          Block 3: testing white-space="no-wrap"
-        </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="normal" page-width="5in" page-height="5in">
+        <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:block white-space="normal">
+          <test:assert property="linefeed-treatment" expected="TREAT_AS_SPACE" />
+          <test:assert property="white-space-treatment" expected="IGNORE_IF_SURROUNDING_LINEFEED" />
+          <test:assert property="white-space-collapse" expected="TRUE" />
+          <test:assert property="wrap-option" expected="WRAP" />
+          Block 1: testing white-space="normal"
+        </fo:block>
+        <fo:block white-space="pre">
+          <test:assert property="linefeed-treatment" expected="PRESERVE" />
+          <test:assert property="white-space-treatment" expected="PRESERVE" />
+          <test:assert property="white-space-collapse" expected="FALSE" />
+          <test:assert property="wrap-option" expected="NO_WRAP" />
+          Block 2: testing white-space="pre"
+        </fo:block>
+        <fo:block white-space="nowrap">
+          <test:assert property="linefeed-treatment" expected="TREAT_AS_SPACE" />
+          <test:assert property="white-space-treatment" expected="IGNORE_IF_SURROUNDING_LINEFEED" />
+          <test:assert property="white-space-collapse" expected="TRUE" />
+          <test:assert property="wrap-option" expected="NO_WRAP" />
+          Block 3: testing white-space="no-wrap"
+        </fo:block>
+      </fo:flow>
+    </fo:page-sequence>
+  </fo:root>
+
-- 
cgit v1.2.3