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 [18/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/list-item_background-image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_background-image.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_background-image.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_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-item).
-    </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">
-            <fo:list-item background-repeat="no-repeat" background-color="yellow"  background-position-horizontal="center" background-position-vertical="center" background-image="##img">
-              <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: We should have a background centered within this whole list item.
-                  We should have a background centered within this whole list item.
-                  We should have a background centered within this whole list item.
-                </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: We should have no background on this list item.
-                  We should have no background on this list item.
-                  We should have no background on this list item.
-                </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: We should have no background on this list item.
-                  We should have no background on this list item.
-                  We should have no background on this list item.
-                </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/block/@ipd"/>
-    <eval expected="72000" xpath="//flow/block/block/@bpd"/>
-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/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-item).
+    </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">
+            <fo:list-item background-repeat="no-repeat" background-color="yellow"  background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+              <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: We should have a background centered within this whole list item.
+                  We should have a background centered within this whole list item.
+                  We should have a background centered within this whole list item.
+                </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: We should have no background on this list item.
+                  We should have no background on this list item.
+                  We should have no background on this list item.
+                </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: We should have no background on this list item.
+                  We should have no background on this list item.
+                  We should have no background on this list item.
+                </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/block/@ipd"/>
+    <eval expected="72000" xpath="//flow/block/block/@bpd"/>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/block/@background"/>
+  </checks>
+</testcase>

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

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_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-item_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-item_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

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_break-before_break-after.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-item_padding.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-item_padding_percentages.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_padding_percentages.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_padding_percentages.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_padding_percentages.xml Wed Feb 13 01:35:01 2008
@@ -1,79 +1,79 @@
-<?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 widths on lists (list-item).
-    </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">
-            <fo:list-item margin="0pt" padding="5%" background-color="yellow">
-              <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: We should have 5% padding around this whole yellow list item.
-                </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: We should have no padding around this whole list item.
-                </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: We should have no padding around this whole list item.
-                </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/block/@bap"/>
-    <eval expected="18000" xpath="//flow/block/block/@start-indent"/>
-    <eval expected="18000" xpath="//flow/block/block/@end-indent"/>
-    <eval expected="color=#ffff00" xpath="//flow/block/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 widths on lists (list-item).
+    </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">
+            <fo:list-item margin="0pt" padding="5%" background-color="yellow">
+              <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: We should have 5% padding around this whole yellow list item.
+                </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: We should have no padding around this whole list item.
+                </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: We should have no padding around this whole list item.
+                </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/block/@bap"/>
+    <eval expected="18000" xpath="//flow/block/block/@start-indent"/>
+    <eval expected="18000" xpath="//flow/block/block/@end-indent"/>
+    <eval expected="color=#ffff00" xpath="//flow/block/block/@background"/>
+  </checks>
+</testcase>

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

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_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-item_space-before_space-after_1.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-item_space-before_space-after_2.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-item_space-before_space-after_3.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/marker_bug.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_bug.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_bug.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_bug.xml Wed Feb 13 01:35:01 2008
@@ -1,69 +1,69 @@
-<?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 for a bug with markers where white space is not removed.
-    </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 margin-top="1in" margin-bottom="1in"/>
-          <fo:region-before extent="1in"/>
-          <fo:region-after extent="1in"/>
-        </fo:simple-page-master>
-      </fo:layout-master-set>
-      <fo:page-sequence master-reference="normal">
-        <fo:static-content flow-name="xsl-region-before">
-          <fo:block background-color="yellow">
-            <fo:retrieve-marker retrieve-class-name="m1" />
-          </fo:block>
-        </fo:static-content>
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block background-color="yellow">
-            <fo:retrieve-marker retrieve-class-name="m2" />
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block background-color="red">
-            <fo:marker marker-class-name="m1">
-              <fo:block>
-                First marker with whitespace around
-              </fo:block>
-            </fo:marker>
-          </fo:block>
-          <fo:block background-color="green"><fo:marker marker-class-name="m2"><fo:block>Second marker with no whitespace around</fo:block></fo:marker></fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="72000" xpath="//regionBefore/@bpd"/>
-    <eval expected="14400" xpath="//regionBefore/block/@bpd"/>
-    <eval expected="14400" xpath="//regionBefore/block/block/@bpd"/>
-    <eval expected="1" xpath="count(//regionBefore/block/*/lineArea)"/>
-
-    <eval expected="72000" xpath="//regionAfter/@bpd"/>
-    <eval expected="14400" xpath="//regionAfter/block/@bpd"/>
-    <eval expected="14400" xpath="//regionAfter/block/block/@bpd"/>
-    <eval expected="1" xpath="count(//regionAfter/block/*/lineArea)"/>
-  </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 for a bug with markers where white space is not removed.
+    </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 margin-top="1in" margin-bottom="1in"/>
+          <fo:region-before extent="1in"/>
+          <fo:region-after extent="1in"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block background-color="yellow">
+            <fo:retrieve-marker retrieve-class-name="m1" />
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block background-color="yellow">
+            <fo:retrieve-marker retrieve-class-name="m2" />
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="red">
+            <fo:marker marker-class-name="m1">
+              <fo:block>
+                First marker with whitespace around
+              </fo:block>
+            </fo:marker>
+          </fo:block>
+          <fo:block background-color="green"><fo:marker marker-class-name="m2"><fo:block>Second marker with no whitespace around</fo:block></fo:marker></fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="72000" xpath="//regionBefore/@bpd"/>
+    <eval expected="14400" xpath="//regionBefore/block/@bpd"/>
+    <eval expected="14400" xpath="//regionBefore/block/block/@bpd"/>
+    <eval expected="1" xpath="count(//regionBefore/block/*/lineArea)"/>
+
+    <eval expected="72000" xpath="//regionAfter/@bpd"/>
+    <eval expected="14400" xpath="//regionAfter/block/@bpd"/>
+    <eval expected="14400" xpath="//regionAfter/block/block/@bpd"/>
+    <eval expected="1" xpath="count(//regionAfter/block/*/lineArea)"/>
+  </checks>
+</testcase>

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

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_bug.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/marker_font-size.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/marker_inline_white-space.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_inline_white-space.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/marker_percentage-resolution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_percentage-resolution.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/marker_text_bug42705.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_text_bug42705.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/marker_white-space-collapse.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/marker_white-space-treatment_bug42703.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.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/marker_white-space_static-content.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/markers_1.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/markers_2.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/markers_3.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/markers_4.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/markers_5a.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/markers_5b.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/markers_5c.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/markers_5d.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/markers_6a.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/markers_6b.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/markers_7.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/markers_8.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/markers_inline-level.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_inline-level.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/page-breaking_1.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/page-breaking_2.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/page-breaking_3.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/page-breaking_4.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/page-breaking_4a.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/page-breaking_5.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/page-breaking_6.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-breaking_6.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-breaking_6.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-breaking_6.xml Wed Feb 13 01:35:01 2008
@@ -1,62 +1,62 @@
-<?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 breaking behaviour in environments where there is not much space.
-    </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="5in" page-width="5in">
-          <fo:region-body/>
-        </fo:simple-page-master>
-      </fo:layout-master-set>
-      <fo:page-sequence master-reference="simple">
-        <fo:flow flow-name="xsl-region-body" hyphenate="true">
-          <fo:block-container width="100pt" background-color="yellow">
-            <fo:block>This is some test text!</fo:block>
-            <fo:block>Bla bla 1234567890.</fo:block>
-            <fo:block>Bla bla 12345678901234567890.</fo:block>
-            <fo:block>This is Blah-blah-blah-blah!</fo:block>
-            <fo:block>This is BLah-blah-blah-blah!</fo:block>
-          </fo:block-container>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="This is some test " xpath="//flow/block[1]/block[1]/block[1]/lineArea[1]"/>
-    <eval expected="text!" xpath="//flow/block[1]/block[1]/block[1]/lineArea[2]"/>
-
-    <eval expected="Bla bla " xpath="//flow/block[1]/block[1]/block[2]/lineArea[1]"/>
-    <eval expected="1234567890." xpath="//flow/block[1]/block[1]/block[2]/lineArea[2]"/>
-
-    <!-- The layout engine should warn about the overflow in this case -->
-    <eval expected="Bla bla " xpath="//flow/block[1]/block[1]/block[3]/lineArea[1]"/>
-    <eval expected="12345678901234567890." xpath="//flow/block[1]/block[1]/block[3]/lineArea[2]"/>
-
-    <eval expected="This is Blah-blah-" xpath="//flow/block[1]/block[1]/block[4]/lineArea[1]"/>
-    <eval expected="blah-blah!" xpath="//flow/block[1]/block[1]/block[4]/lineArea[2]"/>
-
-    <eval expected="This is BLah-blah-" xpath="//flow/block[1]/block[1]/block[5]/lineArea[1]"/>
-    <eval expected="blah-blah!" xpath="//flow/block[1]/block[1]/block[5]/lineArea[2]"/>
-  </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 breaking behaviour in environments where there is not much space.
+    </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="5in" page-width="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="simple">
+        <fo:flow flow-name="xsl-region-body" hyphenate="true">
+          <fo:block-container width="100pt" background-color="yellow">
+            <fo:block>This is some test text!</fo:block>
+            <fo:block>Bla bla 1234567890.</fo:block>
+            <fo:block>Bla bla 12345678901234567890.</fo:block>
+            <fo:block>This is Blah-blah-blah-blah!</fo:block>
+            <fo:block>This is BLah-blah-blah-blah!</fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="This is some test " xpath="//flow/block[1]/block[1]/block[1]/lineArea[1]"/>
+    <eval expected="text!" xpath="//flow/block[1]/block[1]/block[1]/lineArea[2]"/>
+
+    <eval expected="Bla bla " xpath="//flow/block[1]/block[1]/block[2]/lineArea[1]"/>
+    <eval expected="1234567890." xpath="//flow/block[1]/block[1]/block[2]/lineArea[2]"/>
+
+    <!-- The layout engine should warn about the overflow in this case -->
+    <eval expected="Bla bla " xpath="//flow/block[1]/block[1]/block[3]/lineArea[1]"/>
+    <eval expected="12345678901234567890." xpath="//flow/block[1]/block[1]/block[3]/lineArea[2]"/>
+
+    <eval expected="This is Blah-blah-" xpath="//flow/block[1]/block[1]/block[4]/lineArea[1]"/>
+    <eval expected="blah-blah!" xpath="//flow/block[1]/block[1]/block[4]/lineArea[2]"/>
+
+    <eval expected="This is BLah-blah-" xpath="//flow/block[1]/block[1]/block[5]/lineArea[1]"/>
+    <eval expected="blah-blah!" xpath="//flow/block[1]/block[1]/block[5]/lineArea[2]"/>
+  </checks>
+</testcase>

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

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-breaking_6.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/page-height_indefinite_simple.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml Wed Feb 13 01:35:01 2008
@@ -1,53 +1,53 @@
-<?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>
-      Simple test for page-height="indefinite". The page-heights should
-      correspond to the sum of the line-heights of the laid out blocks.
-    </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="auto" page-height="indefinite">
-          <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 line-height="24pt">page1 - block1</fo:block>
-          <fo:block line-height="24pt">page1 - block2</fo:block>
-          <fo:block line-height="24pt">page1 - block3</fo:block>
-          <fo:block break-before="page" line-height="30pt">page2 - block1</fo:block>
-          <fo:block line-height="30pt">page2 - block2</fo:block>
-          <fo:block line-height="30pt">page2 - block3</fo:block>
-          <fo:block break-before="page" line-height="60pt">page3 - block3</fo:block>
-          <fo:block line-height="60pt">page3 - block2</fo:block>
-          <fo:block line-height="60pt">page3 - block3</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="72000" xpath="//pageViewport[@nr=1]/page/regionViewport/@bpd"/>
-    <eval expected="90000" xpath="//pageViewport[@nr=2]/page/regionViewport/@bpd"/>
-    <eval expected="180000" xpath="//pageViewport[@nr=3]/page/regionViewport/@bpd"/>
-  </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>
+      Simple test for page-height="indefinite". The page-heights should
+      correspond to the sum of the line-heights of the laid out blocks.
+    </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="auto" page-height="indefinite">
+          <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 line-height="24pt">page1 - block1</fo:block>
+          <fo:block line-height="24pt">page1 - block2</fo:block>
+          <fo:block line-height="24pt">page1 - block3</fo:block>
+          <fo:block break-before="page" line-height="30pt">page2 - block1</fo:block>
+          <fo:block line-height="30pt">page2 - block2</fo:block>
+          <fo:block line-height="30pt">page2 - block3</fo:block>
+          <fo:block break-before="page" line-height="60pt">page3 - block3</fo:block>
+          <fo:block line-height="60pt">page3 - block2</fo:block>
+          <fo:block line-height="60pt">page3 - block3</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="72000" xpath="//pageViewport[@nr=1]/page/regionViewport/@bpd"/>
+    <eval expected="90000" xpath="//pageViewport[@nr=2]/page/regionViewport/@bpd"/>
+    <eval expected="180000" xpath="//pageViewport[@nr=3]/page/regionViewport/@bpd"/>
+  </checks>
+</testcase>

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

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-height_indefinite_simple.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/page-number-citation-last_basic.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/page-number-citation-last_complex.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/page-number-citation-last_page-sequence.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/page-number-citation_background-color.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_background-color.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_background-color.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_background-color.xml Wed Feb 13 01:35:01 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:page-number-citation 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" id="ref">
-          <fo:block background-color="silver" id="ref">
-            To emphasize a page number citation <fo:page-number-citation ref-id="ref" background-color="yellow" /> 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:page-number-citation 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" id="ref">
+          <fo:block background-color="silver" id="ref">
+            To emphasize a page number citation <fo:page-number-citation ref-id="ref" background-color="yellow" /> 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/trunk/test/layoutengine/standard-testcases/page-number-citation_background-color.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_background-color.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/page-number-citation_background-image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_background-image.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_background-image.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_background-image.xml Wed Feb 13 01:35:01 2008
@@ -1,50 +1,50 @@
-<?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:page-number-citation 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" id="ref">
-            Page number citation <fo:page-number-citation font-size="96pt" ref-id="ref" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
-            Page number citation <fo:page-number-citation font-size="48pt" ref-id="ref" 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>
-    <!-- currently not working because of late ipd adjustment after the image is positioned -->
-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@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:page-number-citation 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" id="ref">
+            Page number citation <fo:page-number-citation font-size="96pt" ref-id="ref" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+            Page number citation <fo:page-number-citation font-size="48pt" ref-id="ref" 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>
+    <!-- currently not working because of late ipd adjustment after the image is positioned -->
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@background"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_background-image.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_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/page-number-citation_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/page-number-citation_basic_2.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/page-number-citation_border_padding.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml Wed Feb 13 01:35:01 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:page-number-citation 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" id="ref">
-            Page number citation <fo:page-number-citation ref-id="ref" border="solid 1pt red" background-color="yellow" /> with a 1pt border.
-          </fo:block>
-          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
-            Page number citation <fo:page-number-citation ref-id="ref" border="solid 5pt red" padding="5pt" background-color="yellow" /> with 5pt border and padding.
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
-            Page number citation <fo:page-number-citation ref-id="ref" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/> with unsymmetric borders and padding.
-          </fo:block>
-          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
-            Page number citation <fo:page-number-citation ref-id="ref" border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/> with border and padding in 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="5560" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/>
-    <eval expected="17560" 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:page-number-citation 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" id="ref">
+            Page number citation <fo:page-number-citation ref-id="ref" border="solid 1pt red" background-color="yellow" /> with a 1pt border.
+          </fo:block>
+          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+            Page number citation <fo:page-number-citation ref-id="ref" border="solid 5pt red" padding="5pt" background-color="yellow" /> with 5pt border and padding.
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+            Page number citation <fo:page-number-citation ref-id="ref" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/> with unsymmetric borders and padding.
+          </fo:block>
+          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
+            Page number citation <fo:page-number-citation ref-id="ref" border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/> with border and padding in 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="5560" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/>
+    <eval expected="17560" 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/trunk/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_border_padding.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/page-number-citation_complex_1.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/page-number-citation_complex_2.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/page-number-citation_empty-inline.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_empty-inline.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/page-number-citation_vertical-align.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml Wed Feb 13 01:35:01 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:page-number-citation 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" id="ref">
-            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" background-color="yellow" /> vertical-align not specified
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
-            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="baseline" background-color="yellow" /> vertical-align="baseline"
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
-            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="top" background-color="yellow" /> vertical-align="top"
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
-            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="middle" background-color="yellow" /> vertical-align="middle"
-          </fo:block>
-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
-            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="bottom" background-color="yellow" /> vertical-align="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:page-number-citation 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" id="ref">
+            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" background-color="yellow" /> vertical-align not specified
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="baseline" background-color="yellow" /> vertical-align="baseline"
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="top" background-color="yellow" /> vertical-align="top"
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="middle" background-color="yellow" /> vertical-align="middle"
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="bottom" background-color="yellow" /> vertical-align="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/trunk/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_vertical-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/page-number_background-color.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number_background-color.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number_background-color.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number_background-color.xml Wed Feb 13 01:35:01 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:page-number 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 emphasize a page number <fo:page-number background-color="yellow" /> 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:page-number 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 emphasize a page number <fo:page-number background-color="yellow" /> 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/trunk/test/layoutengine/standard-testcases/page-number_background-color.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number_background-color.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