xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maxber...@apache.org
Subject svn commit: r627324 [17/22] - in /xmlgraphics/fop/trunk: ./ examples/embedding/ examples/embedding/xml/xml/ examples/fo/ examples/fo/advanced/ examples/fo/fo-reference/ examples/fo/markers/ examples/hyphenation/ examples/mathml/ examples/plan/ examples...
Date Wed, 13 Feb 2008 09:36:21 GMT
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml Wed Feb 13 01:35:01 2008
@@ -1,176 +1,176 @@
-<?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 leaders with leader-pattern="use-content"
-    </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>
-            <fo:leader leader-length="36pt" leader-pattern="use-content">x</fo:leader>
-               Content is "x"
-          </fo:block>
-          <fo:block>
-            <fo:leader leader-length="36pt" leader-pattern="use-content"><fo:inline background-color="yellow">=></fo:inline></fo:leader>
-               Content is "=>" with background
-          </fo:block>
-          <fo:block>
-            <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline background-color="orange">~</fo:inline></fo:leader>
-               Content is "~" with leader-pattern-width="12pt"
-          </fo:block>
-          <fo:block>
-            <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline border="solid 1pt red" background-color="yellow">*</fo:inline></fo:leader>
-               Content is "*" with leader-pattern-width="12pt" and border
-          </fo:block>
-          <fo:block>
-            <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline border="solid 1pt red" font-size="6pt" alignment-baseline="middle" background-color="yellow">++</fo:inline></fo:leader>
-               Content is "++" with l-p-w="12pt" and border small font
-          </fo:block>
-          <fo:block>
-            <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:instream-foreign-object>
-                <svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">
-                <rect x="0" y="0" width="5" height="5" style="fill:red"/>
-                <rect x="5" y="5" width="5" height="5" style="fill:black"/>
-                </svg>
-              </fo:instream-foreign-object></fo:leader>
-              Content is svg 10 x 10
-          </fo:block>
-          <fo:block>
-            <fo:leader leader-pattern="use-content"><fo:instream-foreign-object>
-                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
-                <rect x="0" y="0" width="10" height="5" style="fill:red"/>
-                <rect x="10" y="5" width="10" height="5" style="fill:black"/>
-                </svg>
-                </fo:instream-foreign-object></fo:leader>
-              Content is svg 20 x 10 which is wider than the leader-length
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
-    <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
-    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>
-    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[1]/@offset"/>
-    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[2]/@offset"/>
-    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[3]/@offset"/>
-    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[4]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[4]/@offset"/>
-    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[5]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[5]/@offset"/>
-    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[6]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[6]/@offset"/>
-    
-    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
-    <eval expected="36000" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
-    <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/@offset"/>
-    <eval expected="14016" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[1]/@offset"/>
-    <eval expected="14016" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[2]/@offset"/>
- 
-    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
-    <eval expected="36000" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>
-    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/@offset"/>
-    <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[1]/@offset"/>
-    <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[2]/@offset"/>
-    <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[3]/@offset"/>
- 
-    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
-    <eval expected="36000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
-    <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/@offset"/>
-    <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/@offset"/>
-    <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/inlineparent/@bap"/>
-    <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/@offset"/>
-    <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/inlineparent/@bap"/>
-    <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/@offset"/>
-    <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/inlineparent/@bap"/>
- 
-    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
-    <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
-    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/>
-    <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/@offset"/>
-    <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/inlineparent/@offset"/>
-    <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/inlineparent/@bap"/>
-    <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/@offset"/>
-    <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/inlineparent/@offset"/>
-    <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/inlineparent/@bap"/>
-    <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/@offset"/>
-    <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/inlineparent/@offset"/>
-    <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/inlineparent/@bap"/>
- 
-    <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
-    <eval expected="36000" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/>
-    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/>
-    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/@offset"/>
-    <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/viewport/@offset"/>
-    <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/viewport/@bap"/>
-    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/@offset"/>
-    <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/viewport/@offset"/>
-    <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/viewport/@bap"/>
-    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/>
-    <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/@offset"/>
-    <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/viewport/@offset"/>
-    <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/viewport/@bap"/>
- 
-    <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/>
-    <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/@ipd"/>
-    <eval expected="0" xpath="//flow/block[7]/lineArea/inlineparent/@offset"/>
-    <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
-    <eval expected="0" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/@offset"/>
-    <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/viewport/@ipd"/>
-    <eval expected="-1384" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/viewport/@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 leaders with leader-pattern="use-content"
+    </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>
+            <fo:leader leader-length="36pt" leader-pattern="use-content">x</fo:leader>
+               Content is "x"
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="use-content"><fo:inline background-color="yellow">=></fo:inline></fo:leader>
+               Content is "=>" with background
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline background-color="orange">~</fo:inline></fo:leader>
+               Content is "~" with leader-pattern-width="12pt"
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline border="solid 1pt red" background-color="yellow">*</fo:inline></fo:leader>
+               Content is "*" with leader-pattern-width="12pt" and border
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline border="solid 1pt red" font-size="6pt" alignment-baseline="middle" background-color="yellow">++</fo:inline></fo:leader>
+               Content is "++" with l-p-w="12pt" and border small font
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:instream-foreign-object>
+                <svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">
+                <rect x="0" y="0" width="5" height="5" style="fill:red"/>
+                <rect x="5" y="5" width="5" height="5" style="fill:black"/>
+                </svg>
+              </fo:instream-foreign-object></fo:leader>
+              Content is svg 10 x 10
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-pattern="use-content"><fo:instream-foreign-object>
+                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+                <rect x="0" y="0" width="10" height="5" style="fill:red"/>
+                <rect x="10" y="5" width="10" height="5" style="fill:black"/>
+                </svg>
+                </fo:instream-foreign-object></fo:leader>
+              Content is svg 20 x 10 which is wider than the leader-length
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+    <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>
+    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[4]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[4]/@offset"/>
+    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[5]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[5]/@offset"/>
+    <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[6]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[6]/@offset"/>
+    
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="36000" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/@offset"/>
+    <eval expected="14016" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+    <eval expected="14016" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+ 
+    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+    <eval expected="36000" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/@offset"/>
+    <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+    <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+    <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+ 
+    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+    <eval expected="36000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/@offset"/>
+    <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+    <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/inlineparent/@bap"/>
+    <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+    <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/inlineparent/@bap"/>
+    <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+    <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/inlineparent/@bap"/>
+ 
+    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+    <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/>
+    <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+    <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/inlineparent/@offset"/>
+    <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/inlineparent/@bap"/>
+    <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+    <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/inlineparent/@offset"/>
+    <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/inlineparent/@bap"/>
+    <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+    <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/inlineparent/@offset"/>
+    <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/inlineparent/@bap"/>
+ 
+    <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
+    <eval expected="36000" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/>
+    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+    <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/viewport/@offset"/>
+    <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/viewport/@bap"/>
+    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+    <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/viewport/@offset"/>
+    <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/viewport/@bap"/>
+    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/>
+    <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+    <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/viewport/@offset"/>
+    <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/viewport/@bap"/>
+ 
+    <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/>
+    <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/@ipd"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea/inlineparent/@offset"/>
+    <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+    <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/viewport/@ipd"/>
+    <eval expected="-1384" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/viewport/@offset"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml Wed Feb 13 01:35:01 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 demonstrates a bug with fo:leader use-content
-    </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>
-            <fo:leader leader-length="36pt" leader-pattern="use-content" font-size="24pt">x</fo:leader>
-               use-content x font-size="24pt"
-          </fo:block>
-          <fo:block margin="10pt 0pt 10pt 0pt">
-            <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 5pt red" padding="5pt">x</fo:leader>
-               use-content x solid 5pt red border 5pt padding
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="22200" xpath="//flow/block[1]/lineArea/@bpd"/>
-    <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
-    <eval expected="16000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
-    <eval expected="8616" xpath="//flow/block[1]/lineArea/text/@offset"/>
-
-    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
-    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
-    <eval expected="11100" xpath="//flow/block[2]/lineArea/inlineparent/@bpd"/>
-    <eval expected="16000" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
-    <eval expected="36000" xpath="//flow/block[2]/lineArea/inlineparent/@ipda"/>
-  </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 demonstrates a bug with fo:leader use-content
+    </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>
+            <fo:leader leader-length="36pt" leader-pattern="use-content" font-size="24pt">x</fo:leader>
+               use-content x font-size="24pt"
+          </fo:block>
+          <fo:block margin="10pt 0pt 10pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 5pt red" padding="5pt">x</fo:leader>
+               use-content x solid 5pt red border 5pt padding
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="22200" xpath="//flow/block[1]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
+    <eval expected="16000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+    <eval expected="8616" xpath="//flow/block[1]/lineArea/text/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/inlineparent/@bpd"/>
+    <eval expected="16000" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[2]/lineArea/inlineparent/@ipda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_text-align.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_text-align.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_text-align.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_text-align.xml Wed Feb 13 01:35:01 2008
@@ -1,159 +1,159 @@
-<?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:leader with different text-align
-    </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>
-            <fo:leader leader-pattern="dots"/>
-               dots
-          </fo:block>
-          <fo:block>
-            <fo:leader leader-pattern="rule" rule-style="double"/>
-               rule double
-          </fo:block>
-          <fo:block>
-            <fo:leader leader-pattern="space"/>
-               space
-          </fo:block>
-          <fo:block>
-            <fo:leader leader-pattern="use-content">x</fo:leader>
-               use-content x
-          </fo:block>
-          <fo:block text-align-last="justify">
-            <fo:leader leader-pattern="dots"/>
-               dots text-align-last="justify"
-          </fo:block>
-          <fo:block text-align-last="justify">
-            <fo:leader leader-pattern="rule" rule-style="double"/>
-               rule double text-align-last="justify"
-          </fo:block>
-          <fo:block text-align-last="justify">
-            <fo:leader leader-pattern="space"/>
-               space text-align-last="justify"
-          </fo:block>
-          <fo:block text-align-last="justify">
-            <fo:leader leader-pattern="use-content">x</fo:leader>
-               use-content x text-align-last="justify"
-          </fo:block>
-          <fo:block text-align-last="end">
-            <fo:leader leader-pattern="dots"/>
-               dots text-align-last="end"
-          </fo:block>
-          <fo:block text-align-last="end">
-            <fo:leader leader-pattern="rule" rule-style="double"/>
-               rule double text-align-last="end"
-          </fo:block>
-          <fo:block text-align-last="end">
-            <fo:leader leader-pattern="space"/>
-               space text-align-last="end"
-          </fo:block>
-          <fo:block text-align-last="end">
-            <fo:leader leader-pattern="use-content">x</fo:leader>
-               use-content x text-align-last="end"
-          </fo:block>
-          <fo:block text-align-last="center">
-            <fo:leader leader-pattern="dots"/>
-               dots text-align-last="center"
-          </fo:block>
-          <fo:block text-align-last="center">
-            <fo:leader leader-pattern="rule" rule-style="double"/>
-               rule double text-align-last="center"
-          </fo:block>
-          <fo:block text-align-last="center">
-            <fo:leader leader-pattern="space"/>
-               space text-align-last="center"
-          </fo:block>
-          <fo:block text-align-last="center">
-            <fo:leader leader-pattern="use-content">x</fo:leader>
-               use-content x text-align-last="center"
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
-    <eval expected="12000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
-    <eval expected="12000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
-    <eval expected="12000" xpath="//flow/block[3]/lineArea/space/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
-    <eval expected="12000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>
-    <eval expected="211186" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>
-    <eval expected="174081" xpath="//flow/block[6]/lineArea/leader/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>
-    <eval expected="201939" xpath="//flow/block[7]/lineArea/space/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[8]/lineArea/@ipd"/>
-    <eval expected="161589" xpath="//flow/block[8]/lineArea/inlineparent/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>
-    <eval expected="211752" xpath="//flow/block[9]/lineArea/@start-indent"/>
-    <eval expected="12000" xpath="//flow/block[9]/lineArea/inlineparent/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>
-    <eval expected="175068" xpath="//flow/block[10]/lineArea/@start-indent"/>
-    <eval expected="12000" xpath="//flow/block[10]/lineArea/leader/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>
-    <eval expected="202416" xpath="//flow/block[11]/lineArea/@start-indent"/>
-    <eval expected="12000" xpath="//flow/block[11]/lineArea/space/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[12]/lineArea/@ipd"/>
-    <eval expected="162396" xpath="//flow/block[12]/lineArea/@start-indent"/>
-    <eval expected="12000" xpath="//flow/block[12]/lineArea/inlineparent/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>
-    <eval expected="99210" xpath="//flow/block[13]/lineArea/@start-indent"/>
-    <eval expected="12000" xpath="//flow/block[13]/lineArea/inlineparent/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>
-    <eval expected="80868" xpath="//flow/block[14]/lineArea/@start-indent"/>
-    <eval expected="12000" xpath="//flow/block[14]/lineArea/leader/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>
-    <eval expected="94542" xpath="//flow/block[15]/lineArea/@start-indent"/>
-    <eval expected="12000" xpath="//flow/block[15]/lineArea/space/@ipd"/>
-
-    <eval expected="360000" xpath="//flow/block[16]/lineArea/@ipd"/>
-    <eval expected="74532" xpath="//flow/block[16]/lineArea/@start-indent"/>
-    <eval expected="12000" xpath="//flow/block[16]/lineArea/inlineparent/@ipd"/>
-  </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:leader with different text-align
+    </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>
+            <fo:leader leader-pattern="dots"/>
+               dots
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-pattern="rule" rule-style="double"/>
+               rule double
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-pattern="space"/>
+               space
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-pattern="use-content">x</fo:leader>
+               use-content x
+          </fo:block>
+          <fo:block text-align-last="justify">
+            <fo:leader leader-pattern="dots"/>
+               dots text-align-last="justify"
+          </fo:block>
+          <fo:block text-align-last="justify">
+            <fo:leader leader-pattern="rule" rule-style="double"/>
+               rule double text-align-last="justify"
+          </fo:block>
+          <fo:block text-align-last="justify">
+            <fo:leader leader-pattern="space"/>
+               space text-align-last="justify"
+          </fo:block>
+          <fo:block text-align-last="justify">
+            <fo:leader leader-pattern="use-content">x</fo:leader>
+               use-content x text-align-last="justify"
+          </fo:block>
+          <fo:block text-align-last="end">
+            <fo:leader leader-pattern="dots"/>
+               dots text-align-last="end"
+          </fo:block>
+          <fo:block text-align-last="end">
+            <fo:leader leader-pattern="rule" rule-style="double"/>
+               rule double text-align-last="end"
+          </fo:block>
+          <fo:block text-align-last="end">
+            <fo:leader leader-pattern="space"/>
+               space text-align-last="end"
+          </fo:block>
+          <fo:block text-align-last="end">
+            <fo:leader leader-pattern="use-content">x</fo:leader>
+               use-content x text-align-last="end"
+          </fo:block>
+          <fo:block text-align-last="center">
+            <fo:leader leader-pattern="dots"/>
+               dots text-align-last="center"
+          </fo:block>
+          <fo:block text-align-last="center">
+            <fo:leader leader-pattern="rule" rule-style="double"/>
+               rule double text-align-last="center"
+          </fo:block>
+          <fo:block text-align-last="center">
+            <fo:leader leader-pattern="space"/>
+               space text-align-last="center"
+          </fo:block>
+          <fo:block text-align-last="center">
+            <fo:leader leader-pattern="use-content">x</fo:leader>
+               use-content x text-align-last="center"
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
+    <eval expected="12000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+    <eval expected="12000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
+    <eval expected="12000" xpath="//flow/block[3]/lineArea/space/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
+    <eval expected="12000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>
+    <eval expected="211186" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>
+    <eval expected="174081" xpath="//flow/block[6]/lineArea/leader/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>
+    <eval expected="201939" xpath="//flow/block[7]/lineArea/space/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[8]/lineArea/@ipd"/>
+    <eval expected="161589" xpath="//flow/block[8]/lineArea/inlineparent/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>
+    <eval expected="211752" xpath="//flow/block[9]/lineArea/@start-indent"/>
+    <eval expected="12000" xpath="//flow/block[9]/lineArea/inlineparent/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>
+    <eval expected="175068" xpath="//flow/block[10]/lineArea/@start-indent"/>
+    <eval expected="12000" xpath="//flow/block[10]/lineArea/leader/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>
+    <eval expected="202416" xpath="//flow/block[11]/lineArea/@start-indent"/>
+    <eval expected="12000" xpath="//flow/block[11]/lineArea/space/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[12]/lineArea/@ipd"/>
+    <eval expected="162396" xpath="//flow/block[12]/lineArea/@start-indent"/>
+    <eval expected="12000" xpath="//flow/block[12]/lineArea/inlineparent/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>
+    <eval expected="99210" xpath="//flow/block[13]/lineArea/@start-indent"/>
+    <eval expected="12000" xpath="//flow/block[13]/lineArea/inlineparent/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>
+    <eval expected="80868" xpath="//flow/block[14]/lineArea/@start-indent"/>
+    <eval expected="12000" xpath="//flow/block[14]/lineArea/leader/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>
+    <eval expected="94542" xpath="//flow/block[15]/lineArea/@start-indent"/>
+    <eval expected="12000" xpath="//flow/block[15]/lineArea/space/@ipd"/>
+
+    <eval expected="360000" xpath="//flow/block[16]/lineArea/@ipd"/>
+    <eval expected="74532" xpath="//flow/block[16]/lineArea/@start-indent"/>
+    <eval expected="12000" xpath="//flow/block[16]/lineArea/inlineparent/@ipd"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_text-align.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_text-align.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_toc.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_toc.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_toc.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_toc.xml Wed Feb 13 01:35:01 2008
@@ -1,155 +1,155 @@
-<?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:leader in a typical table of content scenario.
-      This example is taken from the spec section 6.6.1.1.4
-    </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"
-                        initial-page-number="9">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block text-align-last="justify">
-            <fo:basic-link internal-destination="N4">1. Chapter</fo:basic-link>
-            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
-              leader-length.maximum="100%" leader-pattern="dots">
-            </fo:leader>
-            <fo:page-number-citation ref-id="N4">
-            </fo:page-number-citation>
-          </fo:block>
-          <fo:block start-indent="10mm" text-align-last="justify">
-            <fo:basic-link internal-destination="N11">1.1 Section</fo:basic-link>
-            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
-              leader-length.maximum="100%" leader-pattern="dots">
-            </fo:leader>
-            <fo:page-number-citation ref-id="N11">
-            </fo:page-number-citation>
-          </fo:block>
-          <fo:block start-indent="10mm" text-align-last="justify">
-            <fo:basic-link internal-destination="N19">1.2 Section</fo:basic-link>
-            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
-              leader-length.maximum="100%" leader-pattern="dots">
-            </fo:leader>
-            <fo:page-number-citation ref-id="N19">
-            </fo:page-number-citation>
-          </fo:block>
-          <fo:block text-align-last="justify">
-            <fo:basic-link internal-destination="N28">2. Chapter</fo:basic-link>
-            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
-              leader-length.maximum="100%" leader-pattern="dots">
-            </fo:leader>
-            <fo:page-number-citation ref-id="N28">
-            </fo:page-number-citation>
-          </fo:block>
-          <fo:block start-indent="10mm" text-align-last="justify">
-            <fo:basic-link internal-destination="N35">2.1 Section</fo:basic-link>
-            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
-              leader-length.maximum="100%" leader-pattern="dots">
-            </fo:leader>
-            <fo:page-number-citation ref-id="N35">
-            </fo:page-number-citation>
-          </fo:block>
-          <fo:block start-indent="10mm" text-align-last="justify">
-            <fo:basic-link internal-destination="N43">2.2 Section</fo:basic-link>
-            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
-              leader-length.maximum="100%" leader-pattern="dots">
-            </fo:leader>
-            <fo:page-number-citation ref-id="N43">
-            </fo:page-number-citation>
-          </fo:block>
-
-          <fo:block id="N4">1. Chapter
-          </fo:block>
-
-          <fo:block>Text
-          </fo:block>
-
-          <fo:block id="N11">1.1 Section
-          </fo:block>
-
-          <fo:block>Text
-          </fo:block>
-
-          <fo:block id="N19">1.2 Section
-          </fo:block>
-
-          <fo:block>Text
-          </fo:block>
-
-          <fo:block id="N28" break-before="page">2. Chapter
-          </fo:block>
-
-          <fo:block>Text
-          </fo:block>
-
-          <fo:block id="N35">2.1 Section
-          </fo:block>
-
-          <fo:block>Text
-          </fo:block>
-
-          <fo:block id="N43">2.2 Section
-          </fo:block>
-
-          <fo:block>Text
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
-    <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
-    <eval expected="286768" xpath="//flow/block[1]/lineArea/inlineparent[2]/@ipd"/>
-    <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent[2]/@offset"/>
-
-    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
-    <eval expected="331654" xpath="//flow/block[2]/lineArea/@ipd"/>
-    <eval expected="254591" xpath="//flow/block[2]/lineArea/inlineparent[2]/@ipd"/>
-    <eval expected="5280" xpath="//flow/block[2]/lineArea/inlineparent[2]/@offset"/>
-
-    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
-    <eval expected="331654" xpath="//flow/block[3]/lineArea/@ipd"/>
-    <eval expected="254591" xpath="//flow/block[3]/lineArea/inlineparent[2]/@ipd"/>
-    <eval expected="5280" xpath="//flow/block[3]/lineArea/inlineparent[2]/@offset"/>
-
-    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
-    <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
-    <eval expected="280199" xpath="//flow/block[4]/lineArea/inlineparent[2]/@ipd"/>
-    <eval expected="5280" xpath="//flow/block[4]/lineArea/inlineparent[2]/@offset"/>
-
-    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
-    <eval expected="331654" xpath="//flow/block[5]/lineArea/@ipd"/>
-    <eval expected="248032" xpath="//flow/block[5]/lineArea/inlineparent[2]/@ipd"/>
-    <eval expected="5280" xpath="//flow/block[5]/lineArea/inlineparent[2]/@offset"/>
-
-    <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
-    <eval expected="331654" xpath="//flow/block[6]/lineArea/@ipd"/>
-    <eval expected="248032" xpath="//flow/block[6]/lineArea/inlineparent[2]/@ipd"/>
-    <eval expected="5280" xpath="//flow/block[6]/lineArea/inlineparent[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:leader in a typical table of content scenario.
+      This example is taken from the spec section 6.6.1.1.4
+    </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"
+                        initial-page-number="9">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block text-align-last="justify">
+            <fo:basic-link internal-destination="N4">1. Chapter</fo:basic-link>
+            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+              leader-length.maximum="100%" leader-pattern="dots">
+            </fo:leader>
+            <fo:page-number-citation ref-id="N4">
+            </fo:page-number-citation>
+          </fo:block>
+          <fo:block start-indent="10mm" text-align-last="justify">
+            <fo:basic-link internal-destination="N11">1.1 Section</fo:basic-link>
+            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+              leader-length.maximum="100%" leader-pattern="dots">
+            </fo:leader>
+            <fo:page-number-citation ref-id="N11">
+            </fo:page-number-citation>
+          </fo:block>
+          <fo:block start-indent="10mm" text-align-last="justify">
+            <fo:basic-link internal-destination="N19">1.2 Section</fo:basic-link>
+            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+              leader-length.maximum="100%" leader-pattern="dots">
+            </fo:leader>
+            <fo:page-number-citation ref-id="N19">
+            </fo:page-number-citation>
+          </fo:block>
+          <fo:block text-align-last="justify">
+            <fo:basic-link internal-destination="N28">2. Chapter</fo:basic-link>
+            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+              leader-length.maximum="100%" leader-pattern="dots">
+            </fo:leader>
+            <fo:page-number-citation ref-id="N28">
+            </fo:page-number-citation>
+          </fo:block>
+          <fo:block start-indent="10mm" text-align-last="justify">
+            <fo:basic-link internal-destination="N35">2.1 Section</fo:basic-link>
+            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+              leader-length.maximum="100%" leader-pattern="dots">
+            </fo:leader>
+            <fo:page-number-citation ref-id="N35">
+            </fo:page-number-citation>
+          </fo:block>
+          <fo:block start-indent="10mm" text-align-last="justify">
+            <fo:basic-link internal-destination="N43">2.2 Section</fo:basic-link>
+            <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+              leader-length.maximum="100%" leader-pattern="dots">
+            </fo:leader>
+            <fo:page-number-citation ref-id="N43">
+            </fo:page-number-citation>
+          </fo:block>
+
+          <fo:block id="N4">1. Chapter
+          </fo:block>
+
+          <fo:block>Text
+          </fo:block>
+
+          <fo:block id="N11">1.1 Section
+          </fo:block>
+
+          <fo:block>Text
+          </fo:block>
+
+          <fo:block id="N19">1.2 Section
+          </fo:block>
+
+          <fo:block>Text
+          </fo:block>
+
+          <fo:block id="N28" break-before="page">2. Chapter
+          </fo:block>
+
+          <fo:block>Text
+          </fo:block>
+
+          <fo:block id="N35">2.1 Section
+          </fo:block>
+
+          <fo:block>Text
+          </fo:block>
+
+          <fo:block id="N43">2.2 Section
+          </fo:block>
+
+          <fo:block>Text
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
+    <eval expected="286768" xpath="//flow/block[1]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent[2]/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="331654" xpath="//flow/block[2]/lineArea/@ipd"/>
+    <eval expected="254591" xpath="//flow/block[2]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="5280" xpath="//flow/block[2]/lineArea/inlineparent[2]/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+    <eval expected="331654" xpath="//flow/block[3]/lineArea/@ipd"/>
+    <eval expected="254591" xpath="//flow/block[3]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="5280" xpath="//flow/block[3]/lineArea/inlineparent[2]/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
+    <eval expected="280199" xpath="//flow/block[4]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="5280" xpath="//flow/block[4]/lineArea/inlineparent[2]/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+    <eval expected="331654" xpath="//flow/block[5]/lineArea/@ipd"/>
+    <eval expected="248032" xpath="//flow/block[5]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="5280" xpath="//flow/block[5]/lineArea/inlineparent[2]/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
+    <eval expected="331654" xpath="//flow/block[6]/lineArea/@ipd"/>
+    <eval expected="248032" xpath="//flow/block[6]/lineArea/inlineparent[2]/@ipd"/>
+    <eval expected="5280" xpath="//flow/block[6]/lineArea/inlineparent[2]/@offset"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_toc.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/leader_toc.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/linearea_nonempty_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/linefeed-treatment_preserve.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/linefeed-treatment_preserve.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_background-image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_background-image.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_background-image.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_background-image.xml Wed Feb 13 01:35:01 2008
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
-  <info>
-    <p>
-      This test checks background image on lists (list-block).
-    </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:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
-            <fo:list-item>
-              <fo:list-item-label end-indent="label-end()">
-                <fo:block>label 1</fo:block>
-              </fo:list-item-label>
-              <fo:list-item-body start-indent="body-start()">
-                <fo:block>
-                  body 1: The whole list should have a centered background.
-                  The whole list should have a centered background.
-                  The whole list should have a centered background.
-                </fo:block>
-              </fo:list-item-body>
-            </fo:list-item>
-            <fo:list-item>
-              <fo:list-item-label end-indent="label-end()">
-                <fo:block>label 2</fo:block>
-              </fo:list-item-label>
-              <fo:list-item-body start-indent="body-start()">
-                <fo:block>
-                  body 2: The whole list should have a centered background.
-                  The whole list should have a centered background.
-                  The whole list should have a centered background.
-                </fo:block>
-              </fo:list-item-body>
-            </fo:list-item>
-            <fo:list-item>
-              <fo:list-item-label end-indent="label-end()">
-                <fo:block>label 3</fo:block>
-              </fo:list-item-label>
-              <fo:list-item-body start-indent="body-start()">
-                <fo:block>
-                  body 3: The whole list should have a centered background.
-                  The whole list should have a centered background.
-                  The whole list should have a centered background.
-                </fo:block>
-              </fo:list-item-body>
-            </fo:list-item>
-          </fo:list-block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="360000" xpath="//flow/block/@ipd"/>
-    <eval expected="172800" xpath="//flow/block/@bpd"/>
-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=63360" xpath="//flow/block/@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 background image on lists (list-block).
+    </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:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+            <fo:list-item>
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>label 1</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>
+                  body 1: The whole list should have a centered background.
+                  The whole list should have a centered background.
+                  The whole list should have a centered background.
+                </fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+            <fo:list-item>
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>label 2</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>
+                  body 2: The whole list should have a centered background.
+                  The whole list should have a centered background.
+                  The whole list should have a centered background.
+                </fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+            <fo:list-item>
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>label 3</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>
+                  body 3: The whole list should have a centered background.
+                  The whole list should have a centered background.
+                  The whole list should have a centered background.
+                </fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+          </fo:list-block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="360000" xpath="//flow/block/@ipd"/>
+    <eval expected="172800" xpath="//flow/block/@bpd"/>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=63360" xpath="//flow/block/@background"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_background-image.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_background-image.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_basic.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_border_padding.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_fox_orphan-content-limit_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_fox_widow-content-limit_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-together.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-next.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_padding_percentages.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_padding_percentages.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_padding_percentages.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_padding_percentages.xml Wed Feb 13 01:35:01 2008
@@ -1,76 +1,76 @@
-<?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 relative padding on lists (list-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="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:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in" margin="0pt" padding="5%" background-color="yellow">
-            <fo:list-item background-color="white">
-              <fo:list-item-label end-indent="label-end()">
-                <fo:block>label 1</fo:block>
-              </fo:list-item-label>
-              <fo:list-item-body start-indent="body-start()">
-                <fo:block>
-                  body 1: The whole list should have a 5% padding shown in yellow.
-                </fo:block>
-              </fo:list-item-body>
-            </fo:list-item>
-            <fo:list-item background-color="white">
-              <fo:list-item-label end-indent="label-end()">
-                <fo:block>label 2</fo:block>
-              </fo:list-item-label>
-              <fo:list-item-body start-indent="body-start()">
-                <fo:block>
-                  body 2: The whole list should have a 5% padding shown in yellow.
-                </fo:block>
-              </fo:list-item-body>
-            </fo:list-item>
-            <fo:list-item background-color="white">
-              <fo:list-item-label end-indent="label-end()">
-                <fo:block>label 3</fo:block>
-              </fo:list-item-label>
-              <fo:list-item-body start-indent="body-start()">
-                <fo:block>
-                  body 3: The whole list should have a 5% padding shown in yellow.
-                </fo:block>
-              </fo:list-item-body>
-            </fo:list-item>
-          </fo:list-block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="18000 18000 18000 18000" xpath="//flow/block/@bap"/>
-    <eval expected="18000" xpath="//flow/block/@start-indent"/>
-    <eval expected="18000" xpath="//flow/block/@end-indent"/>
-    <eval expected="color=#ffff00" xpath="//flow/block/@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 relative padding on lists (list-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="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:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in" margin="0pt" padding="5%" background-color="yellow">
+            <fo:list-item background-color="white">
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>label 1</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>
+                  body 1: The whole list should have a 5% padding shown in yellow.
+                </fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+            <fo:list-item background-color="white">
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>label 2</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>
+                  body 2: The whole list should have a 5% padding shown in yellow.
+                </fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+            <fo:list-item background-color="white">
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>label 3</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:block>
+                  body 3: The whole list should have a 5% padding shown in yellow.
+                </fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+          </fo:list-block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="18000 18000 18000 18000" xpath="//flow/block/@bap"/>
+    <eval expected="18000" xpath="//flow/block/@start-indent"/>
+    <eval expected="18000" xpath="//flow/block/@end-indent"/>
+    <eval expected="color=#ffff00" xpath="//flow/block/@background"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_padding_percentages.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_padding_percentages.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_simple-page-master_margin.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_space-before_space-after_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_space-before_space-after_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 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