xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r634267 [23/39] - in /xmlgraphics/fop/branches/Temp_ProcessingFeedback: ./ examples/embedding/ examples/embedding/java/embedding/ examples/embedding/java/embedding/intermediate/ examples/embedding/xml/xml/ examples/fo/ examples/fo/advanced/...
Date Thu, 06 Mar 2008 13:34:59 GMT
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml Thu Mar  6 05:33:44 2008
@@ -1,142 +1,142 @@
-<?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>
+<?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>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml Thu Mar  6 05:33:44 2008
@@ -1,81 +1,81 @@
-<?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>
+<?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>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml Thu Mar  6 05:33:44 2008
@@ -1,96 +1,96 @@
-<?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>
+<?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>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_3.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_4.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_5.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml Thu Mar  6 05:33:44 2008
@@ -1,106 +1,106 @@
-<?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>
+<?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>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space_nbsp_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_word-spacing.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_word-spacing_text-align_justify.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_wrap-option.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_wrap-option.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_wrap-option.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_wrap-option.xml Thu Mar  6 05:33:44 2008
@@ -1,58 +1,58 @@
-<?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 the wrap-option property on fo:block.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-      <fo:layout-master-set>
-        <fo:simple-page-master master-name="simple" page-height="6cm" page-width="21cm">
-          <fo:region-body/>
-        </fo:simple-page-master>
-      </fo:layout-master-set>
-      <fo:page-sequence master-reference="simple">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block-container width="5cm" background-color="lightgray">
-            <fo:block background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas et ligula. Suspendisse faucibus. Donec porta risus vitae turpis.</fo:block>
-            <fo:block background-color="orange" wrap-option="no-wrap">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas et ligula. Suspendisse faucibus. Donec porta risus vitae turpis.</fo:block>
-          </fo:block-container>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <element-list category="breaker">
-      <box w="14400"/> <!-- first block, first line -->
-      <box w="14400"/>
-      <penalty w="0" p="0"/>
-      <box w="14400"/>
-      <penalty w="0" p="0"/>
-      <box w="14400"/>
-      <penalty w="0" p="0"/>
-      <box w="14400"/>
-      <box w="14400"/> <!-- first block, last line -->
-      <penalty w="0" p="0"/>
-      <box w="14400"/> <!-- second block, same content, not broken -->
-      <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 the wrap-option property on fo:block.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" page-height="6cm" page-width="21cm">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="simple">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block-container width="5cm" background-color="lightgray">
+            <fo:block background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas et ligula. Suspendisse faucibus. Donec porta risus vitae turpis.</fo:block>
+            <fo:block background-color="orange" wrap-option="no-wrap">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas et ligula. Suspendisse faucibus. Donec porta risus vitae turpis.</fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <element-list category="breaker">
+      <box w="14400"/> <!-- first block, first line -->
+      <box w="14400"/>
+      <penalty w="0" p="0"/>
+      <box w="14400"/>
+      <penalty w="0" p="0"/>
+      <box w="14400"/>
+      <penalty w="0" p="0"/>
+      <box w="14400"/>
+      <box w="14400"/> <!-- first block, last line -->
+      <penalty w="0" p="0"/>
+      <box w="14400"/> <!-- second block, same content, not broken -->
+      <skip>3</skip>
+    </element-list>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_wrap-option.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_wrap-option.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/bookmarks_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/bookmarks_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-color.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-color.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-color.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-color.xml Thu Mar  6 05:33:44 2008
@@ -1,44 +1,44 @@
-<?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>
+<?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>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-color.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-color.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-image.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-image.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-image.xml Thu Mar  6 05:33:44 2008
@@ -1,49 +1,49 @@
-<?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>
+<?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>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-image.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_background-image.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_border_padding.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_border_padding.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_border_padding.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_border_padding.xml Thu Mar  6 05:33:44 2008
@@ -1,99 +1,99 @@
-<?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 border and padding properties.
-    </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" language="en">
-        <fo:flow flow-name="xsl-region-body" font-size="10pt">
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
-            To <fo:character border="solid 1pt red" background-color="yellow" character="e"/>mphasize a letter we give it a 1pt border.
-          </fo:block>
-          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
-            To really <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" character="e"/>mphasize a letter we give it a 5pt border and padding.
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
-            To <fo:character border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/>onfuse give it unsymmetric borders and padding.
-          </fo:block>
-          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
-            Big <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/>order but a smaller font.
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/>
-    <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
-    <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/>
-    <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/>
-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/>
-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/>
-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/>
-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/>
-
-    <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/>
-    <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
-    <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/>
-    <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/>
-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/>
-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/>
-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/>
-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/>
-    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/>
-    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/>
-    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/>
-    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/>
-
-    <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/>
-    <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
-    <eval expected="5000" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/>
-    <eval expected="17000" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/>
-    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/>
-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/>
-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/>
-    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/>
-    <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/>
-    <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/>
-    <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/>
-    <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/>
-
-    <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/>
-    <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
-    <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/>
-    <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/>
-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/>
-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/>
-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/>
-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/>
-    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/>
-    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/>
-    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/>
-    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/>
-  </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 border and padding properties.
+    </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" language="en">
+        <fo:flow flow-name="xsl-region-body" font-size="10pt">
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+            To <fo:character border="solid 1pt red" background-color="yellow" character="e"/>mphasize a letter we give it a 1pt border.
+          </fo:block>
+          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+            To really <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" character="e"/>mphasize a letter we give it a 5pt border and padding.
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+            To <fo:character border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/>onfuse give it unsymmetric borders and padding.
+          </fo:block>
+          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
+            Big <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/>order but a smaller font.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+    <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/>
+    <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/>
+
+    <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+    <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/>
+    <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/>
+
+    <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/>
+    <eval expected="17000" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/>
+    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/>
+    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/>
+    <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/>
+
+    <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/>
+    <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+    <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/>
+    <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_border_padding.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_border_padding.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_vertical-align.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_vertical-align.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_vertical-align.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_vertical-align.xml Thu Mar  6 05:33:44 2008
@@ -1,60 +1,60 @@
-<?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 vertical-align 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">
-          <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="2pt 0pt 2pt 0pt" font-size="20pt">
-            vertical-align<fo:character font-size="10pt" background-color="yellow" character="=" />not specified
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
-            vertical-align<fo:character font-size="10pt" vertical-align="baseline" background-color="yellow" character="=" />baseline
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
-            vertical-align<fo:character font-size="10pt" vertical-align="top" background-color="yellow" character="=" />top
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
-            vertical-align<fo:character font-size="10pt" vertical-align="middle" background-color="yellow" character="=" />middle
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
-            vertical-align<fo:character font-size="10pt" vertical-align="bottom" background-color="yellow" character="=" />bottom
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
-    <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
-    <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
-    <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
-    <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/>
-  </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 vertical-align 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">
+          <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="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" background-color="yellow" character="=" />not specified
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" vertical-align="baseline" background-color="yellow" character="=" />baseline
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" vertical-align="top" background-color="yellow" character="=" />top
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" vertical-align="middle" background-color="yellow" character="=" />middle
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" vertical-align="bottom" background-color="yellow" character="=" />bottom
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+    <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+    <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+    <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_vertical-align.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/character_vertical-align.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/color_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/color_1.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/color_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/color_1.xml Thu Mar  6 05:33:44 2008
@@ -26,7 +26,7 @@
     <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Gladiator">
       <fo:layout-master-set>
         <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
-          <fo:region-body/>
+          <fo:region-body background-color="rgb-icc(100%,80%,80%,sRGB,1,0.8,0.8)" />
         </fo:simple-page-master>
       </fo:layout-master-set>
       <fo:declarations>
@@ -41,12 +41,18 @@
           <fo:block color="rgb-icc(100%,50%,0%, sRGB, 1, 0.5, 0)">color "rgb-icc(100%,50%,0%, sRGB, 1, 0.5, 0)"</fo:block>
           <fo:block color="rgb-icc(0%,100%,0%, unknown, 1, 0.5, 0)">color "rgb-icc(0%,100%,0%, unknown, 1, 0.5, 0)"</fo:block>
           <fo:block color="cmyk(0%,0%,20%,40%)">color "cmyk(0%,0%,20%,40%)" (Khaki)</fo:block>
+          <!-- NYI
+          <fo:block color="rgb-icc(153, 153, 102, #CMYK, 0, 0, 0.2, 0.4)">color "rgb-icc(153, 153, 102, #CMYK, 0, 0, 0.2, 0.4)" (Khaki)</fo:block>
+          -->
         </fo:flow>
       </fo:page-sequence>
     </fo:root>
   </fo>
   <checks>
     <!-- Check page -->
+    <!-- Special case? rgb-icc() used before fo:declarations
+         Revert to sRGB fallback for now -->
+    <eval expected="color=#ffcccc" xpath="//regionViewport[1]/@background" />
     <eval expected="#ff0000" xpath="//block[1]//text/@color"/>
     <eval expected="#ff8000" xpath="//block[2]//text/@color"/>
     <eval expected="#ff8000" xpath="//block[3]//text/@color"/>

Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/color_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar  6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id



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


Mime
View raw message