1 files changed, 152 insertions, 151 deletions
diff --git a/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml b/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
index b12666096..600958f2f 100644
--- a/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
+++ b/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
@@ -1,151 +1,152 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
-  <info>
-    <p>
-      This test checks basic white space handling for white-space-collapse="true".
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <fo:layout-master-set>
-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
-          <fo:region-body/>
-        </fo:simple-page-master>
-      </fo:layout-master-set>
-      <fo:page-sequence master-reference="normal" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
-            spaces  
-            before  
-            and  
-            after  
-            each  
-            word  <fo:character character="&#xa;" />
-<fo:character character=" " /><fo:character character=" " />          and  
-            linefeeds<fo:character character=" " /><fo:character character=" " />
-            everywhere <fo:character character=" " />
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
-            <fo:block background-color="orange">
-              nested block level  
-            </fo:block>
-            <fo:block background-color="red">
-              nested block level  
-            </fo:block>
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
-            <fo:inline background-color="orange">
-              inline level  
-            </fo:inline>
-            <fo:inline background-color="red">
-              inline level  
-            </fo:inline>
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
-            block level  
-            <fo:inline background-color="orange">
-              inline level  
-            </fo:inline>
-            block
-            <fo:inline background-color="red">
-              inline level 
-            </fo:inline>
-            block level  
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
-            <fo:inline background-color="orange">
-              inline level  
-              <fo:inline background-color="red">
-              nested inline level  
-              </fo:inline>
-            </fo:inline>
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
-            <fo:inline background-color="orange">
-              <fo:inline background-color="red">
-                nested inline level  
-              </fo:inline>
-              inline level  
-            </fo:inline>
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
-            block level
-            <fo:inline background-color="orange">
-              <fo:inline background-color="red">
-                nested inline level  
-              </fo:inline>
-              inline level  
-            </fo:inline>
-            block level  
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
-    <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
-    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>
-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>
-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[3]/space)"/>
-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[4]/word)"/>
-    
-    <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/>
-    <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/>
-    <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/>
-    <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/>
-    
-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/>
-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>
-    <eval expected="1" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/>
-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/>
-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/>
-    
-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/>
-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/>
-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/>
-    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/>
-    <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/>
-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>
-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/word)"/>
-    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/space)"/>
-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/word)"/>
-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/space)"/>
-    
-    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>
-    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/>
-    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
-    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
-
-    <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
-    <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
-    <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/>
-    <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/>
-
-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/>
-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>
-    <eval expected="1" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/>
-    <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
-    <eval expected="4" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/word)"/>
-    <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/space)"/>
-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/word)"/>
-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/space)"/>
-  </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks basic white space handling for white-space-collapse="true".
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
+            spaces  
+            before  
+            and  
+            after  
+            each  
+            word  <fo:character character="&#xa;" />
+<fo:character character=" " /><fo:character character=" " />          and  
+            linefeeds<fo:character character=" " /><fo:character character=" " />
+            everywhere <fo:character character=" " />
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
+            <fo:block background-color="orange">
+              nested block level  
+            </fo:block>
+            <fo:block background-color="red">
+              nested block level  
+            </fo:block>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline background-color="orange">
+              inline level  
+            </fo:inline>
+            <fo:inline background-color="red">
+              inline level  
+            </fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            block level  
+            <fo:inline background-color="orange">
+              inline level  
+            </fo:inline>
+            block
+            <fo:inline background-color="red">
+              inline level 
+            </fo:inline>
+            block level  
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
+            <fo:inline background-color="orange">
+              inline level  
+              <fo:inline background-color="red">
+              nested inline level  
+              </fo:inline>
+            </fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
+            <fo:inline background-color="orange">
+              <fo:inline background-color="red">
+                nested inline level  
+              </fo:inline>
+              inline level  
+            </fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  
+            block level
+            <fo:inline background-color="orange">
+              <fo:inline background-color="red">
+                nested inline level  
+              </fo:inline>
+              inline level  
+            </fo:inline>
+            block level  
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
+    <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
+    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>
+    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>
+    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[3]/space)"/>
+    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[4]/word)"/>
+    
+    <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/>
+    <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/>
+    <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/>
+    <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/>
+    
+    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/>
+    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/>
+    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/>
+    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/>
+    
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/>
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/>
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/>
+    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/>
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/word)"/>
+    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/space)"/>
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/word)"/>
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/space)"/>
+    
+    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>
+    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/>
+    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+
+    <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+    <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+    <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/>
+    <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/>
+
+    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/>
+    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>
+    <eval expected="1" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/>
+    <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+    <eval expected="4" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/word)"/>
+    <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/space)"/>
+    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/word)"/>
+    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/space)"/>
+  </checks>
+</testcase>