You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2006/07/28 17:46:32 UTC

svn commit: r426576 [25/41] - in /xmlgraphics/fop/trunk: ./ conf/ examples/embedding/ examples/embedding/java/embedding/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ examples/embedding/java/embedding/tools/ e...

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml Fri Jul 28 08:44:37 2006
@@ -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>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml Fri Jul 28 08:44:37 2006
@@ -1,141 +1,142 @@
-<?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="false".
-    </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="false">
-        <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="5" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
-    <eval expected="60" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text[1]/word)"/>
-    <eval expected="2" xpath="count(//flow/block[1]/lineArea[2]/text[1]/space)"/>
-    
-    <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="16" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>
-    <eval expected="13" 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="16" 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="16" 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="31" 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="13" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>
-    
-    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>
-    <eval expected="18" 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="17" 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="19" 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="16" 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="14" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>
-    <eval expected="15" 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="36" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/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="false".
+    </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="false">
+        <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="5" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
+    <eval expected="60" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
+    <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text[1]/word)"/>
+    <eval expected="2" xpath="count(//flow/block[1]/lineArea[2]/text[1]/space)"/>
+    
+    <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="16" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>
+    <eval expected="13" 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="16" 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="16" 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="31" 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="13" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>
+    
+    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>
+    <eval expected="18" 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="17" 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="19" 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="16" 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="14" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>
+    <eval expected="15" 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="36" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+  </checks>
+</testcase>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml Fri Jul 28 08:44:37 2006
@@ -1,80 +1,81 @@
-<?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 white space handling for white-space-treatment
-      with 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 white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  ignore-if-surrounding-linefeed  
-  all  
-  spaces  
-</fo:block>
-          <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  ignore  
-  all  
-  spaces  
-</fo:block>
-          <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  preserve  
-  all  
-  spaces  
-</fo:block>
-          <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  ignore-if-before-linefeed  
-  all  
-  spaces  
-</fo:block>
-          <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  ignore-if-after-linefeed  
-  all  
-  spaces  
-</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="3" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
-    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
-
-    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>
-    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>
-    
-    <eval expected="3" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>
-    <eval expected="4" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>
-    
-    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
-    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
-    
-    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>
-    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/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 white space handling for white-space-treatment
+      with 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 white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore-if-surrounding-linefeed  
+  all  
+  spaces  
+</fo:block>
+          <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore  
+  all  
+  spaces  
+</fo:block>
+          <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  preserve  
+  all  
+  spaces  
+</fo:block>
+          <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore-if-before-linefeed  
+  all  
+  spaces  
+</fo:block>
+          <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore-if-after-linefeed  
+  all  
+  spaces  
+</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="3" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
+    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
+
+    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>
+    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>
+    
+    <eval expected="3" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>
+    <eval expected="4" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>
+    
+    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
+    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+    
+    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>
+    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/>
+    
+  </checks>
+</testcase>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml Fri Jul 28 08:44:37 2006
@@ -1,95 +1,96 @@
-<?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 white space handling for white-space-treatment
-      with white-space-collapse="false".
-    </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="false">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  ignore-if-surrounding-linefeed                                               
-  all                                                                          
-  spaces                                                                       
-</fo:block>
-          <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  ignore                                                                       
-  all                                                                          
-  spaces                                                                       
-</fo:block>
-          <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  preserve                                                                     
-  all                                                                          
-  spaces                                                                       
-</fo:block>
-          <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  ignore-if-before-linefeed                                                    
-  all                                                                          
-  spaces                                                                       
-</fo:block>
-          <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
-  ignore-if-after-linefeed                                                     
-  all                                                                          
-  spaces                                                                       
-</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="2" xpath="count(//flow/block[1]/lineArea)"/>
-    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
-    <eval expected="50" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text/word)"/>
-    <eval expected="0" xpath="count(//flow/block[1]/lineArea[2]/text/space)"/>
-
-    <eval expected="1" xpath="count(//flow/block[2]/lineArea)"/>
-    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>
-    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>
-    
-    <eval expected="3" xpath="count(//flow/block[3]/lineArea)"/>
-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>
-    <eval expected="90" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>
-    <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>
-    <eval expected="96" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
-    <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
-    <eval expected="38" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
-    
-    <eval expected="2" xpath="count(//flow/block[4]/lineArea)"/>
-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
-    <eval expected="58" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
-    <eval expected="1" xpath="count(//flow/block[4]/lineArea[2]/text/word)"/>
-    <eval expected="77" xpath="count(//flow/block[4]/lineArea[2]/text/space)"/>
-    
-    <eval expected="2" xpath="count(//flow/block[5]/lineArea)"/>
-    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>
-    <eval expected="56" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/>
-    <eval expected="1" xpath="count(//flow/block[5]/lineArea[2]/text/word)"/>
-    <eval expected="72" xpath="count(//flow/block[5]/lineArea[2]/text/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 white space handling for white-space-treatment
+      with white-space-collapse="false".
+    </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="false">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore-if-surrounding-linefeed                                               
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+          <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore                                                                       
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+          <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  preserve                                                                     
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+          <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore-if-before-linefeed                                                    
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+          <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore-if-after-linefeed                                                     
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2" xpath="count(//flow/block[1]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
+    <eval expected="50" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text/word)"/>
+    <eval expected="0" xpath="count(//flow/block[1]/lineArea[2]/text/space)"/>
+
+    <eval expected="1" xpath="count(//flow/block[2]/lineArea)"/>
+    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>
+    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>
+    
+    <eval expected="3" xpath="count(//flow/block[3]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>
+    <eval expected="90" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>
+    <eval expected="96" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
+    <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
+    <eval expected="38" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
+    
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
+    <eval expected="58" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[4]/lineArea[2]/text/word)"/>
+    <eval expected="77" xpath="count(//flow/block[4]/lineArea[2]/text/space)"/>
+    
+    <eval expected="2" xpath="count(//flow/block[5]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>
+    <eval expected="56" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[5]/lineArea[2]/text/word)"/>
+    <eval expected="72" xpath="count(//flow/block[5]/lineArea[2]/text/space)"/>
+    
+  </checks>
+</testcase>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_1.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_1.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_3.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_3.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_3.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_3.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_4.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_4.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_4.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_4.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_5.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_5.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_5.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_5.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml Fri Jul 28 08:44:37 2006
@@ -1,105 +1,106 @@
-<?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 non breaking white space (nbsp).
-    </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" id="single">&#160;single&#160;nbsp&#160;around&#160;</fo:block>
-          <fo:block background-color="red" id="only">&#160;</fo:block>
-          <fo:block background-color="silver" id="double">&#160;&#160;after&#160;&#160;empty&#160;&#160;line&#160;&#160;</fo:block>
-          <fo:block background-color="silver" id="single-justify" text-align="justify" text-align-last="justify" space-before="5pt">&#160;single&#160;nbsp&#160;around&#160;</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
-    <eval expected="4" xpath="count(//flow/block[1]/lineArea/text/space)"/>
-    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
-    <eval expected="1" xpath="count(//flow/block[2]/lineArea/text/space)"/>
-    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
-    <eval expected="8" xpath="count(//flow/block[3]/lineArea/text/space)"/>
-    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
-    <eval expected="3" xpath="count(//flow/block[4]/lineArea/text/space)"/> <!-- trailing nbsp is removed by LineLM -->
-    
-    <!-- nbsp must be adjustable -->
-    <true xpath="not(//flow/block[4]/lineArea/text/space[1]/@adj = 'false')"/>
-    
-    <element-list category="line" id="single">
-      <box w="3336"/>
-      <box/>
-      <box w="3336"/>
-      <box/>
-      <box w="3336"/>
-      <box/>
-      <box w="3336"/>
-      <skip>3</skip>
-    </element-list>
-    
-    <element-list category="line" id="only">
-      <box w="3336"/>
-      <skip>3</skip>
-    </element-list>
-    
-    <element-list category="line" id="double">
-      <box w="3336"/>
-      <box w="3336"/>
-      <box/>
-      <box w="3336"/>
-      <box w="3336"/>
-      <box/>
-      <box w="3336"/>
-      <box w="3336"/>
-      <box/>
-      <box w="3336"/>
-      <box w="3336"/>
-      <skip>3</skip>
-    </element-list>
-    
-    <element-list category="line" id="single-justify">
-      <box w="0"/>
-      <penalty p="INF"/>
-      <glue w="3336" y="1668" z="1112"/>
-      <box/>
-      <box w="0"/>
-      <penalty p="INF"/>
-      <glue w="3336" y="1668" z="1112"/>
-      <box/>
-      <box w="0"/>
-      <penalty p="INF"/>
-      <glue w="3336" y="1668" z="1112"/>
-      <box/>
-      <box w="0"/>
-      <penalty p="INF"/>
-      <glue w="3336" y="1668" z="1112"/>
-      <skip>3</skip>
-    </element-list>
-    
-  </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 non breaking white space (nbsp).
+    </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" id="single">&#160;single&#160;nbsp&#160;around&#160;</fo:block>
+          <fo:block background-color="red" id="only">&#160;</fo:block>
+          <fo:block background-color="silver" id="double">&#160;&#160;after&#160;&#160;empty&#160;&#160;line&#160;&#160;</fo:block>
+          <fo:block background-color="silver" id="single-justify" text-align="justify" text-align-last="justify" space-before="5pt">&#160;single&#160;nbsp&#160;around&#160;</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+    <eval expected="4" xpath="count(//flow/block[1]/lineArea/text/space)"/>
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="1" xpath="count(//flow/block[2]/lineArea/text/space)"/>
+    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+    <eval expected="8" xpath="count(//flow/block[3]/lineArea/text/space)"/>
+    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+    <eval expected="3" xpath="count(//flow/block[4]/lineArea/text/space)"/> <!-- trailing nbsp is removed by LineLM -->
+    
+    <!-- nbsp must be adjustable -->
+    <true xpath="not(//flow/block[4]/lineArea/text/space[1]/@adj = 'false')"/>
+    
+    <element-list category="line" id="single">
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <skip>3</skip>
+    </element-list>
+    
+    <element-list category="line" id="only">
+      <box w="3336"/>
+      <skip>3</skip>
+    </element-list>
+    
+    <element-list category="line" id="double">
+      <box w="3336"/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box w="3336"/>
+      <skip>3</skip>
+    </element-list>
+    
+    <element-list category="line" id="single-justify">
+      <box w="0"/>
+      <penalty p="INF"/>
+      <glue w="3336" y="1668" z="1112"/>
+      <box/>
+      <box w="0"/>
+      <penalty p="INF"/>
+      <glue w="3336" y="1668" z="1112"/>
+      <box/>
+      <box w="0"/>
+      <penalty p="INF"/>
+      <glue w="3336" y="1668" z="1112"/>
+      <box/>
+      <box w="0"/>
+      <penalty p="INF"/>
+      <glue w="3336" y="1668" z="1112"/>
+      <skip>3</skip>
+    </element-list>
+    
+  </checks>
+</testcase>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_nbsp_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_nbsp_2.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_nbsp_2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_nbsp_2.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_word-spacing.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_word-spacing.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_word-spacing.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_word-spacing.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_word-spacing_text-align_justify.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_word-spacing_text-align_justify.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_word-spacing_text-align_justify.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_word-spacing_text-align_justify.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_wrap-option.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_wrap-option.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_wrap-option.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_wrap-option.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/character_background-color.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/character_background-color.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/character_background-color.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/character_background-color.xml Fri Jul 28 08:44:37 2006
@@ -1,43 +1,44 @@
-<?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 fo:character with background-color property.
-    </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" margin="5pt">
-          <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" font-size="10pt">
-          <fo:block background-color="silver">
-            To <fo:character background-color="yellow" character="e" />mphasize a character highlight it.
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
-  </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 fo:character with background-color property.
+    </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" margin="5pt">
+          <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" font-size="10pt">
+          <fo:block background-color="silver">
+            To <fo:character background-color="yellow" character="e" />mphasize a character highlight it.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
+  </checks>
+</testcase>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/character_background-image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/character_background-image.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/character_background-image.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/character_background-image.xml Fri Jul 28 08:44:37 2006
@@ -1,48 +1,49 @@
-<?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 fo:character with background-image property.
-    </p>
-  </info>
-  <variables>
-    <img>../../resources/images/bgimg300dpi.jpg</img>
-  </variables>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-      <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 font-size="24pt">
-            <fo:character font-size="96pt" character="A" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
-            <fo:character font-size="48pt" character="g" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=8976,vertical=21360" xpath="//flow/block[1]/lineArea/text[1]/@background"/>
-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[3]/@background"/>
-  </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 fo:character with background-image property.
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <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 font-size="24pt">
+            <fo:character font-size="96pt" character="A" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+            <fo:character font-size="48pt" character="g" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=8976,vertical=21360" xpath="//flow/block[1]/lineArea/text[1]/@background"/>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[3]/@background"/>
+  </checks>
+</testcase>



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org