Ensured all SVN properties are set equally

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@627324 13f79535-47bb-0310-9956-ffa450edef68

113 files changed, 12040 insertions, 12040 deletions

diff --git a/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml b/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml
index af79c559b..8a0d4e4c2 100755
--- a/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml
+++ b/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml
@@ -1,355 +1,355 @@
-<?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>

-      Checks hyphenation for various languages

-    </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="29.7cm"

-                  page-width="21cm"

-                  margin-top="1cm"

-                  margin-bottom="2cm"

-                  margin-left="7cm"

-                  margin-right="3cm">

-      <fo:region-body margin-top="1.5cm"/>

-    </fo:simple-page-master>

-  </fo:layout-master-set>

-  <!-- end: defines page layout -->

-

-

-  <fo:page-sequence master-reference="simple">

-

-    <fo:flow flow-name="xsl-region-body"

-                text-align="justify">

-

-      <fo:block font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        US English hypenation-ladder-count="no-limit"

-      </fo:block>

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="en"

-                country="US"

-                hyphenate="true"

-                hyphenation-ladder-count="no-limit"

-                >

-        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a

-        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from

-        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its

-        widespread deployment. This enhances the functionality and interoperability of the Web.

-      </fo:block>

-

-      <fo:block font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        US English hypenation-ladder-count="1"

-      </fo:block>

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="en"

-                country="US"

-                hyphenate="true"

-                hyphenation-ladder-count="1"

-                >

-        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a

-        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from

-        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its

-        widespread deployment. This enhances the functionality and interoperability of the Web.

-      </fo:block>

-

-      <fo:block font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        US English hypenation-ladder-count="2"

-      </fo:block>

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="en"

-                country="US"

-                hyphenate="true"

-                hyphenation-ladder-count="2"

-                >

-        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a

-        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from

-        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its

-        widespread deployment. This enhances the functionality and interoperability of the Web.

-      </fo:block>

-

-      <fo:block font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        US English hypenation-ladder-count="3"

-      </fo:block>

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="en"

-                country="US"

-                hyphenate="true"

-                hyphenation-ladder-count="3"

-                >

-        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a

-        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from

-        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its

-        widespread deployment. This enhances the functionality and interoperability of the Web.

-      </fo:block>

-

-      <fo:block font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        US English hypenation-ladder-count="4"

-      </fo:block>

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="en"

-                country="US"

-                hyphenate="true"

-                hyphenation-ladder-count="4"

-                >

-        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a

-        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from

-        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its

-        widespread deployment. This enhances the functionality and interoperability of the Web.

-      </fo:block>

-

-      <fo:block break-before="page"

-            font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        German hypenation-ladder-count="no-limit"

-      </fo:block>

-

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="de"

-                hyphenate="true"

-                hyphenation-ladder-count="no-limit"

-                >

-        1. Warum TEI?

-        Die Verwendungszeit elektronischer Editionen wird von mehreren

-        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu

-        ihrer Darstellung verwendet werden, der etwas längeren der

-        Betriebssysteme, unter denen die Darstellungsprogramme laufen,

-        der logischen Einrichtung des Datenträgers, auf dem sich die

-        Edition befindet, und dessen physischer Dauer.

-      </fo:block>

-

-      <fo:block font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        German hypenation-ladder-count="1"

-      </fo:block>

-

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="de"

-                hyphenate="true"

-                hyphenation-ladder-count="1"

-                >

-        1. Warum TEI?

-        Die Verwendungszeit elektronischer Editionen wird von mehreren

-        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu

-        ihrer Darstellung verwendet werden, der etwas längeren der

-        Betriebssysteme, unter denen die Darstellungsprogramme laufen,

-        der logischen Einrichtung des Datenträgers, auf dem sich die

-        Edition befindet, und dessen physischer Dauer.

-      </fo:block>

-

-      <fo:block font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        German hypenation-ladder-count="2"

-      </fo:block>

-

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="de"

-                hyphenate="true"

-                hyphenation-ladder-count="2"

-                >

-        1. Warum TEI?

-        Die Verwendungszeit elektronischer Editionen wird von mehreren

-        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu

-        ihrer Darstellung verwendet werden, der etwas längeren der

-        Betriebssysteme, unter denen die Darstellungsprogramme laufen,

-        der logischen Einrichtung des Datenträgers, auf dem sich die

-        Edition befindet, und dessen physischer Dauer.

-      </fo:block>

-

-      <fo:block font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        German hypenation-ladder-count="3"

-      </fo:block>

-

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="de"

-                hyphenate="true"

-                hyphenation-ladder-count="3"

-                >

-        1. Warum TEI?

-        Die Verwendungszeit elektronischer Editionen wird von mehreren

-        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu

-        ihrer Darstellung verwendet werden, der etwas längeren der

-        Betriebssysteme, unter denen die Darstellungsprogramme laufen,

-        der logischen Einrichtung des Datenträgers, auf dem sich die

-        Edition befindet, und dessen physischer Dauer.

-      </fo:block>

-

-      <fo:block font-size="12pt"

-            font-family="sans-serif"

-            background-color="blue"

-            color="white"

-            text-align="start">

-        German hypenation-ladder-count="4"

-      </fo:block>

-

-      <fo:block font-size="12pt"

-                font-family="sans-serif"

-                space-after="3pt"

-                language="de"

-                hyphenate="true"

-                hyphenation-ladder-count="4"

-                >

-        1. Warum TEI?

-        Die Verwendungszeit elektronischer Editionen wird von mehreren

-        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu

-        ihrer Darstellung verwendet werden, der etwas längeren der

-        Betriebssysteme, unter denen die Darstellungsprogramme laufen,

-        der logischen Einrichtung des Datenträgers, auf dem sich die

-        Edition befindet, und dessen physischer Dauer.

-      </fo:block>

-

-    </fo:flow>

-  </fo:page-sequence>

-</fo:root>

-</fo>

-  <checks>

-    <eval expected="8" xpath="count(//pageViewport[1]//flow/block[2]/lineArea)"/>

-    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[2]/lineArea[2]/text/word[10]"/>

-    <eval expected="norma-" xpath="//pageViewport[1]//flow/block[2]/lineArea[4]/text/word[12]"/>

-    <eval expected="mak-" xpath="//pageViewport[1]//flow/block[2]/lineArea[5]/text/word[9]"/>

-    <eval expected="specifi-" xpath="//pageViewport[1]//flow/block[2]/lineArea[6]/text/word[10]"/>

-    <eval expected="en-" xpath="//pageViewport[1]//flow/block[2]/lineArea[7]/text/word[9]"/>

-

-    <eval expected="9" xpath="count(//pageViewport[1]//flow/block[4]/lineArea)"/>

-    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[4]/lineArea[2]/text/word[10]"/>

-    <eval expected="nor-" xpath="//pageViewport[1]//flow/block[4]/lineArea[4]/text/word[12]"/>

-    <eval expected="in" xpath="//pageViewport[1]//flow/block[4]/lineArea[5]/text/word[8]"/>

-    <eval expected="the" xpath="//pageViewport[1]//flow/block[4]/lineArea[6]/text/word[9]"/>

-    <eval expected="deployment." xpath="//pageViewport[1]//flow/block[4]/lineArea[7]/text/word[7]"/>

-

-    <eval expected="8" xpath="count(//pageViewport[1]//flow/block[6]/lineArea)"/>

-    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[6]/lineArea[2]/text/word[10]"/>

-    <eval expected="norma-" xpath="//pageViewport[1]//flow/block[6]/lineArea[4]/text/word[12]"/>

-    <eval expected="making" xpath="//pageViewport[1]//flow/block[6]/lineArea[5]/text/word[9]"/>

-    <eval expected="specifica-" xpath="//pageViewport[1]//flow/block[6]/lineArea[6]/text/word[9]"/>

-    <eval expected="en-" xpath="//pageViewport[1]//flow/block[6]/lineArea[7]/text/word[9]"/>

-

-    <eval expected="8" xpath="count(//pageViewport[1]//flow/block[8]/lineArea)"/>

-    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[8]/lineArea[2]/text/word[10]"/>

-    <eval expected="norma-" xpath="//pageViewport[1]//flow/block[8]/lineArea[4]/text/word[12]"/>

-    <eval expected="making" xpath="//pageViewport[1]//flow/block[8]/lineArea[5]/text/word[9]"/>

-    <eval expected="specifica-" xpath="//pageViewport[1]//flow/block[8]/lineArea[6]/text/word[9]"/>

-    <eval expected="en-" xpath="//pageViewport[1]//flow/block[8]/lineArea[7]/text/word[9]"/>

-

-    <eval expected="8" xpath="count(//pageViewport[1]//flow/block[10]/lineArea)"/>

-    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[10]/lineArea[2]/text/word[10]"/>

-    <eval expected="norma-" xpath="//pageViewport[1]//flow/block[10]/lineArea[4]/text/word[12]"/>

-    <eval expected="mak-" xpath="//pageViewport[1]//flow/block[10]/lineArea[5]/text/word[9]"/>

-    <eval expected="specifi-" xpath="//pageViewport[1]//flow/block[10]/lineArea[6]/text/word[10]"/>

-    <eval expected="en-" xpath="//pageViewport[1]//flow/block[10]/lineArea[7]/text/word[9]"/>

-

-    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[2]/lineArea)"/>

-    <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[2]/lineArea[1]/text/word[7]"/>

-    <eval expected="Le-" xpath="//pageViewport[2]//flow/block[2]/lineArea[2]/text/word[9]"/>

-    <eval expected="verwen-" xpath="//pageViewport[2]//flow/block[2]/lineArea[3]/text/word[8]"/>

-    <eval expected="un-" xpath="//pageViewport[2]//flow/block[2]/lineArea[4]/text/word[8]"/>

-    <eval expected="logischen" xpath="//pageViewport[2]//flow/block[2]/lineArea[5]/text/word[7]"/>

-    <eval expected="be-" xpath="//pageViewport[2]//flow/block[2]/lineArea[6]/text/word[9]"/>

-

-    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[4]/lineArea)"/>

-    <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[4]/lineArea[1]/text/word[7]"/>

-    <eval expected="kurzen" xpath="//pageViewport[2]//flow/block[4]/lineArea[2]/text/word[8]"/>

-    <eval expected="ver-" xpath="//pageViewport[2]//flow/block[4]/lineArea[3]/text/word[8]"/>

-    <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[4]/lineArea[4]/text/word[7]"/>

-    <eval expected="lo-" xpath="//pageViewport[2]//flow/block[4]/lineArea[5]/text/word[7]"/>

-    <eval expected="die" xpath="//pageViewport[2]//flow/block[4]/lineArea[6]/text/word[8]"/>

-

-    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[6]/lineArea)"/>

-    <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[1]/text/word[7]"/>

-    <eval expected="kurzen" xpath="//pageViewport[2]//flow/block[6]/lineArea[2]/text/word[8]"/>

-    <eval expected="ver-" xpath="//pageViewport[2]//flow/block[6]/lineArea[3]/text/word[8]"/>

-    <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[6]/lineArea[4]/text/word[7]"/>

-    <eval expected="logi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[5]/text/word[7]"/>

-    <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[6]/text/word[9]"/>

-

-    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[8]/lineArea)"/>

-    <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[8]/lineArea[1]/text/word[7]"/>

-    <eval expected="Le-" xpath="//pageViewport[2]//flow/block[8]/lineArea[2]/text/word[9]"/>

-    <eval expected="ver-" xpath="//pageViewport[2]//flow/block[8]/lineArea[3]/text/word[8]"/>

-    <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[8]/lineArea[4]/text/word[7]"/>

-    <eval expected="logi-" xpath="//pageViewport[2]//flow/block[8]/lineArea[5]/text/word[7]"/>

-    <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[8]/lineArea[6]/text/word[9]"/>

-

-    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[10]/lineArea)"/>

-    <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[10]/lineArea[1]/text/word[7]"/>

-    <eval expected="Le-" xpath="//pageViewport[2]//flow/block[10]/lineArea[2]/text/word[9]"/>

-    <eval expected="verwen-" xpath="//pageViewport[2]//flow/block[10]/lineArea[3]/text/word[8]"/>

-    <eval expected="un-" xpath="//pageViewport[2]//flow/block[10]/lineArea[4]/text/word[8]"/>

-    <eval expected="logischen" xpath="//pageViewport[2]//flow/block[10]/lineArea[5]/text/word[7]"/>

-    <eval expected="be-" xpath="//pageViewport[2]//flow/block[10]/lineArea[6]/text/word[9]"/>

-

-  </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>
+      Checks hyphenation for various languages
+    </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="29.7cm"
+                  page-width="21cm"
+                  margin-top="1cm"
+                  margin-bottom="2cm"
+                  margin-left="7cm"
+                  margin-right="3cm">
+      <fo:region-body margin-top="1.5cm"/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <!-- end: defines page layout -->
+
+
+  <fo:page-sequence master-reference="simple">
+
+    <fo:flow flow-name="xsl-region-body"
+                text-align="justify">
+
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        US English hypenation-ladder-count="no-limit"
+      </fo:block>
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="en"
+                country="US"
+                hyphenate="true"
+                hyphenation-ladder-count="no-limit"
+                >
+        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+        widespread deployment. This enhances the functionality and interoperability of the Web.
+      </fo:block>
+
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        US English hypenation-ladder-count="1"
+      </fo:block>
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="en"
+                country="US"
+                hyphenate="true"
+                hyphenation-ladder-count="1"
+                >
+        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+        widespread deployment. This enhances the functionality and interoperability of the Web.
+      </fo:block>
+
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        US English hypenation-ladder-count="2"
+      </fo:block>
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="en"
+                country="US"
+                hyphenate="true"
+                hyphenation-ladder-count="2"
+                >
+        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+        widespread deployment. This enhances the functionality and interoperability of the Web.
+      </fo:block>
+
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        US English hypenation-ladder-count="3"
+      </fo:block>
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="en"
+                country="US"
+                hyphenate="true"
+                hyphenation-ladder-count="3"
+                >
+        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+        widespread deployment. This enhances the functionality and interoperability of the Web.
+      </fo:block>
+
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        US English hypenation-ladder-count="4"
+      </fo:block>
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="en"
+                country="US"
+                hyphenate="true"
+                hyphenation-ladder-count="4"
+                >
+        This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+        W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+        another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+        widespread deployment. This enhances the functionality and interoperability of the Web.
+      </fo:block>
+
+      <fo:block break-before="page"
+            font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        German hypenation-ladder-count="no-limit"
+      </fo:block>
+
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="de"
+                hyphenate="true"
+                hyphenation-ladder-count="no-limit"
+                >
+        1. Warum TEI?
+        Die Verwendungszeit elektronischer Editionen wird von mehreren
+        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+        ihrer Darstellung verwendet werden, der etwas längeren der
+        Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+        der logischen Einrichtung des Datenträgers, auf dem sich die
+        Edition befindet, und dessen physischer Dauer.
+      </fo:block>
+
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        German hypenation-ladder-count="1"
+      </fo:block>
+
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="de"
+                hyphenate="true"
+                hyphenation-ladder-count="1"
+                >
+        1. Warum TEI?
+        Die Verwendungszeit elektronischer Editionen wird von mehreren
+        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+        ihrer Darstellung verwendet werden, der etwas längeren der
+        Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+        der logischen Einrichtung des Datenträgers, auf dem sich die
+        Edition befindet, und dessen physischer Dauer.
+      </fo:block>
+
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        German hypenation-ladder-count="2"
+      </fo:block>
+
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="de"
+                hyphenate="true"
+                hyphenation-ladder-count="2"
+                >
+        1. Warum TEI?
+        Die Verwendungszeit elektronischer Editionen wird von mehreren
+        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+        ihrer Darstellung verwendet werden, der etwas längeren der
+        Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+        der logischen Einrichtung des Datenträgers, auf dem sich die
+        Edition befindet, und dessen physischer Dauer.
+      </fo:block>
+
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        German hypenation-ladder-count="3"
+      </fo:block>
+
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="de"
+                hyphenate="true"
+                hyphenation-ladder-count="3"
+                >
+        1. Warum TEI?
+        Die Verwendungszeit elektronischer Editionen wird von mehreren
+        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+        ihrer Darstellung verwendet werden, der etwas längeren der
+        Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+        der logischen Einrichtung des Datenträgers, auf dem sich die
+        Edition befindet, und dessen physischer Dauer.
+      </fo:block>
+
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
+            background-color="blue"
+            color="white"
+            text-align="start">
+        German hypenation-ladder-count="4"
+      </fo:block>
+
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                space-after="3pt"
+                language="de"
+                hyphenate="true"
+                hyphenation-ladder-count="4"
+                >
+        1. Warum TEI?
+        Die Verwendungszeit elektronischer Editionen wird von mehreren
+        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+        ihrer Darstellung verwendet werden, der etwas längeren der
+        Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+        der logischen Einrichtung des Datenträgers, auf dem sich die
+        Edition befindet, und dessen physischer Dauer.
+      </fo:block>
+
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
+</fo>
+  <checks>
+    <eval expected="8" xpath="count(//pageViewport[1]//flow/block[2]/lineArea)"/>
+    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[2]/lineArea[2]/text/word[10]"/>
+    <eval expected="norma-" xpath="//pageViewport[1]//flow/block[2]/lineArea[4]/text/word[12]"/>
+    <eval expected="mak-" xpath="//pageViewport[1]//flow/block[2]/lineArea[5]/text/word[9]"/>
+    <eval expected="specifi-" xpath="//pageViewport[1]//flow/block[2]/lineArea[6]/text/word[10]"/>
+    <eval expected="en-" xpath="//pageViewport[1]//flow/block[2]/lineArea[7]/text/word[9]"/>
+
+    <eval expected="9" xpath="count(//pageViewport[1]//flow/block[4]/lineArea)"/>
+    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[4]/lineArea[2]/text/word[10]"/>
+    <eval expected="nor-" xpath="//pageViewport[1]//flow/block[4]/lineArea[4]/text/word[12]"/>
+    <eval expected="in" xpath="//pageViewport[1]//flow/block[4]/lineArea[5]/text/word[8]"/>
+    <eval expected="the" xpath="//pageViewport[1]//flow/block[4]/lineArea[6]/text/word[9]"/>
+    <eval expected="deployment." xpath="//pageViewport[1]//flow/block[4]/lineArea[7]/text/word[7]"/>
+
+    <eval expected="8" xpath="count(//pageViewport[1]//flow/block[6]/lineArea)"/>
+    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[6]/lineArea[2]/text/word[10]"/>
+    <eval expected="norma-" xpath="//pageViewport[1]//flow/block[6]/lineArea[4]/text/word[12]"/>
+    <eval expected="making" xpath="//pageViewport[1]//flow/block[6]/lineArea[5]/text/word[9]"/>
+    <eval expected="specifica-" xpath="//pageViewport[1]//flow/block[6]/lineArea[6]/text/word[9]"/>
+    <eval expected="en-" xpath="//pageViewport[1]//flow/block[6]/lineArea[7]/text/word[9]"/>
+
+    <eval expected="8" xpath="count(//pageViewport[1]//flow/block[8]/lineArea)"/>
+    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[8]/lineArea[2]/text/word[10]"/>
+    <eval expected="norma-" xpath="//pageViewport[1]//flow/block[8]/lineArea[4]/text/word[12]"/>
+    <eval expected="making" xpath="//pageViewport[1]//flow/block[8]/lineArea[5]/text/word[9]"/>
+    <eval expected="specifica-" xpath="//pageViewport[1]//flow/block[8]/lineArea[6]/text/word[9]"/>
+    <eval expected="en-" xpath="//pageViewport[1]//flow/block[8]/lineArea[7]/text/word[9]"/>
+
+    <eval expected="8" xpath="count(//pageViewport[1]//flow/block[10]/lineArea)"/>
+    <eval expected="Di-" xpath="//pageViewport[1]//flow/block[10]/lineArea[2]/text/word[10]"/>
+    <eval expected="norma-" xpath="//pageViewport[1]//flow/block[10]/lineArea[4]/text/word[12]"/>
+    <eval expected="mak-" xpath="//pageViewport[1]//flow/block[10]/lineArea[5]/text/word[9]"/>
+    <eval expected="specifi-" xpath="//pageViewport[1]//flow/block[10]/lineArea[6]/text/word[10]"/>
+    <eval expected="en-" xpath="//pageViewport[1]//flow/block[10]/lineArea[7]/text/word[9]"/>
+
+    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[2]/lineArea)"/>
+    <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[2]/lineArea[1]/text/word[7]"/>
+    <eval expected="Le-" xpath="//pageViewport[2]//flow/block[2]/lineArea[2]/text/word[9]"/>
+    <eval expected="verwen-" xpath="//pageViewport[2]//flow/block[2]/lineArea[3]/text/word[8]"/>
+    <eval expected="un-" xpath="//pageViewport[2]//flow/block[2]/lineArea[4]/text/word[8]"/>
+    <eval expected="logischen" xpath="//pageViewport[2]//flow/block[2]/lineArea[5]/text/word[7]"/>
+    <eval expected="be-" xpath="//pageViewport[2]//flow/block[2]/lineArea[6]/text/word[9]"/>
+
+    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[4]/lineArea)"/>
+    <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[4]/lineArea[1]/text/word[7]"/>
+    <eval expected="kurzen" xpath="//pageViewport[2]//flow/block[4]/lineArea[2]/text/word[8]"/>
+    <eval expected="ver-" xpath="//pageViewport[2]//flow/block[4]/lineArea[3]/text/word[8]"/>
+    <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[4]/lineArea[4]/text/word[7]"/>
+    <eval expected="lo-" xpath="//pageViewport[2]//flow/block[4]/lineArea[5]/text/word[7]"/>
+    <eval expected="die" xpath="//pageViewport[2]//flow/block[4]/lineArea[6]/text/word[8]"/>
+
+    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[6]/lineArea)"/>
+    <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[1]/text/word[7]"/>
+    <eval expected="kurzen" xpath="//pageViewport[2]//flow/block[6]/lineArea[2]/text/word[8]"/>
+    <eval expected="ver-" xpath="//pageViewport[2]//flow/block[6]/lineArea[3]/text/word[8]"/>
+    <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[6]/lineArea[4]/text/word[7]"/>
+    <eval expected="logi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[5]/text/word[7]"/>
+    <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[6]/text/word[9]"/>
+
+    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[8]/lineArea)"/>
+    <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[8]/lineArea[1]/text/word[7]"/>
+    <eval expected="Le-" xpath="//pageViewport[2]//flow/block[8]/lineArea[2]/text/word[9]"/>
+    <eval expected="ver-" xpath="//pageViewport[2]//flow/block[8]/lineArea[3]/text/word[8]"/>
+    <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[8]/lineArea[4]/text/word[7]"/>
+    <eval expected="logi-" xpath="//pageViewport[2]//flow/block[8]/lineArea[5]/text/word[7]"/>
+    <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[8]/lineArea[6]/text/word[9]"/>
+
+    <eval expected="7" xpath="count(//pageViewport[2]//flow/block[10]/lineArea)"/>
+    <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[10]/lineArea[1]/text/word[7]"/>
+    <eval expected="Le-" xpath="//pageViewport[2]//flow/block[10]/lineArea[2]/text/word[9]"/>
+    <eval expected="verwen-" xpath="//pageViewport[2]//flow/block[10]/lineArea[3]/text/word[8]"/>
+    <eval expected="un-" xpath="//pageViewport[2]//flow/block[10]/lineArea[4]/text/word[8]"/>
+    <eval expected="logischen" xpath="//pageViewport[2]//flow/block[10]/lineArea[5]/text/word[7]"/>
+    <eval expected="be-" xpath="//pageViewport[2]//flow/block[10]/lineArea[6]/text/word[9]"/>
+
+  </checks>
+</testcase>
diff --git a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml
index cf4c1818a..4c1c81189 100755
--- a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml
+++ b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml
@@ -1,400 +1,400 @@
-<?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:inlines with border and padding properties and hyphenation.

-    </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="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt" 

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="start" .conditionality="discard".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt" 

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="end" .conditionality="discard".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="justify" .conditionality="discard".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="center" .conditionality="discard".

-          </fo:block>

-

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="start" .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="end" .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="justify" .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="center" .conditionality="retain".

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="261100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="39570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>

-    

-    <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="261100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="39570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>

-    

-    <eval expected="262613" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="268613" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="39570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>

-    

-    <eval expected="216190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="222190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="310170" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="310170" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="100030" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="104030" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>

-

-    <eval expected="255100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="265100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="345720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="35570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="45570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="255100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="265100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="345720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="35570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="45570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="259229" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="269229" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="340000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="35570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="45570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="216190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="226190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="299050" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="309050" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="111150" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="121150" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@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:inlines with border and padding properties and hyphenation.
+    </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="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt" 
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="start" .conditionality="discard".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt" 
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="end" .conditionality="discard".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="justify" .conditionality="discard".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="center" .conditionality="discard".
+          </fo:block>
+
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="start" .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="end" .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="justify" .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="center" .conditionality="retain".
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="261100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="39570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+    
+    <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="261100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="39570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>
+    
+    <eval expected="262613" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="268613" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="39570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>
+    
+    <eval expected="216190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="222190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="310170" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="310170" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="100030" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="104030" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>
+
+    <eval expected="255100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="265100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="345720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="35570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="45570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="255100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="265100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="345720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="35570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="45570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="259229" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="269229" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="340000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="35570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="45570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="216190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="226190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="299050" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="309050" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="111150" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="121150" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-start"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml
index 0e058d9e8..6eda5a058 100755
--- a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml
+++ b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml
@@ -1,400 +1,400 @@
-<?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 inlines with border and padding properties and hyphenation.

-    </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="de">

-        <fo:flow flow-name="xsl-region-body" font-size="10pt">

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt" 

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz

-            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>

-            text-align="start" .conditionality="discard".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt" 

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz

-            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>

-            text-align="end" .conditionality="discard".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz

-            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>

-            text-align="justify" .conditionality="discard".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz

-            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>

-            text-align="center" .conditionality="discard".

-          </fo:block>

-

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz

-            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>

-            text-align="start" .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz

-            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>

-            text-align="end" .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz

-            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>

-            text-align="justify" .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz

-            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>

-            text-align="center" .conditionality="retain".

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="250110" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="256110" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="348490" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="348490" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="91710" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="95710" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>

-    

-    <eval expected="250110" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="256110" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="348490" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="348490" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="91710" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="95710" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>

-    

-    <eval expected="250110" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="256110" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="349999" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="349999" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="91710" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="95710" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>

-    

-    <eval expected="238440" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="244440" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="320690" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="320690" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="131180" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="135180" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>

-

-    <eval expected="250110" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="260110" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="336820" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="346820" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="103380" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="113380" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="250110" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="260110" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="336820" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="346820" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="103380" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="113380" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="250110" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="260110" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="340000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="103380" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="113380" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="238440" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="248440" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="320690" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="330690" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="131180" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="141180" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@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 inlines with border and padding properties and hyphenation.
+    </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="de">
+        <fo:flow flow-name="xsl-region-body" font-size="10pt">
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt" 
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+            text-align="start" .conditionality="discard".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt" 
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+            text-align="end" .conditionality="discard".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+            text-align="justify" .conditionality="discard".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+            text-align="center" .conditionality="discard".
+          </fo:block>
+
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+            text-align="start" .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+            text-align="end" .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+            text-align="justify" .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+            Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+            text-align="center" .conditionality="retain".
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="250110" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="256110" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="348490" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="348490" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="91710" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="95710" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+    
+    <eval expected="250110" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="256110" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="348490" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="348490" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="91710" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="95710" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>
+    
+    <eval expected="250110" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="256110" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="349999" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="349999" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="91710" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="95710" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>
+    
+    <eval expected="238440" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="244440" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="320690" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="320690" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="131180" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="135180" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>
+
+    <eval expected="250110" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="260110" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="336820" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="346820" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="103380" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="113380" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="250110" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="260110" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="336820" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="346820" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="103380" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="113380" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="250110" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="260110" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="340000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="103380" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="113380" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="238440" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="248440" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="320690" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="330690" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="131180" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="141180" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-start"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/basic-link_background-image.xml b/test/layoutengine/standard-testcases/basic-link_background-image.xml
index 88b5a4daf..36aefb963 100644
--- a/test/layoutengine/standard-testcases/basic-link_background-image.xml
+++ b/test/layoutengine/standard-testcases/basic-link_background-image.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks background image on a fo:basic-link.

-    </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>

-            Why is <fo:basic-link external-destination="http://xmlgraphics.apache.org/fop" font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">FOP</fo:basic-link> so cool?

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/>

-    <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/>

-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@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 a fo:basic-link.
+    </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>
+            Why is <fo:basic-link external-destination="http://xmlgraphics.apache.org/fop" font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">FOP</fo:basic-link> so cool?
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/>
+    <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block-container_padding_percentages.xml b/test/layoutengine/standard-testcases/block-container_padding_percentages.xml
index 4173b0c3c..f82c3f985 100644
--- a/test/layoutengine/standard-testcases/block-container_padding_percentages.xml
+++ b/test/layoutengine/standard-testcases/block-container_padding_percentages.xml
@@ -1,54 +1,54 @@
-<?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 block containers.

-    </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:block-container width="2in" height="1in" background-color="yellow" padding="5%">

-             <fo:block>margin not specified padding="5%" on this 2x1in yellow container</fo:block>

-          </fo:block-container>

-          <fo:block-container width="2in" height="1in" margin="0pt" background-color="blue" padding="5%">

-             <fo:block>margin="0pt" padding="5%" on this 2x1in blue container</fo:block>

-          </fo:block-container>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/>

-    <eval expected="-18000" xpath="//flow/block[1]/@space-start"/>

-    <eval expected="-18000" xpath="//flow/block[1]/@space-end"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/>

-    <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/>

-    <eval expected="18000" xpath="//flow/block[2]/@start-indent"/>

-    <eval expected="18000" xpath="//flow/block[2]/@end-indent"/>

-    <eval expected="color=#0000ff" xpath="//flow/block[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 relative padding on block containers.
+    </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:block-container width="2in" height="1in" background-color="yellow" padding="5%">
+             <fo:block>margin not specified padding="5%" on this 2x1in yellow container</fo:block>
+          </fo:block-container>
+          <fo:block-container width="2in" height="1in" margin="0pt" background-color="blue" padding="5%">
+             <fo:block>margin="0pt" padding="5%" on this 2x1in blue container</fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/>
+    <eval expected="-18000" xpath="//flow/block[1]/@space-start"/>
+    <eval expected="-18000" xpath="//flow/block[1]/@space-end"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/>
+    <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/>
+    <eval expected="18000" xpath="//flow/block[2]/@start-indent"/>
+    <eval expected="18000" xpath="//flow/block[2]/@end-indent"/>
+    <eval expected="color=#0000ff" xpath="//flow/block[2]/@background"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml b/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml
index 7b1bfc793..95cf2fb13 100644
--- a/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml
+++ b/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml
@@ -1,104 +1,104 @@
-<?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 in-flow block-containers with reference orientation.

-      Special case with nested block-containers from Bugzilla #36391.

-    </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 column-count="2"/>

-        </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>Reference orientation : 0</fo:block>

-            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">

-                <fo:block-container  border="solid 1pt" width="30pt" reference-orientation="0">

-                    <fo:block>ABC</fo:block>

-                </fo:block-container>

-            </fo:block-container>

-            <fo:block>Reference orientation : 90</fo:block>

-            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">

-                <fo:block-container  border="solid 1pt" width="30pt" reference-orientation="90">

-                    <fo:block>ABC</fo:block>

-                </fo:block-container>

-            </fo:block-container>

-            <fo:block>Reference orientation : -270</fo:block>

-            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">

-                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-270">

-                    <fo:block>ABC</fo:block>

-                </fo:block-container>

-            </fo:block-container>

-            <fo:block break-before="column">Reference orientation : 180</fo:block>

-            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">

-                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="180">

-                    <fo:block>ABC</fo:block>

-                </fo:block-container>

-            </fo:block-container>

-            <fo:block>Reference orientation : -180</fo:block>

-            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">

-                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-180">

-                    <fo:block>ABC</fo:block>

-                </fo:block-container>

-            </fo:block-container>

-            <fo:block>Reference orientation : 270</fo:block>

-            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">

-                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="270">

-                    <fo:block>ABC</fo:block>

-                </fo:block-container>

-            </fo:block-container>

-            <fo:block>Reference orientation : -90</fo:block>

-            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">

-                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-90">

-                    <fo:block>ABC</fo:block>

-                </fo:block-container>

-            </fo:block-container>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- 0 -->

-    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[2]/@ctm"/>

-    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[2]/block[1]/block[1]/@ctm"/>

-    <!-- 90 -->

-    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[4]/@ctm"/>

-    <eval expected="[0.0 -1.0 1.0 0.0 0.0 31000.0]" xpath="//mainReference/span/flow[1]/block[4]/block[1]/block[1]/@ctm"/>

-    <!-- -270 -->

-    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[6]/@ctm"/>

-    <eval expected="[0.0 -1.0 1.0 0.0 0.0 31000.0]" xpath="//mainReference/span/flow[1]/block[6]/block[1]/block[1]/@ctm"/>

-    <!-- 180 -->

-    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[2]/@ctm"/>

-    <eval expected="[-1.0 -0.0 0.0 -1.0 30000.0 15400.0]" xpath="//mainReference/span/flow[2]/block[2]/block[1]/block[1]/@ctm"/>

-    <!-- -180 -->

-    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[4]/@ctm"/>

-    <eval expected="[-1.0 -0.0 0.0 -1.0 30000.0 15400.0]" xpath="//mainReference/span/flow[2]/block[4]/block[1]/block[1]/@ctm"/>

-    <!-- 270 -->

-    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/@ctm"/>

-    <eval expected="[0.0 1.0 -1.0 0.0 90000.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/block[1]/block[1]/@ctm"/>

-    <!-- -90 -->

-    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/@ctm"/>

-    <eval expected="[0.0 1.0 -1.0 0.0 90000.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/block[1]/block[1]/@ctm"/>

-  </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 in-flow block-containers with reference orientation.
+      Special case with nested block-containers from Bugzilla #36391.
+    </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 column-count="2"/>
+        </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>Reference orientation : 0</fo:block>
+            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+                <fo:block-container  border="solid 1pt" width="30pt" reference-orientation="0">
+                    <fo:block>ABC</fo:block>
+                </fo:block-container>
+            </fo:block-container>
+            <fo:block>Reference orientation : 90</fo:block>
+            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+                <fo:block-container  border="solid 1pt" width="30pt" reference-orientation="90">
+                    <fo:block>ABC</fo:block>
+                </fo:block-container>
+            </fo:block-container>
+            <fo:block>Reference orientation : -270</fo:block>
+            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-270">
+                    <fo:block>ABC</fo:block>
+                </fo:block-container>
+            </fo:block-container>
+            <fo:block break-before="column">Reference orientation : 180</fo:block>
+            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="180">
+                    <fo:block>ABC</fo:block>
+                </fo:block-container>
+            </fo:block-container>
+            <fo:block>Reference orientation : -180</fo:block>
+            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-180">
+                    <fo:block>ABC</fo:block>
+                </fo:block-container>
+            </fo:block-container>
+            <fo:block>Reference orientation : 270</fo:block>
+            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="270">
+                    <fo:block>ABC</fo:block>
+                </fo:block-container>
+            </fo:block-container>
+            <fo:block>Reference orientation : -90</fo:block>
+            <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+                <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-90">
+                    <fo:block>ABC</fo:block>
+                </fo:block-container>
+            </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- 0 -->
+    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[2]/@ctm"/>
+    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[2]/block[1]/block[1]/@ctm"/>
+    <!-- 90 -->
+    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[4]/@ctm"/>
+    <eval expected="[0.0 -1.0 1.0 0.0 0.0 31000.0]" xpath="//mainReference/span/flow[1]/block[4]/block[1]/block[1]/@ctm"/>
+    <!-- -270 -->
+    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[6]/@ctm"/>
+    <eval expected="[0.0 -1.0 1.0 0.0 0.0 31000.0]" xpath="//mainReference/span/flow[1]/block[6]/block[1]/block[1]/@ctm"/>
+    <!-- 180 -->
+    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[2]/@ctm"/>
+    <eval expected="[-1.0 -0.0 0.0 -1.0 30000.0 15400.0]" xpath="//mainReference/span/flow[2]/block[2]/block[1]/block[1]/@ctm"/>
+    <!-- -180 -->
+    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[4]/@ctm"/>
+    <eval expected="[-1.0 -0.0 0.0 -1.0 30000.0 15400.0]" xpath="//mainReference/span/flow[2]/block[4]/block[1]/block[1]/@ctm"/>
+    <!-- 270 -->
+    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/@ctm"/>
+    <eval expected="[0.0 1.0 -1.0 0.0 90000.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/block[1]/block[1]/@ctm"/>
+    <!-- -90 -->
+    <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/@ctm"/>
+    <eval expected="[0.0 1.0 -1.0 0.0 90000.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/block[1]/block[1]/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_break-after_bug40230.xml b/test/layoutengine/standard-testcases/block_break-after_bug40230.xml
index 15c66482f..129836159 100644
--- a/test/layoutengine/standard-testcases/block_break-after_bug40230.xml
+++ b/test/layoutengine/standard-testcases/block_break-after_bug40230.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- $Id: block_break-after.xml 426576 2006-07-28 15:44:37Z jeremias $ -->
+<!-- $Id$ -->
 <testcase>
   <info>
     <p>
diff --git a/test/layoutengine/standard-testcases/block_font-stretch.xml b/test/layoutengine/standard-testcases/block_font-stretch.xml
index 9f006d580..d3c11fb00 100644
--- a/test/layoutengine/standard-testcases/block_font-stretch.xml
+++ b/test/layoutengine/standard-testcases/block_font-stretch.xml
@@ -1,56 +1,56 @@
-<?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 font stretches.

-    </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="210mm" page-height="297mm">

-          <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-family="serif">font-family="serif" font-stretch not given</fo:block>

-          <fo:block font-family="serif" font-stretch="ultra-condensed">font-family="serif" font-stretch="ultra-condensed"

-            <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>

-          </fo:block>  

-          <fo:block font-family="serif" font-stretch="extra-condensed">font-family="serif" font-stretch="extra-condensed"</fo:block>

-          <fo:block font-family="serif" font-stretch="condensed">font-family="serif" font-stretch="condensed"</fo:block>

-          <fo:block font-family="serif" font-stretch="semi-condensed">font-family="serif" font-stretch="semi-condensed"</fo:block>

-          <fo:block font-family="serif" font-stretch="normal">font-family="serif" font-stretch="normal"</fo:block>

-          <fo:block font-family="serif" font-stretch="semi-expanded">font-family="serif" font-stretch="semi-expanded"</fo:block>

-          <fo:block font-family="serif" font-stretch="expanded">font-family="serif" font-stretch="expanded"</fo:block>

-          <fo:block font-family="serif" font-stretch="extra-expanded">font-family="serif" font-stretch="extra-expanded"</fo:block>

-          <fo:block font-family="serif" font-stretch="ultra-expanded">font-family="serif" font-stretch="ultra-expanded"

-            <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>

-          </fo:block>

-          <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>

-          <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-  </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 font stretches.
+    </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="210mm" page-height="297mm">
+          <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-family="serif">font-family="serif" font-stretch not given</fo:block>
+          <fo:block font-family="serif" font-stretch="ultra-condensed">font-family="serif" font-stretch="ultra-condensed"
+            <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>
+          </fo:block>  
+          <fo:block font-family="serif" font-stretch="extra-condensed">font-family="serif" font-stretch="extra-condensed"</fo:block>
+          <fo:block font-family="serif" font-stretch="condensed">font-family="serif" font-stretch="condensed"</fo:block>
+          <fo:block font-family="serif" font-stretch="semi-condensed">font-family="serif" font-stretch="semi-condensed"</fo:block>
+          <fo:block font-family="serif" font-stretch="normal">font-family="serif" font-stretch="normal"</fo:block>
+          <fo:block font-family="serif" font-stretch="semi-expanded">font-family="serif" font-stretch="semi-expanded"</fo:block>
+          <fo:block font-family="serif" font-stretch="expanded">font-family="serif" font-stretch="expanded"</fo:block>
+          <fo:block font-family="serif" font-stretch="extra-expanded">font-family="serif" font-stretch="extra-expanded"</fo:block>
+          <fo:block font-family="serif" font-stretch="ultra-expanded">font-family="serif" font-stretch="ultra-expanded"
+            <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>
+          </fo:block>
+          <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>
+          <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_line-height.xml b/test/layoutengine/standard-testcases/block_line-height.xml
index 10b8fcdc6..ef859dce6 100644
--- a/test/layoutengine/standard-testcases/block_line-height.xml
+++ b/test/layoutengine/standard-testcases/block_line-height.xml
@@ -1,124 +1,124 @@
-<?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 line height and its special inheritance behaviour

-    </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 line-height="normal" background-color="yellow">line-height="normal"

-            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>

-            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>

-          </fo:block>

-          <fo:block line-height="150%" background-color="yellow">line-height="150%"

-            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>

-            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>

-          </fo:block>

-          <fo:block line-height="20pt" background-color="yellow">line-height="20pt"

-            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>

-            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>

-          </fo:block>

-          <fo:block line-height="1.5" background-color="yellow">line-height="1.5"

-            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>

-            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>

-          </fo:block>

-          <fo:block line-height="150% - 5pt" background-color="yellow">line-height="150% - 5pt"

-            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>

-            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>

-    <eval expected="14400" xpath="//flow/block[1]/lineArea/@bpda"/>

-    <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-before"/>

-    <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-after"/>

-    <eval expected="13319" xpath="//flow/block[1]/block[1]/lineArea/@bpd"/>

-    <eval expected="17280" xpath="//flow/block[1]/block[1]/lineArea/@bpda"/>

-    <eval expected="1980" xpath="//flow/block[1]/block[1]/lineArea/@space-before"/>

-    <eval expected="1981" xpath="//flow/block[1]/block[1]/lineArea/@space-after"/>

-    <eval expected="9250" xpath="//flow/block[1]/block[2]/lineArea/@bpd"/>

-    <eval expected="12000" xpath="//flow/block[1]/block[2]/lineArea/@bpda"/>

-    <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-after"/>

-

-    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>

-    <eval expected="18000" xpath="//flow/block[2]/lineArea/@bpda"/>

-    <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-before"/>

-    <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-after"/>

-    <eval expected="13319" xpath="//flow/block[2]/block[1]/lineArea/@bpd"/>

-    <eval expected="18000" xpath="//flow/block[2]/block[1]/lineArea/@bpda"/>

-    <eval expected="2340" xpath="//flow/block[2]/block[1]/lineArea/@space-before"/>

-    <eval expected="2341" xpath="//flow/block[2]/block[1]/lineArea/@space-after"/>

-    <eval expected="9250" xpath="//flow/block[2]/block[2]/lineArea/@bpd"/>

-    <eval expected="18000" xpath="//flow/block[2]/block[2]/lineArea/@bpda"/>

-    <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-before"/>

-    <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-after"/>

-

-    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>

-    <eval expected="20000" xpath="//flow/block[3]/lineArea/@bpda"/>

-    <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-before"/>

-    <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-after"/>

-    <eval expected="13319" xpath="//flow/block[3]/block[1]/lineArea/@bpd"/>

-    <eval expected="20000" xpath="//flow/block[3]/block[1]/lineArea/@bpda"/>

-    <eval expected="3340" xpath="//flow/block[3]/block[1]/lineArea/@space-before"/>

-    <eval expected="3341" xpath="//flow/block[3]/block[1]/lineArea/@space-after"/>

-    <eval expected="9250" xpath="//flow/block[3]/block[2]/lineArea/@bpd"/>

-    <eval expected="20000" xpath="//flow/block[3]/block[2]/lineArea/@bpda"/>

-    <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-before"/>

-    <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-after"/>

-

-    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>

-    <eval expected="18000" xpath="//flow/block[4]/lineArea/@bpda"/>

-    <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-before"/>

-    <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-after"/>

-    <eval expected="13319" xpath="//flow/block[4]/block[1]/lineArea/@bpd"/>

-    <eval expected="21600" xpath="//flow/block[4]/block[1]/lineArea/@bpda"/>

-    <eval expected="4140" xpath="//flow/block[4]/block[1]/lineArea/@space-before"/>

-    <eval expected="4141" xpath="//flow/block[4]/block[1]/lineArea/@space-after"/>

-    <eval expected="9250" xpath="//flow/block[4]/block[2]/lineArea/@bpd"/>

-    <eval expected="15000" xpath="//flow/block[4]/block[2]/lineArea/@bpda"/>

-    <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-before"/>

-    <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-after"/>

-

-    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>

-    <eval expected="13000" xpath="//flow/block[5]/lineArea/@bpda"/>

-    <eval expected="950" xpath="//flow/block[5]/lineArea/@space-before"/>

-    <eval expected="950" xpath="//flow/block[5]/lineArea/@space-after"/>

-    <eval expected="13319" xpath="//flow/block[5]/block[1]/lineArea/@bpd"/>

-    <eval expected="13000" xpath="//flow/block[5]/block[1]/lineArea/@bpda"/>

-    <eval expected="-159" xpath="//flow/block[5]/block[1]/lineArea/@space-before"/>

-    <eval expected="-160" xpath="//flow/block[5]/block[1]/lineArea/@space-after"/>

-    <eval expected="9250" xpath="//flow/block[5]/block[2]/lineArea/@bpd"/>

-    <eval expected="13000" xpath="//flow/block[5]/block[2]/lineArea/@bpda"/>

-    <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-before"/>

-    <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-after"/>

-  </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 line height and its special inheritance behaviour
+    </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 line-height="normal" background-color="yellow">line-height="normal"
+            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>
+            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>
+          </fo:block>
+          <fo:block line-height="150%" background-color="yellow">line-height="150%"
+            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
+            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
+          </fo:block>
+          <fo:block line-height="20pt" background-color="yellow">line-height="20pt"
+            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
+            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
+          </fo:block>
+          <fo:block line-height="1.5" background-color="yellow">line-height="1.5"
+            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>
+            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>
+          </fo:block>
+          <fo:block line-height="150% - 5pt" background-color="yellow">line-height="150% - 5pt"
+            <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
+            <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+    <eval expected="14400" xpath="//flow/block[1]/lineArea/@bpda"/>
+    <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-before"/>
+    <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-after"/>
+    <eval expected="13319" xpath="//flow/block[1]/block[1]/lineArea/@bpd"/>
+    <eval expected="17280" xpath="//flow/block[1]/block[1]/lineArea/@bpda"/>
+    <eval expected="1980" xpath="//flow/block[1]/block[1]/lineArea/@space-before"/>
+    <eval expected="1981" xpath="//flow/block[1]/block[1]/lineArea/@space-after"/>
+    <eval expected="9250" xpath="//flow/block[1]/block[2]/lineArea/@bpd"/>
+    <eval expected="12000" xpath="//flow/block[1]/block[2]/lineArea/@bpda"/>
+    <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-after"/>
+
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="18000" xpath="//flow/block[2]/lineArea/@bpda"/>
+    <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-before"/>
+    <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-after"/>
+    <eval expected="13319" xpath="//flow/block[2]/block[1]/lineArea/@bpd"/>
+    <eval expected="18000" xpath="//flow/block[2]/block[1]/lineArea/@bpda"/>
+    <eval expected="2340" xpath="//flow/block[2]/block[1]/lineArea/@space-before"/>
+    <eval expected="2341" xpath="//flow/block[2]/block[1]/lineArea/@space-after"/>
+    <eval expected="9250" xpath="//flow/block[2]/block[2]/lineArea/@bpd"/>
+    <eval expected="18000" xpath="//flow/block[2]/block[2]/lineArea/@bpda"/>
+    <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-before"/>
+    <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-after"/>
+
+    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+    <eval expected="20000" xpath="//flow/block[3]/lineArea/@bpda"/>
+    <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-before"/>
+    <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-after"/>
+    <eval expected="13319" xpath="//flow/block[3]/block[1]/lineArea/@bpd"/>
+    <eval expected="20000" xpath="//flow/block[3]/block[1]/lineArea/@bpda"/>
+    <eval expected="3340" xpath="//flow/block[3]/block[1]/lineArea/@space-before"/>
+    <eval expected="3341" xpath="//flow/block[3]/block[1]/lineArea/@space-after"/>
+    <eval expected="9250" xpath="//flow/block[3]/block[2]/lineArea/@bpd"/>
+    <eval expected="20000" xpath="//flow/block[3]/block[2]/lineArea/@bpda"/>
+    <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-before"/>
+    <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-after"/>
+
+    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+    <eval expected="18000" xpath="//flow/block[4]/lineArea/@bpda"/>
+    <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-before"/>
+    <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-after"/>
+    <eval expected="13319" xpath="//flow/block[4]/block[1]/lineArea/@bpd"/>
+    <eval expected="21600" xpath="//flow/block[4]/block[1]/lineArea/@bpda"/>
+    <eval expected="4140" xpath="//flow/block[4]/block[1]/lineArea/@space-before"/>
+    <eval expected="4141" xpath="//flow/block[4]/block[1]/lineArea/@space-after"/>
+    <eval expected="9250" xpath="//flow/block[4]/block[2]/lineArea/@bpd"/>
+    <eval expected="15000" xpath="//flow/block[4]/block[2]/lineArea/@bpda"/>
+    <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-before"/>
+    <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-after"/>
+
+    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+    <eval expected="13000" xpath="//flow/block[5]/lineArea/@bpda"/>
+    <eval expected="950" xpath="//flow/block[5]/lineArea/@space-before"/>
+    <eval expected="950" xpath="//flow/block[5]/lineArea/@space-after"/>
+    <eval expected="13319" xpath="//flow/block[5]/block[1]/lineArea/@bpd"/>
+    <eval expected="13000" xpath="//flow/block[5]/block[1]/lineArea/@bpda"/>
+    <eval expected="-159" xpath="//flow/block[5]/block[1]/lineArea/@space-before"/>
+    <eval expected="-160" xpath="//flow/block[5]/block[1]/lineArea/@space-after"/>
+    <eval expected="9250" xpath="//flow/block[5]/block[2]/lineArea/@bpd"/>
+    <eval expected="13000" xpath="//flow/block[5]/block[2]/lineArea/@bpda"/>
+    <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-before"/>
+    <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-after"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml b/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml
index a29c974f9..df4839475 100644
--- a/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml
+++ b/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml
@@ -1,165 +1,165 @@
-<?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 line-stacking-strategy font-height against inlines of different sizes.

-    </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 line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="20pt" 

-                background-color="yellow">bigger

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="20pt"

-                border="solid 2pt red"

-                padding="3pt"

-                background-color="yellow">bigger with b &amp; p

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                baseline-shift="sub" 

-                background-color="yellow">sub

-              <fo:inline font-size="8pt" 

-                  baseline-shift="sub" 

-                  background-color="red">sub

-              </fo:inline>sub

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                baseline-shift="super" 

-                background-color="yellow">super

-              <fo:inline font-size="8pt" 

-                  baseline-shift="super" 

-                  background-color="red">super

-              </fo:inline>super

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="18pt" 

-                baseline-shift="super" 

-                background-color="yellow">super

-              <fo:inline font-size="24pt" 

-                  baseline-shift="sub" 

-                  background-color="red">sub

-                <fo:inline font-size="30pt" 

-                    baseline-shift="super" 

-                    background-color="green">super

-                </fo:inline>sub

-              </fo:inline>super

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="18pt" 

-                baseline-shift="sub" 

-                background-color="yellow">sub

-              <fo:inline font-size="24pt" 

-                  baseline-shift="super" 

-                  background-color="red">super

-                <fo:inline font-size="36pt" 

-                    baseline-shift="sub" 

-                    background-color="green">sub

-                </fo:inline>super

-              </fo:inline>sub

-            </fo:inline>

-            After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5487" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="3528" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="-4450" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-3794" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="-10194" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="1968" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="-16860" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1835" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-13722" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="798" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/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 line-stacking-strategy font-height against inlines of different sizes.
+    </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 line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="20pt" 
+                background-color="yellow">bigger
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="20pt"
+                border="solid 2pt red"
+                padding="3pt"
+                background-color="yellow">bigger with b &amp; p
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="sub" 
+                background-color="yellow">sub
+              <fo:inline font-size="8pt" 
+                  baseline-shift="sub" 
+                  background-color="red">sub
+              </fo:inline>sub
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="super" 
+                background-color="yellow">super
+              <fo:inline font-size="8pt" 
+                  baseline-shift="super" 
+                  background-color="red">super
+              </fo:inline>super
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="18pt" 
+                baseline-shift="super" 
+                background-color="yellow">super
+              <fo:inline font-size="24pt" 
+                  baseline-shift="sub" 
+                  background-color="red">sub
+                <fo:inline font-size="30pt" 
+                    baseline-shift="super" 
+                    background-color="green">super
+                </fo:inline>sub
+              </fo:inline>super
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="18pt" 
+                baseline-shift="sub" 
+                background-color="yellow">sub
+              <fo:inline font-size="24pt" 
+                  baseline-shift="super" 
+                  background-color="red">super
+                <fo:inline font-size="36pt" 
+                    baseline-shift="sub" 
+                    background-color="green">sub
+                </fo:inline>super
+              </fo:inline>sub
+            </fo:inline>
+            After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5487" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="3528" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="-4450" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-3794" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="-10194" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="1968" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="-16860" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1835" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-13722" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="798" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_linefeed-treatment.xml b/test/layoutengine/standard-testcases/block_linefeed-treatment.xml
index 23686bb10..ac60a457f 100644
--- a/test/layoutengine/standard-testcases/block_linefeed-treatment.xml
+++ b/test/layoutengine/standard-testcases/block_linefeed-treatment.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks white space handling for linefeed-treatment.

-      This currently fails because

-        a) Preserved linefeeds in fo:character are not handled correctly

-        b) ZWSP are not handled correctly

-    </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 linefeed-treatment="treat-as-space" background-color="silver" margin="1pt 0pt 1pt 0pt">

-treat-as-space

-all<fo:character character="&#xa;"/>linefeeds

-</fo:block>

-          <fo:block linefeed-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">

-ignore

-all<fo:character character="&#xa;"/>linefeeds

-</fo:block>

-          <fo:block linefeed-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">

-preserve

-all<fo:character character="&#xa;"/>linefeeds

-</fo:block>

-          <fo:block linefeed-treatment="treat-as-zero-width-space" background-color="silver" margin="1pt 0pt 1pt 0pt">

-treat-as-zero-width-space

-all<fo:character character="&#xa;"/>linefeeds

-</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>

-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>

-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/char)"/>

-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>

-    <eval expected="0" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>

-

-    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[1]/word)"/>

-    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[1]/space)"/>

-    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[2]/word)"/>

-    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[2]/space)"/>

-    

-    <eval expected="0" xpath="count(//flow/block[3]/lineArea[1]/text)"/>

-    <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>

-    <eval expected="0" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>

-    <eval expected="1" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>

-    <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>

-    <eval expected="1" xpath="count(//flow/block[3]/lineArea[4]/text/word)"/>

-    <eval expected="0" xpath="count(//flow/block[3]/lineArea[4]/text/space)"/>

-    

-    <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>

-    <eval expected="0" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>

-    

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks white space handling for linefeed-treatment.
+      This currently fails because
+        a) Preserved linefeeds in fo:character are not handled correctly
+        b) ZWSP are not handled correctly
+    </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 linefeed-treatment="treat-as-space" background-color="silver" margin="1pt 0pt 1pt 0pt">
+treat-as-space
+all<fo:character character="&#xa;"/>linefeeds
+</fo:block>
+          <fo:block linefeed-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ignore
+all<fo:character character="&#xa;"/>linefeeds
+</fo:block>
+          <fo:block linefeed-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
+preserve
+all<fo:character character="&#xa;"/>linefeeds
+</fo:block>
+          <fo:block linefeed-treatment="treat-as-zero-width-space" background-color="silver" margin="1pt 0pt 1pt 0pt">
+treat-as-zero-width-space
+all<fo:character character="&#xa;"/>linefeeds
+</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
+    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
+    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/char)"/>
+    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>
+    <eval expected="0" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>
+
+    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[1]/word)"/>
+    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[1]/space)"/>
+    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[2]/word)"/>
+    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[2]/space)"/>
+    
+    <eval expected="0" xpath="count(//flow/block[3]/lineArea[1]/text)"/>
+    <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>
+    <eval expected="0" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
+    <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[3]/lineArea[4]/text/word)"/>
+    <eval expected="0" xpath="count(//flow/block[3]/lineArea[4]/text/space)"/>
+    
+    <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
+    <eval expected="0" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+    
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_margin_inherit.xml b/test/layoutengine/standard-testcases/block_margin_inherit.xml
index 4466dbd34..86877c66a 100644
--- a/test/layoutengine/standard-testcases/block_margin_inherit.xml
+++ b/test/layoutengine/standard-testcases/block_margin_inherit.xml
@@ -1,77 +1,77 @@
-<?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 margin percentages on fo:block with explict inheritance.

-    </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 margin="5%" background-color="yellow">

-            <fo:block margin="inherit" background-color="blue">

-               margin="inherit" - should have the same margin as the enclosing block

-            </fo:block>

-          </fo:block>

-          <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <element-list category="breaker">

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="18000" y="0" z="0"/>

-      <box w="14400"/>

-      <box w="14400"/>

-      <penalty w="0" p="INF"/>

-      <glue w="18000" y="0" z="0"/>

-      <penalty w="0" p="0"/>

-      <box w="14400"/>

-      <box w="14400"/>

-      <skip>3</skip>

-    </element-list>

-  

-    <true xpath="not(boolean(//flow/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules -->

-    <eval expected="324000" xpath="//flow/block[1]/@ipd"/>

-    <eval expected="18000" xpath="//flow/block[1]/@start-indent"/>

-    <eval expected="18000" xpath="//flow/block[1]/@end-indent"/>

-    <eval expected="18000" xpath="//flow/block[1]/@space-start"/>

-    <eval expected="18000" xpath="//flow/block[1]/@space-end"/>

-    

-    <eval expected="18000" xpath="//flow/block[1]/block[1]/@space-before"/>

-    <eval expected="288000" xpath="//flow/block[1]/block[1]/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[1]/block[1]/@start-indent"/>

-    <eval expected="36000" xpath="//flow/block[1]/block[1]/@end-indent"/>

-    <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-start"/>

-    <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-end"/>

-    <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/>  <!-- space collapsed under space resolution rules -->

-    <true xpath="not(boolean(//flow/block[1]/block[2]))"/>

-    

-    <eval expected="18000" xpath="//flow/block[1]/@space-after"/>

-  </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 margin percentages on fo:block with explict inheritance.
+    </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 margin="5%" background-color="yellow">
+            <fo:block margin="inherit" background-color="blue">
+               margin="inherit" - should have the same margin as the enclosing block
+            </fo:block>
+          </fo:block>
+          <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <element-list category="breaker">
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="18000" y="0" z="0"/>
+      <box w="14400"/>
+      <box w="14400"/>
+      <penalty w="0" p="INF"/>
+      <glue w="18000" y="0" z="0"/>
+      <penalty w="0" p="0"/>
+      <box w="14400"/>
+      <box w="14400"/>
+      <skip>3</skip>
+    </element-list>
+  
+    <true xpath="not(boolean(//flow/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules -->
+    <eval expected="324000" xpath="//flow/block[1]/@ipd"/>
+    <eval expected="18000" xpath="//flow/block[1]/@start-indent"/>
+    <eval expected="18000" xpath="//flow/block[1]/@end-indent"/>
+    <eval expected="18000" xpath="//flow/block[1]/@space-start"/>
+    <eval expected="18000" xpath="//flow/block[1]/@space-end"/>
+    
+    <eval expected="18000" xpath="//flow/block[1]/block[1]/@space-before"/>
+    <eval expected="288000" xpath="//flow/block[1]/block[1]/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[1]/block[1]/@start-indent"/>
+    <eval expected="36000" xpath="//flow/block[1]/block[1]/@end-indent"/>
+    <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-start"/>
+    <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-end"/>
+    <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/>  <!-- space collapsed under space resolution rules -->
+    <true xpath="not(boolean(//flow/block[1]/block[2]))"/>
+    
+    <eval expected="18000" xpath="//flow/block[1]/@space-after"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_margin_percentages.xml b/test/layoutengine/standard-testcases/block_margin_percentages.xml
index 7f5e947b4..d3ce921c5 100644
--- a/test/layoutengine/standard-testcases/block_margin_percentages.xml
+++ b/test/layoutengine/standard-testcases/block_margin_percentages.xml
@@ -1,77 +1,77 @@
-<?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 margin percentages on fo:block.

-    </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 margin="5%" background-color="yellow">

-            <fo:block margin="5%" background-color="blue">

-               margin="5%" - should have the slightly smaller margin than the enclosing block

-            </fo:block>

-          </fo:block>

-          <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <element-list category="breaker">

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="18000" y="0" z="0"/>

-      <box w="14400"/>

-      <box w="14400"/>

-      <penalty w="0" p="INF"/>

-      <glue w="18000" y="0" z="0"/>

-      <penalty w="0" p="0"/>

-      <box w="14400"/>

-      <box w="14400"/>

-      <skip>3</skip>

-    </element-list>

-  

-    <eval expected="18000" xpath="//flow/block[1]/@space-before"/>

-    <eval expected="324000" xpath="//flow/block[1]/@ipd"/>

-    <eval expected="18000" xpath="//flow/block[1]/@start-indent"/>

-    <eval expected="18000" xpath="//flow/block[1]/@end-indent"/>

-    <eval expected="18000" xpath="//flow/block[1]/@space-start"/>

-    <eval expected="18000" xpath="//flow/block[1]/@space-end"/>

-    

-    <true xpath="not(boolean(//flow/block[1]/block[1]/@space-before))"/>  <!-- space collapsed under space resolution rules -->

-    <eval expected="291600" xpath="//flow/block[1]/block[1]/@ipd"/>

-    <eval expected="34200" xpath="//flow/block[1]/block[1]/@start-indent"/>

-    <eval expected="34200" xpath="//flow/block[1]/block[1]/@end-indent"/>

-    <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-start"/>

-    <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-end"/>

-    <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/>  <!-- space collapsed under space resolution rules -->

-    <true xpath="not(boolean(//flow/block[1]/block[2]))"/>

-    

-    <eval expected="18000" xpath="//flow/block[1]/@space-after"/>

-  </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 margin percentages on fo:block.
+    </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 margin="5%" background-color="yellow">
+            <fo:block margin="5%" background-color="blue">
+               margin="5%" - should have the slightly smaller margin than the enclosing block
+            </fo:block>
+          </fo:block>
+          <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <element-list category="breaker">
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="18000" y="0" z="0"/>
+      <box w="14400"/>
+      <box w="14400"/>
+      <penalty w="0" p="INF"/>
+      <glue w="18000" y="0" z="0"/>
+      <penalty w="0" p="0"/>
+      <box w="14400"/>
+      <box w="14400"/>
+      <skip>3</skip>
+    </element-list>
+  
+    <eval expected="18000" xpath="//flow/block[1]/@space-before"/>
+    <eval expected="324000" xpath="//flow/block[1]/@ipd"/>
+    <eval expected="18000" xpath="//flow/block[1]/@start-indent"/>
+    <eval expected="18000" xpath="//flow/block[1]/@end-indent"/>
+    <eval expected="18000" xpath="//flow/block[1]/@space-start"/>
+    <eval expected="18000" xpath="//flow/block[1]/@space-end"/>
+    
+    <true xpath="not(boolean(//flow/block[1]/block[1]/@space-before))"/>  <!-- space collapsed under space resolution rules -->
+    <eval expected="291600" xpath="//flow/block[1]/block[1]/@ipd"/>
+    <eval expected="34200" xpath="//flow/block[1]/block[1]/@start-indent"/>
+    <eval expected="34200" xpath="//flow/block[1]/block[1]/@end-indent"/>
+    <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-start"/>
+    <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-end"/>
+    <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/>  <!-- space collapsed under space resolution rules -->
+    <true xpath="not(boolean(//flow/block[1]/block[2]))"/>
+    
+    <eval expected="18000" xpath="//flow/block[1]/@space-after"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_padding_2.xml b/test/layoutengine/standard-testcases/block_padding_2.xml
index 40e14dd80..31f7826a6 100644
--- a/test/layoutengine/standard-testcases/block_padding_2.xml
+++ b/test/layoutengine/standard-testcases/block_padding_2.xml
@@ -1,112 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks non-conditional before- and after-padding in break-situations.

-    </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="3in" page-height="2in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="lightgray" padding-before="30pt" padding-before.conditionality="retain" padding-after="30pt" padding-after.conditionality="retain">

-            <fo:block background-color="yellow">line1</fo:block>

-            <fo:block background-color="orange">line2</fo:block>

-            <fo:block background-color="yellow">line3</fo:block>

-            <fo:block background-color="orange">line4</fo:block>

-            <fo:block background-color="yellow">line5</fo:block>

-            <fo:block background-color="orange">line6</fo:block>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <element-list category="breaker">

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      

-      <box w="14400"/>

-      

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/> <!-- w="30000" is for the padding-after -->

-      <penalty w="0" p="0"/>

-      <glue w="-60000"/> <!-- difference between break and no-break situation -->

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/> <!-- w="30000" is for the padding-before -->

-      

-      <box w="14400"/>

-      

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      <penalty w="0" p="0"/>

-      <glue w="-60000"/>

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      

-      <box w="14400"/>

-

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      <penalty w="0" p="0"/>

-      <glue w="-60000"/>

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      

-      <box w="14400"/>

-

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      <penalty w="0" p="0"/>

-      <glue w="-60000"/>

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      

-      <box w="14400"/>

-

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      <penalty w="0" p="0"/>

-      <glue w="-60000"/>

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      

-      <box w="14400"/>

-      

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="30000"/>

-      

-      <skip>1</skip> <!-- helper box -->

-      <skip>3</skip>

-    </element-list>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks non-conditional before- and after-padding in break-situations.
+    </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="3in" page-height="2in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="lightgray" padding-before="30pt" padding-before.conditionality="retain" padding-after="30pt" padding-after.conditionality="retain">
+            <fo:block background-color="yellow">line1</fo:block>
+            <fo:block background-color="orange">line2</fo:block>
+            <fo:block background-color="yellow">line3</fo:block>
+            <fo:block background-color="orange">line4</fo:block>
+            <fo:block background-color="yellow">line5</fo:block>
+            <fo:block background-color="orange">line6</fo:block>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <element-list category="breaker">
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      
+      <box w="14400"/>
+      
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/> <!-- w="30000" is for the padding-after -->
+      <penalty w="0" p="0"/>
+      <glue w="-60000"/> <!-- difference between break and no-break situation -->
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/> <!-- w="30000" is for the padding-before -->
+      
+      <box w="14400"/>
+      
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      <penalty w="0" p="0"/>
+      <glue w="-60000"/>
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      
+      <box w="14400"/>
+
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      <penalty w="0" p="0"/>
+      <glue w="-60000"/>
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      
+      <box w="14400"/>
+
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      <penalty w="0" p="0"/>
+      <glue w="-60000"/>
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      
+      <box w="14400"/>
+
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      <penalty w="0" p="0"/>
+      <glue w="-60000"/>
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      
+      <box w="14400"/>
+      
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="30000"/>
+      
+      <skip>1</skip> <!-- helper box -->
+      <skip>3</skip>
+    </element-list>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_padding_percentages.xml b/test/layoutengine/standard-testcases/block_padding_percentages.xml
index 326f2a744..991f1f85d 100644
--- a/test/layoutengine/standard-testcases/block_padding_percentages.xml
+++ b/test/layoutengine/standard-testcases/block_padding_percentages.xml
@@ -1,54 +1,54 @@
-<?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 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="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="yellow" padding="5%">

-             margin not specified padding="5%"

-          </fo:block>

-          <fo:block margin="0pt" background-color="yellow" padding="5%">

-             margin="0pt" padding="5%"

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/>

-    <eval expected="-18000" xpath="//flow/block[1]/@space-start"/>

-    <eval expected="-18000" xpath="//flow/block[1]/@space-end"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/>

-    <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/>

-    <eval expected="18000" xpath="//flow/block[2]/@start-indent"/>

-    <eval expected="18000" xpath="//flow/block[2]/@end-indent"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[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 relative padding on 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="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="yellow" padding="5%">
+             margin not specified padding="5%"
+          </fo:block>
+          <fo:block margin="0pt" background-color="yellow" padding="5%">
+             margin="0pt" padding="5%"
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/>
+    <eval expected="-18000" xpath="//flow/block[1]/@space-start"/>
+    <eval expected="-18000" xpath="//flow/block[1]/@space-end"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/>
+    <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/>
+    <eval expected="18000" xpath="//flow/block[2]/@start-indent"/>
+    <eval expected="18000" xpath="//flow/block[2]/@end-indent"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[2]/@background"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml
index 9c49df822..5898cbff2 100644
--- a/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml
+++ b/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml
@@ -1,56 +1,56 @@
-<?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 block-level space properties. This is the space-resolution example in "4.3.1 Space-resolution Rules".

-    </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 background-color="lightgray"/>

-        </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 space-before="10pt" background-color="yellow">

-            <fo:block space-before="4pt" space-before.conditionality="retain">

-              <fo:block space-before="5pt" background-color="orange">

-                In olden times when wishing still helped one, there lived a king whose daughters

-              </fo:block>

-            </fo:block>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- Only the third space (5pt, discard) survives the space-resolution. -->

-    <element-list category="breaker">

-      <box w="0"/>

-      <penalty w="0" p="INF"/>

-      <glue w="5000"/>

-      <box w="14400"/>

-      <box w="14400"/>

-      <skip>3</skip>

-    </element-list>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks block-level space properties. This is the space-resolution example in "4.3.1 Space-resolution Rules".
+    </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 background-color="lightgray"/>
+        </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 space-before="10pt" background-color="yellow">
+            <fo:block space-before="4pt" space-before.conditionality="retain">
+              <fo:block space-before="5pt" background-color="orange">
+                In olden times when wishing still helped one, there lived a king whose daughters
+              </fo:block>
+            </fo:block>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- Only the third space (5pt, discard) survives the space-resolution. -->
+    <element-list category="breaker">
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="5000"/>
+      <box w="14400"/>
+      <box w="14400"/>
+      <skip>3</skip>
+    </element-list>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_text-align_1.xml b/test/layoutengine/standard-testcases/block_text-align_1.xml
index e91c997f1..675438112 100644
--- a/test/layoutengine/standard-testcases/block_text-align_1.xml
+++ b/test/layoutengine/standard-testcases/block_text-align_1.xml
@@ -1,124 +1,124 @@
-<?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 text-align and text-align-last.

-    </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="10in" 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">

-          <fo:block>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>

-          <fo:block text-align="start" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>

-          <fo:block text-align="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>

-          <fo:block text-align="center" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>

-          <fo:block text-align="end">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>

-          <fo:block text-align="justify" text-align-last="center" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>

-          <fo:block text-align="justify" text-align-last="end">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- default settings for text-align -->

-    <true xpath="not(boolean(//flow/block[1]/lineArea[1]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[1]/lineArea[2]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[1]/lineArea[3]/@start-indent))"/>

-    <true xpath="//flow/block[1]/lineArea[1]/text/@ipd != //flow/block[1]/lineArea[2]/text/@ipd"/>

-    <true xpath="//flow/block[1]/lineArea[2]/text/@ipd != //flow/block[1]/lineArea[3]/text/@ipd"/>

-

-    <!-- text-align="start" -->

-    <true xpath="not(boolean(//flow/block[2]/lineArea[1]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[2]/lineArea[2]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[2]/lineArea[3]/@start-indent))"/>

-    <true xpath="//flow/block[2]/lineArea[1]/text/@ipd != //flow/block[2]/lineArea[2]/text/@ipd"/>

-    <true xpath="//flow/block[2]/lineArea[2]/text/@ipd != //flow/block[2]/lineArea[3]/text/@ipd"/>

-    

-    <!-- block 1 and 2 must have the same result -->

-    <true xpath="//flow/block[1]/lineArea[1]/text/@ipd = //flow/block[2]/lineArea[1]/text/@ipd"/>

-    <true xpath="//flow/block[1]/lineArea[2]/text/@ipd = //flow/block[2]/lineArea[2]/text/@ipd"/>

-    <true xpath="//flow/block[1]/lineArea[3]/text/@ipd = //flow/block[2]/lineArea[3]/text/@ipd"/>

-

-    <!-- text-align="justify" -->

-    <true xpath="not(boolean(//flow/block[3]/lineArea[1]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[3]/lineArea[2]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[3]/lineArea[3]/@start-indent))"/>

-    <!-- Some tolerance seems to be necessary here. Why is that exactly? -->

-    <true xpath="(360000 - //flow/block[3]/lineArea[1]/text/@ipd) &lt; 3000"/>

-    <true xpath="(360000 - //flow/block[3]/lineArea[1]/text/@ipd) &gt; -3000"/>

-    <true xpath="(360000 - //flow/block[3]/lineArea[2]/text/@ipd) &lt; 3000"/>

-    <true xpath="(360000 - //flow/block[3]/lineArea[2]/text/@ipd) &gt; -3000"/>

-    <true xpath="//flow/block[3]/lineArea[3]/text/@ipd &lt; 350000"/>

-

-    <!-- text-align="center" -->

-    <true xpath="//flow/block[4]/lineArea[1]/@start-indent &gt; 10000"/>

-    <true xpath="//flow/block[4]/lineArea[2]/@start-indent &gt; 10000"/>

-    <true xpath="//flow/block[4]/lineArea[3]/@start-indent &gt; 10000"/>

-    <!-- Some tolerance seems to be necessary here. Why is that exactly? -->

-    <true xpath="(360000 - //flow/block[4]/lineArea[1]/text/@ipd - (2 * //flow/block[4]/lineArea[1]/@start-indent)) &lt; 4000"/>

-    <true xpath="(360000 - //flow/block[4]/lineArea[1]/text/@ipd - (2 * //flow/block[4]/lineArea[1]/@start-indent)) &gt; -4000"/>

-    <true xpath="(360000 - //flow/block[4]/lineArea[2]/text/@ipd - (2 * //flow/block[4]/lineArea[2]/@start-indent)) &lt; 4000"/>

-    <true xpath="(360000 - //flow/block[4]/lineArea[2]/text/@ipd - (2 * //flow/block[4]/lineArea[2]/@start-indent)) &gt; -4000"/>

-    <true xpath="(360000 - //flow/block[4]/lineArea[3]/text/@ipd - (2 * //flow/block[4]/lineArea[3]/@start-indent)) &lt; 4000"/>

-    <true xpath="(360000 - //flow/block[4]/lineArea[3]/text/@ipd - (2 * //flow/block[4]/lineArea[3]/@start-indent)) &gt; -4000"/>

-

-    <!-- text-align="end" -->

-    <true xpath="//flow/block[5]/lineArea[1]/@start-indent &gt; 10000"/>

-    <true xpath="//flow/block[5]/lineArea[2]/@start-indent &gt; 10000"/>

-    <true xpath="//flow/block[5]/lineArea[3]/@start-indent &gt; 10000"/>

-    <!-- Some tolerance seems to be necessary here. Why is that exactly? -->

-    <true xpath="(360000 - //flow/block[5]/lineArea[1]/text/@ipd - //flow/block[5]/lineArea[1]/@start-indent) &lt; 4000"/>

-    <true xpath="(360000 - //flow/block[5]/lineArea[1]/text/@ipd - //flow/block[5]/lineArea[1]/@start-indent) &gt; -4000"/>

-    <true xpath="(360000 - //flow/block[5]/lineArea[2]/text/@ipd - //flow/block[5]/lineArea[2]/@start-indent) &lt; 4000"/>

-    <true xpath="(360000 - //flow/block[5]/lineArea[2]/text/@ipd - //flow/block[5]/lineArea[2]/@start-indent) &gt; -4000"/>

-    <true xpath="(360000 - //flow/block[5]/lineArea[3]/text/@ipd - //flow/block[5]/lineArea[3]/@start-indent) &lt; 4000"/>

-    <true xpath="(360000 - //flow/block[5]/lineArea[3]/text/@ipd - //flow/block[5]/lineArea[3]/@start-indent) &gt; -4000"/>

-

-    <!-- text-align="justify" text-align-last="center" -->

-    <true xpath="not(boolean(//flow/block[6]/lineArea[1]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[6]/lineArea[2]/@start-indent))"/>

-    <true xpath="//flow/block[6]/lineArea[3]/@start-indent &gt; 10000"/>

-    <true xpath="(360000 - //flow/block[6]/lineArea[1]/text/@ipd) &lt; 3000"/>

-    <true xpath="(360000 - //flow/block[6]/lineArea[1]/text/@ipd) &gt; -3000"/>

-    <true xpath="(360000 - //flow/block[6]/lineArea[2]/text/@ipd) &lt; 3000"/>

-    <true xpath="(360000 - //flow/block[6]/lineArea[2]/text/@ipd) &gt; -3000"/>

-    <true xpath="(360000 - //flow/block[6]/lineArea[3]/text/@ipd - (2 * //flow/block[6]/lineArea[3]/@start-indent)) &lt; 4000"/>

-    <true xpath="(360000 - //flow/block[6]/lineArea[3]/text/@ipd - (2 * //flow/block[6]/lineArea[3]/@start-indent)) &gt; -4000"/>

-

-    <!-- text-align="justify" text-align-last="end" -->

-    <true xpath="not(boolean(//flow/block[7]/lineArea[1]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[7]/lineArea[2]/@start-indent))"/>

-    <true xpath="//flow/block[7]/lineArea[3]/@start-indent &gt; 10000"/>

-    <true xpath="(360000 - //flow/block[7]/lineArea[1]/text/@ipd) &lt; 3000"/>

-    <true xpath="(360000 - //flow/block[7]/lineArea[1]/text/@ipd) &gt; -3000"/>

-    <true xpath="(360000 - //flow/block[7]/lineArea[2]/text/@ipd) &lt; 3000"/>

-    <true xpath="(360000 - //flow/block[7]/lineArea[2]/text/@ipd) &gt; -3000"/>

-    <true xpath="(360000 - //flow/block[7]/lineArea[3]/text/@ipd - //flow/block[7]/lineArea[3]/@start-indent) &lt; 4000"/>

-    <true xpath="(360000 - //flow/block[7]/lineArea[3]/text/@ipd - //flow/block[7]/lineArea[3]/@start-indent) &gt; -4000"/>

-

-    <!-- TODO Check element list -->

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks text-align and text-align-last.
+    </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="10in" 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">
+          <fo:block>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+          <fo:block text-align="start" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+          <fo:block text-align="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+          <fo:block text-align="center" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+          <fo:block text-align="end">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+          <fo:block text-align="justify" text-align-last="center" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+          <fo:block text-align="justify" text-align-last="end">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- default settings for text-align -->
+    <true xpath="not(boolean(//flow/block[1]/lineArea[1]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[1]/lineArea[2]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[1]/lineArea[3]/@start-indent))"/>
+    <true xpath="//flow/block[1]/lineArea[1]/text/@ipd != //flow/block[1]/lineArea[2]/text/@ipd"/>
+    <true xpath="//flow/block[1]/lineArea[2]/text/@ipd != //flow/block[1]/lineArea[3]/text/@ipd"/>
+
+    <!-- text-align="start" -->
+    <true xpath="not(boolean(//flow/block[2]/lineArea[1]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[2]/lineArea[2]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[2]/lineArea[3]/@start-indent))"/>
+    <true xpath="//flow/block[2]/lineArea[1]/text/@ipd != //flow/block[2]/lineArea[2]/text/@ipd"/>
+    <true xpath="//flow/block[2]/lineArea[2]/text/@ipd != //flow/block[2]/lineArea[3]/text/@ipd"/>
+    
+    <!-- block 1 and 2 must have the same result -->
+    <true xpath="//flow/block[1]/lineArea[1]/text/@ipd = //flow/block[2]/lineArea[1]/text/@ipd"/>
+    <true xpath="//flow/block[1]/lineArea[2]/text/@ipd = //flow/block[2]/lineArea[2]/text/@ipd"/>
+    <true xpath="//flow/block[1]/lineArea[3]/text/@ipd = //flow/block[2]/lineArea[3]/text/@ipd"/>
+
+    <!-- text-align="justify" -->
+    <true xpath="not(boolean(//flow/block[3]/lineArea[1]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[3]/lineArea[2]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[3]/lineArea[3]/@start-indent))"/>
+    <!-- Some tolerance seems to be necessary here. Why is that exactly? -->
+    <true xpath="(360000 - //flow/block[3]/lineArea[1]/text/@ipd) &lt; 3000"/>
+    <true xpath="(360000 - //flow/block[3]/lineArea[1]/text/@ipd) &gt; -3000"/>
+    <true xpath="(360000 - //flow/block[3]/lineArea[2]/text/@ipd) &lt; 3000"/>
+    <true xpath="(360000 - //flow/block[3]/lineArea[2]/text/@ipd) &gt; -3000"/>
+    <true xpath="//flow/block[3]/lineArea[3]/text/@ipd &lt; 350000"/>
+
+    <!-- text-align="center" -->
+    <true xpath="//flow/block[4]/lineArea[1]/@start-indent &gt; 10000"/>
+    <true xpath="//flow/block[4]/lineArea[2]/@start-indent &gt; 10000"/>
+    <true xpath="//flow/block[4]/lineArea[3]/@start-indent &gt; 10000"/>
+    <!-- Some tolerance seems to be necessary here. Why is that exactly? -->
+    <true xpath="(360000 - //flow/block[4]/lineArea[1]/text/@ipd - (2 * //flow/block[4]/lineArea[1]/@start-indent)) &lt; 4000"/>
+    <true xpath="(360000 - //flow/block[4]/lineArea[1]/text/@ipd - (2 * //flow/block[4]/lineArea[1]/@start-indent)) &gt; -4000"/>
+    <true xpath="(360000 - //flow/block[4]/lineArea[2]/text/@ipd - (2 * //flow/block[4]/lineArea[2]/@start-indent)) &lt; 4000"/>
+    <true xpath="(360000 - //flow/block[4]/lineArea[2]/text/@ipd - (2 * //flow/block[4]/lineArea[2]/@start-indent)) &gt; -4000"/>
+    <true xpath="(360000 - //flow/block[4]/lineArea[3]/text/@ipd - (2 * //flow/block[4]/lineArea[3]/@start-indent)) &lt; 4000"/>
+    <true xpath="(360000 - //flow/block[4]/lineArea[3]/text/@ipd - (2 * //flow/block[4]/lineArea[3]/@start-indent)) &gt; -4000"/>
+
+    <!-- text-align="end" -->
+    <true xpath="//flow/block[5]/lineArea[1]/@start-indent &gt; 10000"/>
+    <true xpath="//flow/block[5]/lineArea[2]/@start-indent &gt; 10000"/>
+    <true xpath="//flow/block[5]/lineArea[3]/@start-indent &gt; 10000"/>
+    <!-- Some tolerance seems to be necessary here. Why is that exactly? -->
+    <true xpath="(360000 - //flow/block[5]/lineArea[1]/text/@ipd - //flow/block[5]/lineArea[1]/@start-indent) &lt; 4000"/>
+    <true xpath="(360000 - //flow/block[5]/lineArea[1]/text/@ipd - //flow/block[5]/lineArea[1]/@start-indent) &gt; -4000"/>
+    <true xpath="(360000 - //flow/block[5]/lineArea[2]/text/@ipd - //flow/block[5]/lineArea[2]/@start-indent) &lt; 4000"/>
+    <true xpath="(360000 - //flow/block[5]/lineArea[2]/text/@ipd - //flow/block[5]/lineArea[2]/@start-indent) &gt; -4000"/>
+    <true xpath="(360000 - //flow/block[5]/lineArea[3]/text/@ipd - //flow/block[5]/lineArea[3]/@start-indent) &lt; 4000"/>
+    <true xpath="(360000 - //flow/block[5]/lineArea[3]/text/@ipd - //flow/block[5]/lineArea[3]/@start-indent) &gt; -4000"/>
+
+    <!-- text-align="justify" text-align-last="center" -->
+    <true xpath="not(boolean(//flow/block[6]/lineArea[1]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[6]/lineArea[2]/@start-indent))"/>
+    <true xpath="//flow/block[6]/lineArea[3]/@start-indent &gt; 10000"/>
+    <true xpath="(360000 - //flow/block[6]/lineArea[1]/text/@ipd) &lt; 3000"/>
+    <true xpath="(360000 - //flow/block[6]/lineArea[1]/text/@ipd) &gt; -3000"/>
+    <true xpath="(360000 - //flow/block[6]/lineArea[2]/text/@ipd) &lt; 3000"/>
+    <true xpath="(360000 - //flow/block[6]/lineArea[2]/text/@ipd) &gt; -3000"/>
+    <true xpath="(360000 - //flow/block[6]/lineArea[3]/text/@ipd - (2 * //flow/block[6]/lineArea[3]/@start-indent)) &lt; 4000"/>
+    <true xpath="(360000 - //flow/block[6]/lineArea[3]/text/@ipd - (2 * //flow/block[6]/lineArea[3]/@start-indent)) &gt; -4000"/>
+
+    <!-- text-align="justify" text-align-last="end" -->
+    <true xpath="not(boolean(//flow/block[7]/lineArea[1]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[7]/lineArea[2]/@start-indent))"/>
+    <true xpath="//flow/block[7]/lineArea[3]/@start-indent &gt; 10000"/>
+    <true xpath="(360000 - //flow/block[7]/lineArea[1]/text/@ipd) &lt; 3000"/>
+    <true xpath="(360000 - //flow/block[7]/lineArea[1]/text/@ipd) &gt; -3000"/>
+    <true xpath="(360000 - //flow/block[7]/lineArea[2]/text/@ipd) &lt; 3000"/>
+    <true xpath="(360000 - //flow/block[7]/lineArea[2]/text/@ipd) &gt; -3000"/>
+    <true xpath="(360000 - //flow/block[7]/lineArea[3]/text/@ipd - //flow/block[7]/lineArea[3]/@start-indent) &lt; 4000"/>
+    <true xpath="(360000 - //flow/block[7]/lineArea[3]/text/@ipd - //flow/block[7]/lineArea[3]/@start-indent) &gt; -4000"/>
+
+    <!-- TODO Check element list -->
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_text-align_2.xml b/test/layoutengine/standard-testcases/block_text-align_2.xml
index 691f1ee87..e05d1e3ee 100644
--- a/test/layoutengine/standard-testcases/block_text-align_2.xml
+++ b/test/layoutengine/standard-testcases/block_text-align_2.xml
@@ -1,52 +1,52 @@
-<?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 text-align and text-align-last in special conditions.

-    </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="10in" page-width="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="simple" id="bla1">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block text-align-last="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</fo:block>

-          <!-- The next block is pretty much like the previous but there is a linefeed that is converted to a space which is then

-               removed by LineLM.removeElementsForTrailingSpaces(). There used to be a ClassCastException here. -->

-          <fo:block text-align-last="justify" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.

-          </fo:block>

-          <fo:block text-align="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- all three blocks must be identical -->

-    <true xpath="not(boolean(//flow/block[1]/lineArea[1]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[2]/lineArea[1]/@start-indent))"/>

-    <true xpath="not(boolean(//flow/block[3]/lineArea[1]/@start-indent))"/>

-    <true xpath="//flow/block[1]/lineArea[1]/text/@ipd = //flow/block[2]/lineArea[1]/text/@ipd"/>

-    <true xpath="//flow/block[1]/lineArea[1]/text/@ipd &gt; //flow/block[3]/lineArea[1]/text/@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 text-align and text-align-last in special conditions.
+    </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="10in" page-width="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="simple" id="bla1">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block text-align-last="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</fo:block>
+          <!-- The next block is pretty much like the previous but there is a linefeed that is converted to a space which is then
+               removed by LineLM.removeElementsForTrailingSpaces(). There used to be a ClassCastException here. -->
+          <fo:block text-align-last="justify" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+          </fo:block>
+          <fo:block text-align="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- all three blocks must be identical -->
+    <true xpath="not(boolean(//flow/block[1]/lineArea[1]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[2]/lineArea[1]/@start-indent))"/>
+    <true xpath="not(boolean(//flow/block[3]/lineArea[1]/@start-indent))"/>
+    <true xpath="//flow/block[1]/lineArea[1]/text/@ipd = //flow/block[2]/lineArea[1]/text/@ipd"/>
+    <true xpath="//flow/block[1]/lineArea[1]/text/@ipd &gt; //flow/block[3]/lineArea[1]/text/@ipd"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml b/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
index 600958f2f..2f9edece8 100644
--- a/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
+++ b/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks basic white space handling for white-space-collapse="true".

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            spaces  

-            before  

-            and  

-            after  

-            each  

-            word  <fo:character character="&#xa;" />

-<fo:character character=" " /><fo:character character=" " />          and  

-            linefeeds<fo:character character=" " /><fo:character character=" " />

-            everywhere <fo:character character=" " />

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            <fo:block background-color="orange">

-              nested block level  

-            </fo:block>

-            <fo:block background-color="red">

-              nested block level  

-            </fo:block>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline background-color="orange">

-              inline level  

-            </fo:inline>

-            <fo:inline background-color="red">

-              inline level  

-            </fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            block level  

-            <fo:inline background-color="orange">

-              inline level  

-            </fo:inline>

-            block

-            <fo:inline background-color="red">

-              inline level 

-            </fo:inline>

-            block level  

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            <fo:inline background-color="orange">

-              inline level  

-              <fo:inline background-color="red">

-              nested inline level  

-              </fo:inline>

-            </fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            <fo:inline background-color="orange">

-              <fo:inline background-color="red">

-                nested inline level  

-              </fo:inline>

-              inline level  

-            </fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            block level

-            <fo:inline background-color="orange">

-              <fo:inline background-color="red">

-                nested inline level  

-              </fo:inline>

-              inline level  

-            </fo:inline>

-            block level  

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>

-    <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>

-    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>

-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>

-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[3]/space)"/>

-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[4]/word)"/>

-    

-    <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/>

-    <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/>

-    <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/>

-    <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/>

-    

-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/>

-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>

-    <eval expected="1" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/>

-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/>

-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/>

-    

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/>

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/>

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/>

-    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/>

-    <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/>

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/word)"/>

-    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/space)"/>

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/word)"/>

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/space)"/>

-    

-    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>

-    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/>

-    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>

-    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>

-

-    <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>

-    <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>

-    <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/>

-    <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/>

-

-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/>

-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>

-    <eval expected="1" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/>

-    <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>

-    <eval expected="4" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>

-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/word)"/>

-    <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/space)"/>

-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/word)"/>

-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/space)"/>

-  </checks>

-</testcase>

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

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks basic white space handling for white-space-collapse="false".

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="false">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            spaces  

-            before  

-            and  

-            after  

-            each  

-            word  <fo:character character="&#xa;" />

-<fo:character character=" " /><fo:character character=" " />          and  

-            linefeeds<fo:character character=" " /><fo:character character=" " />

-            everywhere<fo:character character=" " />          

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            <fo:block background-color="orange">

-              nested block level  

-            </fo:block>

-            <fo:block background-color="red">

-              nested block level  

-            </fo:block>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline background-color="orange">

-              inline level  

-            </fo:inline>

-            <fo:inline background-color="red">

-              inline level  

-            </fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            block level  

-            <fo:inline background-color="orange">

-              inline level  

-            </fo:inline>

-            block

-            <fo:inline background-color="red">

-              inline level 

-            </fo:inline>

-            block level  

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            <fo:inline background-color="orange">

-              inline level  

-              <fo:inline background-color="red">

-              nested inline level  

-              </fo:inline>

-            </fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            <fo:inline background-color="orange">

-              <fo:inline background-color="red">

-                nested inline level  

-              </fo:inline>

-              inline level  

-            </fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">  

-            block level

-            <fo:inline background-color="orange">

-              <fo:inline background-color="red">

-                nested inline level  

-              </fo:inline>

-              inline level  

-            </fo:inline>

-            block level  

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="5" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>

-    <eval expected="60" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>

-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text[1]/word)"/>

-    <eval expected="2" xpath="count(//flow/block[1]/lineArea[2]/text[1]/space)"/>

-    

-    <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/>

-    <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/>

-    <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/>

-    <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/>

-    

-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/>

-    <eval expected="16" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>

-    <eval expected="13" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/>

-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/>

-    <eval expected="16" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/>

-    

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/>

-    <eval expected="16" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/>

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/>

-    <eval expected="31" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/>

-    <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/>

-    <eval expected="13" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>

-    

-    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>

-    <eval expected="18" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/>

-    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>

-    <eval expected="17" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>

-

-    <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>

-    <eval expected="19" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>

-    <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/>

-    <eval expected="16" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/>

-

-    <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/>

-    <eval expected="14" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>

-    <eval expected="15" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/>

-    <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>

-    <eval expected="36" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>

-  </checks>

-</testcase>

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

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks white space handling for white-space-treatment

-      with white-space-collapse="true".

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  ignore-if-surrounding-linefeed  

-  all  

-  spaces  

-</fo:block>

-          <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  ignore  

-  all  

-  spaces  

-</fo:block>

-          <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  preserve  

-  all  

-  spaces  

-</fo:block>

-          <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  ignore-if-before-linefeed  

-  all  

-  spaces  

-</fo:block>

-          <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  ignore-if-after-linefeed  

-  all  

-  spaces  

-</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="3" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>

-    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>

-

-    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>

-    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>

-    

-    <eval expected="3" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>

-    <eval expected="4" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>

-    

-    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>

-    <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>

-    

-    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>

-    <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/>

-    

-  </checks>

-</testcase>

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

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks white space handling for white-space-treatment

-      with white-space-collapse="false".

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="false">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  ignore-if-surrounding-linefeed                                               

-  all                                                                          

-  spaces                                                                       

-</fo:block>

-          <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  ignore                                                                       

-  all                                                                          

-  spaces                                                                       

-</fo:block>

-          <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  preserve                                                                     

-  all                                                                          

-  spaces                                                                       

-</fo:block>

-          <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  ignore-if-before-linefeed                                                    

-  all                                                                          

-  spaces                                                                       

-</fo:block>

-          <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">

-  ignore-if-after-linefeed                                                     

-  all                                                                          

-  spaces                                                                       

-</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="2" xpath="count(//flow/block[1]/lineArea)"/>

-    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>

-    <eval expected="50" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>

-    <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text/word)"/>

-    <eval expected="0" xpath="count(//flow/block[1]/lineArea[2]/text/space)"/>

-

-    <eval expected="1" xpath="count(//flow/block[2]/lineArea)"/>

-    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>

-    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>

-    

-    <eval expected="3" xpath="count(//flow/block[3]/lineArea)"/>

-    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>

-    <eval expected="90" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>

-    <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>

-    <eval expected="96" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>

-    <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>

-    <eval expected="38" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>

-    

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea)"/>

-    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>

-    <eval expected="58" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>

-    <eval expected="1" xpath="count(//flow/block[4]/lineArea[2]/text/word)"/>

-    <eval expected="77" xpath="count(//flow/block[4]/lineArea[2]/text/space)"/>

-    

-    <eval expected="2" xpath="count(//flow/block[5]/lineArea)"/>

-    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>

-    <eval expected="56" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/>

-    <eval expected="1" xpath="count(//flow/block[5]/lineArea[2]/text/word)"/>

-    <eval expected="72" xpath="count(//flow/block[5]/lineArea[2]/text/space)"/>

-    

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks white space handling for white-space-treatment
+      with white-space-collapse="false".
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="false">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore-if-surrounding-linefeed                                               
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+          <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore                                                                       
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+          <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  preserve                                                                     
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+          <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore-if-before-linefeed                                                    
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+          <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+  ignore-if-after-linefeed                                                     
+  all                                                                          
+  spaces                                                                       
+</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2" xpath="count(//flow/block[1]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
+    <eval expected="50" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text/word)"/>
+    <eval expected="0" xpath="count(//flow/block[1]/lineArea[2]/text/space)"/>
+
+    <eval expected="1" xpath="count(//flow/block[2]/lineArea)"/>
+    <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>
+    <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>
+    
+    <eval expected="3" xpath="count(//flow/block[3]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>
+    <eval expected="90" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>
+    <eval expected="96" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
+    <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
+    <eval expected="38" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
+    
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
+    <eval expected="58" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[4]/lineArea[2]/text/word)"/>
+    <eval expected="77" xpath="count(//flow/block[4]/lineArea[2]/text/space)"/>
+    
+    <eval expected="2" xpath="count(//flow/block[5]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>
+    <eval expected="56" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/>
+    <eval expected="1" xpath="count(//flow/block[5]/lineArea[2]/text/word)"/>
+    <eval expected="72" xpath="count(//flow/block[5]/lineArea[2]/text/space)"/>
+    
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml b/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml
index b7e490b47..72e73fc64 100644
--- a/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml
+++ b/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml
@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks non breaking white space (nbsp).

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" id="single">&#160;single&#160;nbsp&#160;around&#160;</fo:block>

-          <fo:block background-color="red" id="only">&#160;</fo:block>

-          <fo:block background-color="silver" id="double">&#160;&#160;after&#160;&#160;empty&#160;&#160;line&#160;&#160;</fo:block>

-          <fo:block background-color="silver" id="single-justify" text-align="justify" text-align-last="justify" space-before="5pt">&#160;single&#160;nbsp&#160;around&#160;</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>

-    <eval expected="4" xpath="count(//flow/block[1]/lineArea/text/space)"/>

-    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>

-    <eval expected="1" xpath="count(//flow/block[2]/lineArea/text/space)"/>

-    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>

-    <eval expected="8" xpath="count(//flow/block[3]/lineArea/text/space)"/>

-    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>

-    <eval expected="3" xpath="count(//flow/block[4]/lineArea/text/space)"/> <!-- trailing nbsp is removed by LineLM -->

-    

-    <!-- nbsp must be adjustable -->

-    <true xpath="not(//flow/block[4]/lineArea/text/space[1]/@adj = 'false')"/>

-    

-    <element-list category="line" id="single">

-      <box w="3336"/>

-      <box/>

-      <box w="3336"/>

-      <box/>

-      <box w="3336"/>

-      <box/>

-      <box w="3336"/>

-      <skip>3</skip>

-    </element-list>

-    

-    <element-list category="line" id="only">

-      <box w="3336"/>

-      <skip>3</skip>

-    </element-list>

-    

-    <element-list category="line" id="double">

-      <box w="3336"/>

-      <box w="3336"/>

-      <box/>

-      <box w="3336"/>

-      <box w="3336"/>

-      <box/>

-      <box w="3336"/>

-      <box w="3336"/>

-      <box/>

-      <box w="3336"/>

-      <box w="3336"/>

-      <skip>3</skip>

-    </element-list>

-    

-    <element-list category="line" id="single-justify">

-      <box w="0"/>

-      <penalty p="INF"/>

-      <glue w="3336" y="1668" z="1112"/>

-      <box/>

-      <box w="0"/>

-      <penalty p="INF"/>

-      <glue w="3336" y="1668" z="1112"/>

-      <box/>

-      <box w="0"/>

-      <penalty p="INF"/>

-      <glue w="3336" y="1668" z="1112"/>

-      <box/>

-      <box w="0"/>

-      <penalty p="INF"/>

-      <glue w="3336" y="1668" z="1112"/>

-      <skip>3</skip>

-    </element-list>

-    

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks non breaking white space (nbsp).
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" id="single">&#160;single&#160;nbsp&#160;around&#160;</fo:block>
+          <fo:block background-color="red" id="only">&#160;</fo:block>
+          <fo:block background-color="silver" id="double">&#160;&#160;after&#160;&#160;empty&#160;&#160;line&#160;&#160;</fo:block>
+          <fo:block background-color="silver" id="single-justify" text-align="justify" text-align-last="justify" space-before="5pt">&#160;single&#160;nbsp&#160;around&#160;</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+    <eval expected="4" xpath="count(//flow/block[1]/lineArea/text/space)"/>
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="1" xpath="count(//flow/block[2]/lineArea/text/space)"/>
+    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+    <eval expected="8" xpath="count(//flow/block[3]/lineArea/text/space)"/>
+    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+    <eval expected="3" xpath="count(//flow/block[4]/lineArea/text/space)"/> <!-- trailing nbsp is removed by LineLM -->
+    
+    <!-- nbsp must be adjustable -->
+    <true xpath="not(//flow/block[4]/lineArea/text/space[1]/@adj = 'false')"/>
+    
+    <element-list category="line" id="single">
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <skip>3</skip>
+    </element-list>
+    
+    <element-list category="line" id="only">
+      <box w="3336"/>
+      <skip>3</skip>
+    </element-list>
+    
+    <element-list category="line" id="double">
+      <box w="3336"/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box w="3336"/>
+      <box/>
+      <box w="3336"/>
+      <box w="3336"/>
+      <skip>3</skip>
+    </element-list>
+    
+    <element-list category="line" id="single-justify">
+      <box w="0"/>
+      <penalty p="INF"/>
+      <glue w="3336" y="1668" z="1112"/>
+      <box/>
+      <box w="0"/>
+      <penalty p="INF"/>
+      <glue w="3336" y="1668" z="1112"/>
+      <box/>
+      <box w="0"/>
+      <penalty p="INF"/>
+      <glue w="3336" y="1668" z="1112"/>
+      <box/>
+      <box w="0"/>
+      <penalty p="INF"/>
+      <glue w="3336" y="1668" z="1112"/>
+      <skip>3</skip>
+    </element-list>
+    
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_wrap-option.xml b/test/layoutengine/standard-testcases/block_wrap-option.xml
index bb2e75130..d6584ee4a 100644
--- a/test/layoutengine/standard-testcases/block_wrap-option.xml
+++ b/test/layoutengine/standard-testcases/block_wrap-option.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks the wrap-option property on fo:block.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="simple" page-height="6cm" page-width="21cm">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="simple">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block-container width="5cm" background-color="lightgray">

-            <fo:block background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas et ligula. Suspendisse faucibus. Donec porta risus vitae turpis.</fo:block>

-            <fo:block background-color="orange" wrap-option="no-wrap">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas et ligula. Suspendisse faucibus. Donec porta risus vitae turpis.</fo:block>

-          </fo:block-container>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <element-list category="breaker">

-      <box w="14400"/> <!-- first block, first line -->

-      <box w="14400"/>

-      <penalty w="0" p="0"/>

-      <box w="14400"/>

-      <penalty w="0" p="0"/>

-      <box w="14400"/>

-      <penalty w="0" p="0"/>

-      <box w="14400"/>

-      <box w="14400"/> <!-- first block, last line -->

-      <penalty w="0" p="0"/>

-      <box w="14400"/> <!-- second block, same content, not broken -->

-      <skip>3</skip>

-    </element-list>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks the wrap-option property on fo:block.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" page-height="6cm" page-width="21cm">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="simple">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block-container width="5cm" background-color="lightgray">
+            <fo:block background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas et ligula. Suspendisse faucibus. Donec porta risus vitae turpis.</fo:block>
+            <fo:block background-color="orange" wrap-option="no-wrap">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas et ligula. Suspendisse faucibus. Donec porta risus vitae turpis.</fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <element-list category="breaker">
+      <box w="14400"/> <!-- first block, first line -->
+      <box w="14400"/>
+      <penalty w="0" p="0"/>
+      <box w="14400"/>
+      <penalty w="0" p="0"/>
+      <box w="14400"/>
+      <penalty w="0" p="0"/>
+      <box w="14400"/>
+      <box w="14400"/> <!-- first block, last line -->
+      <penalty w="0" p="0"/>
+      <box w="14400"/> <!-- second block, same content, not broken -->
+      <skip>3</skip>
+    </element-list>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/character_background-color.xml b/test/layoutengine/standard-testcases/character_background-color.xml
index 241d73f1f..f9ea30690 100644
--- a/test/layoutengine/standard-testcases/character_background-color.xml
+++ b/test/layoutengine/standard-testcases/character_background-color.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks fo:character with background-color property.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body" font-size="10pt">

-          <fo:block background-color="silver">

-            To <fo:character background-color="yellow" character="e" />mphasize a character highlight it.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks fo:character with background-color property.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body" font-size="10pt">
+          <fo:block background-color="silver">
+            To <fo:character background-color="yellow" character="e" />mphasize a character highlight it.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/character_background-image.xml b/test/layoutengine/standard-testcases/character_background-image.xml
index 67e9e8162..b887315f2 100644
--- a/test/layoutengine/standard-testcases/character_background-image.xml
+++ b/test/layoutengine/standard-testcases/character_background-image.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks fo:character with background-image property.

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block font-size="24pt">

-            <fo:character font-size="96pt" character="A" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />

-            <fo:character font-size="48pt" character="g" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=8976,vertical=21360" xpath="//flow/block[1]/lineArea/text[1]/@background"/>

-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[3]/@background"/>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks fo:character with background-image property.
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block font-size="24pt">
+            <fo:character font-size="96pt" character="A" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+            <fo:character font-size="48pt" character="g" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=8976,vertical=21360" xpath="//flow/block[1]/lineArea/text[1]/@background"/>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[3]/@background"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/character_border_padding.xml b/test/layoutengine/standard-testcases/character_border_padding.xml
index 465a4f1a7..57c5f4907 100644
--- a/test/layoutengine/standard-testcases/character_border_padding.xml
+++ b/test/layoutengine/standard-testcases/character_border_padding.xml
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks fo:character with border and padding properties.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">

-        <fo:flow flow-name="xsl-region-body" font-size="10pt">

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">

-            To <fo:character border="solid 1pt red" background-color="yellow" character="e"/>mphasize a letter we give it a 1pt border.

-          </fo:block>

-          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">

-            To really <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" character="e"/>mphasize a letter we give it a 5pt border and padding.

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">

-            To <fo:character border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/>onfuse give it unsymmetric borders and padding.

-          </fo:block>

-          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">

-            Big <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/>order but a smaller font.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>

-    <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/>

-    <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/>

-

-    <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>

-    <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/>

-    <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/>

-

-    <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>

-    <eval expected="5000" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/>

-    <eval expected="17000" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/>

-    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/>

-    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/>

-    <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/>

-

-    <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/>

-    <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>

-    <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/>

-    <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks fo:character with border and padding properties.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+        <fo:flow flow-name="xsl-region-body" font-size="10pt">
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+            To <fo:character border="solid 1pt red" background-color="yellow" character="e"/>mphasize a letter we give it a 1pt border.
+          </fo:block>
+          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+            To really <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" character="e"/>mphasize a letter we give it a 5pt border and padding.
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+            To <fo:character border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/>onfuse give it unsymmetric borders and padding.
+          </fo:block>
+          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
+            Big <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/>order but a smaller font.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+    <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/>
+    <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/>
+
+    <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+    <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/>
+    <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/>
+
+    <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/>
+    <eval expected="17000" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/>
+    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/>
+    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/>
+    <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/>
+
+    <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/>
+    <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+    <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/>
+    <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/character_vertical-align.xml b/test/layoutengine/standard-testcases/character_vertical-align.xml
index e01d4c0a3..91653f8d6 100644
--- a/test/layoutengine/standard-testcases/character_vertical-align.xml
+++ b/test/layoutengine/standard-testcases/character_vertical-align.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks fo:character with vertical-align property.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            vertical-align<fo:character font-size="10pt" background-color="yellow" character="=" />not specified

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            vertical-align<fo:character font-size="10pt" vertical-align="baseline" background-color="yellow" character="=" />baseline

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            vertical-align<fo:character font-size="10pt" vertical-align="top" background-color="yellow" character="=" />top

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            vertical-align<fo:character font-size="10pt" vertical-align="middle" background-color="yellow" character="=" />middle

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            vertical-align<fo:character font-size="10pt" vertical-align="bottom" background-color="yellow" character="=" />bottom

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>

-    <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>

-    <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>

-    <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks fo:character with vertical-align property.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" background-color="yellow" character="=" />not specified
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" vertical-align="baseline" background-color="yellow" character="=" />baseline
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" vertical-align="top" background-color="yellow" character="=" />top
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" vertical-align="middle" background-color="yellow" character="=" />middle
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            vertical-align<fo:character font-size="10pt" vertical-align="bottom" background-color="yellow" character="=" />bottom
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+    <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+    <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+    <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_bmp.xml b/test/layoutengine/standard-testcases/external-graphic_bmp.xml
index 2482b1dbd..4e1a2d4b9 100644
--- a/test/layoutengine/standard-testcases/external-graphic_bmp.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_bmp.xml
@@ -1,57 +1,57 @@
-<?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 external-graphics.

-    </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>BMP external-graphic 300dpi</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg300dpi.bmp"/>EOG

-          </fo:block>

-          <fo:block>BMP external-graphic 72dpi</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg72dpi.bmp"/>EOG

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>

-    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>

-    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>

-    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>

-  </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 external-graphics.
+    </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>BMP external-graphic 300dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.bmp"/>EOG
+          </fo:block>
+          <fo:block>BMP external-graphic 72dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.bmp"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml
index e32e4d080..cac54e853 100644
--- a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml
@@ -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 external-graphics with relative content-height

-    </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>plain external-graphic</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" content-height="200%" content-width="200%" />EOG

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="360000" xpath="//flow/block[2]/@ipd"/>

-    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-  </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 external-graphics with relative content-height
+    </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>plain external-graphic</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" content-height="200%" content-width="200%" />EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="360000" xpath="//flow/block[2]/@ipd"/>
+    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_eps.xml b/test/layoutengine/standard-testcases/external-graphic_eps.xml
index 5ffb4b410..3a4af488b 100644
--- a/test/layoutengine/standard-testcases/external-graphic_eps.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_eps.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks external-graphics.

-    </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>EPS external-graphic</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/barcode.eps"/>EOG

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="135655" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="135655" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="42525" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="42525" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-  </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 external-graphics.
+    </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>EPS external-graphic</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/barcode.eps"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="135655" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="135655" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="42525" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="42525" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_gif.xml b/test/layoutengine/standard-testcases/external-graphic_gif.xml
index b500313a0..a3cbd300e 100644
--- a/test/layoutengine/standard-testcases/external-graphic_gif.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_gif.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks external-graphics.

-    </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>GIF external-graphic</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg72dpi.gif"/>EOG

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-  </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 external-graphics.
+    </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>GIF external-graphic</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.gif"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_jpeg.xml b/test/layoutengine/standard-testcases/external-graphic_jpeg.xml
index 10f52f8fa..a669145b4 100644
--- a/test/layoutengine/standard-testcases/external-graphic_jpeg.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_jpeg.xml
@@ -1,57 +1,57 @@
-<?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 external-graphics.

-    </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>JPEG external-graphic 300dpi</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG

-          </fo:block>

-          <fo:block>JPEG external-graphic 72dpi</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg72dpi.jpg"/>EOG

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>

-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>

-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>

-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>

-  </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 external-graphics.
+    </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>JPEG external-graphic 300dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          <fo:block>JPEG external-graphic 72dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.jpg"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_oversized.xml b/test/layoutengine/standard-testcases/external-graphic_oversized.xml
index e423acd17..3d8f85d1d 100644
--- a/test/layoutengine/standard-testcases/external-graphic_oversized.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_oversized.xml
@@ -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>

-      This test checks external-graphics. An oversized image is to be squeezed into page using min/opt/max values.

-    </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="21cm" page-height="29.7cm" margin="2cm">

-          <fo:region-body background-color="yellow"/>

-        </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="8pt">This first block is only to force an infinite loop if the image is not scaled down.</fo:block>

-          <!-- TODO If you remove the above block, the image is placed on the page although it's too big. No warnings. -->

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/big-image.png" 

-                inline-progression-dimension.maximum="100%" block-progression-dimension.maximum="100%"

-                content-width="scale-to-fit" content-height="scale-to-fit" overflow="hidden"/>

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="0 0 595275 841889" xpath="//pageViewport/@bounds"/>

-    <eval expected="481891" xpath="//regionBody/@ipda"/>

-    <eval expected="728505" xpath="//regionBody/@bpda"/>

-    <eval expected="481891" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="728505" xpath="//flow/block[2]/lineArea/viewport/@bpda + //flow/block[1]/@bpda"/>

-  </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 external-graphics. An oversized image is to be squeezed into page using min/opt/max values.
+    </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="21cm" page-height="29.7cm" margin="2cm">
+          <fo:region-body background-color="yellow"/>
+        </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="8pt">This first block is only to force an infinite loop if the image is not scaled down.</fo:block>
+          <!-- TODO If you remove the above block, the image is placed on the page although it's too big. No warnings. -->
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/big-image.png" 
+                inline-progression-dimension.maximum="100%" block-progression-dimension.maximum="100%"
+                content-width="scale-to-fit" content-height="scale-to-fit" overflow="hidden"/>
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="0 0 595275 841889" xpath="//pageViewport/@bounds"/>
+    <eval expected="481891" xpath="//regionBody/@ipda"/>
+    <eval expected="728505" xpath="//regionBody/@bpda"/>
+    <eval expected="481891" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="728505" xpath="//flow/block[2]/lineArea/viewport/@bpda + //flow/block[1]/@bpda"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_png.xml b/test/layoutengine/standard-testcases/external-graphic_png.xml
index aae0daef9..da8c1807f 100644
--- a/test/layoutengine/standard-testcases/external-graphic_png.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_png.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks external-graphics.

-    </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>PNG external-graphic 300dpi</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg300dpi.png"/>EOG

-          </fo:block>

-          <fo:block>PNG external-graphic 72dpi</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg72dpi.png"/>EOG

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-    <!-- Due to unit computations there is a little difference to the expected 192000 -->

-    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>

-    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>

-    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>

-    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>

-  </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 external-graphics.
+    </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>PNG external-graphic 300dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.png"/>EOG
+          </fo:block>
+          <fo:block>PNG external-graphic 72dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.png"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <!-- Due to unit computations there is a little difference to the expected 192000 -->
+    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_src_uri.xml b/test/layoutengine/standard-testcases/external-graphic_src_uri.xml
index cd1dc91fe..1b28fe8f2 100644
--- a/test/layoutengine/standard-testcases/external-graphic_src_uri.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_src_uri.xml
@@ -1,83 +1,83 @@
-<?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 URI references to external-graphics.

-    </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="210mm" page-height="297mm">

-          <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>plain external-graphic (relative URI)</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG

-          </fo:block>

-          <fo:block>plain external-graphic (relative URI with scheme)</fo:block>

-          <fo:block>

-            <fo:external-graphic src="file:../../resources/images/bgimg300dpi.jpg"/>EOG

-          </fo:block>

-          <!-- Commented out until portable solution found

-          <fo:block>plain external-graphic (absolute URI)</fo:block>

-          <fo:block>

-            <fo:external-graphic src="/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG

-          </fo:block>

-          <fo:block>plain external-graphic (absolute URI with scheme)</fo:block>

-          <fo:block>

-            <fo:external-graphic src="file:/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG

-          </fo:block>

-          -->

-          <fo:block>plain external-graphic (relative URI using url(...) function)</fo:block>

-          <fo:block>

-            <fo:external-graphic src="url(../../resources/images/bgimg300dpi.jpg)"/>EOG

-          </fo:block>

-          <fo:block>plain external-graphic (absolute HTTP URI)</fo:block>

-          <fo:block>

-            <fo:external-graphic src="http://xml.apache.org/fop/images/logo.jpg"/>EOG

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>

-    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>

-    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>

-    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>

-    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>

-    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>

-    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>

-    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>

-    <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>

-    <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>

-    <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>

-    <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>

-  </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 URI references to external-graphics.
+    </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="210mm" page-height="297mm">
+          <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>plain external-graphic (relative URI)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          <fo:block>plain external-graphic (relative URI with scheme)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="file:../../resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          <!-- Commented out until portable solution found
+          <fo:block>plain external-graphic (absolute URI)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          <fo:block>plain external-graphic (absolute URI with scheme)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="file:/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          -->
+          <fo:block>plain external-graphic (relative URI using url(...) function)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="url(../../resources/images/bgimg300dpi.jpg)"/>EOG
+          </fo:block>
+          <fo:block>plain external-graphic (absolute HTTP URI)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="http://xml.apache.org/fop/images/logo.jpg"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+    <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+    <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+    <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+    <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_svg.xml b/test/layoutengine/standard-testcases/external-graphic_svg.xml
index a9d6a048a..80c3e5afc 100644
--- a/test/layoutengine/standard-testcases/external-graphic_svg.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_svg.xml
@@ -1,82 +1,82 @@
-<?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 external-graphics.

-    </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="10in" page-height="15in">

-          <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 text-align="left">2 inch wide SVG external-graphic on LHS</fo:block>

-          <fo:block text-align="left">

-            <fo:external-graphic src="../../resources/images/img.svg" content-width="2in" scaling="uniform" />EOG

-          </fo:block>

-          <fo:block text-align="right">4 inch wide SVG external-graphic on RHS</fo:block>

-          <fo:block text-align="right">

-            <fo:external-graphic src="../../resources/images/img.svg" content-width="4in" scaling="uniform" />EOG

-          </fo:block>

-          <fo:block text-align="center">6 inch wide SVG external-graphic in center, non-uniformly squeezed to a height of 4in.</fo:block>

-          <fo:block text-align="center">

-            <fo:external-graphic src="../../resources/images/img.svg" content-width="6in" content-height="4in" scaling="non-uniform" />EOG

-          </fo:block>

-          <fo:block text-align="left">SVG external-graphic with an intrinsic size (16ptx16pt)</fo:block>

-          <fo:block text-align="left">

-            <fo:external-graphic src="../../resources/images/img-w-size.svg"/>EOG

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-    <eval expected="0 0 144000 144000" xpath="//flow/block[2]/lineArea/viewport/@pos"/>

-    

-    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>

-    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>

-    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>

-    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>

-    <eval expected="0 0 288000 288000" xpath="//flow/block[4]/lineArea/viewport/@pos"/>

-

-    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>

-    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>

-    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>

-    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>

-    <eval expected="0 0 432000 288000" xpath="//flow/block[6]/lineArea/viewport/@pos"/>

-

-    <!-- TODO: This evaluates nicely to 16000mpt with 72dpi in the FOUserAgent but will result 

-         in 16080 for 300dpi which is caused by rounding errors because pixels are used internally. -->

-    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>

-    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>

-    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>

-    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>

-    <eval expected="0 0 16000 16000" xpath="//flow/block[8]/lineArea/viewport/@pos"/>

-  </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 external-graphics.
+    </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="10in" page-height="15in">
+          <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 text-align="left">2 inch wide SVG external-graphic on LHS</fo:block>
+          <fo:block text-align="left">
+            <fo:external-graphic src="../../resources/images/img.svg" content-width="2in" scaling="uniform" />EOG
+          </fo:block>
+          <fo:block text-align="right">4 inch wide SVG external-graphic on RHS</fo:block>
+          <fo:block text-align="right">
+            <fo:external-graphic src="../../resources/images/img.svg" content-width="4in" scaling="uniform" />EOG
+          </fo:block>
+          <fo:block text-align="center">6 inch wide SVG external-graphic in center, non-uniformly squeezed to a height of 4in.</fo:block>
+          <fo:block text-align="center">
+            <fo:external-graphic src="../../resources/images/img.svg" content-width="6in" content-height="4in" scaling="non-uniform" />EOG
+          </fo:block>
+          <fo:block text-align="left">SVG external-graphic with an intrinsic size (16ptx16pt)</fo:block>
+          <fo:block text-align="left">
+            <fo:external-graphic src="../../resources/images/img-w-size.svg"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="0 0 144000 144000" xpath="//flow/block[2]/lineArea/viewport/@pos"/>
+    
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+    <eval expected="0 0 288000 288000" xpath="//flow/block[4]/lineArea/viewport/@pos"/>
+
+    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+    <eval expected="0 0 432000 288000" xpath="//flow/block[6]/lineArea/viewport/@pos"/>
+
+    <!-- TODO: This evaluates nicely to 16000mpt with 72dpi in the FOUserAgent but will result 
+         in 16080 for 300dpi which is caused by rounding errors because pixels are used internally. -->
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+    <eval expected="0 0 16000 16000" xpath="//flow/block[8]/lineArea/viewport/@pos"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_tiff.xml b/test/layoutengine/standard-testcases/external-graphic_tiff.xml
index 719e64bf4..63ad60d66 100644
--- a/test/layoutengine/standard-testcases/external-graphic_tiff.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_tiff.xml
@@ -1,73 +1,73 @@
-<?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 external-graphics.

-    </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="8in" page-height="8in">

-          <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>TIFF external-graphic 300dpi</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg300dpi.tif"/>EOG

-          </fo:block>

-          <fo:block>TIFF external-graphic 72dpi</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/bgimg72dpi.tif"/>EOG

-          </fo:block>

-          <fo:block>TIFF external-graphic (CCITT group 4 encoding)</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/tiff_group4.tif"/>EOG

-          </fo:block>

-          <fo:block>TIFF external-graphic (CCITT group 4 encoding, multiple strips)</fo:block>

-          <fo:block>

-            <fo:external-graphic src="../../resources/images/tiff_group4-multi-strip.tif"/>EOG

-          </fo:block>

-          <fo:block>EOF</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>

-    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>

-    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>

-    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>

-    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>

-    <eval expected="550588" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>

-    <eval expected="550588" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>

-    <eval expected="66705" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>

-    <eval expected="66705" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>

-    <eval expected="550588" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>

-    <eval expected="550588" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>

-    <eval expected="66705" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>

-    <eval expected="66705" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>

-  </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 external-graphics.
+    </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="8in" page-height="8in">
+          <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>TIFF external-graphic 300dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.tif"/>EOG
+          </fo:block>
+          <fo:block>TIFF external-graphic 72dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.tif"/>EOG
+          </fo:block>
+          <fo:block>TIFF external-graphic (CCITT group 4 encoding)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/tiff_group4.tif"/>EOG
+          </fo:block>
+          <fo:block>TIFF external-graphic (CCITT group 4 encoding, multiple strips)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/tiff_group4-multi-strip.tif"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+    <eval expected="550588" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+    <eval expected="550588" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+    <eval expected="66705" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+    <eval expected="66705" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+    <eval expected="550588" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+    <eval expected="550588" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+    <eval expected="66705" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+    <eval expected="66705" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/fox_external-document_1.xml b/test/layoutengine/standard-testcases/fox_external-document_1.xml
index 4b31809ab..1780202a6 100644
--- a/test/layoutengine/standard-testcases/fox_external-document_1.xml
+++ b/test/layoutengine/standard-testcases/fox_external-document_1.xml
@@ -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>

-      This test checks the basics of fox:external-document.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"

-        xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">

-      <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>

-      <fox:external-document id="img" src="../../resources/images/bgimg72dpi.png"/>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="1" xpath="count(/areaTree/pageSequence)"/>

-    <eval expected="1" xpath="count(//pageViewport)"/>

-    <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@formatted-nr"/>

-    <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@nr"/>

-    <eval expected="0 0 191976 191976" xpath="/areaTree/pageSequence/pageViewport/@bounds"/>

-    

-    <eval expected="191976" xpath="//regionViewport/@ipd"/>

-    <eval expected="191976" xpath="//regionViewport/@bpd"/>

-    <eval expected="191976" xpath="//lineArea/@ipd"/>

-    <eval expected="191976" xpath="//lineArea/@bpd"/>

-    <eval expected="191976" xpath="//viewport/@ipd"/>

-    <eval expected="191976" xpath="//viewport/@bpd"/>

-    <eval expected="0 0 191976 191976" xpath="//viewport/@pos"/>

-    <eval expected="img" xpath="//viewport/@prod-id"/>

-    <eval expected="img" xpath="//image/@prod-id"/>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks the basics of fox:external-document.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+        xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+      <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>
+      <fox:external-document id="img" src="../../resources/images/bgimg72dpi.png"/>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="count(/areaTree/pageSequence)"/>
+    <eval expected="1" xpath="count(//pageViewport)"/>
+    <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@formatted-nr"/>
+    <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@nr"/>
+    <eval expected="0 0 191976 191976" xpath="/areaTree/pageSequence/pageViewport/@bounds"/>
+    
+    <eval expected="191976" xpath="//regionViewport/@ipd"/>
+    <eval expected="191976" xpath="//regionViewport/@bpd"/>
+    <eval expected="191976" xpath="//lineArea/@ipd"/>
+    <eval expected="191976" xpath="//lineArea/@bpd"/>
+    <eval expected="191976" xpath="//viewport/@ipd"/>
+    <eval expected="191976" xpath="//viewport/@bpd"/>
+    <eval expected="0 0 191976 191976" xpath="//viewport/@pos"/>
+    <eval expected="img" xpath="//viewport/@prod-id"/>
+    <eval expected="img" xpath="//image/@prod-id"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/fox_external-document_2.xml b/test/layoutengine/standard-testcases/fox_external-document_2.xml
index abd5fd2bf..365af5b21 100644
--- a/test/layoutengine/standard-testcases/fox_external-document_2.xml
+++ b/test/layoutengine/standard-testcases/fox_external-document_2.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks fox:external-document.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"

-        xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body reference-orientation="90"/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fox:external-document id="img1" src="../../resources/images/bgimg72dpi.png"

-        width="5in" height="5in" text-align="center" display-align="center"/>

-      <fo:page-sequence master-reference="normal" id="ps1">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Just a normal page-sequence in between...

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-      <fox:external-document id="img2" src="../../resources/images/bgimg72dpi.png"

-        width="5in" height="5in" content-width="scale-to-fit"/>

-      <fox:external-document id="img3" src="../../resources/images/bgimg72dpi.png"

-        width="5in" height="5in" content-width="scale-down-to-fit" initial-page-number="5"/>

-      <fox:external-document id="img4" src="../../resources/images/big-image.png"

-        reference-orientation="90"/>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="5" xpath="count(/areaTree/pageSequence)"/>

-    <eval expected="6" xpath="count(//pageViewport)"/>

-    

-    <eval expected="1" xpath="//pageViewport[@nr = '1']/@formatted-nr"/>

-    <eval expected="2" xpath="//pageViewport[@nr = '2']/@formatted-nr"/>

-    <eval expected="3" xpath="//pageViewport[@nr = '3']/@formatted-nr"/>

-    <eval expected="4" xpath="//pageViewport[@nr = '4']/@formatted-nr"/>

-    <true xpath="boolean(//pageViewport[@nr = '4']/@blank)"/> <!-- effect from force-page-count="auto" -->

-    <eval expected="5" xpath="//pageViewport[@nr = '5']/@formatted-nr"/>

-    <eval expected="6" xpath="//pageViewport[@nr = '6']/@formatted-nr"/>

-    

-    <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr = '1']/@bounds"/>

-    <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr = '2']/@bounds"/>

-    <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr = '3']/@bounds"/>

-    <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr = '5']/@bounds"/>

-    <eval expected="0 0 843913 597172" xpath="//pageViewport[@nr = '6']/@bounds"/>

-    

-    <eval expected="84012 84012 191976 191976" xpath="//viewport[@prod-id = 'img1']/@pos"/>

-    <eval expected="0 0 360000 360000" xpath="//viewport[@prod-id = 'img2']/@pos"/>

-    <eval expected="0 0 191976 191976" xpath="//viewport[@prod-id = 'img3']/@pos"/>

-    <eval expected="0 0 597172 843913" xpath="//viewport[@prod-id = 'img4']/@pos"/>

-

-    <eval expected="0 0 843913 597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@rect"/>

-    <eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/@ipd"/>

-    <eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@bpd"/>

-    <eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@ipd"/>

-    <eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@bpd"/>

-    <eval expected="[0.0 -1.0 1.0 0.0 0.0 597172.0]" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@ctm"/>

-    

-  </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 fox:external-document.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+        xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body reference-orientation="90"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fox:external-document id="img1" src="../../resources/images/bgimg72dpi.png"
+        width="5in" height="5in" text-align="center" display-align="center"/>
+      <fo:page-sequence master-reference="normal" id="ps1">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Just a normal page-sequence in between...
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+      <fox:external-document id="img2" src="../../resources/images/bgimg72dpi.png"
+        width="5in" height="5in" content-width="scale-to-fit"/>
+      <fox:external-document id="img3" src="../../resources/images/bgimg72dpi.png"
+        width="5in" height="5in" content-width="scale-down-to-fit" initial-page-number="5"/>
+      <fox:external-document id="img4" src="../../resources/images/big-image.png"
+        reference-orientation="90"/>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="5" xpath="count(/areaTree/pageSequence)"/>
+    <eval expected="6" xpath="count(//pageViewport)"/>
+    
+    <eval expected="1" xpath="//pageViewport[@nr = '1']/@formatted-nr"/>
+    <eval expected="2" xpath="//pageViewport[@nr = '2']/@formatted-nr"/>
+    <eval expected="3" xpath="//pageViewport[@nr = '3']/@formatted-nr"/>
+    <eval expected="4" xpath="//pageViewport[@nr = '4']/@formatted-nr"/>
+    <true xpath="boolean(//pageViewport[@nr = '4']/@blank)"/> <!-- effect from force-page-count="auto" -->
+    <eval expected="5" xpath="//pageViewport[@nr = '5']/@formatted-nr"/>
+    <eval expected="6" xpath="//pageViewport[@nr = '6']/@formatted-nr"/>
+    
+    <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr = '1']/@bounds"/>
+    <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr = '2']/@bounds"/>
+    <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr = '3']/@bounds"/>
+    <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr = '5']/@bounds"/>
+    <eval expected="0 0 843913 597172" xpath="//pageViewport[@nr = '6']/@bounds"/>
+    
+    <eval expected="84012 84012 191976 191976" xpath="//viewport[@prod-id = 'img1']/@pos"/>
+    <eval expected="0 0 360000 360000" xpath="//viewport[@prod-id = 'img2']/@pos"/>
+    <eval expected="0 0 191976 191976" xpath="//viewport[@prod-id = 'img3']/@pos"/>
+    <eval expected="0 0 597172 843913" xpath="//viewport[@prod-id = 'img4']/@pos"/>
+
+    <eval expected="0 0 843913 597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@rect"/>
+    <eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/@ipd"/>
+    <eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@bpd"/>
+    <eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@ipd"/>
+    <eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@bpd"/>
+    <eval expected="[0.0 -1.0 1.0 0.0 0.0 597172.0]" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@ctm"/>
+    
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline-container_border_padding.xml b/test/layoutengine/standard-testcases/inline-container_border_padding.xml
index a667b86f1..cfa6f9075 100644
--- a/test/layoutengine/standard-testcases/inline-container_border_padding.xml
+++ b/test/layoutengine/standard-testcases/inline-container_border_padding.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks the borders and the like for instream-foreign-object.

-    </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="orange">

-            Before <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">

-                <fo:block>inside the container</fo:block>

-            </fo:inline-container> after

-          </fo:block>

-          <fo:block background-color="yellow" font-size="100pt">

-            BC <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">

-                <fo:block font-size="12pt">inside the container</fo:block>

-            </fo:inline-container> AC

-          </fo:block>

-          <fo:block font-size="9pt">

-           In both blocks we have a setting of border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" on the i-f-o.

-           In the first block the i-f-o determines the height of the line in the 2nd block the font is bigger than the i-f-o.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- first e-g -->

-    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/>

-    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/>

-    <eval expected="70000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/>

-    <eval expected="1650" xpath="//flow/block[1]/lineArea/viewport/@offset"/>

-    <eval expected="20000 30000 20000 30000" xpath="//flow/block[1]/lineArea/viewport/@bap"/>

-    <eval expected="color=#ffffff" xpath="//flow/block[1]/lineArea/viewport/@background"/>

-    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/>

-    <eval expected="(solid,#000000,20000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/>

-    <eval expected="(solid,#000000,15000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/>

-    <eval expected="(solid,#000000,10000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>

-    <eval expected="15000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>

-    <eval expected="10000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>

-    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>

-    <eval expected="20000 20000 20000 20000" xpath="//flow/block[1]/lineArea/viewport/foreignObject/@pos"/>

-    <!-- second e-g -->

-    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>

-    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>

-    <eval expected="70000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>

-    <eval expected="15550" xpath="//flow/block[2]/lineArea/viewport/@offset"/>

-    <eval expected="20000 30000 20000 30000" xpath="//flow/block[2]/lineArea/viewport/@bap"/>

-    <eval expected="color=#ffffff" xpath="//flow/block[2]/lineArea/viewport/@background"/>

-    <eval expected="(solid,#000000,5000)" xpath="//flow/block[2]/lineArea/viewport/@border-before"/>

-    <eval expected="(solid,#000000,20000)" xpath="//flow/block[2]/lineArea/viewport/@border-after"/>

-    <eval expected="(solid,#000000,15000)" xpath="//flow/block[2]/lineArea/viewport/@border-start"/>

-    <eval expected="(solid,#000000,10000)" xpath="//flow/block[2]/lineArea/viewport/@border-end"/>

-    <eval expected="15000" xpath="//flow/block[2]/lineArea/viewport/@padding-before"/>

-    <eval expected="10000" xpath="//flow/block[2]/lineArea/viewport/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea/viewport/@padding-start"/>

-    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@padding-end"/>

-    <eval expected="20000 20000 20000 20000" xpath="//flow/block[2]/lineArea/viewport/foreignObject/@pos"/>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks the borders and the like for instream-foreign-object.
+    </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="orange">
+            Before <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">
+                <fo:block>inside the container</fo:block>
+            </fo:inline-container> after
+          </fo:block>
+          <fo:block background-color="yellow" font-size="100pt">
+            BC <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">
+                <fo:block font-size="12pt">inside the container</fo:block>
+            </fo:inline-container> AC
+          </fo:block>
+          <fo:block font-size="9pt">
+           In both blocks we have a setting of border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" on the i-f-o.
+           In the first block the i-f-o determines the height of the line in the 2nd block the font is bigger than the i-f-o.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- first e-g -->
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/>
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/>
+    <eval expected="70000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/>
+    <eval expected="1650" xpath="//flow/block[1]/lineArea/viewport/@offset"/>
+    <eval expected="20000 30000 20000 30000" xpath="//flow/block[1]/lineArea/viewport/@bap"/>
+    <eval expected="color=#ffffff" xpath="//flow/block[1]/lineArea/viewport/@background"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/>
+    <eval expected="(solid,#000000,20000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/>
+    <eval expected="(solid,#000000,15000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/>
+    <eval expected="(solid,#000000,10000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
+    <eval expected="15000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
+    <eval expected="10000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
+    <eval expected="20000 20000 20000 20000" xpath="//flow/block[1]/lineArea/viewport/foreignObject/@pos"/>
+    <!-- second e-g -->
+    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="70000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="15550" xpath="//flow/block[2]/lineArea/viewport/@offset"/>
+    <eval expected="20000 30000 20000 30000" xpath="//flow/block[2]/lineArea/viewport/@bap"/>
+    <eval expected="color=#ffffff" xpath="//flow/block[2]/lineArea/viewport/@background"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[2]/lineArea/viewport/@border-before"/>
+    <eval expected="(solid,#000000,20000)" xpath="//flow/block[2]/lineArea/viewport/@border-after"/>
+    <eval expected="(solid,#000000,15000)" xpath="//flow/block[2]/lineArea/viewport/@border-start"/>
+    <eval expected="(solid,#000000,10000)" xpath="//flow/block[2]/lineArea/viewport/@border-end"/>
+    <eval expected="15000" xpath="//flow/block[2]/lineArea/viewport/@padding-before"/>
+    <eval expected="10000" xpath="//flow/block[2]/lineArea/viewport/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/viewport/@padding-start"/>
+    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@padding-end"/>
+    <eval expected="20000 20000 20000 20000" xpath="//flow/block[2]/lineArea/viewport/foreignObject/@pos"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml b/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml
index bf8b5ab39..f6736fcd7 100644
--- a/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml
+++ b/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml
@@ -1,92 +1,92 @@
-<?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 inline level alignment-adjust.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" background-color="yellow">alignment-adjust not specified</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="auto" background-color="yellow">alignment-adjust="auto"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="baseline" background-color="yellow">alignment-adjust="baseline"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="before-edge" background-color="yellow">alignment-adjust="before-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="text-before-edge" background-color="yellow">alignment-adjust="text-before-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="central" background-color="yellow">alignment-adjust="central"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="middle" background-color="yellow">alignment-adjust="middle"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="after-edge" background-color="yellow">alignment-adjust="after-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="text-after-edge" background-color="yellow">alignment-adjust="text-after-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="ideographic" background-color="yellow">alignment-adjust="ideographic"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="alphabetic" background-color="yellow">alignment-adjust="alphabetic"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="hanging" background-color="yellow">alignment-adjust="hanging"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="mathematical" background-color="yellow">alignment-adjust="mathematical"</fo:inline> After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="10052" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="10052" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="5427" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="5487" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="802" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="802" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="802" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="8616" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="6462" xpath="//flow/block[13]/lineArea[1]/inlineparent/@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 inline level alignment-adjust.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" background-color="yellow">alignment-adjust not specified</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="auto" background-color="yellow">alignment-adjust="auto"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="baseline" background-color="yellow">alignment-adjust="baseline"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="before-edge" background-color="yellow">alignment-adjust="before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="text-before-edge" background-color="yellow">alignment-adjust="text-before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="central" background-color="yellow">alignment-adjust="central"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="middle" background-color="yellow">alignment-adjust="middle"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="after-edge" background-color="yellow">alignment-adjust="after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="text-after-edge" background-color="yellow">alignment-adjust="text-after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="ideographic" background-color="yellow">alignment-adjust="ideographic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="alphabetic" background-color="yellow">alignment-adjust="alphabetic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="hanging" background-color="yellow">alignment-adjust="hanging"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="mathematical" background-color="yellow">alignment-adjust="mathematical"</fo:inline> After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="10052" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="10052" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="5427" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="5487" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="802" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="802" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="802" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="8616" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="6462" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml b/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml
index 501e76bd8..0254f6c20 100644
--- a/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml
+++ b/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml
@@ -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 inline level alignment-adjust.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="0pt" background-color="yellow">alignment-adjust="0pt"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="0%" background-color="yellow">alignment-adjust="0%"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="3pt" background-color="yellow">alignment-adjust="3pt"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="-3pt" background-color="yellow">alignment-adjust="-3pt"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="30%" background-color="yellow">alignment-adjust="30%"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-adjust="-30%" background-color="yellow">alignment-adjust="-30%"</fo:inline> After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="13078" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>

-    <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="15122" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="13678" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>

-    <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="15722" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="6472" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/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 inline level alignment-adjust.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="0pt" background-color="yellow">alignment-adjust="0pt"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="0%" background-color="yellow">alignment-adjust="0%"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="3pt" background-color="yellow">alignment-adjust="3pt"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="-3pt" background-color="yellow">alignment-adjust="-3pt"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="30%" background-color="yellow">alignment-adjust="30%"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="-30%" background-color="yellow">alignment-adjust="-30%"</fo:inline> After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="13078" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+    <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="15122" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="13678" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+    <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="15722" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="6472" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml b/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml
index 03f9da676..6f0377adc 100644
--- a/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml
+++ b/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml
@@ -1,92 +1,92 @@
-<?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 inline level alignment-baseline.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/inlineparent/@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 inline level alignment-baseline.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml b/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml
index d1274be73..1c77feb4c 100644
--- a/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml
+++ b/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml
@@ -1,117 +1,117 @@
-<?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 inline level alignment-baseline.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" background-color="yellow">alignment-baseline not specified</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            Before <fo:inline font-size="14pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/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 inline level alignment-baseline.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-baseline_3.xml b/test/layoutengine/standard-testcases/inline_alignment-baseline_3.xml
index 10948938b..51ba74b68 100644
--- a/test/layoutengine/standard-testcases/inline_alignment-baseline_3.xml
+++ b/test/layoutengine/standard-testcases/inline_alignment-baseline_3.xml
@@ -1,92 +1,92 @@
-<?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 inline level alignment-baseline.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="1436" xpath="//flow/block[5]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="2361" xpath="//flow/block[6]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="2349" xpath="//flow/block[7]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="3286" xpath="//flow/block[9]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="3286" xpath="//flow/block[10]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="1723" xpath="//flow/block[12]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="2154" xpath="//flow/block[13]/lineArea[1]/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 inline level alignment-baseline.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="1436" xpath="//flow/block[5]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="2361" xpath="//flow/block[6]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="2349" xpath="//flow/block[7]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="3286" xpath="//flow/block[9]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="3286" xpath="//flow/block[10]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="1723" xpath="//flow/block[12]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="2154" xpath="//flow/block[13]/lineArea[1]/inlineparent[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-baseline_4.xml b/test/layoutengine/standard-testcases/inline_alignment-baseline_4.xml
index 6400c4da5..adf427196 100644
--- a/test/layoutengine/standard-testcases/inline_alignment-baseline_4.xml
+++ b/test/layoutengine/standard-testcases/inline_alignment-baseline_4.xml
@@ -1,232 +1,232 @@
-<?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 inline level alignment-baseline for nested inlines.

-    </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" font-family="sans-serif">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="50%" 

-                background-color="yellow">alphabetic

-              <fo:inline font-size="150%" background-color="red">alphabetic</fo:inline>

-            </fo:inline>

-             Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="50%" 

-                dominant-baseline="reset-size"

-                background-color="yellow">alphabetic

-              <fo:inline font-size="150%" background-color="red">alphabetic</fo:inline>

-            </fo:inline>

-            Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="50%"

-                alignment-baseline="hanging" 

-                background-color="yellow">hanging

-              <fo:inline font-size="50%" background-color="red" alignment-baseline="middle">middle</fo:inline>

-            </fo:inline>

-            Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="50%"

-               dominant-baseline="reset-size"

-               alignment-baseline="hanging"

-               background-color="yellow">hanging

-              <fo:inline font-size="50%" background-color="red" alignment-baseline="middle">middle</fo:inline>

-            </fo:inline>

-            Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="50%" 

-                alignment-baseline="text-before-edge"

-                background-color="yellow">text-before-edge

-              <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline>

-            </fo:inline>

-             Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="50%" 

-                dominant-baseline="reset-size"

-                alignment-baseline="text-before-edge" 

-                background-color="yellow">text-before-edge

-              <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline>

-            </fo:inline>

-            Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="25%" 

-                alignment-baseline="central"

-                background-color="yellow">central

-              <fo:inline font-size="150%"

-                  alignment-baseline="text-before-edge"

-                  background-color="red">text-before-edge

-                <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline>

-              </fo:inline>

-            </fo:inline>

-            Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="25%" 

-                dominant-baseline="reset-size"

-                alignment-baseline="central"

-                background-color="yellow">central

-              <fo:inline font-size="150%"

-                  alignment-baseline="text-before-edge"

-                  background-color="red">text-before-edge

-                <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline>

-              </fo:inline>

-            </fo:inline>

-            Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="25%" 

-                dominant-baseline="reset-size"

-                alignment-baseline="central"

-                background-color="yellow">central

-              <fo:inline font-size="150%"

-                  dominant-baseline="reset-size"

-                  alignment-baseline="text-before-edge"

-                  background-color="red">text-before-edge

-                <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline>

-              </fo:inline>

-            </fo:inline>

-            Big <fo:inline font-size="8pt">Baseline table changed twice</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big

-            <fo:inline font-size="50%" 

-                dominant-baseline="reset-size"

-                alignment-baseline="before-edge" 

-                background-color="yellow">before-edge

-              <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline>

-            </fo:inline>

-            Big <fo:inline font-size="8pt">This is over constraint</fo:inline>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="22200" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="8616" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="22200" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="8616" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="22200" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1723" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="6494" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="22200" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1723" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="2739" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="22200" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="5550" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="27750" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="22200" xpath="//flow/block[7]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="8325" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-8325" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="4308" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="22491" xpath="//flow/block[8]/lineArea[1]/@bpd"/>

-    <eval expected="291" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="8616" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="-8616" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>

-    <eval expected="291" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="22200" xpath="//flow/block[9]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="8325" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="-6462" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="27750" xpath="//flow/block[10]/lineArea[1]/@bpd"/>

-    <eval expected="5550" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-5550" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="5550" xpath="//flow/block[10]/lineArea[1]/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 inline level alignment-baseline for nested inlines.
+    </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" font-family="sans-serif">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="50%" 
+                background-color="yellow">alphabetic
+              <fo:inline font-size="150%" background-color="red">alphabetic</fo:inline>
+            </fo:inline>
+             Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="50%" 
+                dominant-baseline="reset-size"
+                background-color="yellow">alphabetic
+              <fo:inline font-size="150%" background-color="red">alphabetic</fo:inline>
+            </fo:inline>
+            Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="50%"
+                alignment-baseline="hanging" 
+                background-color="yellow">hanging
+              <fo:inline font-size="50%" background-color="red" alignment-baseline="middle">middle</fo:inline>
+            </fo:inline>
+            Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="50%"
+               dominant-baseline="reset-size"
+               alignment-baseline="hanging"
+               background-color="yellow">hanging
+              <fo:inline font-size="50%" background-color="red" alignment-baseline="middle">middle</fo:inline>
+            </fo:inline>
+            Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="50%" 
+                alignment-baseline="text-before-edge"
+                background-color="yellow">text-before-edge
+              <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline>
+            </fo:inline>
+             Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="50%" 
+                dominant-baseline="reset-size"
+                alignment-baseline="text-before-edge" 
+                background-color="yellow">text-before-edge
+              <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline>
+            </fo:inline>
+            Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="25%" 
+                alignment-baseline="central"
+                background-color="yellow">central
+              <fo:inline font-size="150%"
+                  alignment-baseline="text-before-edge"
+                  background-color="red">text-before-edge
+                <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline>
+              </fo:inline>
+            </fo:inline>
+            Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="25%" 
+                dominant-baseline="reset-size"
+                alignment-baseline="central"
+                background-color="yellow">central
+              <fo:inline font-size="150%"
+                  alignment-baseline="text-before-edge"
+                  background-color="red">text-before-edge
+                <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline>
+              </fo:inline>
+            </fo:inline>
+            Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="25%" 
+                dominant-baseline="reset-size"
+                alignment-baseline="central"
+                background-color="yellow">central
+              <fo:inline font-size="150%"
+                  dominant-baseline="reset-size"
+                  alignment-baseline="text-before-edge"
+                  background-color="red">text-before-edge
+                <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline>
+              </fo:inline>
+            </fo:inline>
+            Big <fo:inline font-size="8pt">Baseline table changed twice</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+            <fo:inline font-size="50%" 
+                dominant-baseline="reset-size"
+                alignment-baseline="before-edge" 
+                background-color="yellow">before-edge
+              <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline>
+            </fo:inline>
+            Big <fo:inline font-size="8pt">This is over constraint</fo:inline>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="22200" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="8616" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="22200" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="8616" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="22200" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1723" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="6494" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="22200" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1723" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="2739" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="22200" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="5550" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="27750" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="22200" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="8325" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-8325" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="4308" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="22491" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+    <eval expected="291" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="8616" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="-8616" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+    <eval expected="291" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="22200" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="8325" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="-6462" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="27750" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
+    <eval expected="5550" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-5550" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="5550" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_background-color.xml b/test/layoutengine/standard-testcases/inline_background-color.xml
index 7b488ee4c..eda86cf8f 100644
--- a/test/layoutengine/standard-testcases/inline_background-color.xml
+++ b/test/layoutengine/standard-testcases/inline_background-color.xml
@@ -1,133 +1,133 @@
-<?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:inline with background-color 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">

-        <fo:flow flow-name="xsl-region-body" font-size="10pt">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it.

-          </fo:block>

-          <fo:block background-color="silver" text-align="end" margin="1pt 0pt 1pt 0pt">

-            To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="end".

-          </fo:block>

-          <fo:block background-color="silver" text-align="justify" margin="1pt 0pt 1pt 0pt">

-            To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="justify".

-          </fo:block>

-          <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt">

-            To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="center".

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">

-            This demonstrates a long inline

-              <fo:inline background-color="yellow">which stretches over multiple lines to

-                show how the highlight extends from line to line while

-                correctly honouring the text-align (not specified) property</fo:inline>

-            back to normal

-          </fo:block>

-          <fo:block background-color="silver" text-align="end" margin="1pt 0pt 1pt 0pt">

-            This demonstrates a long inline

-              <fo:inline background-color="yellow">which stretches over multiple lines to

-                show how the highlight extends from line to line while

-                correctly honouring the text-align="end" property</fo:inline>

-            back to normal

-          </fo:block>

-          <fo:block background-color="silver" text-align="justify" margin="1pt 0pt 1pt 0pt">

-            This demonstrates a long inline

-              <fo:inline background-color="yellow">which stretches over multiple lines to

-                show how the highlight extends from line to line while

-                correctly honouring the text-align="justify" property</fo:inline>

-            back to normal

-          </fo:block>

-          <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt">

-            This demonstrates a long inline

-              <fo:inline background-color="yellow">which stretches over multiple lines to

-                show how the highlight extends from line to line while

-                correctly honouring the text-align="center" property</fo:inline>

-            back to normal

-          </fo:block>

-          <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt">

-            Nested inline highlights

-              <fo:inline background-color="yellow" font-size="10pt">this is 10pt text

-                <fo:inline font-size="14pt">nested within is 14pt text</fo:inline>

-                followed by 10pt text</fo:inline>

-            back to normal

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="90040" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/inlineparent/@background"/>

-

-    <eval expected="90040" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[2]/lineArea/inlineparent/@background"/>

-

-    <eval expected="90040" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[3]/lineArea/inlineparent/@background"/>

-

-    <eval expected="90040" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[4]/lineArea/inlineparent/@background"/>

-

-    <eval expected="188950" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[1]/inlineparent/@background"/>

-    <eval expected="335700" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[2]/inlineparent/@background"/>

-    <eval expected="126160" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[3]/inlineparent/@background"/>

-

-    <eval expected="188950" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[1]/inlineparent/@background"/>

-    <eval expected="335700" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[2]/inlineparent/@background"/>

-    <eval expected="90200" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[3]/inlineparent/@background"/>

-

-    <eval expected="199793" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[1]/inlineparent/@background"/>

-    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[2]/inlineparent/@background"/>

-    <eval expected="99080" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[3]/inlineparent/@background"/>

-

-    <eval expected="128370" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[1]/inlineparent/@background"/>

-    <eval expected="269560" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[2]/inlineparent/@background"/>

-    <eval expected="225250" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[3]/inlineparent/@background"/>

-

-    <eval expected="151184" xpath="//flow/block[9]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[9]/lineArea[1]/inlineparent/@background"/>

-    <eval expected="81704" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@ipd"/>

-    <eval expected="161644" xpath="//flow/block[9]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[9]/lineArea[2]/inlineparent/@background"/>

-    <eval expected="67704" xpath="//flow/block[9]/lineArea[2]/inlineparent/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:inline with background-color 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">
+        <fo:flow flow-name="xsl-region-body" font-size="10pt">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it.
+          </fo:block>
+          <fo:block background-color="silver" text-align="end" margin="1pt 0pt 1pt 0pt">
+            To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="end".
+          </fo:block>
+          <fo:block background-color="silver" text-align="justify" margin="1pt 0pt 1pt 0pt">
+            To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="justify".
+          </fo:block>
+          <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt">
+            To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="center".
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+            This demonstrates a long inline
+              <fo:inline background-color="yellow">which stretches over multiple lines to
+                show how the highlight extends from line to line while
+                correctly honouring the text-align (not specified) property</fo:inline>
+            back to normal
+          </fo:block>
+          <fo:block background-color="silver" text-align="end" margin="1pt 0pt 1pt 0pt">
+            This demonstrates a long inline
+              <fo:inline background-color="yellow">which stretches over multiple lines to
+                show how the highlight extends from line to line while
+                correctly honouring the text-align="end" property</fo:inline>
+            back to normal
+          </fo:block>
+          <fo:block background-color="silver" text-align="justify" margin="1pt 0pt 1pt 0pt">
+            This demonstrates a long inline
+              <fo:inline background-color="yellow">which stretches over multiple lines to
+                show how the highlight extends from line to line while
+                correctly honouring the text-align="justify" property</fo:inline>
+            back to normal
+          </fo:block>
+          <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt">
+            This demonstrates a long inline
+              <fo:inline background-color="yellow">which stretches over multiple lines to
+                show how the highlight extends from line to line while
+                correctly honouring the text-align="center" property</fo:inline>
+            back to normal
+          </fo:block>
+          <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt">
+            Nested inline highlights
+              <fo:inline background-color="yellow" font-size="10pt">this is 10pt text
+                <fo:inline font-size="14pt">nested within is 14pt text</fo:inline>
+                followed by 10pt text</fo:inline>
+            back to normal
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="90040" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/inlineparent/@background"/>
+
+    <eval expected="90040" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[2]/lineArea/inlineparent/@background"/>
+
+    <eval expected="90040" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[3]/lineArea/inlineparent/@background"/>
+
+    <eval expected="90040" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[4]/lineArea/inlineparent/@background"/>
+
+    <eval expected="188950" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[1]/inlineparent/@background"/>
+    <eval expected="335700" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[2]/inlineparent/@background"/>
+    <eval expected="126160" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[3]/inlineparent/@background"/>
+
+    <eval expected="188950" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[1]/inlineparent/@background"/>
+    <eval expected="335700" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[2]/inlineparent/@background"/>
+    <eval expected="90200" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[3]/inlineparent/@background"/>
+
+    <eval expected="199793" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[1]/inlineparent/@background"/>
+    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[2]/inlineparent/@background"/>
+    <eval expected="99080" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[3]/inlineparent/@background"/>
+
+    <eval expected="128370" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[1]/inlineparent/@background"/>
+    <eval expected="269560" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[2]/inlineparent/@background"/>
+    <eval expected="225250" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[3]/inlineparent/@background"/>
+
+    <eval expected="151184" xpath="//flow/block[9]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[9]/lineArea[1]/inlineparent/@background"/>
+    <eval expected="81704" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@ipd"/>
+    <eval expected="161644" xpath="//flow/block[9]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[9]/lineArea[2]/inlineparent/@background"/>
+    <eval expected="67704" xpath="//flow/block[9]/lineArea[2]/inlineparent/inlineparent/@ipd"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_background-image.xml b/test/layoutengine/standard-testcases/inline_background-image.xml
index 5e60e20cf..165b28c14 100644
--- a/test/layoutengine/standard-testcases/inline_background-image.xml
+++ b/test/layoutengine/standard-testcases/inline_background-image.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks background image on a fo:inline.

-    </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>

-            Why is <fo:inline font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">FOP</fo:inline> so cool?

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/>

-    <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/>

-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@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 a fo:inline.
+    </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>
+            Why is <fo:inline font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">FOP</fo:inline> so cool?
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/>
+    <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_baseline-shift_1.xml b/test/layoutengine/standard-testcases/inline_baseline-shift_1.xml
index 66b4b7bdf..eb064b9b8 100644
--- a/test/layoutengine/standard-testcases/inline_baseline-shift_1.xml
+++ b/test/layoutengine/standard-testcases/inline_baseline-shift_1.xml
@@ -1,165 +1,165 @@
-<?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 inline level baseline-shift.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before 

-            <fo:inline font-size="10pt" 

-                baseline-shift="baseline" 

-                background-color="yellow">baseline-shift="baseline"</fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                baseline-shift="sub" 

-                background-color="yellow">baseline-shift="sub"</fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt"

-                baseline-shift="super" 

-                background-color="yellow">baseline-shift="super"</fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt"

-                baseline-shift="0pt"

-                background-color="yellow">baseline-shift="0pt"</fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt"

-                baseline-shift="0%" 

-                background-color="yellow">baseline-shift="0%"</fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt"

-                baseline-shift="3pt"

-                background-color="yellow">baseline-shift="3pt"</fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt"

-                baseline-shift="-3pt"

-                background-color="yellow">baseline-shift="-3pt"</fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt"

-                baseline-shift="30%"

-                background-color="yellow">baseline-shift="30%"</fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt"

-                baseline-shift="-30%"

-                background-color="yellow">baseline-shift="-30%"</fo:inline>

-            After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="14737" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5487" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="17400" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>

-    <eval expected="4450" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="4450" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="13078" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>

-    <eval expected="128" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="128" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="15122" xpath="//flow/block[7]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5872" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="15118" xpath="//flow/block[8]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-after"/>

-    <eval expected="2168" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2168" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="17162" xpath="//flow/block[9]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="7912" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/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 inline level baseline-shift.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before 
+            <fo:inline font-size="10pt" 
+                baseline-shift="baseline" 
+                background-color="yellow">baseline-shift="baseline"</fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="sub" 
+                background-color="yellow">baseline-shift="sub"</fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt"
+                baseline-shift="super" 
+                background-color="yellow">baseline-shift="super"</fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt"
+                baseline-shift="0pt"
+                background-color="yellow">baseline-shift="0pt"</fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt"
+                baseline-shift="0%" 
+                background-color="yellow">baseline-shift="0%"</fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt"
+                baseline-shift="3pt"
+                background-color="yellow">baseline-shift="3pt"</fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt"
+                baseline-shift="-3pt"
+                background-color="yellow">baseline-shift="-3pt"</fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt"
+                baseline-shift="30%"
+                background-color="yellow">baseline-shift="30%"</fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt"
+                baseline-shift="-30%"
+                background-color="yellow">baseline-shift="-30%"</fo:inline>
+            After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="14737" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5487" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="17400" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+    <eval expected="4450" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="4450" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="13078" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+    <eval expected="128" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="128" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="15122" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5872" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="15118" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-after"/>
+    <eval expected="2168" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2168" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="17162" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="7912" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_baseline-shift_2.xml b/test/layoutengine/standard-testcases/inline_baseline-shift_2.xml
index 0af4f3683..77b1812eb 100644
--- a/test/layoutengine/standard-testcases/inline_baseline-shift_2.xml
+++ b/test/layoutengine/standard-testcases/inline_baseline-shift_2.xml
@@ -1,173 +1,173 @@
-<?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 inline level baseline-shift.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                baseline-shift="sub" 

-                background-color="yellow">sub

-              <fo:inline font-size="8pt" 

-                  baseline-shift="sub" 

-                  background-color="red">sub

-              </fo:inline>sub

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                baseline-shift="sub" 

-                background-color="yellow">sub

-              <fo:inline font-size="8pt" 

-                  baseline-shift="super" 

-                  background-color="red">super

-              </fo:inline>sub

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                baseline-shift="super" 

-                background-color="yellow">super

-              <fo:inline font-size="8pt" 

-                  baseline-shift="super" 

-                  background-color="red">super

-              </fo:inline>super

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                baseline-shift="super" 

-                background-color="yellow">super

-              <fo:inline font-size="8pt" 

-                  baseline-shift="sub" 

-                  background-color="red">sub

-              </fo:inline>super

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                baseline-shift="30%" 

-                background-color="yellow">30%

-              <fo:inline font-size="8pt" 

-                  baseline-shift="-50%" 

-                  background-color="red">-50%

-              </fo:inline>30%

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="18pt" 

-                baseline-shift="super" 

-                background-color="yellow">super

-              <fo:inline font-size="24pt" 

-                  baseline-shift="sub" 

-                  background-color="red">sub

-                <fo:inline font-size="30pt" 

-                    baseline-shift="super" 

-                    background-color="green">super

-                </fo:inline>sub

-              </fo:inline>super

-            </fo:inline>

-            After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="16415" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5487" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="3528" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="14737" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5487" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-3794" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="21194" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="8244" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="3794" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-3794" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="8244" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="17400" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="4450" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="3528" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="4450" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="15118" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="2168" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="7436" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="2168" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="39060" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="25086" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="14892" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="-16860" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="25086" xpath="//flow/block[6]/lineArea[1]/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 inline level baseline-shift.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="sub" 
+                background-color="yellow">sub
+              <fo:inline font-size="8pt" 
+                  baseline-shift="sub" 
+                  background-color="red">sub
+              </fo:inline>sub
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="sub" 
+                background-color="yellow">sub
+              <fo:inline font-size="8pt" 
+                  baseline-shift="super" 
+                  background-color="red">super
+              </fo:inline>sub
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="super" 
+                background-color="yellow">super
+              <fo:inline font-size="8pt" 
+                  baseline-shift="super" 
+                  background-color="red">super
+              </fo:inline>super
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="super" 
+                background-color="yellow">super
+              <fo:inline font-size="8pt" 
+                  baseline-shift="sub" 
+                  background-color="red">sub
+              </fo:inline>super
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                baseline-shift="30%" 
+                background-color="yellow">30%
+              <fo:inline font-size="8pt" 
+                  baseline-shift="-50%" 
+                  background-color="red">-50%
+              </fo:inline>30%
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="18pt" 
+                baseline-shift="super" 
+                background-color="yellow">super
+              <fo:inline font-size="24pt" 
+                  baseline-shift="sub" 
+                  background-color="red">sub
+                <fo:inline font-size="30pt" 
+                    baseline-shift="super" 
+                    background-color="green">super
+                </fo:inline>sub
+              </fo:inline>super
+            </fo:inline>
+            After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="16415" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5487" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="3528" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="14737" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5487" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-3794" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="21194" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="8244" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="3794" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-3794" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="8244" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="17400" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="4450" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="3528" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="4450" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="15118" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="2168" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="7436" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="2168" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="39060" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="25086" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="14892" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="-16860" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="25086" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
+
diff --git a/test/layoutengine/standard-testcases/inline_baseline-shift_3.xml b/test/layoutengine/standard-testcases/inline_baseline-shift_3.xml
index 46649aac8..f79efbb57 100644
--- a/test/layoutengine/standard-testcases/inline_baseline-shift_3.xml
+++ b/test/layoutengine/standard-testcases/inline_baseline-shift_3.xml
@@ -1,211 +1,211 @@
-<?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 inline level baseline-shift.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                alignment-baseline="middle" 

-                dominant-baseline="middle" 

-                background-color="yellow">middle

-              <fo:inline font-size="8pt" 

-                  baseline-shift="sub" 

-                  background-color="red">sub

-              </fo:inline>middle

-            </fo:inline>

-            After <fo:inline font-size="8pt">Baseline table changed</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                alignment-baseline="middle" 

-                dominant-baseline="middle" 

-                background-color="yellow">middle

-              <fo:inline font-size="8pt" 

-                  baseline-shift="super" 

-                  background-color="red">super

-              </fo:inline>middle

-            </fo:inline>

-            After <fo:inline font-size="8pt">Baseline table changed</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                alignment-baseline="text-after-edge" 

-                dominant-baseline="text-after-edge"

-                background-color="yellow">text-after-edge

-              <fo:inline font-size="8pt" 

-                  baseline-shift="30%" 

-                  background-color="red">30%

-              </fo:inline>text-after-edge

-            </fo:inline>

-            After <fo:inline font-size="8pt">Baseline table changed</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                alignment-baseline="text-before-edge" 

-                dominant-baseline="text-before-edge"

-                background-color="yellow">text-before-edge

-              <fo:inline font-size="8pt" 

-                  baseline-shift="-50%" 

-                  background-color="red">-50%

-              </fo:inline>text-before-edge

-            </fo:inline>

-            After <fo:inline font-size="8pt">Baseline table changed</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                alignment-baseline="middle" 

-                background-color="yellow">middle

-              <fo:inline font-size="8pt" 

-                  baseline-shift="sub" 

-                  background-color="red">sub

-              </fo:inline>middle

-            </fo:inline>

-            After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                alignment-baseline="middle" 

-                background-color="yellow">middle

-              <fo:inline font-size="8pt" 

-                  baseline-shift="super" 

-                  background-color="red">super

-              </fo:inline>middle

-            </fo:inline>

-            After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                alignment-baseline="text-after-edge" 

-                background-color="yellow">text-after-edge

-              <fo:inline font-size="8pt" 

-                  baseline-shift="30%" 

-                  background-color="red">30%

-              </fo:inline>text-after-edge

-            </fo:inline>

-            After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            Before

-            <fo:inline font-size="10pt" 

-                alignment-baseline="text-before-edge" 

-                background-color="yellow">text-before-edge

-              <fo:inline font-size="8pt" 

-                  baseline-shift="-50%" 

-                  background-color="red">-50%

-              </fo:inline>text-before-edge

-            </fo:inline>

-            After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="14846" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1826" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="5620" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1826" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-1702" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-1750" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="13400" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="6000" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1826" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="3528" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="14918" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="3794" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-3794" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="3700" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-2992" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="17708" xpath="//flow/block[8]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="10308" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/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 inline level baseline-shift.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                alignment-baseline="middle" 
+                dominant-baseline="middle" 
+                background-color="yellow">middle
+              <fo:inline font-size="8pt" 
+                  baseline-shift="sub" 
+                  background-color="red">sub
+              </fo:inline>middle
+            </fo:inline>
+            After <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                alignment-baseline="middle" 
+                dominant-baseline="middle" 
+                background-color="yellow">middle
+              <fo:inline font-size="8pt" 
+                  baseline-shift="super" 
+                  background-color="red">super
+              </fo:inline>middle
+            </fo:inline>
+            After <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                alignment-baseline="text-after-edge" 
+                dominant-baseline="text-after-edge"
+                background-color="yellow">text-after-edge
+              <fo:inline font-size="8pt" 
+                  baseline-shift="30%" 
+                  background-color="red">30%
+              </fo:inline>text-after-edge
+            </fo:inline>
+            After <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                alignment-baseline="text-before-edge" 
+                dominant-baseline="text-before-edge"
+                background-color="yellow">text-before-edge
+              <fo:inline font-size="8pt" 
+                  baseline-shift="-50%" 
+                  background-color="red">-50%
+              </fo:inline>text-before-edge
+            </fo:inline>
+            After <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                alignment-baseline="middle" 
+                background-color="yellow">middle
+              <fo:inline font-size="8pt" 
+                  baseline-shift="sub" 
+                  background-color="red">sub
+              </fo:inline>middle
+            </fo:inline>
+            After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                alignment-baseline="middle" 
+                background-color="yellow">middle
+              <fo:inline font-size="8pt" 
+                  baseline-shift="super" 
+                  background-color="red">super
+              </fo:inline>middle
+            </fo:inline>
+            After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                alignment-baseline="text-after-edge" 
+                background-color="yellow">text-after-edge
+              <fo:inline font-size="8pt" 
+                  baseline-shift="30%" 
+                  background-color="red">30%
+              </fo:inline>text-after-edge
+            </fo:inline>
+            After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before
+            <fo:inline font-size="10pt" 
+                alignment-baseline="text-before-edge" 
+                background-color="yellow">text-before-edge
+              <fo:inline font-size="8pt" 
+                  baseline-shift="-50%" 
+                  background-color="red">-50%
+              </fo:inline>text-before-edge
+            </fo:inline>
+            After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="14846" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1826" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="5620" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1826" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-1702" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-1750" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="13400" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="6000" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1826" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="3528" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="14918" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="3794" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-3794" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="3700" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-2992" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="17708" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="10308" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_baseline-shift_4.xml b/test/layoutengine/standard-testcases/inline_baseline-shift_4.xml
index 81566bac0..6be9d6f81 100644
--- a/test/layoutengine/standard-testcases/inline_baseline-shift_4.xml
+++ b/test/layoutengine/standard-testcases/inline_baseline-shift_4.xml
@@ -1,185 +1,185 @@
-<?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 inline level baseline-shift.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                alignment-baseline="central" 

-                baseline-shift="6pt" 

-                background-color="yellow">6pt central

-            </fo:inline>

-            <fo:inline font-size="50%" 

-                alignment-baseline="central" 

-                background-color="orange">central

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                alignment-baseline="central" 

-                baseline-shift="-6pt" 

-                background-color="yellow">-6pt central

-            </fo:inline>

-            <fo:inline font-size="50%" 

-                alignment-baseline="central" 

-                background-color="orange">central

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                alignment-baseline="central" 

-                baseline-shift="sub" 

-                background-color="yellow">sub

-              <fo:inline font-size="150%" 

-                  alignment-baseline="text-before-edge" 

-                  background-color="red">text-before-edge

-                  <fo:inline font-size="6pt"

-                      background-color="green">Baseline unchanged</fo:inline>                  

-              </fo:inline>central

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                alignment-baseline="central" 

-                baseline-shift="super" 

-                background-color="yellow">super

-              <fo:inline font-size="150%" 

-                  alignment-baseline="text-after-edge" 

-                  background-color="red">text-after-edge

-                  <fo:inline font-size="6pt"

-                      background-color="green">Baseline unchanged</fo:inline>                  

-              </fo:inline>central

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                alignment-baseline="central" 

-                baseline-shift="sub" 

-                background-color="yellow">sub

-              <fo:inline font-size="150%" 

-                  dominant-baseline="text-before-edge" 

-                  background-color="red">text-before-edge

-                  <fo:inline font-size="6pt"

-                      background-color="green">Baseline changed</fo:inline>                  

-              </fo:inline>central

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                alignment-baseline="central" 

-                baseline-shift="super" 

-                background-color="yellow">super

-              <fo:inline font-size="150%" 

-                  dominant-baseline="text-after-edge" 

-                  background-color="red">text-after-edge

-                  <fo:inline font-size="6pt"

-                      background-color="green">Baseline changed</fo:inline>                  

-              </fo:inline>central

-            </fo:inline>

-            After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="17100" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="2300" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/text[1]/@offset"/>

-    <eval expected="6000" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/text[1]/@offset"/>

-    <eval expected="2300" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="17100" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="9700" xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/text[1]/@offset"/>

-    <eval expected="3700" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="16892" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5792" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="1436" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="23168" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="8368" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="3700" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-3700" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="5136" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="8368" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="14800" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5792" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-2872" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>

-    

-    <eval expected="22340" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="7540" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="2872" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-2872" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>

-    <eval expected="7540" xpath="//flow/block[6]/lineArea[1]/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 inline level baseline-shift.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                alignment-baseline="central" 
+                baseline-shift="6pt" 
+                background-color="yellow">6pt central
+            </fo:inline>
+            <fo:inline font-size="50%" 
+                alignment-baseline="central" 
+                background-color="orange">central
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                alignment-baseline="central" 
+                baseline-shift="-6pt" 
+                background-color="yellow">-6pt central
+            </fo:inline>
+            <fo:inline font-size="50%" 
+                alignment-baseline="central" 
+                background-color="orange">central
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                alignment-baseline="central" 
+                baseline-shift="sub" 
+                background-color="yellow">sub
+              <fo:inline font-size="150%" 
+                  alignment-baseline="text-before-edge" 
+                  background-color="red">text-before-edge
+                  <fo:inline font-size="6pt"
+                      background-color="green">Baseline unchanged</fo:inline>                  
+              </fo:inline>central
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                alignment-baseline="central" 
+                baseline-shift="super" 
+                background-color="yellow">super
+              <fo:inline font-size="150%" 
+                  alignment-baseline="text-after-edge" 
+                  background-color="red">text-after-edge
+                  <fo:inline font-size="6pt"
+                      background-color="green">Baseline unchanged</fo:inline>                  
+              </fo:inline>central
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                alignment-baseline="central" 
+                baseline-shift="sub" 
+                background-color="yellow">sub
+              <fo:inline font-size="150%" 
+                  dominant-baseline="text-before-edge" 
+                  background-color="red">text-before-edge
+                  <fo:inline font-size="6pt"
+                      background-color="green">Baseline changed</fo:inline>                  
+              </fo:inline>central
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                alignment-baseline="central" 
+                baseline-shift="super" 
+                background-color="yellow">super
+              <fo:inline font-size="150%" 
+                  dominant-baseline="text-after-edge" 
+                  background-color="red">text-after-edge
+                  <fo:inline font-size="6pt"
+                      background-color="green">Baseline changed</fo:inline>                  
+              </fo:inline>central
+            </fo:inline>
+            After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="17100" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="2300" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/text[1]/@offset"/>
+    <eval expected="6000" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/text[1]/@offset"/>
+    <eval expected="2300" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="17100" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="9700" xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/text[1]/@offset"/>
+    <eval expected="3700" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="16892" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5792" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="1436" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="23168" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="8368" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="3700" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-3700" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="5136" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="8368" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="14800" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5792" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-2872" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="22340" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="7540" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-2872" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+    <eval expected="7540" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml b/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml
index d9e19b0c8..d6ae38578 100644
--- a/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml
+++ b/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml
@@ -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:inline and nested nodes. Regression test for Bugzilla #36248.

-    </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" id="ps1">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>normal<fo:inline><fo:page-number/></fo:inline>normal</fo:block>

-          <fo:block>normal<fo:inline><fo:page-number-citation ref-id="ps1"/></fo:inline>normal</fo:block>

-          <fo:block>normal<fo:inline><fo:character character="x"/></fo:inline>normal</fo:block>

-          <fo:block>normal<fo:inline><fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/></fo:inline>normal</fo:block>

-          <fo:block>normal<fo:inline><fo:instream-foreign-object content-width="20pt" content-height="20pt">

-              <svg:svg viewBox="0 0 20 20">

-                <svg:g style="fill:red; stroke:#000000">

-                  <svg:rect x="0" y="0" width="15" height="15"/>

-                  <svg:rect x="5" y="5" width="15" height="15"/>

-                </svg:g>

-              </svg:svg>

-            </fo:instream-foreign-object>

-</fo:inline>normal</fo:block>

-          <fo:block>normal<fo:inline><fo:leader/></fo:inline>normal</fo:block>

-          <fo:block>normal<fo:inline><fo:wrapper>wrapped</fo:wrapper></fo:inline>normal</fo:block>

-          <fo:block>normal<fo:inline>TODO: bidi-override is missing here</fo:inline>normal</fo:block>

-          <fo:block>normal<fo:inline><fo:inline>nested inline</fo:inline></fo:inline>normal</fo:block>

-          <fo:block>normal<fo:inline><fo:footnote><fo:inline>bla</fo:inline><fo:footnote-body><fo:block>bla? yawn.</fo:block></fo:footnote-body></fo:footnote></fo:inline>normal</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="10" xpath="count(//flow/block)"/>

-    <!-- We don't really check all this stuff here, rather we're making sure there are no ClassCastExceptions anymore. -->

-  </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:inline and nested nodes. Regression test for Bugzilla #36248.
+    </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" id="ps1">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>normal<fo:inline><fo:page-number/></fo:inline>normal</fo:block>
+          <fo:block>normal<fo:inline><fo:page-number-citation ref-id="ps1"/></fo:inline>normal</fo:block>
+          <fo:block>normal<fo:inline><fo:character character="x"/></fo:inline>normal</fo:block>
+          <fo:block>normal<fo:inline><fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/></fo:inline>normal</fo:block>
+          <fo:block>normal<fo:inline><fo:instream-foreign-object content-width="20pt" content-height="20pt">
+              <svg:svg viewBox="0 0 20 20">
+                <svg:g style="fill:red; stroke:#000000">
+                  <svg:rect x="0" y="0" width="15" height="15"/>
+                  <svg:rect x="5" y="5" width="15" height="15"/>
+                </svg:g>
+              </svg:svg>
+            </fo:instream-foreign-object>
+</fo:inline>normal</fo:block>
+          <fo:block>normal<fo:inline><fo:leader/></fo:inline>normal</fo:block>
+          <fo:block>normal<fo:inline><fo:wrapper>wrapped</fo:wrapper></fo:inline>normal</fo:block>
+          <fo:block>normal<fo:inline>TODO: bidi-override is missing here</fo:inline>normal</fo:block>
+          <fo:block>normal<fo:inline><fo:inline>nested inline</fo:inline></fo:inline>normal</fo:block>
+          <fo:block>normal<fo:inline><fo:footnote><fo:inline>bla</fo:inline><fo:footnote-body><fo:block>bla? yawn.</fo:block></fo:footnote-body></fo:footnote></fo:inline>normal</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="10" xpath="count(//flow/block)"/>
+    <!-- We don't really check all this stuff here, rather we're making sure there are no ClassCastExceptions anymore. -->
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_border_padding.xml b/test/layoutengine/standard-testcases/inline_border_padding.xml
index a0197c319..9748b26dd 100644
--- a/test/layoutengine/standard-testcases/inline_border_padding.xml
+++ b/test/layoutengine/standard-testcases/inline_border_padding.xml
@@ -1,141 +1,141 @@
-<?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 inlines with border and padding properties.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">

-        <fo:flow flow-name="xsl-region-body" font-size="10pt">

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">

-            To <fo:inline border="solid 1pt red" background-color="yellow">emphasize</fo:inline> a word we give it a 1pt border and a background.

-          </fo:block>

-          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">

-            Demonstrates a big border <fo:inline border="solid 5pt red" padding="5pt" background-color="yellow">inline with border="solid 5pt red" padding="5pt"</fo:inline> extending over the small allocation rectangle to the top and bottom.

-          </fo:block>

-          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">

-            Demonstrates <fo:inline border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow">unsymmetric borders and padding</fo:inline> but the baselines should align.

-          </fo:block>

-          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">

-            Big border <fo:inline border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt">with a smaller font</fo:inline> but the baselines should align.

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">

-            This demonstrates correct line breaking of a fo:inline because it does fit nicely..

-            This demonstrates correct line breaking of a fo:inline because it does fit <fo:inline border="solid 1pt red" padding-start="2pt" padding-end="2pt" background-color="yellow">nicely..

-            Not really as we started a fo:inline with border/padding just before the word "nicely" which forces it to the next line.</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">

-            Demonstrates nested

-              <fo:inline border="solid 2pt red" padding-start="2pt" padding-end="2pt" background-color="yellow">inlines

-                <fo:inline border="solid 1pt green" padding-start="2pt" padding-end="2pt" background-color="orange">finishing together

-                </fo:inline>

-              </fo:inline>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="48350" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>

-    <eval expected="50350" xpath="//flow/block[1]/lineArea/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-start"/>

-    

-    <eval expected="208190" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>

-    <eval expected="228190" xpath="//flow/block[2]/lineArea/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-start"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-start"/>

-    

-    <eval expected="151170" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>

-    <eval expected="163170" xpath="//flow/block[3]/lineArea/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-start"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-end"/>

-    <eval expected="4000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-start"/>

-    

-    <eval expected="64464" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>

-    <eval expected="84464" xpath="//flow/block[4]/lineArea/inlineparent/@ipda"/>

-    <eval expected="8616" xpath="//flow/block[4]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-start"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-start"/>

-    

-    <eval expected="340710" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="343710" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="2000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>

-    <eval expected="193840" xpath="//flow/block[5]/lineArea[4]/inlineparent/@ipd"/>

-    <eval expected="196840" xpath="//flow/block[5]/lineArea[4]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[4]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[5]/lineArea[4]/inlineparent/@padding-end"/>

-    

-    <eval expected="113270" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/>

-    <eval expected="121270" xpath="//flow/block[6]/lineArea/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-start"/>

-    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-end"/>

-    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-start"/>

-    <eval expected="76150" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@ipd"/>

-    <eval expected="82150" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@offset"/>

-    <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-after"/>

-    <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-before"/>

-    <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-end"/>

-    <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-start"/>

-    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@padding-end"/>

-    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@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 inlines with border and padding properties.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+        <fo:flow flow-name="xsl-region-body" font-size="10pt">
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+            To <fo:inline border="solid 1pt red" background-color="yellow">emphasize</fo:inline> a word we give it a 1pt border and a background.
+          </fo:block>
+          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+            Demonstrates a big border <fo:inline border="solid 5pt red" padding="5pt" background-color="yellow">inline with border="solid 5pt red" padding="5pt"</fo:inline> extending over the small allocation rectangle to the top and bottom.
+          </fo:block>
+          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+            Demonstrates <fo:inline border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow">unsymmetric borders and padding</fo:inline> but the baselines should align.
+          </fo:block>
+          <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
+            Big border <fo:inline border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt">with a smaller font</fo:inline> but the baselines should align.
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+            This demonstrates correct line breaking of a fo:inline because it does fit nicely..
+            This demonstrates correct line breaking of a fo:inline because it does fit <fo:inline border="solid 1pt red" padding-start="2pt" padding-end="2pt" background-color="yellow">nicely..
+            Not really as we started a fo:inline with border/padding just before the word "nicely" which forces it to the next line.</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+            Demonstrates nested
+              <fo:inline border="solid 2pt red" padding-start="2pt" padding-end="2pt" background-color="yellow">inlines
+                <fo:inline border="solid 1pt green" padding-start="2pt" padding-end="2pt" background-color="orange">finishing together
+                </fo:inline>
+              </fo:inline>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="48350" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+    <eval expected="50350" xpath="//flow/block[1]/lineArea/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-start"/>
+    
+    <eval expected="208190" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
+    <eval expected="228190" xpath="//flow/block[2]/lineArea/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-start"/>
+    
+    <eval expected="151170" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>
+    <eval expected="163170" xpath="//flow/block[3]/lineArea/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-start"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-end"/>
+    <eval expected="4000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-start"/>
+    
+    <eval expected="64464" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
+    <eval expected="84464" xpath="//flow/block[4]/lineArea/inlineparent/@ipda"/>
+    <eval expected="8616" xpath="//flow/block[4]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-start"/>
+    
+    <eval expected="340710" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="343710" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="2000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>
+    <eval expected="193840" xpath="//flow/block[5]/lineArea[4]/inlineparent/@ipd"/>
+    <eval expected="196840" xpath="//flow/block[5]/lineArea[4]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[4]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[5]/lineArea[4]/inlineparent/@padding-end"/>
+    
+    <eval expected="113270" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/>
+    <eval expected="121270" xpath="//flow/block[6]/lineArea/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-start"/>
+    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-end"/>
+    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-start"/>
+    <eval expected="76150" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@ipd"/>
+    <eval expected="82150" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@offset"/>
+    <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-after"/>
+    <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-before"/>
+    <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-end"/>
+    <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-start"/>
+    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@padding-end"/>
+    <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@padding-start"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_border_padding_block_nested_1.xml b/test/layoutengine/standard-testcases/inline_border_padding_block_nested_1.xml
index 95083a9e0..3d48ee79a 100644
--- a/test/layoutengine/standard-testcases/inline_border_padding_block_nested_1.xml
+++ b/test/layoutengine/standard-testcases/inline_border_padding_block_nested_1.xml
@@ -1,134 +1,134 @@
-<?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:inlines with border and padding properties and nested inner blocks.

-    </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="3pt 0pt 3pt 0pt">

-            Before inline

-            <fo:inline border="solid 1pt red" padding="2pt" background-color="yellow"><fo:block>starting with a block</fo:block>

-              after block</fo:inline>

-            After inline

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">

-            Before inline

-            <fo:inline border="solid 1pt red" padding="2pt" background-color="yellow">before block

-              <fo:block>having a block at the end of an inline</fo:block></fo:inline>

-            After inline

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">

-            Before inline

-              <fo:inline 

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="2pt" 

-                padding-end.length="2pt" 

-                background-color="yellow">before block

-                <fo:block>As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:block>

-            after block</fo:inline>

-            After inline

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="347000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipda"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-start"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-start"/>

-    <eval expected="46130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="49130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>

-

-    <eval expected="54470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="57470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="347000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-end"/>

-    

-    <eval expected="54470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="57470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@offset"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-before"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@offset"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-before"/>

-    <eval expected="46130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipd"/>

-    <eval expected="49130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-end"/>

-    

-  </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:inlines with border and padding properties and nested inner blocks.
+    </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="3pt 0pt 3pt 0pt">
+            Before inline
+            <fo:inline border="solid 1pt red" padding="2pt" background-color="yellow"><fo:block>starting with a block</fo:block>
+              after block</fo:inline>
+            After inline
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+            Before inline
+            <fo:inline border="solid 1pt red" padding="2pt" background-color="yellow">before block
+              <fo:block>having a block at the end of an inline</fo:block></fo:inline>
+            After inline
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+            Before inline
+              <fo:inline 
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="2pt" 
+                padding-end.length="2pt" 
+                background-color="yellow">before block
+                <fo:block>As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:block>
+            after block</fo:inline>
+            After inline
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="347000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipda"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-start"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-start"/>
+    <eval expected="46130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="49130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+
+    <eval expected="54470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="57470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="347000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-end"/>
+    
+    <eval expected="54470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="57470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@offset"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-before"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@offset"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-before"/>
+    <eval expected="46130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipd"/>
+    <eval expected="49130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-end"/>
+    
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_border_padding_block_nested_2.xml b/test/layoutengine/standard-testcases/inline_border_padding_block_nested_2.xml
index f606da4b4..a22f23fda 100644
--- a/test/layoutengine/standard-testcases/inline_border_padding_block_nested_2.xml
+++ b/test/layoutengine/standard-testcases/inline_border_padding_block_nested_2.xml
@@ -1,180 +1,180 @@
-<?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:inlines with border and padding properties and nested inner blocks.

-    </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="3pt 0pt 3pt 0pt">

-            Before inline

-            <fo:inline 

-              border="solid 1pt red" 

-              border-start-width.length="1pt" 

-              border-start-width.conditionality="retain" 

-              border-end-width.length="1pt" 

-              border-end-width.conditionality="retain" 

-              padding="2pt"

-              padding-start.length="2pt" 

-              padding-start.conditionality="retain" 

-              padding-end.length="2pt" 

-              padding-end.conditionality="retain" 

-              background-color="yellow"><fo:block>starting with a block</fo:block>

-              after block</fo:inline>

-            After inline with conditionality="retain"

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">

-            Before inline

-            <fo:inline 

-              border="solid 1pt red" 

-              border-start-width.length="1pt" 

-              border-start-width.conditionality="retain" 

-              border-end-width.length="1pt" 

-              border-end-width.conditionality="retain" 

-              padding="2pt"

-              padding-start.length="2pt" 

-              padding-start.conditionality="retain" 

-              padding-end.length="2pt" 

-              padding-end.conditionality="retain" 

-              background-color="yellow">before block

-              <fo:block>having a block at the end of an inline</fo:block></fo:inline>

-            After inline with conditionality="retain"

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">

-            Before inline

-            <fo:inline 

-              border="solid 1pt red"

-              border-start-width.length="1pt" 

-              border-start-width.conditionality="retain" 

-              border-end-width.length="1pt" 

-              border-end-width.conditionality="retain" 

-              padding="2pt"

-              padding-start.length="2pt" 

-              padding-start.conditionality="retain" 

-              padding-end.length="2pt" 

-              padding-end.conditionality="retain" 

-              background-color="yellow">before block

-              <fo:block>As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:block>

-            after block</fo:inline>

-            After inline with conditionality="retain"

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="344000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipda"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-start"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-start"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-end"/>

-    <eval expected="46130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="52130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/>

-    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>

-

-    <eval expected="54470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="60470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="344000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipda"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-start"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-start"/>

-    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-end"/>

-    

-    <eval expected="54470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="60470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="344000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipda"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-start"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-start"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-end"/>

-    <eval expected="344000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipda"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-start"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-start"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-end"/>

-    <eval expected="46130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipd"/>

-    <eval expected="52130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipda"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-start"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-end"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-after"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-start"/>

-    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-end"/>

-    

-  </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:inlines with border and padding properties and nested inner blocks.
+    </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="3pt 0pt 3pt 0pt">
+            Before inline
+            <fo:inline 
+              border="solid 1pt red" 
+              border-start-width.length="1pt" 
+              border-start-width.conditionality="retain" 
+              border-end-width.length="1pt" 
+              border-end-width.conditionality="retain" 
+              padding="2pt"
+              padding-start.length="2pt" 
+              padding-start.conditionality="retain" 
+              padding-end.length="2pt" 
+              padding-end.conditionality="retain" 
+              background-color="yellow"><fo:block>starting with a block</fo:block>
+              after block</fo:inline>
+            After inline with conditionality="retain"
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+            Before inline
+            <fo:inline 
+              border="solid 1pt red" 
+              border-start-width.length="1pt" 
+              border-start-width.conditionality="retain" 
+              border-end-width.length="1pt" 
+              border-end-width.conditionality="retain" 
+              padding="2pt"
+              padding-start.length="2pt" 
+              padding-start.conditionality="retain" 
+              padding-end.length="2pt" 
+              padding-end.conditionality="retain" 
+              background-color="yellow">before block
+              <fo:block>having a block at the end of an inline</fo:block></fo:inline>
+            After inline with conditionality="retain"
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+            Before inline
+            <fo:inline 
+              border="solid 1pt red"
+              border-start-width.length="1pt" 
+              border-start-width.conditionality="retain" 
+              border-end-width.length="1pt" 
+              border-end-width.conditionality="retain" 
+              padding="2pt"
+              padding-start.length="2pt" 
+              padding-start.conditionality="retain" 
+              padding-end.length="2pt" 
+              padding-end.conditionality="retain" 
+              background-color="yellow">before block
+              <fo:block>As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:block>
+            after block</fo:inline>
+            After inline with conditionality="retain"
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="344000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipda"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-start"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-start"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-end"/>
+    <eval expected="46130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="52130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/>
+    <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+
+    <eval expected="54470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="60470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="344000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipda"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-start"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-start"/>
+    <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-end"/>
+    
+    <eval expected="54470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="60470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="344000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipda"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-start"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-start"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-end"/>
+    <eval expected="344000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipda"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-start"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-start"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-end"/>
+    <eval expected="46130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipd"/>
+    <eval expected="52130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipda"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-start"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-end"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-start"/>
+    <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-end"/>
+    
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_border_padding_conditionality_1.xml b/test/layoutengine/standard-testcases/inline_border_padding_conditionality_1.xml
index aa5e3d44b..2f10ed281 100644
--- a/test/layoutengine/standard-testcases/inline_border_padding_conditionality_1.xml
+++ b/test/layoutengine/standard-testcases/inline_border_padding_conditionality_1.xml
@@ -1,399 +1,399 @@
-<?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:inlines with border and padding properties and conditionality.

-    </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="3pt 0pt 3pt 0pt">

-            Multi-line fo:inline

-              <fo:inline 

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align not set .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end">

-            Multi-line fo:inline

-              <fo:inline 

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="end" .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="justify" .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="center" .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt" 

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align not set .conditionality="discard".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt" 

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="end" .conditionality="discard".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="justify" .conditionality="discard".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="center" .conditionality="discard".

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="265100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="345720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="45570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="265100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="345720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="45570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="259229" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="269229" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="340000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="45570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="216190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="226190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="299050" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="309050" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="111150" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="121150" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-start"/>

-    

-    <eval expected="255100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="261100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="35570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="39570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>

-    

-    <eval expected="255100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="261100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="35570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="39570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>

-    

-    <eval expected="262613" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="268613" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="35570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="39570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/>

-    

-    <eval expected="216190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="222190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="310170" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="310170" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="100030" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="104030" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>

-  </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:inlines with border and padding properties and conditionality.
+    </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="3pt 0pt 3pt 0pt">
+            Multi-line fo:inline
+              <fo:inline 
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align not set .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end">
+            Multi-line fo:inline
+              <fo:inline 
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="end" .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="justify" .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="center" .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt" 
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align not set .conditionality="discard".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt" 
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="end" .conditionality="discard".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="justify" .conditionality="discard".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="center" .conditionality="discard".
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="265100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="345720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="45570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="265100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="345720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="45570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="259229" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="269229" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="340000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="45570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="216190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="226190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="299050" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="309050" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="111150" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="121150" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-start"/>
+    
+    <eval expected="255100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="261100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="35570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="39570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>
+    
+    <eval expected="255100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="261100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="35570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="39570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>
+    
+    <eval expected="262613" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="268613" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="35570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="39570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/>
+    
+    <eval expected="216190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="222190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="310170" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="310170" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="100030" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="104030" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml b/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml
index d6e594ec1..122713e3d 100644
--- a/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml
+++ b/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml
@@ -1,312 +1,312 @@
-<?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:inlines with border and padding properties and conditionality retain.

-    </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="3pt 0pt 3pt 0pt">

-            Multi-line fo:inline

-              <fo:inline 

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align not set padding .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end">

-            Multi-line fo:inline

-              <fo:inline 

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="end" padding .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="justify" padding .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,

-            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="center" padding .conditionality="retain".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">

-            Multi-line fo:inline

-              <fo:inline border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-start-width.conditionality="retain" 

-                border-end-width.length="1pt" 

-                border-end-width.conditionality="retain" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-start.conditionality="retain" 

-                padding-end.length="3pt" 

-                padding-end.conditionality="retain" 

-                background-color="yellow" 

-                linefeed-treatment="preserve">As far as the laws of mathematics refer to reality,

-              they are not certain, and as far as they are certain, 

-              they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="center" .conditionality="retain" linefeed-treatment="preserve".

-          </fo:block>

-          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">

-            Multi-line fo:inline

-              <fo:inline

-                border="solid 1pt red"

-                border-start-width.length="1pt" 

-                border-end-width.length="1pt" 

-                padding="1pt"

-                padding-start.length="5pt" 

-                padding-end.length="3pt" 

-                background-color="yellow" 

-                linefeed-treatment="preserve">As far as the laws of mathematics refer to reality,

-              they are not certain, and as far as they are certain, 

-              they do not refer to reality - Albert Einstein</fo:inline>

-            text-align="center" .conditionality="discard" linefeed-treatment="preserve".

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="264100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="343720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="44570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/>

-

-    <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="264100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="343720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="44570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-start"/>

-

-    <eval expected="260075" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="269075" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="342000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="44570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-start"/>

-

-    <eval expected="237870" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="246870" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="317940" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="325940" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="70580" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="79580" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-start"/>

-

-    <eval expected="172840" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="182840" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="231230" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="241230" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>

-    <eval expected="222320" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="232320" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>

-

-    <eval expected="149500" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>

-    <eval expected="155500" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>

-    <eval expected="254570" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>

-    <eval expected="254570" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>

-    <eval expected="222320" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>

-    <eval expected="226320" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>

-    <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>

-  </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:inlines with border and padding properties and conditionality retain.
+    </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="3pt 0pt 3pt 0pt">
+            Multi-line fo:inline
+              <fo:inline 
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align not set padding .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end">
+            Multi-line fo:inline
+              <fo:inline 
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="end" padding .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="justify" padding .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+            and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="center" padding .conditionality="retain".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+            Multi-line fo:inline
+              <fo:inline border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-start-width.conditionality="retain" 
+                border-end-width.length="1pt" 
+                border-end-width.conditionality="retain" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-start.conditionality="retain" 
+                padding-end.length="3pt" 
+                padding-end.conditionality="retain" 
+                background-color="yellow" 
+                linefeed-treatment="preserve">As far as the laws of mathematics refer to reality,
+              they are not certain, and as far as they are certain, 
+              they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="center" .conditionality="retain" linefeed-treatment="preserve".
+          </fo:block>
+          <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+            Multi-line fo:inline
+              <fo:inline
+                border="solid 1pt red"
+                border-start-width.length="1pt" 
+                border-end-width.length="1pt" 
+                padding="1pt"
+                padding-start.length="5pt" 
+                padding-end.length="3pt" 
+                background-color="yellow" 
+                linefeed-treatment="preserve">As far as the laws of mathematics refer to reality,
+              they are not certain, and as far as they are certain, 
+              they do not refer to reality - Albert Einstein</fo:inline>
+            text-align="center" .conditionality="discard" linefeed-treatment="preserve".
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="264100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="343720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="44570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/>
+
+    <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="264100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="343720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="44570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-start"/>
+
+    <eval expected="260075" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="269075" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="342000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="44570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-start"/>
+
+    <eval expected="237870" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="246870" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="317940" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="325940" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="70580" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="79580" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-start"/>
+
+    <eval expected="172840" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="182840" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="231230" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="241230" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>
+    <eval expected="222320" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="232320" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>
+
+    <eval expected="149500" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="155500" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>
+    <eval expected="254570" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="254570" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>
+    <eval expected="222320" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="226320" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_dominant-baseline_1.xml b/test/layoutengine/standard-testcases/inline_dominant-baseline_1.xml
index 8a170e5a7..00f475ff7 100644
--- a/test/layoutengine/standard-testcases/inline_dominant-baseline_1.xml
+++ b/test/layoutengine/standard-testcases/inline_dominant-baseline_1.xml
@@ -1,129 +1,129 @@
-<?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 inline level dominant-baseline.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="auto">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="auto"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="no-change">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="no-change"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="ideographic">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="ideographic"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="alphabetic">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="alphabetic"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="hanging">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="hanging"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="mathematical">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="mathematical"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="central">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="central"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="middle">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="middle"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="text-after-edge">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="text-after-edge"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">

-            <fo:inline dominant-baseline="text-before-edge">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="text-before-edge"</fo:inline> After</fo:inline>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="574" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[8]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[9]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[10]/lineArea[1]/@bpd"/>

-    <eval expected="1925" xpath="//flow/block[10]/lineArea[1]/@space-before"/>

-    <eval expected="1925" xpath="//flow/block[10]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@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 inline level dominant-baseline.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="auto">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="auto"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="no-change">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="no-change"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="ideographic">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="ideographic"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="alphabetic">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="alphabetic"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="hanging">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="hanging"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="mathematical">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="mathematical"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="central">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="central"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="middle">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="middle"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="text-after-edge">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="text-after-edge"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            <fo:inline dominant-baseline="text-before-edge">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="text-before-edge"</fo:inline> After</fo:inline>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="574" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[10]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[10]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_dominant-baseline_2.xml b/test/layoutengine/standard-testcases/inline_dominant-baseline_2.xml
index 20b6c2363..15266cfde 100644
--- a/test/layoutengine/standard-testcases/inline_dominant-baseline_2.xml
+++ b/test/layoutengine/standard-testcases/inline_dominant-baseline_2.xml
@@ -1,129 +1,129 @@
-<?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 inline level dominant-baseline.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="auto">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="auto"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="no-change">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="no-change"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="ideographic">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="ideographic"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="alphabetic">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="alphabetic"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="hanging">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="hanging"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="mathematical">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="mathematical"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="central">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="central"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="middle">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="middle"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="text-after-edge">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="text-after-edge"</fo:inline> After</fo:inline>

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">

-            <fo:inline dominant-baseline="text-before-edge">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="text-before-edge"</fo:inline> After</fo:inline>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[1]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[1]/lineArea[1]/@space-after"/>

-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="-2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[2]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[2]/lineArea[1]/@space-after"/>

-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="-2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[3]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[3]/lineArea[1]/@space-after"/>

-    <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="-3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[4]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[4]/lineArea[1]/@space-after"/>

-    <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="-2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[5]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[5]/lineArea[1]/@space-after"/>

-    <eval expected="574" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="-574" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[6]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[6]/lineArea[1]/@space-after"/>

-    <eval expected="1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="-1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[7]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[7]/lineArea[1]/@space-after"/>

-    <eval expected="1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="-1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[8]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[8]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[8]/lineArea[1]/@space-after"/>

-    <eval expected="1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="-1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[9]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[9]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[9]/lineArea[1]/@space-after"/>

-    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="-3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-

-    <eval expected="12950" xpath="//flow/block[10]/lineArea[1]/@bpd"/>

-    <eval expected="1375" xpath="//flow/block[10]/lineArea[1]/@space-before"/>

-    <eval expected="1375" xpath="//flow/block[10]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@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 inline level dominant-baseline.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="auto">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="auto"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="no-change">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="no-change"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="ideographic">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="ideographic"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="alphabetic">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="alphabetic"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="hanging">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="hanging"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="mathematical">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="mathematical"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="central">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="central"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="middle">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="middle"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="text-after-edge">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="text-after-edge"</fo:inline> After</fo:inline>
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            <fo:inline dominant-baseline="text-before-edge">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="text-before-edge"</fo:inline> After</fo:inline>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="-2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="-2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+    <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="-3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+    <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="-2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+    <eval expected="574" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="-574" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+    <eval expected="1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="-1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[7]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[7]/lineArea[1]/@space-after"/>
+    <eval expected="1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="-1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[8]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[8]/lineArea[1]/@space-after"/>
+    <eval expected="1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="-1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[9]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[9]/lineArea[1]/@space-after"/>
+    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="-3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+    <eval expected="12950" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
+    <eval expected="1375" xpath="//flow/block[10]/lineArea[1]/@space-before"/>
+    <eval expected="1375" xpath="//flow/block[10]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_dominant-baseline_3.xml b/test/layoutengine/standard-testcases/inline_dominant-baseline_3.xml
index 836cf48e3..6bab34f97 100644
--- a/test/layoutengine/standard-testcases/inline_dominant-baseline_3.xml
+++ b/test/layoutengine/standard-testcases/inline_dominant-baseline_3.xml
@@ -1,116 +1,116 @@
-<?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 inline level dominant-baseline.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                dominant-baseline="central" 

-                background-color="yellow">central

-                <fo:inline font-size="50%"

-                    background-color="red">Baseline changed</fo:inline>                  

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                dominant-baseline="text-before-edge" 

-                background-color="yellow">text-before-edge

-                <fo:inline font-size="50%"

-                    background-color="red">Baseline changed</fo:inline>                  

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                dominant-baseline="text-after-edge" 

-                background-color="yellow">text-after-edge

-                <fo:inline font-size="150%"

-                    background-color="red">Baseline changed</fo:inline>                  

-            </fo:inline>

-            After

-          </fo:block>

-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">

-            Before

-            <fo:inline font-size="50%" 

-                dominant-baseline="middle" 

-                background-color="yellow">middle

-                <fo:inline font-size="150%"

-                    dominant-baseline="hanging" 

-                    background-color="red">hanging

-                  <fo:inline font-size="75%"

-                      background-color="green">Baseline changed

-                  </fo:inline>                  

-                </fo:inline>                  

-            </fo:inline>

-            After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="14800" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5744" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="1850" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="14800" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5744" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="14800" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5744" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="15018" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5744" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>

-    <eval expected="-1826" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/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 inline level dominant-baseline.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                dominant-baseline="central" 
+                background-color="yellow">central
+                <fo:inline font-size="50%"
+                    background-color="red">Baseline changed</fo:inline>                  
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                dominant-baseline="text-before-edge" 
+                background-color="yellow">text-before-edge
+                <fo:inline font-size="50%"
+                    background-color="red">Baseline changed</fo:inline>                  
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                dominant-baseline="text-after-edge" 
+                background-color="yellow">text-after-edge
+                <fo:inline font-size="150%"
+                    background-color="red">Baseline changed</fo:inline>                  
+            </fo:inline>
+            After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+            Before
+            <fo:inline font-size="50%" 
+                dominant-baseline="middle" 
+                background-color="yellow">middle
+                <fo:inline font-size="150%"
+                    dominant-baseline="hanging" 
+                    background-color="red">hanging
+                  <fo:inline font-size="75%"
+                      background-color="green">Baseline changed
+                  </fo:inline>                  
+                </fo:inline>                  
+            </fo:inline>
+            After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="14800" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5744" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="1850" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="14800" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5744" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="14800" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5744" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="15018" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5744" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+    <eval expected="-1826" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_keep-together.xml b/test/layoutengine/standard-testcases/inline_keep-together.xml
index af9317815..6ec4ce603 100644
--- a/test/layoutengine/standard-testcases/inline_keep-together.xml
+++ b/test/layoutengine/standard-testcases/inline_keep-together.xml
@@ -1,59 +1,59 @@
-<?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 keep-together.within-line.

-    </p>

-    <p>

-      This test builds on the results from page-breaking_6.xml.

-    </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">

-          <fo:block-container width="100pt" background-color="yellow">

-            <fo:block keep-together.within-line="always">This is Blah blah blah blah!</fo:block>

-            <fo:block>This is <fo:inline keep-together.within-line="always">Blah blah blah blah!</fo:inline></fo:block>

-            <fo:block>This is <fo:wrapper keep-together.within-line="always">Blah blah blah blah!</fo:wrapper></fo:block>

-          </fo:block-container>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- The layout engine should warn the user about the overflow in this case. -->

-    <eval expected="This is Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[1]/lineArea[1]"/>

-

-    <!-- The layout engine should warn the user about the overflow in this case. -->

-    <eval expected="This is" xpath="//flow/block[1]/block[1]/block[2]/lineArea[1]"/>

-    <eval expected="Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[2]/lineArea[2]"/>

-

-    <!-- The layout engine should warn the user about the overflow in this case. -->

-    <eval expected="This is" xpath="//flow/block[1]/block[1]/block[3]/lineArea[1]"/>

-    <eval expected="Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[3]/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 keep-together.within-line.
+    </p>
+    <p>
+      This test builds on the results from page-breaking_6.xml.
+    </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">
+          <fo:block-container width="100pt" background-color="yellow">
+            <fo:block keep-together.within-line="always">This is Blah blah blah blah!</fo:block>
+            <fo:block>This is <fo:inline keep-together.within-line="always">Blah blah blah blah!</fo:inline></fo:block>
+            <fo:block>This is <fo:wrapper keep-together.within-line="always">Blah blah blah blah!</fo:wrapper></fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- The layout engine should warn the user about the overflow in this case. -->
+    <eval expected="This is Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[1]/lineArea[1]"/>
+
+    <!-- The layout engine should warn the user about the overflow in this case. -->
+    <eval expected="This is" xpath="//flow/block[1]/block[1]/block[2]/lineArea[1]"/>
+    <eval expected="Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[2]/lineArea[2]"/>
+
+    <!-- The layout engine should warn the user about the overflow in this case. -->
+    <eval expected="This is" xpath="//flow/block[1]/block[1]/block[3]/lineArea[1]"/>
+    <eval expected="Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[3]/lineArea[2]"/>
+
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_vertical-align_1.xml b/test/layoutengine/standard-testcases/inline_vertical-align_1.xml
index c3ec1ac76..59842acfb 100644
--- a/test/layoutengine/standard-testcases/inline_vertical-align_1.xml
+++ b/test/layoutengine/standard-testcases/inline_vertical-align_1.xml
@@ -1,189 +1,189 @@
-<?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 inline level vertical 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="6in">

-          <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">

-            Before <fo:inline font-size="10pt" background-color="yellow">vertical-align not specified</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="baseline" background-color="yellow">vertical-align="baseline"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="top" background-color="yellow">vertical-align="top"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="text-top" background-color="yellow">vertical-align="text-top"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="middle" background-color="yellow">vertical-align="middle"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="text-bottom" background-color="yellow">vertical-align="text-bottom"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="bottom" background-color="yellow">vertical-align="bottom"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="super" background-color="yellow">vertical-align="super"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="sub" background-color="yellow">vertical-align="sub"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="3pt" background-color="yellow">vertical-align="3pt"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="-3pt" background-color="yellow">vertical-align="-3pt"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="50%" background-color="yellow">vertical-align="50%"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline font-size="10pt" vertical-align="-50%" background-color="yellow">vertical-align="-50%"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline vertical-align="super" background-color="yellow">vertical-align="super"</fo:inline> After

-          </fo:block>

-          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">

-            Before <fo:inline vertical-align="sub" background-color="yellow">vertical-align="sub"</fo:inline> After

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="18500" xpath="//flow/block[1]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[1]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[1]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="7180" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="18500" xpath="//flow/block[2]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[2]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[2]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="7180" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="18500" xpath="//flow/block[3]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[3]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[3]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="18500" xpath="//flow/block[4]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[4]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[4]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="18500" xpath="//flow/block[5]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[5]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[5]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="4565" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="18500" xpath="//flow/block[6]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[6]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[6]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="9250" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="18500" xpath="//flow/block[7]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[7]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[7]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="9250" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="21780" xpath="//flow/block[8]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[8]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[8]/lineArea[1]/@space-after"/>

-    <eval expected="3280" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="3280" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="19045" xpath="//flow/block[9]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[9]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[9]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="9795" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="18500" xpath="//flow/block[10]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="4180" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="19430" xpath="//flow/block[11]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="10180" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="18500" xpath="//flow/block[12]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="1180" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="22430" xpath="//flow/block[13]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="13180" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="28960" xpath="//flow/block[14]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-after"/>

-    <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[14]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[2]/@offset"/>

-

-    <eval expected="23730" xpath="//flow/block[15]/lineArea[1]/@bpd"/>

-    <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-before"/>

-    <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-after"/>

-    <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[1]/@offset"/>

-    <eval expected="5230" xpath="//flow/block[15]/lineArea[1]/inlineparent/@offset"/>

-    <eval expected="0" xpath="//flow/block[15]/lineArea[1]/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 inline level vertical 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="6in">
+          <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">
+            Before <fo:inline font-size="10pt" background-color="yellow">vertical-align not specified</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="baseline" background-color="yellow">vertical-align="baseline"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="top" background-color="yellow">vertical-align="top"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="text-top" background-color="yellow">vertical-align="text-top"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="middle" background-color="yellow">vertical-align="middle"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="text-bottom" background-color="yellow">vertical-align="text-bottom"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="bottom" background-color="yellow">vertical-align="bottom"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="super" background-color="yellow">vertical-align="super"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="sub" background-color="yellow">vertical-align="sub"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="3pt" background-color="yellow">vertical-align="3pt"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="-3pt" background-color="yellow">vertical-align="-3pt"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="50%" background-color="yellow">vertical-align="50%"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline font-size="10pt" vertical-align="-50%" background-color="yellow">vertical-align="-50%"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline vertical-align="super" background-color="yellow">vertical-align="super"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+            Before <fo:inline vertical-align="sub" background-color="yellow">vertical-align="sub"</fo:inline> After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="18500" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="7180" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="18500" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="7180" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="18500" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="18500" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="18500" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="4565" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="18500" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="9250" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="18500" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[7]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[7]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="9250" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="21780" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[8]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[8]/lineArea[1]/@space-after"/>
+    <eval expected="3280" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="3280" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="19045" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[9]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[9]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="9795" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="18500" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="4180" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="19430" xpath="//flow/block[11]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="10180" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="18500" xpath="//flow/block[12]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1180" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="22430" xpath="//flow/block[13]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="13180" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="28960" xpath="//flow/block[14]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-after"/>
+    <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[14]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="23730" xpath="//flow/block[15]/lineArea[1]/@bpd"/>
+    <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-before"/>
+    <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5230" xpath="//flow/block[15]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_vertical-align_2.xml b/test/layoutengine/standard-testcases/inline_vertical-align_2.xml
index 7019ba603..e013f5e92 100644
--- a/test/layoutengine/standard-testcases/inline_vertical-align_2.xml
+++ b/test/layoutengine/standard-testcases/inline_vertical-align_2.xml
@@ -1,122 +1,122 @@
-<?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 inline level vertical align.

-      This example is taken from the spec section 7.13.

-    </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="5.5in" page-height="7.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="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">

-            This is a longer line that provides a context for the line with images aligned on it.

-            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />,

-            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />,

-            middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />,

-            none <fo:external-graphic src="url(../../resources/images/line_medium.png)" />. 

-            And this is a line of text that follows the line with the objects aligned on it.

-          </fo:block>

-          <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">

-            This is a longer line that provides a context for the line with images aligned on it.

-            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />,

-            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />,

-            middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />.

-            And this is a line of text that follows the line with the objects aligned on it.

-          </fo:block>

-          <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">

-            This is a longer line that provides a context for the line with images aligned on it.

-            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />,

-            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />.

-            And this is a line of text that follows the line with the objects aligned on it.

-          </fo:block>

-          <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">

-            This is a longer line that provides a context for the line with images aligned on it.

-            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />,

-            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />.

-            And this is a line of text that follows the line with the objects aligned on it.

-          </fo:block>

-          <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">

-            This is a longer line that provides a context for the line with images aligned on it.

-            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />,

-            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />,

-            middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />.

-            And this is a line of text that follows the line with the objects aligned on it.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[2]/@offset"/>

-    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[2]/@offset"/>

-    <eval expected="35995" tolerance="5" xpath="//flow/block[1]/lineArea[2]/viewport[3]/@offset"/>

-    <eval expected="17998" tolerance="5" xpath="//flow/block[1]/lineArea[2]/viewport[4]/@offset"/>

-    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[3]/@offset"/>

-    <eval expected="34379" tolerance="5" xpath="//flow/block[1]/lineArea[2]/viewport[5]/@offset"/>

-    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[4]/@offset"/>

-    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[6]/@offset"/>

-    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[5]/@offset"/>

-

-    <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[2]/@offset"/>

-    <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[2]/@offset"/>

-    <eval expected="35995" tolerance="5" xpath="//flow/block[2]/lineArea[2]/viewport[3]/@offset"/>

-    <eval expected="17998" tolerance="5" xpath="//flow/block[2]/lineArea[2]/viewport[4]/@offset"/>

-    <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[3]/@offset"/>

-    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[5]/@offset"/>

-    <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[4]/@offset"/>

-

-    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[2]/@offset"/>

-    <eval expected="35995" tolerance="5" xpath="//flow/block[3]/lineArea[2]/viewport[3]/@offset"/>

-    <eval expected="17998" tolerance="5" xpath="//flow/block[3]/lineArea[2]/viewport[4]/@offset"/>

-    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[3]/@offset"/>

-

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[2]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[2]/@offset"/>

-    <eval expected="35995" tolerance="5" xpath="//flow/block[4]/lineArea[2]/viewport[3]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[4]/@offset"/>

-    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[3]/@offset"/>

-

-    <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[1]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[2]/@offset"/>

-    <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[2]/@offset"/>

-    <eval expected="35995" tolerance="5" xpath="//flow/block[5]/lineArea[2]/viewport[3]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[4]/@offset"/>

-    <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[3]/@offset"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[5]/@offset"/>

-    <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[4]/@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 inline level vertical align.
+      This example is taken from the spec section 7.13.
+    </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="5.5in" page-height="7.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="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+            This is a longer line that provides a context for the line with images aligned on it.
+            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />,
+            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />,
+            middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />,
+            none <fo:external-graphic src="url(../../resources/images/line_medium.png)" />. 
+            And this is a line of text that follows the line with the objects aligned on it.
+          </fo:block>
+          <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+            This is a longer line that provides a context for the line with images aligned on it.
+            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />,
+            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />,
+            middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />.
+            And this is a line of text that follows the line with the objects aligned on it.
+          </fo:block>
+          <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+            This is a longer line that provides a context for the line with images aligned on it.
+            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />,
+            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />.
+            And this is a line of text that follows the line with the objects aligned on it.
+          </fo:block>
+          <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+            This is a longer line that provides a context for the line with images aligned on it.
+            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />,
+            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />.
+            And this is a line of text that follows the line with the objects aligned on it.
+          </fo:block>
+          <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+            This is a longer line that provides a context for the line with images aligned on it.
+            Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />,
+            after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />,
+            middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />.
+            And this is a line of text that follows the line with the objects aligned on it.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[2]/@offset"/>
+    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[2]/@offset"/>
+    <eval expected="35995" tolerance="5" xpath="//flow/block[1]/lineArea[2]/viewport[3]/@offset"/>
+    <eval expected="17998" tolerance="5" xpath="//flow/block[1]/lineArea[2]/viewport[4]/@offset"/>
+    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[3]/@offset"/>
+    <eval expected="34379" tolerance="5" xpath="//flow/block[1]/lineArea[2]/viewport[5]/@offset"/>
+    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[4]/@offset"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[6]/@offset"/>
+    <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[5]/@offset"/>
+
+    <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[2]/@offset"/>
+    <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[2]/@offset"/>
+    <eval expected="35995" tolerance="5" xpath="//flow/block[2]/lineArea[2]/viewport[3]/@offset"/>
+    <eval expected="17998" tolerance="5" xpath="//flow/block[2]/lineArea[2]/viewport[4]/@offset"/>
+    <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[3]/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[5]/@offset"/>
+    <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[4]/@offset"/>
+
+    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[2]/@offset"/>
+    <eval expected="35995" tolerance="5" xpath="//flow/block[3]/lineArea[2]/viewport[3]/@offset"/>
+    <eval expected="17998" tolerance="5" xpath="//flow/block[3]/lineArea[2]/viewport[4]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[3]/@offset"/>
+
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[2]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[2]/@offset"/>
+    <eval expected="35995" tolerance="5" xpath="//flow/block[4]/lineArea[2]/viewport[3]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[4]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[3]/@offset"/>
+
+    <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[2]/@offset"/>
+    <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[2]/@offset"/>
+    <eval expected="35995" tolerance="5" xpath="//flow/block[5]/lineArea[2]/viewport[3]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[4]/@offset"/>
+    <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[3]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[5]/@offset"/>
+    <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[4]/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader-alignment.xml b/test/layoutengine/standard-testcases/leader-alignment.xml
index 3f36afc30..abc354150 100644
--- a/test/layoutengine/standard-testcases/leader-alignment.xml
+++ b/test/layoutengine/standard-testcases/leader-alignment.xml
@@ -1,68 +1,68 @@
-<?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

-    </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="6in">

-          <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 margin="0pt" padding-left="10mm">

-                margin="0pt" padding-left="10mm"

-          </fo:block>

-          <fo:block padding-left="10mm">

-                padding-left="10mm"

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length.minimum="12pt"

-              leader-length.optimum="80pt"

-              leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/>

-              leader-alignment="page"

-          </fo:block>

-          <fo:block margin="0pt" padding-left="10mm">

-            <fo:leader leader-length.minimum="12pt"

-              leader-length.optimum="80pt"

-              leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/>

-              leader-alignment="page"

-          </fo:block>

-          <fo:block margin="0pt" padding-left="5mm">

-            <fo:leader leader-length.minimum="12pt"

-              leader-length.optimum="80pt"

-              leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/>

-              leader-alignment="reference-area"

-            <fo:leader leader-length.minimum="12pt"

-              leader-length.optimum="80pt"

-              leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/>

-              leader-alignment="reference-area" Leader-pattern is aligned as if it began on the current reference-area's content-rectangle start-edge.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-  </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
+    </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="6in">
+          <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 margin="0pt" padding-left="10mm">
+                margin="0pt" padding-left="10mm"
+          </fo:block>
+          <fo:block padding-left="10mm">
+                padding-left="10mm"
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length.minimum="12pt"
+              leader-length.optimum="80pt"
+              leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/>
+              leader-alignment="page"
+          </fo:block>
+          <fo:block margin="0pt" padding-left="10mm">
+            <fo:leader leader-length.minimum="12pt"
+              leader-length.optimum="80pt"
+              leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/>
+              leader-alignment="page"
+          </fo:block>
+          <fo:block margin="0pt" padding-left="5mm">
+            <fo:leader leader-length.minimum="12pt"
+              leader-length.optimum="80pt"
+              leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/>
+              leader-alignment="reference-area"
+            <fo:leader leader-length.minimum="12pt"
+              leader-length.optimum="80pt"
+              leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/>
+              leader-alignment="reference-area" Leader-pattern is aligned as if it began on the current reference-area's content-rectangle start-edge.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_alignment-baseline.xml b/test/layoutengine/standard-testcases/leader_alignment-baseline.xml
index 352da3efc..8173667fe 100644
--- a/test/layoutengine/standard-testcases/leader_alignment-baseline.xml
+++ b/test/layoutengine/standard-testcases/leader_alignment-baseline.xml
@@ -1,171 +1,171 @@
-<?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 alignment-baseline values.

-    </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="dots" alignment-baseline="baseline" background-color="yellow"/>

-               dots baseline

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="baseline" background-color="yellow"/>

-               rule solid baseline

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="baseline" background-color="yellow"/>

-               rule double baseline

-          </fo:block>

-          <fo:block>

-          <!-- use content currently causes a ClassCastException

-            <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="baseline" background-color="yellow">x</fo:leader>

-               use-content x baseline

-          -->

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="before-edge" background-color="yellow"/>

-               dots before-edge

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="before-edge" background-color="yellow"/>

-               rule solid before-edge

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="before-edge" background-color="yellow"/>

-               rule double before-edge

-          </fo:block>

-          <fo:block>

-          <!-- use content currently causes a ClassCastException

-            <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="before-edge" background-color="yellow">x</fo:leader>

-               use-content x before-edge

-          -->

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="middle" background-color="yellow"/>

-               dots middle

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="middle" background-color="yellow"/>

-               rule solid middle

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="middle" background-color="yellow"/>

-               rule double middle

-          </fo:block>

-          <fo:block>

-          <!-- use content currently causes a ClassCastException

-            <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="middle" background-color="yellow">x</fo:leader>

-               use-content x middle

-          -->

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="after-edge" background-color="yellow"/>

-               dots after-edge

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="after-edge" background-color="yellow"/>

-               rule solid after-edge

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="after-edge" background-color="yellow"/>

-               rule double after-edge

-          </fo:block>

-          <fo:block>

-          <!-- use content currently causes a ClassCastException

-            <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="after-edge" background-color="yellow">x</fo:leader>

-               use-content x after-edge

-          -->

-          </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="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>

-    <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>

-    <eval expected="7616" xpath="//flow/block[2]/lineArea/leader/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipd"/>

-    <eval expected="7616" xpath="//flow/block[3]/lineArea/leader/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[6]/lineArea/leader/@ipd"/>

-    <eval expected="0" xpath="//flow/block[6]/lineArea/leader/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[7]/lineArea/leader/@ipd"/>

-    <eval expected="0" xpath="//flow/block[7]/lineArea/leader/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[9]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[9]/lineArea/inlineparent/@ipd"/>

-    <eval expected="3810" xpath="//flow/block[9]/lineArea/inlineparent/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[10]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[10]/lineArea/leader/@ipd"/>

-    <eval expected="4978" xpath="//flow/block[10]/lineArea/leader/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[11]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[11]/lineArea/leader/@ipd"/>

-    <eval expected="4978" xpath="//flow/block[11]/lineArea/leader/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[13]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[13]/lineArea/inlineparent/@ipd"/>

-    <eval expected="7764" xpath="//flow/block[13]/lineArea/inlineparent/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[14]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[14]/lineArea/leader/@ipd"/>

-    <eval expected="10100" xpath="//flow/block[14]/lineArea/leader/@offset"/>

-

-    <eval expected="11100" xpath="//flow/block[15]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[15]/lineArea/leader/@ipd"/>

-    <eval expected="10100" xpath="//flow/block[15]/lineArea/leader/@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 with different alignment-baseline values.
+    </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="dots" alignment-baseline="baseline" background-color="yellow"/>
+               dots baseline
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="baseline" background-color="yellow"/>
+               rule solid baseline
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="baseline" background-color="yellow"/>
+               rule double baseline
+          </fo:block>
+          <fo:block>
+          <!-- use content currently causes a ClassCastException
+            <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="baseline" background-color="yellow">x</fo:leader>
+               use-content x baseline
+          -->
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="before-edge" background-color="yellow"/>
+               dots before-edge
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="before-edge" background-color="yellow"/>
+               rule solid before-edge
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="before-edge" background-color="yellow"/>
+               rule double before-edge
+          </fo:block>
+          <fo:block>
+          <!-- use content currently causes a ClassCastException
+            <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="before-edge" background-color="yellow">x</fo:leader>
+               use-content x before-edge
+          -->
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="middle" background-color="yellow"/>
+               dots middle
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="middle" background-color="yellow"/>
+               rule solid middle
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="middle" background-color="yellow"/>
+               rule double middle
+          </fo:block>
+          <fo:block>
+          <!-- use content currently causes a ClassCastException
+            <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="middle" background-color="yellow">x</fo:leader>
+               use-content x middle
+          -->
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="after-edge" background-color="yellow"/>
+               dots after-edge
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="after-edge" background-color="yellow"/>
+               rule solid after-edge
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="after-edge" background-color="yellow"/>
+               rule double after-edge
+          </fo:block>
+          <fo:block>
+          <!-- use content currently causes a ClassCastException
+            <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="after-edge" background-color="yellow">x</fo:leader>
+               use-content x after-edge
+          -->
+          </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="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+    <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>
+    <eval expected="7616" xpath="//flow/block[2]/lineArea/leader/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipd"/>
+    <eval expected="7616" xpath="//flow/block[3]/lineArea/leader/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[6]/lineArea/leader/@ipd"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea/leader/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[7]/lineArea/leader/@ipd"/>
+    <eval expected="0" xpath="//flow/block[7]/lineArea/leader/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[9]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[9]/lineArea/inlineparent/@ipd"/>
+    <eval expected="3810" xpath="//flow/block[9]/lineArea/inlineparent/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[10]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[10]/lineArea/leader/@ipd"/>
+    <eval expected="4978" xpath="//flow/block[10]/lineArea/leader/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[11]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[11]/lineArea/leader/@ipd"/>
+    <eval expected="4978" xpath="//flow/block[11]/lineArea/leader/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[13]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[13]/lineArea/inlineparent/@ipd"/>
+    <eval expected="7764" xpath="//flow/block[13]/lineArea/inlineparent/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[14]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[14]/lineArea/leader/@ipd"/>
+    <eval expected="10100" xpath="//flow/block[14]/lineArea/leader/@offset"/>
+
+    <eval expected="11100" xpath="//flow/block[15]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[15]/lineArea/leader/@ipd"/>
+    <eval expected="10100" xpath="//flow/block[15]/lineArea/leader/@offset"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_background-color.xml b/test/layoutengine/standard-testcases/leader_background-color.xml
index 25b046045..78262ca3c 100644
--- a/test/layoutengine/standard-testcases/leader_background-color.xml
+++ b/test/layoutengine/standard-testcases/leader_background-color.xml
@@ -1,82 +1,82 @@
-<?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 background-color

-    </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="dots" background-color="yellow"/>

-               dots yellow background

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" background-color="yellow"/>

-               rule solid yellow background

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" background-color="yellow"/>

-               rule double yellow background

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="space" background-color="yellow"/>

-               space yellow background

-          </fo:block>

-          <fo:block>

-          <!-- use content currently causes a ClassCastException

-            <fo:leader leader-length="36pt" leader-pattern="use-content" background-color="yellow">x</fo:leader>

-               use-content x yellow background

-          -->

-          </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="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/inlineparent/@background"/>

-

-    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[2]/lineArea/leader/@background"/>

-

-    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[3]/lineArea/leader/@background"/>

-

-    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[4]/lineArea/space/@ipd"/>

-    <eval expected="color=#ffff00" xpath="//flow/block[4]/lineArea/space/@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:leader with background-color
+    </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="dots" background-color="yellow"/>
+               dots yellow background
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" background-color="yellow"/>
+               rule solid yellow background
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" background-color="yellow"/>
+               rule double yellow background
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="space" background-color="yellow"/>
+               space yellow background
+          </fo:block>
+          <fo:block>
+          <!-- use content currently causes a ClassCastException
+            <fo:leader leader-length="36pt" leader-pattern="use-content" background-color="yellow">x</fo:leader>
+               use-content x yellow background
+          -->
+          </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="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/inlineparent/@background"/>
+
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[2]/lineArea/leader/@background"/>
+
+    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[3]/lineArea/leader/@background"/>
+
+    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[4]/lineArea/space/@ipd"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[4]/lineArea/space/@background"/>
+
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_border_padding.xml b/test/layoutengine/standard-testcases/leader_border_padding.xml
index b028d5014..e2bd0c231 100644
--- a/test/layoutengine/standard-testcases/leader_border_padding.xml
+++ b/test/layoutengine/standard-testcases/leader_border_padding.xml
@@ -1,289 +1,289 @@
-<?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 border and padding

-    </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="dots" border="solid 1pt red"/>

-               dots solid 1pt red border

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border="solid 1pt red"/>

-               rule solid solid 1pt red border

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border="solid 1pt red"/>

-               rule double solid 1pt red border

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="space" border="solid 1pt red"/>

-               space solid 1pt red border

-          </fo:block>

-          <fo:block>

-            <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 1pt red">x</fo:leader>

-               use-content x solid 1pt red border

-          </fo:block>

-          <fo:block margin="10pt 0pt 10pt 0pt">

-            <fo:leader leader-length="36pt" leader-pattern="dots" border="solid 5pt red" padding="5pt"/>

-               dots solid 5pt red border 5pt padding

-          </fo:block>

-          <fo:block margin="10pt 0pt 10pt 0pt">

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border="solid 5pt red" padding="5pt"/>

-               rule solid solid 5pt red border 5pt padding

-          </fo:block>

-          <fo:block margin="10pt 0pt 10pt 0pt">

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border="solid 5pt red" padding="5pt"/>

-               rule double solid 5pt red border 5pt padding

-          </fo:block>

-          <fo:block margin="10pt 0pt 10pt 0pt">

-            <fo:leader leader-length="36pt" leader-pattern="space" border="solid 5pt red" padding="5pt"/>

-               space solid 5pt red border 5pt padding

-          </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:block margin="2pt 0pt 2pt 0pt">

-            <fo:leader leader-length="36pt" leader-pattern="dots" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>

-               dots uneven border and padding

-          </fo:block>

-          <fo:block margin="2pt 0pt 2pt 0pt">

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>

-               rule solid uneven border and padding

-          </fo:block>

-          <fo:block margin="2pt 0pt 2pt 0pt">

-            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>

-               rule double uneven border and padding

-          </fo:block>

-          <fo:block margin="2pt 0pt 2pt 0pt">

-            <fo:leader leader-length="36pt" leader-pattern="space" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>

-               space uneven border and padding

-          </fo:block>

-          <fo:block margin="2pt 0pt 2pt 0pt">

-            <fo:leader leader-length="36pt" leader-pattern="use-content" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt">x</fo:leader>

-               use-content x uneven border and padding

-          </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="34000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipda"/>

-    <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-start"/>

-

-    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>

-    <eval expected="34000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipda"/>

-    <eval expected="7616" xpath="//flow/block[2]/lineArea/leader/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-start"/>

-

-    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>

-    <eval expected="34000" xpath="//flow/block[3]/lineArea/leader/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipda"/>

-    <eval expected="7616" xpath="//flow/block[3]/lineArea/leader/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-start"/>

-

-    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>

-    <eval expected="34000" xpath="//flow/block[4]/lineArea/space/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[4]/lineArea/space/@ipda"/>

-    <eval expected="8615" xpath="//flow/block[4]/lineArea/space/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-start"/>

-

-    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>

-    <eval expected="34000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-start"/>

-

-    <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>

-    <eval expected="16000" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[6]/lineArea/inlineparent/@ipda"/>

-    <eval expected="5280" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-start"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-start"/>

-

-    <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>

-    <eval expected="16000" xpath="//flow/block[7]/lineArea/leader/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[7]/lineArea/leader/@ipda"/>

-    <eval expected="7616" xpath="//flow/block[7]/lineArea/leader/@offset"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-after"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-before"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-end"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-start"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-start"/>

-

-    <eval expected="11100" xpath="//flow/block[8]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[8]/lineArea/@ipd"/>

-    <eval expected="16000" xpath="//flow/block[8]/lineArea/leader/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[8]/lineArea/leader/@ipda"/>

-    <eval expected="7616" xpath="//flow/block[8]/lineArea/leader/@offset"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-after"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-before"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-end"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-start"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-start"/>

-

-    <eval expected="11100" xpath="//flow/block[9]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>

-    <eval expected="16000" xpath="//flow/block[9]/lineArea/space/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[9]/lineArea/space/@ipda"/>

-    <eval expected="8615" xpath="//flow/block[9]/lineArea/space/@offset"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-after"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-before"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-end"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-start"/>

-    <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-start"/>

-

-    <eval expected="11100" xpath="//flow/block[10]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>

-    <eval expected="16000" xpath="//flow/block[10]/lineArea/inlineparent/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[10]/lineArea/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[10]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-start"/>

-    <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-after"/>

-    <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-before"/>

-    <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-end"/>

-    <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-start"/>

-

-    <eval expected="11100" xpath="//flow/block[11]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>

-    <eval expected="24000" xpath="//flow/block[11]/lineArea/inlineparent/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[11]/lineArea/inlineparent/@ipda"/>

-    <eval expected="5280" xpath="//flow/block[11]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-start"/>

-    <eval expected="3000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-end"/>

-    <eval expected="4000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-start"/>

-

-    <eval expected="11100" xpath="//flow/block[12]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[12]/lineArea/@ipd"/>

-    <eval expected="24000" xpath="//flow/block[12]/lineArea/leader/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[12]/lineArea/leader/@ipda"/>

-    <eval expected="7616" xpath="//flow/block[12]/lineArea/leader/@offset"/>

-    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[12]/lineArea/leader/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[12]/lineArea/leader/@border-before"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[12]/lineArea/leader/@border-end"/>

-    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[12]/lineArea/leader/@border-start"/>

-    <eval expected="3000" xpath="//flow/block[12]/lineArea/leader/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[12]/lineArea/leader/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[12]/lineArea/leader/@padding-end"/>

-    <eval expected="4000" xpath="//flow/block[12]/lineArea/leader/@padding-start"/>

-

-    <eval expected="11100" xpath="//flow/block[13]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>

-    <eval expected="24000" xpath="//flow/block[13]/lineArea/leader/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[13]/lineArea/leader/@ipda"/>

-    <eval expected="7616" xpath="//flow/block[13]/lineArea/leader/@offset"/>

-    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[13]/lineArea/leader/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[13]/lineArea/leader/@border-before"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[13]/lineArea/leader/@border-end"/>

-    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[13]/lineArea/leader/@border-start"/>

-    <eval expected="3000" xpath="//flow/block[13]/lineArea/leader/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[13]/lineArea/leader/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[13]/lineArea/leader/@padding-end"/>

-    <eval expected="4000" xpath="//flow/block[13]/lineArea/leader/@padding-start"/>

-

-    <eval expected="11100" xpath="//flow/block[14]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>

-    <eval expected="24000" xpath="//flow/block[14]/lineArea/space/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[14]/lineArea/space/@ipda"/>

-    <eval expected="8615" xpath="//flow/block[14]/lineArea/space/@offset"/>

-    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[14]/lineArea/space/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[14]/lineArea/space/@border-before"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[14]/lineArea/space/@border-end"/>

-    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[14]/lineArea/space/@border-start"/>

-    <eval expected="3000" xpath="//flow/block[14]/lineArea/space/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[14]/lineArea/space/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[14]/lineArea/space/@padding-end"/>

-    <eval expected="4000" xpath="//flow/block[14]/lineArea/space/@padding-start"/>

-

-    <eval expected="11100" xpath="//flow/block[15]/lineArea/@bpd"/>

-    <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>

-    <eval expected="24000" xpath="//flow/block[15]/lineArea/inlineparent/@ipd"/>

-    <eval expected="36000" xpath="//flow/block[15]/lineArea/inlineparent/@ipda"/>

-    <eval expected="0" xpath="//flow/block[15]/lineArea/inlineparent/@offset"/>

-    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-after"/>

-    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-before"/>

-    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-end"/>

-    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-start"/>

-    <eval expected="3000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-after"/>

-    <eval expected="1000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-before"/>

-    <eval expected="2000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-end"/>

-    <eval expected="4000" xpath="//flow/block[15]/lineArea/inlineparent/@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:leader with border and padding
+    </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="dots" border="solid 1pt red"/>
+               dots solid 1pt red border
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border="solid 1pt red"/>
+               rule solid solid 1pt red border
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border="solid 1pt red"/>
+               rule double solid 1pt red border
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="space" border="solid 1pt red"/>
+               space solid 1pt red border
+          </fo:block>
+          <fo:block>
+            <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 1pt red">x</fo:leader>
+               use-content x solid 1pt red border
+          </fo:block>
+          <fo:block margin="10pt 0pt 10pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="dots" border="solid 5pt red" padding="5pt"/>
+               dots solid 5pt red border 5pt padding
+          </fo:block>
+          <fo:block margin="10pt 0pt 10pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border="solid 5pt red" padding="5pt"/>
+               rule solid solid 5pt red border 5pt padding
+          </fo:block>
+          <fo:block margin="10pt 0pt 10pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border="solid 5pt red" padding="5pt"/>
+               rule double solid 5pt red border 5pt padding
+          </fo:block>
+          <fo:block margin="10pt 0pt 10pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="space" border="solid 5pt red" padding="5pt"/>
+               space solid 5pt red border 5pt padding
+          </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:block margin="2pt 0pt 2pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="dots" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>
+               dots uneven border and padding
+          </fo:block>
+          <fo:block margin="2pt 0pt 2pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>
+               rule solid uneven border and padding
+          </fo:block>
+          <fo:block margin="2pt 0pt 2pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>
+               rule double uneven border and padding
+          </fo:block>
+          <fo:block margin="2pt 0pt 2pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="space" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>
+               space uneven border and padding
+          </fo:block>
+          <fo:block margin="2pt 0pt 2pt 0pt">
+            <fo:leader leader-length="36pt" leader-pattern="use-content" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt">x</fo:leader>
+               use-content x uneven border and padding
+          </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="34000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipda"/>
+    <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-start"/>
+
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+    <eval expected="34000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipda"/>
+    <eval expected="7616" xpath="//flow/block[2]/lineArea/leader/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-start"/>
+
+    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
+    <eval expected="34000" xpath="//flow/block[3]/lineArea/leader/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipda"/>
+    <eval expected="7616" xpath="//flow/block[3]/lineArea/leader/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-start"/>
+
+    <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
+    <eval expected="34000" xpath="//flow/block[4]/lineArea/space/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[4]/lineArea/space/@ipda"/>
+    <eval expected="8615" xpath="//flow/block[4]/lineArea/space/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-start"/>
+
+    <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>
+    <eval expected="34000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-start"/>
+
+    <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>
+    <eval expected="16000" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[6]/lineArea/inlineparent/@ipda"/>
+    <eval expected="5280" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-start"/>
+
+    <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>
+    <eval expected="16000" xpath="//flow/block[7]/lineArea/leader/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[7]/lineArea/leader/@ipda"/>
+    <eval expected="7616" xpath="//flow/block[7]/lineArea/leader/@offset"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-start"/>
+
+    <eval expected="11100" xpath="//flow/block[8]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[8]/lineArea/@ipd"/>
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/leader/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[8]/lineArea/leader/@ipda"/>
+    <eval expected="7616" xpath="//flow/block[8]/lineArea/leader/@offset"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-start"/>
+
+    <eval expected="11100" xpath="//flow/block[9]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>
+    <eval expected="16000" xpath="//flow/block[9]/lineArea/space/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[9]/lineArea/space/@ipda"/>
+    <eval expected="8615" xpath="//flow/block[9]/lineArea/space/@offset"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-start"/>
+
+    <eval expected="11100" xpath="//flow/block[10]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>
+    <eval expected="16000" xpath="//flow/block[10]/lineArea/inlineparent/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[10]/lineArea/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[10]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-start"/>
+    <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-end"/>
+    <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-start"/>
+
+    <eval expected="11100" xpath="//flow/block[11]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>
+    <eval expected="24000" xpath="//flow/block[11]/lineArea/inlineparent/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[11]/lineArea/inlineparent/@ipda"/>
+    <eval expected="5280" xpath="//flow/block[11]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-start"/>
+    <eval expected="3000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-end"/>
+    <eval expected="4000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-start"/>
+
+    <eval expected="11100" xpath="//flow/block[12]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[12]/lineArea/@ipd"/>
+    <eval expected="24000" xpath="//flow/block[12]/lineArea/leader/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[12]/lineArea/leader/@ipda"/>
+    <eval expected="7616" xpath="//flow/block[12]/lineArea/leader/@offset"/>
+    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[12]/lineArea/leader/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[12]/lineArea/leader/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[12]/lineArea/leader/@border-end"/>
+    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[12]/lineArea/leader/@border-start"/>
+    <eval expected="3000" xpath="//flow/block[12]/lineArea/leader/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[12]/lineArea/leader/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[12]/lineArea/leader/@padding-end"/>
+    <eval expected="4000" xpath="//flow/block[12]/lineArea/leader/@padding-start"/>
+
+    <eval expected="11100" xpath="//flow/block[13]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>
+    <eval expected="24000" xpath="//flow/block[13]/lineArea/leader/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[13]/lineArea/leader/@ipda"/>
+    <eval expected="7616" xpath="//flow/block[13]/lineArea/leader/@offset"/>
+    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[13]/lineArea/leader/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[13]/lineArea/leader/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[13]/lineArea/leader/@border-end"/>
+    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[13]/lineArea/leader/@border-start"/>
+    <eval expected="3000" xpath="//flow/block[13]/lineArea/leader/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[13]/lineArea/leader/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[13]/lineArea/leader/@padding-end"/>
+    <eval expected="4000" xpath="//flow/block[13]/lineArea/leader/@padding-start"/>
+
+    <eval expected="11100" xpath="//flow/block[14]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>
+    <eval expected="24000" xpath="//flow/block[14]/lineArea/space/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[14]/lineArea/space/@ipda"/>
+    <eval expected="8615" xpath="//flow/block[14]/lineArea/space/@offset"/>
+    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[14]/lineArea/space/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[14]/lineArea/space/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[14]/lineArea/space/@border-end"/>
+    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[14]/lineArea/space/@border-start"/>
+    <eval expected="3000" xpath="//flow/block[14]/lineArea/space/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[14]/lineArea/space/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[14]/lineArea/space/@padding-end"/>
+    <eval expected="4000" xpath="//flow/block[14]/lineArea/space/@padding-start"/>
+
+    <eval expected="11100" xpath="//flow/block[15]/lineArea/@bpd"/>
+    <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>
+    <eval expected="24000" xpath="//flow/block[15]/lineArea/inlineparent/@ipd"/>
+    <eval expected="36000" xpath="//flow/block[15]/lineArea/inlineparent/@ipda"/>
+    <eval expected="0" xpath="//flow/block[15]/lineArea/inlineparent/@offset"/>
+    <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-after"/>
+    <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-end"/>
+    <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-start"/>
+    <eval expected="3000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-after"/>
+    <eval expected="1000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-end"/>
+    <eval expected="4000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-start"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_dots.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_dots.xml
index 1a0cc8d96..4410f7e33 100644
--- a/test/layoutengine/standard-testcases/leader_leader-pattern_dots.xml
+++ b/test/layoutengine/standard-testcases/leader_leader-pattern_dots.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- $Id: text-decoration1.xml 198408 2005-02-09 21:38:31Z jeremias $ -->
+<!-- $Id$ -->
 <testcase>
   <info>
     <p>
diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_rule.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_rule.xml
index 4dce8be6c..438f8f980 100644
--- a/test/layoutengine/standard-testcases/leader_leader-pattern_rule.xml
+++ b/test/layoutengine/standard-testcases/leader_leader-pattern_rule.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- $Id: text-decoration1.xml 198408 2005-02-09 21:38:31Z jeremias $ -->
+<!-- $Id$ -->
 <testcase>
   <info>
     <p>
diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_space.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_space.xml
index 8948ccb65..2e7387f08 100644
--- a/test/layoutengine/standard-testcases/leader_leader-pattern_space.xml
+++ b/test/layoutengine/standard-testcases/leader_leader-pattern_space.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- $Id: text-decoration1.xml 198408 2005-02-09 21:38:31Z jeremias $ -->
+<!-- $Id$ -->
 <testcase>
   <info>
     <p>
diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml
index a3bf802dd..c98bd4511 100644
--- a/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml
+++ b/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml
index c79ee28c7..26d20aa9c 100644
--- a/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml
+++ b/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/leader_text-align.xml b/test/layoutengine/standard-testcases/leader_text-align.xml
index 2316bf15b..7dbe067fc 100644
--- a/test/layoutengine/standard-testcases/leader_text-align.xml
+++ b/test/layoutengine/standard-testcases/leader_text-align.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/leader_toc.xml b/test/layoutengine/standard-testcases/leader_toc.xml
index b970bfedf..a1197d046 100644
--- a/test/layoutengine/standard-testcases/leader_toc.xml
+++ b/test/layoutengine/standard-testcases/leader_toc.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/list-block_background-image.xml b/test/layoutengine/standard-testcases/list-block_background-image.xml
index 431ab3edd..0dc92102b 100644
--- a/test/layoutengine/standard-testcases/list-block_background-image.xml
+++ b/test/layoutengine/standard-testcases/list-block_background-image.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/list-block_padding_percentages.xml b/test/layoutengine/standard-testcases/list-block_padding_percentages.xml
index 2300eb84e..4e1ff165a 100644
--- a/test/layoutengine/standard-testcases/list-block_padding_percentages.xml
+++ b/test/layoutengine/standard-testcases/list-block_padding_percentages.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/list-item_background-image.xml b/test/layoutengine/standard-testcases/list-item_background-image.xml
index c6d7263a0..e1f4a27b7 100644
--- a/test/layoutengine/standard-testcases/list-item_background-image.xml
+++ b/test/layoutengine/standard-testcases/list-item_background-image.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/list-item_padding_percentages.xml b/test/layoutengine/standard-testcases/list-item_padding_percentages.xml
index 713bbdf36..768e25d90 100644
--- a/test/layoutengine/standard-testcases/list-item_padding_percentages.xml
+++ b/test/layoutengine/standard-testcases/list-item_padding_percentages.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/marker_bug.xml b/test/layoutengine/standard-testcases/marker_bug.xml
index a0c0ab5a4..2c60c7c6e 100644
--- a/test/layoutengine/standard-testcases/marker_bug.xml
+++ b/test/layoutengine/standard-testcases/marker_bug.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/page-breaking_6.xml b/test/layoutengine/standard-testcases/page-breaking_6.xml
index 59fe119b7..63549eb1d 100644
--- a/test/layoutengine/standard-testcases/page-breaking_6.xml
+++ b/test/layoutengine/standard-testcases/page-breaking_6.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml b/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml
index 64dedc079..256f86622 100644
--- a/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml
+++ b/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/page-number-citation_background-color.xml b/test/layoutengine/standard-testcases/page-number-citation_background-color.xml
index 2a6853990..c3f845b79 100644
--- a/test/layoutengine/standard-testcases/page-number-citation_background-color.xml
+++ b/test/layoutengine/standard-testcases/page-number-citation_background-color.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/page-number-citation_background-image.xml b/test/layoutengine/standard-testcases/page-number-citation_background-image.xml
index 20246526e..503d506d9 100644
--- a/test/layoutengine/standard-testcases/page-number-citation_background-image.xml
+++ b/test/layoutengine/standard-testcases/page-number-citation_background-image.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml b/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml
index a92c4d9c3..c27be1fd7 100644
--- a/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml
+++ b/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml b/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml
index 0c443dbf7..2bc794446 100644
--- a/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml
+++ b/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/page-number_background-color.xml b/test/layoutengine/standard-testcases/page-number_background-color.xml
index f7f61b770..0d23848e4 100644
--- a/test/layoutengine/standard-testcases/page-number_background-color.xml
+++ b/test/layoutengine/standard-testcases/page-number_background-color.xml
@@ -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>
diff --git a/test/layoutengine/standard-testcases/page-number_background-image.xml b/test/layoutengine/standard-testcases/page-number_background-image.xml
index 1835fd287..d11a2d3da 100644
--- a/test/layoutengine/standard-testcases/page-number_background-image.xml
+++ b/test/layoutengine/standard-testcases/page-number_background-image.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks fo:page-number 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">

-            Page <fo:page-number font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />

-            Page <fo:page-number font-size="48pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=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 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">
+            Page <fo:page-number font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+            Page <fo:page-number font-size="48pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=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>
diff --git a/test/layoutengine/standard-testcases/page-number_border_padding.xml b/test/layoutengine/standard-testcases/page-number_border_padding.xml
index 9bbacc8a6..36f7c5db2 100644
--- a/test/layoutengine/standard-testcases/page-number_border_padding.xml
+++ b/test/layoutengine/standard-testcases/page-number_border_padding.xml
@@ -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 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">

-            Page number <fo:page-number 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 <fo:page-number 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 <fo:page-number 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 <fo:page-number 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 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">
+            Page number <fo:page-number 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 <fo:page-number 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 <fo:page-number 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 <fo:page-number 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>
diff --git a/test/layoutengine/standard-testcases/page-number_initial-page-number_2.xml b/test/layoutengine/standard-testcases/page-number_initial-page-number_2.xml
index d743ef769..597bb9226 100644
--- a/test/layoutengine/standard-testcases/page-number_initial-page-number_2.xml
+++ b/test/layoutengine/standard-testcases/page-number_initial-page-number_2.xml
@@ -1,54 +1,54 @@
-<?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: page-number3.xml 198733 2005-06-09 14:20:45Z jeremias $ -->

-<testcase>

-  <info>

-    <p>

-      This test checks fo:page-number.

-    </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="master1" page-width="5in" page-height="1in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="master1" white-space-collapse="true" initial-page-number="9">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block><fo:inline>9</fo:inline> <fo:inline>10</fo:inline></fo:block>

-          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>

-          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>

-          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>

-          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>

-          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>

-          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>

-          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="9" xpath="//pageViewport[@nr=9]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[1]/text[2]"/>

-    <eval expected="6672" xpath="//pageViewport[@nr=9]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[1]/text[2]/@ipd"/>

-

-    <eval expected="10" xpath="//pageViewport[@nr=10]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[1]/text[2]"/>

-    <eval expected="13344" xpath="//pageViewport[@nr=10]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[1]/text[2]/@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:page-number.
+    </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="master1" page-width="5in" page-height="1in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="master1" white-space-collapse="true" initial-page-number="9">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block><fo:inline>9</fo:inline> <fo:inline>10</fo:inline></fo:block>
+          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>
+          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>
+          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>
+          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>
+          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>
+          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>
+          <fo:block>page: -&gt;<fo:page-number color="red"/>&lt;-</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="9" xpath="//pageViewport[@nr=9]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[1]/text[2]"/>
+    <eval expected="6672" xpath="//pageViewport[@nr=9]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[1]/text[2]/@ipd"/>
+
+    <eval expected="10" xpath="//pageViewport[@nr=10]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[1]/text[2]"/>
+    <eval expected="13344" xpath="//pageViewport[@nr=10]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[1]/text[2]/@ipd"/>
+
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-number_vertical-align.xml b/test/layoutengine/standard-testcases/page-number_vertical-align.xml
index 7a85a821d..f02b04096 100644
--- a/test/layoutengine/standard-testcases/page-number_vertical-align.xml
+++ b/test/layoutengine/standard-testcases/page-number_vertical-align.xml
@@ -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 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">

-            Page <fo:page-number 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 <fo:page-number 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 <fo:page-number 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 <fo:page-number 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 <fo:page-number 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 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">
+            Page <fo:page-number 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 <fo:page-number 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 <fo:page-number 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 <fo:page-number 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 <fo:page-number 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>
diff --git a/test/layoutengine/standard-testcases/ps-extension_2.xml b/test/layoutengine/standard-testcases/ps-extension_2.xml
index 036c19fd6..9fadd9845 100644
--- a/test/layoutengine/standard-testcases/ps-extension_2.xml
+++ b/test/layoutengine/standard-testcases/ps-extension_2.xml
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id: $ -->

-<testcase>

-  <info>

-    <p>

-      This test checks the PostScript extension for custom setpagedevice calls and comments.

-      The extension attachments need to show up in the area tree XML so the AreaTreeParser can fully restore the area tree.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:ps="http://xmlgraphics.apache.org/fop/postscript">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="A4" page-height="29.7cm" page-width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">

-          <ps:ps-setpagedevice name="lower tray"><![CDATA[ << /MediaPosition 4 >> ]]></ps:ps-setpagedevice>

-          <ps:ps-comment-before>A4 before page</ps:ps-comment-before>

-          <ps:ps-comment-after>A4 after page</ps:ps-comment-after>

-          <fo:region-body/>

-        </fo:simple-page-master>

-        <fo:simple-page-master master-name="A4a" page-height="29.7cm" page-width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">

-          <ps:ps-setpagedevice name="upper tray"><![CDATA[ << /MediaPosition 1 >> ]]></ps:ps-setpagedevice>

-          <ps:ps-comment-before>A4a before page 1</ps:ps-comment-before>

-          <ps:ps-comment-after>A4a after page 1</ps:ps-comment-after>

-          <ps:ps-comment-before>A4a before page 2</ps:ps-comment-before>

-          <ps:ps-comment-after>A4a after page 2</ps:ps-comment-after>

-          <fo:region-body background-color="orange"/>

-        </fo:simple-page-master>

-        <fo:page-sequence-master master-name="complex">

-      	  <fo:repeatable-page-master-reference master-reference="A4" maximum-repeats="1"/>

-      	  <fo:repeatable-page-master-reference master-reference="A4a" maximum-repeats="1"/>

-      	  <fo:repeatable-page-master-reference master-reference="A4"/>

-        </fo:page-sequence-master>

-      </fo:layout-master-set>

-      <fo:declarations>

-        <ps:ps-setpagedevice name="autofeed"><![CDATA[ << /ManualFeed false >> ]]></ps:ps-setpagedevice>

-        <ps:ps-comment-before>header comment 1</ps:ps-comment-before>

-        <ps:ps-comment-after>footer comment 1</ps:ps-comment-after>

-        <ps:ps-comment-before>header comment 2</ps:ps-comment-before>

-        <ps:ps-comment-after>footer comment 2</ps:ps-comment-after>

-      </fo:declarations>

-      <fo:page-sequence master-reference="complex">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>Hello World!</fo:block>

-          <fo:block break-before="page"/>

-          <fo:block>Hello World!</fo:block>

-          <fo:block break-before="page"/>

-          <fo:block>Hello World!</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-  </fo:root>

-  </fo>

-  <checks>

-    <eval expected="2" xpath="count(/areaTree/child::*)"/>

-    <eval expected="1" xpath="count(/areaTree/child::pageSequence)"/>

-    <eval expected="1" xpath="count(/areaTree/child::extension-attachments)"/>

-    <eval expected="5" xpath="count(/areaTree/child::extension-attachments/child::*)"/>

-    <eval expected="autofeed"       xpath="/areaTree/extension-attachments/child::*[1]/@name"/>

-    <eval expected="header comment 1" xpath="/areaTree/extension-attachments/child::*[2]/text()"/>

-    <eval expected="footer comment 1" xpath="/areaTree/extension-attachments/child::*[3]/text()"/>

-    <eval expected="header comment 2" xpath="/areaTree/extension-attachments/child::*[4]/text()"/>

-    <eval expected="footer comment 2" xpath="/areaTree/extension-attachments/child::*[5]/text()"/>

-

-    <eval expected="3" xpath="count(/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=1]/page/extension-attachments/child::*)"/>

-    <eval expected="lower tray" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=1]/page/extension-attachments/child::*[1]/@name"/>

-    <eval expected="A4 before page" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=1]/page/extension-attachments/child::*[2]"/>

-    <eval expected="A4 after page" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=1]/page/extension-attachments/child::*[3]"/>

-

-    <eval expected="5" xpath="count(/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*)"/>

-    <eval expected="upper tray" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[1]/@name"/>

-    <eval expected="A4a before page 1" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[2]"/>

-    <eval expected="A4a after page 1" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[3]"/>

-    <eval expected="A4a before page 2" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[4]"/>

-    <eval expected="A4a after page 2" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[5]"/>

-

-    <eval expected="3" xpath="count(/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=3]/page/extension-attachments/child::*)"/>

-    <eval expected="lower tray" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=3]/page/extension-attachments/child::*[1]/@name"/>

-    <eval expected="A4 before page" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=3]/page/extension-attachments/child::*[2]"/>

-    <eval expected="A4 after page" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=3]/page/extension-attachments/child::*[3]"/>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks the PostScript extension for custom setpagedevice calls and comments.
+      The extension attachments need to show up in the area tree XML so the AreaTreeParser can fully restore the area tree.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:ps="http://xmlgraphics.apache.org/fop/postscript">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="A4" page-height="29.7cm" page-width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
+          <ps:ps-setpagedevice name="lower tray"><![CDATA[ << /MediaPosition 4 >> ]]></ps:ps-setpagedevice>
+          <ps:ps-comment-before>A4 before page</ps:ps-comment-before>
+          <ps:ps-comment-after>A4 after page</ps:ps-comment-after>
+          <fo:region-body/>
+        </fo:simple-page-master>
+        <fo:simple-page-master master-name="A4a" page-height="29.7cm" page-width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
+          <ps:ps-setpagedevice name="upper tray"><![CDATA[ << /MediaPosition 1 >> ]]></ps:ps-setpagedevice>
+          <ps:ps-comment-before>A4a before page 1</ps:ps-comment-before>
+          <ps:ps-comment-after>A4a after page 1</ps:ps-comment-after>
+          <ps:ps-comment-before>A4a before page 2</ps:ps-comment-before>
+          <ps:ps-comment-after>A4a after page 2</ps:ps-comment-after>
+          <fo:region-body background-color="orange"/>
+        </fo:simple-page-master>
+        <fo:page-sequence-master master-name="complex">
+      	  <fo:repeatable-page-master-reference master-reference="A4" maximum-repeats="1"/>
+      	  <fo:repeatable-page-master-reference master-reference="A4a" maximum-repeats="1"/>
+      	  <fo:repeatable-page-master-reference master-reference="A4"/>
+        </fo:page-sequence-master>
+      </fo:layout-master-set>
+      <fo:declarations>
+        <ps:ps-setpagedevice name="autofeed"><![CDATA[ << /ManualFeed false >> ]]></ps:ps-setpagedevice>
+        <ps:ps-comment-before>header comment 1</ps:ps-comment-before>
+        <ps:ps-comment-after>footer comment 1</ps:ps-comment-after>
+        <ps:ps-comment-before>header comment 2</ps:ps-comment-before>
+        <ps:ps-comment-after>footer comment 2</ps:ps-comment-after>
+      </fo:declarations>
+      <fo:page-sequence master-reference="complex">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>Hello World!</fo:block>
+          <fo:block break-before="page"/>
+          <fo:block>Hello World!</fo:block>
+          <fo:block break-before="page"/>
+          <fo:block>Hello World!</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+  </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2" xpath="count(/areaTree/child::*)"/>
+    <eval expected="1" xpath="count(/areaTree/child::pageSequence)"/>
+    <eval expected="1" xpath="count(/areaTree/child::extension-attachments)"/>
+    <eval expected="5" xpath="count(/areaTree/child::extension-attachments/child::*)"/>
+    <eval expected="autofeed"       xpath="/areaTree/extension-attachments/child::*[1]/@name"/>
+    <eval expected="header comment 1" xpath="/areaTree/extension-attachments/child::*[2]/text()"/>
+    <eval expected="footer comment 1" xpath="/areaTree/extension-attachments/child::*[3]/text()"/>
+    <eval expected="header comment 2" xpath="/areaTree/extension-attachments/child::*[4]/text()"/>
+    <eval expected="footer comment 2" xpath="/areaTree/extension-attachments/child::*[5]/text()"/>
+
+    <eval expected="3" xpath="count(/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=1]/page/extension-attachments/child::*)"/>
+    <eval expected="lower tray" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=1]/page/extension-attachments/child::*[1]/@name"/>
+    <eval expected="A4 before page" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=1]/page/extension-attachments/child::*[2]"/>
+    <eval expected="A4 after page" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=1]/page/extension-attachments/child::*[3]"/>
+
+    <eval expected="5" xpath="count(/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*)"/>
+    <eval expected="upper tray" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[1]/@name"/>
+    <eval expected="A4a before page 1" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[2]"/>
+    <eval expected="A4a after page 1" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[3]"/>
+    <eval expected="A4a before page 2" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[4]"/>
+    <eval expected="A4a after page 2" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4a' and @nr=2]/page/extension-attachments/child::*[5]"/>
+
+    <eval expected="3" xpath="count(/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=3]/page/extension-attachments/child::*)"/>
+    <eval expected="lower tray" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=3]/page/extension-attachments/child::*[1]/@name"/>
+    <eval expected="A4 before page" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=3]/page/extension-attachments/child::*[2]"/>
+    <eval expected="A4 after page" xpath="/areaTree/pageSequence/pageViewport[@simple-page-master-name='A4' and @nr=3]/page/extension-attachments/child::*[3]"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/region-body_column-count_bug36356.xml b/test/layoutengine/standard-testcases/region-body_column-count_bug36356.xml
index cd02fe183..c9f72ba30 100644
--- a/test/layoutengine/standard-testcases/region-body_column-count_bug36356.xml
+++ b/test/layoutengine/standard-testcases/region-body_column-count_bug36356.xml
@@ -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 multi-column documents. Checks a problem described in Bugzilla #36356.

-      The balancing algorithm does not seem to always find the right breaking points.

-    </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="320pt" page-height="4in">

-          <fo:region-body column-count="3" column-gap="10pt"/>

-        </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 margin="5pt">

-            <fo:block>line1</fo:block>

-            <fo:block>line2</fo:block>

-            <fo:block>line3</fo:block>

-            <fo:block>line4</fo:block>

-            <fo:block>line5</fo:block>

-            <fo:block>line6</fo:block>

-          </fo:block>

-          <fo:block margin="5pt" span="all">

-            <fo:block>This line is spanned over all columns.</fo:block>

-          </fo:block>

-          <fo:block margin="5pt">

-            <fo:block>line1</fo:block>

-            <fo:block>line2</fo:block>

-            <fo:block>line3</fo:block>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- 33800 = 2 * 5000 + 2 * 14400 -->

-    <eval expected="38800" xpath="//mainReference/span[1]/@bpd"/>

-    <eval expected="3" xpath="count(//mainReference/span[1]/flow)"/>

-  </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 multi-column documents. Checks a problem described in Bugzilla #36356.
+      The balancing algorithm does not seem to always find the right breaking points.
+    </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="320pt" page-height="4in">
+          <fo:region-body column-count="3" column-gap="10pt"/>
+        </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 margin="5pt">
+            <fo:block>line1</fo:block>
+            <fo:block>line2</fo:block>
+            <fo:block>line3</fo:block>
+            <fo:block>line4</fo:block>
+            <fo:block>line5</fo:block>
+            <fo:block>line6</fo:block>
+          </fo:block>
+          <fo:block margin="5pt" span="all">
+            <fo:block>This line is spanned over all columns.</fo:block>
+          </fo:block>
+          <fo:block margin="5pt">
+            <fo:block>line1</fo:block>
+            <fo:block>line2</fo:block>
+            <fo:block>line3</fo:block>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- 33800 = 2 * 5000 + 2 * 14400 -->
+    <eval expected="38800" xpath="//mainReference/span[1]/@bpd"/>
+    <eval expected="3" xpath="count(//mainReference/span[1]/flow)"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml
index 5a4077bb4..1dfe99990 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml
@@ -1,107 +1,107 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%">

-          <fo:region-body margin="5%" background-color="yellow" />

-          <fo:region-before extent="5%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" />

-          <fo:region-end extent="5%" background-color="orange" />

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margins on all regions and the page master.

-            The page size is 5in x 3in. This gives top and bottom margins of 0.25in and

-            left and right margins 0.15in.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="288000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="10800 36000 10800 288000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="288000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="288000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="194400 36000 10800 288000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="288000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="172800" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="288000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="21600 36000 172800 288000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="172800" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="288000" xpath="//page/regionViewport[5]/regionBody/@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>
+      This test checks relative margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%">
+          <fo:region-body margin="5%" background-color="yellow" />
+          <fo:region-before extent="5%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" />
+          <fo:region-end extent="5%" background-color="orange" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margins on all regions and the page master.
+            The page size is 5in x 3in. This gives top and bottom margins of 0.25in and
+            left and right margins 0.15in.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="288000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="10800 36000 10800 288000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="288000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="288000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="194400 36000 10800 288000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="288000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="172800" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="288000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="21600 36000 172800 288000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="172800" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="288000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml
index cffbf14e8..2d63815b5 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml
@@ -1,112 +1,112 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%" reference-orientation="0">

-          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />

-          <fo:region-before extent="10%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" />

-          <fo:region-end extent="10%" background-color="orange" />

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margin on the page master, 10% margin on regions before

-            and end and 5% margin on regions start and after. Corresponding margins are set

-            on the region body. The page size is 5in x 3in with the page reference not rotated.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 1.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="10800 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 1.0 10800.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="183600 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 1.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 1.0 10800.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>

-  </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 margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%" reference-orientation="0">
+          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />
+          <fo:region-before extent="10%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" />
+          <fo:region-end extent="10%" background-color="orange" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margin on the page master, 10% margin on regions before
+            and end and 5% margin on regions start and after. Corresponding margins are set
+            on the region body. The page size is 5in x 3in with the page reference not rotated.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 1.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="10800 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 1.0 10800.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="183600 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 1.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 1.0 10800.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml
index 3c5171d28..e594a211e 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml
@@ -1,113 +1,113 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%" reference-orientation="0" writing-mode="rl">

-          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />

-          <fo:region-before extent="10%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" />

-          <fo:region-end extent="10%" background-color="orange" />

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margin on the page master, 10% margin on regions before

-            and end and 5% margin on regions start and after. Corresponding margins are set

-            on the region body. The page size is 5in x 3in with the page reference not rotated

-            and a rl writing-mode.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <eval expected="[-1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>

-    <eval expected="[-1.0 0.0 0.0 1.0 194400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>

-  </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 margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%" reference-orientation="0" writing-mode="rl">
+          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
+          <fo:region-before extent="10%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" />
+          <fo:region-end extent="10%" background-color="orange" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margin on the page master, 10% margin on regions before
+            and end and 5% margin on regions start and after. Corresponding margins are set
+            on the region body. The page size is 5in x 3in with the page reference not rotated
+            and a rl writing-mode.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <eval expected="[-1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+    <eval expected="[-1.0 0.0 0.0 1.0 194400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml
index e7980afdc..4a3054a9a 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml
@@ -1,113 +1,113 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%" reference-orientation="180">

-          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />

-          <fo:region-before extent="10%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" />

-          <fo:region-end extent="10%" background-color="orange" />

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margin on the page master, 10% margin on regions before

-            and end and 5% margin on regions start and after. Corresponding margins are set

-            on the region body. The page size is 5in x 3in with the page reference rotated by 

-            180 degrees.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="10800 306000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="194400 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="10800 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <eval expected="[-1.0 -0.0 0.0 -1.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>

-    <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>

-  </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 margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%" reference-orientation="180">
+          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />
+          <fo:region-before extent="10%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" />
+          <fo:region-end extent="10%" background-color="orange" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margin on the page master, 10% margin on regions before
+            and end and 5% margin on regions start and after. Corresponding margins are set
+            on the region body. The page size is 5in x 3in with the page reference rotated by 
+            180 degrees.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="10800 306000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="194400 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="10800 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <eval expected="[-1.0 -0.0 0.0 -1.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+    <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml
index b18878a1f..b9a26ce7c 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml
@@ -1,113 +1,113 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%" reference-orientation="180" writing-mode="rl">

-          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />

-          <fo:region-before extent="10%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" />

-          <fo:region-end extent="10%" background-color="orange" />

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margin on the page master, 10% margin on regions before

-            and end and 5% margin on regions start and after. Corresponding margins are set

-            on the region body. The page size is 5in x 3in with the page reference rotated by 

-            180 degrees and a rl writing-mode.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="10800 306000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 -1.0 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="10800 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 -1.0 10800.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="183600 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 -1.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 -1.0 10800.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 -1.0 21600.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>

-  </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 margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%" reference-orientation="180" writing-mode="rl">
+          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
+          <fo:region-before extent="10%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" />
+          <fo:region-end extent="10%" background-color="orange" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margin on the page master, 10% margin on regions before
+            and end and 5% margin on regions start and after. Corresponding margins are set
+            on the region body. The page size is 5in x 3in with the page reference rotated by 
+            180 degrees and a rl writing-mode.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="10800 306000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 -1.0 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="10800 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 -1.0 10800.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="183600 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 -1.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 -1.0 10800.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 -1.0 21600.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml
index 7646d1d29..7d7196ece 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml
@@ -1,113 +1,113 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%" reference-orientation="270">

-          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />

-          <fo:region-before extent="10%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" />

-          <fo:region-end extent="10%" background-color="orange" />

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margin on the page master, 10% margin on regions before

-            and end and 5% margin on regions start and after. Corresponding margins are set

-            on the region body. The page size is 5in x 3in with the page reference rotated by 

-            270 degrees.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="183600 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <eval expected="[0.0 1.0 -1.0 0.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="21600 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <eval expected="[0.0 1.0 -1.0 0.0 183600.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="21600 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <eval expected="[0.0 1.0 -1.0 0.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <eval expected="[0.0 1.0 -1.0 0.0 21600.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>

-    <eval expected="[0.0 1.0 -1.0 0.0 183600.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>

-  </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 margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%" reference-orientation="270">
+          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />
+          <fo:region-before extent="10%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" />
+          <fo:region-end extent="10%" background-color="orange" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margin on the page master, 10% margin on regions before
+            and end and 5% margin on regions start and after. Corresponding margins are set
+            on the region body. The page size is 5in x 3in with the page reference rotated by 
+            270 degrees.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="183600 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <eval expected="[0.0 1.0 -1.0 0.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="21600 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <eval expected="[0.0 1.0 -1.0 0.0 183600.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="21600 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <eval expected="[0.0 1.0 -1.0 0.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <eval expected="[0.0 1.0 -1.0 0.0 21600.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+    <eval expected="[0.0 1.0 -1.0 0.0 183600.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml
index 26880f095..93b37467b 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml
@@ -1,113 +1,113 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%" reference-orientation="270" writing-mode="rl">

-          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />

-          <fo:region-before extent="10%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" />

-          <fo:region-end extent="10%" background-color="orange" />

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margin on the page master, 10% margin on regions before

-            and end and 5% margin on regions start and after. Corresponding margins are set

-            on the region body. The page size is 5in x 3in with the page reference rotated by 

-            270 degrees and a rl writing-mode.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="183600 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <eval expected="[-0.0 -1.0 -1.0 0.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="21600 324000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="21600 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <eval expected="[-0.0 -1.0 -1.0 0.0 21600.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>

-    <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>

-  </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 margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%" reference-orientation="270" writing-mode="rl">
+          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
+          <fo:region-before extent="10%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" />
+          <fo:region-end extent="10%" background-color="orange" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margin on the page master, 10% margin on regions before
+            and end and 5% margin on regions start and after. Corresponding margins are set
+            on the region body. The page size is 5in x 3in with the page reference rotated by 
+            270 degrees and a rl writing-mode.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="183600 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <eval expected="[-0.0 -1.0 -1.0 0.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="21600 324000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="21600 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <eval expected="[-0.0 -1.0 -1.0 0.0 21600.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+    <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml
index 01c0eaecd..ab6a58400 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml
@@ -1,113 +1,113 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%" reference-orientation="90">

-          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />

-          <fo:region-before extent="10%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" />

-          <fo:region-end extent="10%" background-color="orange" />

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margin on the page master, 10% margin on regions before

-            and end and 5% margin on regions start and after. Corresponding margins are set

-            on the region body. The page size is 5in x 3in with the page reference rotated by 

-            90 degrees.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <eval expected="[0.0 -1.0 1.0 0.0 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="32400 324000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <eval expected="[0.0 -1.0 1.0 0.0 32400.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="32400 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <eval expected="[0.0 -1.0 1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <eval expected="[0.0 -1.0 1.0 0.0 194400.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>

-    <eval expected="[0.0 -1.0 1.0 0.0 32400.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>

-  </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 margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%" reference-orientation="90">
+          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />
+          <fo:region-before extent="10%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" />
+          <fo:region-end extent="10%" background-color="orange" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margin on the page master, 10% margin on regions before
+            and end and 5% margin on regions start and after. Corresponding margins are set
+            on the region body. The page size is 5in x 3in with the page reference rotated by 
+            90 degrees.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <eval expected="[0.0 -1.0 1.0 0.0 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="32400 324000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <eval expected="[0.0 -1.0 1.0 0.0 32400.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="32400 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <eval expected="[0.0 -1.0 1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <eval expected="[0.0 -1.0 1.0 0.0 194400.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+    <eval expected="[0.0 -1.0 1.0 0.0 32400.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml
index bbf2a022d..8c98329f7 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml
@@ -1,113 +1,113 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%" reference-orientation="90" writing-mode="rl">

-          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />

-          <fo:region-before extent="10%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" />

-          <fo:region-end extent="10%" background-color="orange" />

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margin on the page master, 10% margin on regions before

-            and end and 5% margin on regions start and after. Corresponding margins are set

-            on the region body. The page size is 5in x 3in with the page reference rotated by 

-            90 degrees and a rl writing-mode.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <eval expected="[0.0 1.0 1.0 0.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="32400 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <eval expected="[0.0 1.0 1.0 0.0 32400.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="32400 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <eval expected="[0.0 1.0 1.0 0.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <eval expected="[0.0 1.0 1.0 0.0 194400.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>

-    <eval expected="[0.0 1.0 1.0 0.0 32400.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>

-  </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 margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%" reference-orientation="90" writing-mode="rl">
+          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
+          <fo:region-before extent="10%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" />
+          <fo:region-end extent="10%" background-color="orange" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margin on the page master, 10% margin on regions before
+            and end and 5% margin on regions start and after. Corresponding margins are set
+            on the region body. The page size is 5in x 3in with the page reference rotated by 
+            90 degrees and a rl writing-mode.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <eval expected="[0.0 1.0 1.0 0.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="32400 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <eval expected="[0.0 1.0 1.0 0.0 32400.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="32400 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <eval expected="[0.0 1.0 1.0 0.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <eval expected="[0.0 1.0 1.0 0.0 194400.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+    <eval expected="[0.0 1.0 1.0 0.0 32400.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml b/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml
index 4de877c91..68db2454e 100644
--- a/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml
+++ b/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml
@@ -1,114 +1,114 @@
-<?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 margin on region (region-body).

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/bgimg300dpi.jpg</img>

-  </variables>

-  <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="3in" page-height="5in" margin="5%" reference-orientation="0" writing-mode="rl">

-          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" writing-mode="lr"/>

-          <fo:region-before extent="10%" background-color="blue" precedence="true" />

-          <fo:region-after extent="5%" background-color="green" precedence="true" />

-          <fo:region-start extent="5%" background-color="red" writing-mode="tb"/>

-          <fo:region-end extent="10%" background-color="orange"  writing-mode="tb"/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" white-space-collapse="true">

-        <fo:static-content flow-name="xsl-region-before">

-          <fo:block>

-            r e g i o n  b e f o r e

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-after">

-          <fo:block>

-            r e g i o n  a f t e r

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-start">

-          <fo:block>

-            r e g i o n  s t a r t top - bottom

-          </fo:block>

-        </fo:static-content>

-        <fo:static-content flow-name="xsl-region-end">

-          <fo:block>

-            r e g i o n  e n d top - bottom

-          </fo:block>

-        </fo:static-content>

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            Demonstrates relative 5% margin on the page master, 10% margin on regions before

-            and end and 5% margin on regions start and after. Corresponding margins are set

-            on the region body. The page size is 5in x 3in with the page reference not rotated

-            and a rl writing-mode on the page master, a normal writing mode on the region-body

-            and tb writing mode on start and end regions.

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- region before -->

-    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>

-    <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>

-    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>

-    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>

-    <!-- region start -->

-    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>

-    <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>

-    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>

-    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@bpd"/>

-    <eval expected="[0.0 1.0 -1.0 0.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>

-    <!-- region end -->

-    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>

-    <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>

-    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>

-    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>

-    <eval expected="[0.0 1.0 -1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>

-    <!-- region after -->

-    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>

-    <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>

-    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>

-    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>

-    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>

-    <!-- region body -->

-    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>

-    <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>

-    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>

-    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>

-    <eval expected="[1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>

-  </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 margin on region (region-body).
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/bgimg300dpi.jpg</img>
+  </variables>
+  <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="3in" page-height="5in" margin="5%" reference-orientation="0" writing-mode="rl">
+          <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" writing-mode="lr"/>
+          <fo:region-before extent="10%" background-color="blue" precedence="true" />
+          <fo:region-after extent="5%" background-color="green" precedence="true" />
+          <fo:region-start extent="5%" background-color="red" writing-mode="tb"/>
+          <fo:region-end extent="10%" background-color="orange"  writing-mode="tb"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block>
+            r e g i o n  b e f o r e
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block>
+            r e g i o n  a f t e r
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:block>
+            r e g i o n  s t a r t top - bottom
+          </fo:block>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:block>
+            r e g i o n  e n d top - bottom
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            Demonstrates relative 5% margin on the page master, 10% margin on regions before
+            and end and 5% margin on regions start and after. Corresponding margins are set
+            on the region body. The page size is 5in x 3in with the page reference not rotated
+            and a rl writing-mode on the page master, a normal writing mode on the region-body
+            and tb writing mode on start and end regions.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- region before -->
+    <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+    <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+    <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+    <!-- region start -->
+    <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+    <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+    <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+    <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+    <eval expected="[0.0 1.0 -1.0 0.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+    <!-- region end -->
+    <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+    <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+    <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+    <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+    <eval expected="[0.0 1.0 -1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+    <!-- region after -->
+    <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+    <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+    <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+    <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+    <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+    <!-- region body -->
+    <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+    <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+    <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+    <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+    <eval expected="[1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-body_background-image.xml b/test/layoutengine/standard-testcases/table-body_background-image.xml
index ffe122098..2a9aa9362 100644
--- a/test/layoutengine/standard-testcases/table-body_background-image.xml
+++ b/test/layoutengine/standard-testcases/table-body_background-image.xml
@@ -1,110 +1,110 @@
-<?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 a fo:table-body.

-    </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:table>

-            <fo:table-column column-number="1" />

-            <fo:table-column column-number="2" />

-            <fo:table-column column-number="3" />

-            <fo:table-header>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Header Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-header>

-            <fo:table-body background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 3 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 3 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 3 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 4 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 4 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 4 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-          <fo:block>Table with centered background image on body</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-  <!-- backgrounds on table-body are not supported at the time this test

-  was written. Therefore no checks! -->

-  </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 a fo:table-body.
+    </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:table>
+            <fo:table-column column-number="1" />
+            <fo:table-column column-number="2" />
+            <fo:table-column column-number="3" />
+            <fo:table-header>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Header Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-body background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 3 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 3 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 3 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 4 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 4 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 4 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block>Table with centered background image on body</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+  <!-- backgrounds on table-body are not supported at the time this test
+  was written. Therefore no checks! -->
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-cell_background-image.xml b/test/layoutengine/standard-testcases/table-cell_background-image.xml
index 047728243..1c4587b25 100644
--- a/test/layoutengine/standard-testcases/table-cell_background-image.xml
+++ b/test/layoutengine/standard-testcases/table-cell_background-image.xml
@@ -1,131 +1,131 @@
-<?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 positioned background images on a fo:table-cell.

-    </p>

-  </info>

-  <variables>

-    <img>../../resources/images/box1.png</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" margin="15pt">

-          <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:table border-collapse="separate" table-layout="fixed">

-            <fo:table-column />

-            <fo:table-column />

-            <fo:table-column />

-            <fo:table-body>

-              <fo:table-row>

-                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue" 

-                   background-image="##img"

-                   background-position-horizontal="right" 

-                   background-repeat="no-repeat">

-                  <fo:block>image in top right corner</fo:block>

-                </fo:table-cell>

-                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green" 

-                   background-image="##img"

-                   background-position-horizontal="right" 

-                   background-position-vertical="center" 

-                   background-repeat="no-repeat">

-                  <fo:block>image in center right</fo:block>

-                </fo:table-cell>

-                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow" 

-                   background-image="##img"

-                   background-position-horizontal="right" 

-                   background-position-vertical="bottom" 

-                   background-repeat="no-repeat">

-                  <fo:block>image in bottom right corner</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row>

-                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow" 

-                   background-image="##img"

-                   background-position-horizontal="center" 

-                   background-repeat="no-repeat">

-                  <fo:block>image in top center</fo:block>

-                </fo:table-cell>

-                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue" 

-                   background-image="##img"

-                   background-position-horizontal="center" 

-                   background-position-vertical="center" 

-                   background-repeat="no-repeat">

-                  <fo:block>image in center</fo:block>

-                </fo:table-cell>

-                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green" 

-                   background-image="##img"

-                   background-position-horizontal="center" 

-                   background-position-vertical="bottom" 

-                   background-repeat="no-repeat">

-                  <fo:block>image in bottom center</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row>

-                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green" 

-                   background-image="##img"

-                   background-repeat="no-repeat">

-                  <fo:block>image in top left</fo:block>

-                </fo:table-cell>

-                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow" 

-                   background-image="##img"

-                   background-position-vertical="center" 

-                   background-repeat="no-repeat">

-                  <fo:block>image in center left</fo:block>

-                </fo:table-cell>

-                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue" 

-                   background-image="##img"

-                   background-position-vertical="bottom" 

-                   background-repeat="no-repeat">

-                  <fo:block>image in bottom left</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- first cell in row 1 -->

-    <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=0" xpath="//flow/block/block[1]/@background"/>

-    <!-- second cell in row 1 -->

-    <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=28495" xpath="//flow/block/block[2]/@background"/>

-    <!-- third cell in row 1 -->

-    <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=56991" xpath="//flow/block/block[3]/@background"/>

-    <!-- first cell in row 2 -->

-    <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=0" xpath="//flow/block/block[4]/@background"/>

-    <!-- second cell in row 2 -->

-    <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=28495" xpath="//flow/block/block[5]/@background"/>

-    <!-- third cell in row 2 -->

-    <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=56991" xpath="//flow/block/block[6]/@background"/>

-    <!-- first cell in row 3 -->

-    <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block/block[7]/@background"/>

-    <!-- second cell in row 3 -->

-    <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=28495" xpath="//flow/block/block[8]/@background"/>

-    <!-- third cell in row 3 -->

-    <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=56991" xpath="//flow/block/block[9]/@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 positioned background images on a fo:table-cell.
+    </p>
+  </info>
+  <variables>
+    <img>../../resources/images/box1.png</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" margin="15pt">
+          <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:table border-collapse="separate" table-layout="fixed">
+            <fo:table-column />
+            <fo:table-column />
+            <fo:table-column />
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue" 
+                   background-image="##img"
+                   background-position-horizontal="right" 
+                   background-repeat="no-repeat">
+                  <fo:block>image in top right corner</fo:block>
+                </fo:table-cell>
+                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green" 
+                   background-image="##img"
+                   background-position-horizontal="right" 
+                   background-position-vertical="center" 
+                   background-repeat="no-repeat">
+                  <fo:block>image in center right</fo:block>
+                </fo:table-cell>
+                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow" 
+                   background-image="##img"
+                   background-position-horizontal="right" 
+                   background-position-vertical="bottom" 
+                   background-repeat="no-repeat">
+                  <fo:block>image in bottom right corner</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow" 
+                   background-image="##img"
+                   background-position-horizontal="center" 
+                   background-repeat="no-repeat">
+                  <fo:block>image in top center</fo:block>
+                </fo:table-cell>
+                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue" 
+                   background-image="##img"
+                   background-position-horizontal="center" 
+                   background-position-vertical="center" 
+                   background-repeat="no-repeat">
+                  <fo:block>image in center</fo:block>
+                </fo:table-cell>
+                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green" 
+                   background-image="##img"
+                   background-position-horizontal="center" 
+                   background-position-vertical="bottom" 
+                   background-repeat="no-repeat">
+                  <fo:block>image in bottom center</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green" 
+                   background-image="##img"
+                   background-repeat="no-repeat">
+                  <fo:block>image in top left</fo:block>
+                </fo:table-cell>
+                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow" 
+                   background-image="##img"
+                   background-position-vertical="center" 
+                   background-repeat="no-repeat">
+                  <fo:block>image in center left</fo:block>
+                </fo:table-cell>
+                <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue" 
+                   background-image="##img"
+                   background-position-vertical="bottom" 
+                   background-repeat="no-repeat">
+                  <fo:block>image in bottom left</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- first cell in row 1 -->
+    <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=0" xpath="//flow/block/block[1]/@background"/>
+    <!-- second cell in row 1 -->
+    <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=28495" xpath="//flow/block/block[2]/@background"/>
+    <!-- third cell in row 1 -->
+    <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=56991" xpath="//flow/block/block[3]/@background"/>
+    <!-- first cell in row 2 -->
+    <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=0" xpath="//flow/block/block[4]/@background"/>
+    <!-- second cell in row 2 -->
+    <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=28495" xpath="//flow/block/block[5]/@background"/>
+    <!-- third cell in row 2 -->
+    <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=56991" xpath="//flow/block/block[6]/@background"/>
+    <!-- first cell in row 3 -->
+    <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block/block[7]/@background"/>
+    <!-- second cell in row 3 -->
+    <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=28495" xpath="//flow/block/block[8]/@background"/>
+    <!-- third cell in row 3 -->
+    <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=56991" xpath="//flow/block/block[9]/@background"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-cell_block_margin_percentage.xml b/test/layoutengine/standard-testcases/table-cell_block_margin_percentage.xml
index 84504cbc4..84aa38538 100644
--- a/test/layoutengine/standard-testcases/table-cell_block_margin_percentage.xml
+++ b/test/layoutengine/standard-testcases/table-cell_block_margin_percentage.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<!-- $Id$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks basic tables with percentages in cells.

-    </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:table table-layout="fixed" width="100%">

-            <fo:table-column column-width="2in"/>

-            <fo:table-column column-width="3in"/>

-            <fo:table-body>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block margin="10%">cell1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell background-color="yellow">

-                  <fo:block margin-left="5%" margin-right="5%">cell2</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- table dimensions -->

-    <eval expected="360000" xpath="//flow/block[1]/@ipd"/>

-    <eval expected="43200" xpath="//flow/block[1]/@bpd"/>

-    

-    <!-- cell 1 -->

-    <true xpath="//flow/block[1]/block[1]/@is-reference-area"/>

-    <eval expected="144000" xpath="//flow/block[1]/block[1]/@ipd"/>

-    <eval expected="43200" xpath="//flow/block[1]/block[1]/@bpd"/>

-    <eval expected="115200" xpath="//flow/block[1]/block[1]/block[1]/@ipd"/>

-    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@bpd"/>

-    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-before"/>

-    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-after"/>

-    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@start-indent"/>

-    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-start"/>

-    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@end-indent"/>

-    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-end"/>

-

-    <!-- cell 2 -->

-    <true xpath="//flow/block[1]/block[2]/@is-reference-area"/>

-    <eval expected="144000" xpath="//flow/block[1]/block[2]/@left-offset"/>

-    <eval expected="216000" xpath="//flow/block[1]/block[2]/@ipd"/>

-    <eval expected="43200" xpath="//flow/block[1]/block[2]/@bpd"/>

-    <eval expected="194400" xpath="//flow/block[1]/block[2]/block[1]/@ipd"/>

-    <eval expected="14400" xpath="//flow/block[1]/block[2]/block[1]/@bpd"/>

-    <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@start-indent"/>

-    <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@space-start"/>

-    <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@end-indent"/>

-    <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@space-end"/>

-  </checks>

-</testcase>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks basic tables with percentages in cells.
+    </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:table table-layout="fixed" width="100%">
+            <fo:table-column column-width="2in"/>
+            <fo:table-column column-width="3in"/>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block margin="10%">cell1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="yellow">
+                  <fo:block margin-left="5%" margin-right="5%">cell2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- table dimensions -->
+    <eval expected="360000" xpath="//flow/block[1]/@ipd"/>
+    <eval expected="43200" xpath="//flow/block[1]/@bpd"/>
+    
+    <!-- cell 1 -->
+    <true xpath="//flow/block[1]/block[1]/@is-reference-area"/>
+    <eval expected="144000" xpath="//flow/block[1]/block[1]/@ipd"/>
+    <eval expected="43200" xpath="//flow/block[1]/block[1]/@bpd"/>
+    <eval expected="115200" xpath="//flow/block[1]/block[1]/block[1]/@ipd"/>
+    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@bpd"/>
+    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-before"/>
+    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-after"/>
+    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@start-indent"/>
+    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-start"/>
+    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@end-indent"/>
+    <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-end"/>
+
+    <!-- cell 2 -->
+    <true xpath="//flow/block[1]/block[2]/@is-reference-area"/>
+    <eval expected="144000" xpath="//flow/block[1]/block[2]/@left-offset"/>
+    <eval expected="216000" xpath="//flow/block[1]/block[2]/@ipd"/>
+    <eval expected="43200" xpath="//flow/block[1]/block[2]/@bpd"/>
+    <eval expected="194400" xpath="//flow/block[1]/block[2]/block[1]/@ipd"/>
+    <eval expected="14400" xpath="//flow/block[1]/block[2]/block[1]/@bpd"/>
+    <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@start-indent"/>
+    <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@space-start"/>
+    <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@end-indent"/>
+    <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@space-end"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-cell_padding_percentages.xml b/test/layoutengine/standard-testcases/table-cell_padding_percentages.xml
index 2cc55afad..3608b47f1 100644
--- a/test/layoutengine/standard-testcases/table-cell_padding_percentages.xml
+++ b/test/layoutengine/standard-testcases/table-cell_padding_percentages.xml
@@ -1,65 +1,65 @@
-<?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 a fo:table-cell.

-    </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:table table-layout="fixed">

-            <fo:table-column column-number="1" />

-            <fo:table-column column-number="2" />

-            <fo:table-column column-number="3" />

-            <fo:table-body>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell margin="0pt" padding="2%" background-color="yellow">

-                  <fo:block>Row 1 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-          <fo:block>Table a yellow cell having 2% padding.</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="7200 7200 7200 7200" xpath="//flow/block/block[2]/@bap"/>

-    <eval expected="color=#ffff00" xpath="//flow/block/block[2]/@background"/>

-    <eval expected="7200" xpath="//flow/block/block[2]/block/@start-indent"/>

-    <eval expected="7200" xpath="//flow/block/block[2]/block/@end-indent"/>

-    <eval expected="7200" xpath="//flow/block/block[2]/block/@space-start"/>

-    <eval expected="7200" xpath="//flow/block/block[2]/block/@space-end"/>

-  </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 a fo:table-cell.
+    </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:table table-layout="fixed">
+            <fo:table-column column-number="1" />
+            <fo:table-column column-number="2" />
+            <fo:table-column column-number="3" />
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell margin="0pt" padding="2%" background-color="yellow">
+                  <fo:block>Row 1 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block>Table a yellow cell having 2% padding.</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="7200 7200 7200 7200" xpath="//flow/block/block[2]/@bap"/>
+    <eval expected="color=#ffff00" xpath="//flow/block/block[2]/@background"/>
+    <eval expected="7200" xpath="//flow/block/block[2]/block/@start-indent"/>
+    <eval expected="7200" xpath="//flow/block/block[2]/block/@end-indent"/>
+    <eval expected="7200" xpath="//flow/block/block[2]/block/@space-start"/>
+    <eval expected="7200" xpath="//flow/block/block[2]/block/@space-end"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-header_background-image.xml b/test/layoutengine/standard-testcases/table-header_background-image.xml
index f4867c9da..f74c13b0d 100644
--- a/test/layoutengine/standard-testcases/table-header_background-image.xml
+++ b/test/layoutengine/standard-testcases/table-header_background-image.xml
@@ -1,101 +1,101 @@
-<?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 a fo:table-header and footer.

-    </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:table>

-            <fo:table-column column-number="1" />

-            <fo:table-column column-number="2" />

-            <fo:table-column column-number="3" />

-            <fo:table-header background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Header Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-header>

-            <fo:table-footer background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Footer Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Footer Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Footer Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-footer>

-            <fo:table-body background-color="blue">

-              <fo:table-row height="4in" background-color="blue">

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row height="4in" background-color="blue">

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-          <fo:block>Table with centered background image in header and footer</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-  <!-- backgrounds on table-header/footer are not supported at the time this test

-  was written. Therefore no checks! -->

-  </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 a fo:table-header and footer.
+    </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:table>
+            <fo:table-column column-number="1" />
+            <fo:table-column column-number="2" />
+            <fo:table-column column-number="3" />
+            <fo:table-header background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Header Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-footer background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Footer Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Footer Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Footer Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-footer>
+            <fo:table-body background-color="blue">
+              <fo:table-row height="4in" background-color="blue">
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row height="4in" background-color="blue">
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block>Table with centered background image in header and footer</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+  <!-- backgrounds on table-header/footer are not supported at the time this test
+  was written. Therefore no checks! -->
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-row_background-image.xml b/test/layoutengine/standard-testcases/table-row_background-image.xml
index eec4b6e17..fa29f1b8e 100644
--- a/test/layoutengine/standard-testcases/table-row_background-image.xml
+++ b/test/layoutengine/standard-testcases/table-row_background-image.xml
@@ -1,89 +1,89 @@
-<?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 a fo:table-row.

-    </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:table table-layout="fixed">

-            <fo:table-column column-number="1" />

-            <fo:table-column column-number="2" />

-            <fo:table-column column-number="3" />

-            <fo:table-header>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Header Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-header>

-            <fo:table-body>

-              <fo:table-row height="1in" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-          <fo:block>Table with centered background image on row 1</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="360000" xpath="//flow/block/block[4]/@ipd"/>

-    <eval expected="72000" xpath="//flow/block/block[4]/@bpd"/>

-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/block[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 background image on a fo:table-row.
+    </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:table table-layout="fixed">
+            <fo:table-column column-number="1" />
+            <fo:table-column column-number="2" />
+            <fo:table-column column-number="3" />
+            <fo:table-header>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Header Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-body>
+              <fo:table-row height="1in" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block>Table with centered background image on row 1</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="360000" xpath="//flow/block/block[4]/@ipd"/>
+    <eval expected="72000" xpath="//flow/block/block[4]/@bpd"/>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/block[4]/@background"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table_background-image.xml b/test/layoutengine/standard-testcases/table_background-image.xml
index 0b808638e..3efce48e6 100644
--- a/test/layoutengine/standard-testcases/table_background-image.xml
+++ b/test/layoutengine/standard-testcases/table_background-image.xml
@@ -1,113 +1,113 @@
-<?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 a fo:table.

-    </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:table table-layout="fixed" background-color="yellow" 

-                    background-repeat="no-repeat" 

-                    background-position-horizontal="center" 

-                    background-position-vertical="center" 

-                    background-image="##img">

-            <fo:table-column column-number="1" />

-            <fo:table-column column-number="2" />

-            <fo:table-column column-number="3" />

-            <fo:table-header>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Header Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-header>

-            <fo:table-body>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 2 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 3 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 3 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 3 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 4 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 4 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 4 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-          <fo:block>Table with centered background image</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block[1]/@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 a fo:table.
+    </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:table table-layout="fixed" background-color="yellow" 
+                    background-repeat="no-repeat" 
+                    background-position-horizontal="center" 
+                    background-position-vertical="center" 
+                    background-image="##img">
+            <fo:table-column column-number="1" />
+            <fo:table-column column-number="2" />
+            <fo:table-column column-number="3" />
+            <fo:table-header>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Header Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 2 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 3 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 3 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 3 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 4 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 4 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 4 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block>Table with centered background image</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block[1]/@background"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table_padding_percentages.xml b/test/layoutengine/standard-testcases/table_padding_percentages.xml
index 69c8f19b4..9d4041b17 100644
--- a/test/layoutengine/standard-testcases/table_padding_percentages.xml
+++ b/test/layoutengine/standard-testcases/table_padding_percentages.xml
@@ -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 a fo:table.

-    </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:table table-layout="fixed" margin="0pt" padding="5%" 

-                    background-color="yellow" border-collapse="separate">

-            <fo:table-column column-number="1" />

-            <fo:table-column column-number="2" />

-            <fo:table-column column-number="3" />

-            <fo:table-header>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Header Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Header Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-header>

-            <fo:table-body>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 2</fo:block>

-                </fo:table-cell>

-                <fo:table-cell>

-                  <fo:block>Row 1 Col 3</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-          <fo:block>Table on yellow background with 5% padding</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <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 a fo:table.
+    </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:table table-layout="fixed" margin="0pt" padding="5%" 
+                    background-color="yellow" border-collapse="separate">
+            <fo:table-column column-number="1" />
+            <fo:table-column column-number="2" />
+            <fo:table-column column-number="3" />
+            <fo:table-header>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Header Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Header Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block>Row 1 Col 3</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block>Table on yellow background with 5% padding</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <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>
diff --git a/test/layoutengine/standard-testcases/table_width.xml b/test/layoutengine/standard-testcases/table_width.xml
index b5151d31b..d15739671 100644
--- a/test/layoutengine/standard-testcases/table_width.xml
+++ b/test/layoutengine/standard-testcases/table_width.xml
@@ -1,98 +1,98 @@
-<?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 table width in certain situations.

-    </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-container width="100%" height="10pt" background-color="lightgray">

-            <fo:block/>

-          </fo:block-container>

-          <fo:table table-layout="fixed" width="100%" border-collapse="separate">

-            <fo:table-column column-width="proportional-column-width(3)"/>

-            <fo:table-column column-width="proportional-column-width(2)"/>

-            <fo:table-body>

-              <fo:table-row>

-                <fo:table-cell>

-                  <fo:block>cell1</fo:block>

-                </fo:table-cell>

-                <fo:table-cell background-color="yellow">

-                  <fo:block>cell2</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-          <fo:block start-indent="1in" end-indent="1in">

-            <fo:block-container width="100%" height="10pt" background-color="lightgray">

-              <fo:block/>

-            </fo:block-container>

-            <fo:table table-layout="fixed" width="100%" border-collapse="separate" background-color="gray">

-              <fo:table-column column-width="proportional-column-width(3)"/>

-              <fo:table-column column-width="proportional-column-width(2)"/>

-              <fo:table-body start-indent="0cm" end-indent="0cm">

-                <fo:table-row>

-                  <fo:table-cell>

-                    <fo:block>cell1</fo:block>

-                  </fo:table-cell>

-                  <fo:table-cell background-color="yellow">

-                    <fo:block>cell2</fo:block>

-                  </fo:table-cell>

-                </fo:table-row>

-              </fo:table-body>

-            </fo:table>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <!-- width of the first block-container -->

-    <eval expected="360000" xpath="//flow/block[1]/@ipd"/>

-

-    <!-- width of the first table -->

-    <eval expected="360000" xpath="//flow/block[2]/@ipd"/>

-    <eval expected="216000" xpath="//flow/block[2]/block[1]/@ipd"/>

-    <eval expected="144000" xpath="//flow/block[2]/block[2]/@ipd"/>

-    

-    <!-- width of the enclosing block establishing the indents -->

-    <eval expected="216000" xpath="//flow/block[3]/@ipd"/>

-    <eval expected="72000" xpath="//flow/block[3]/@start-indent"/>

-    <eval expected="72000" xpath="//flow/block[3]/@end-indent"/>

-    

-    <!-- width of the second block-container -->

-    <eval expected="216000" xpath="//flow/block[3]/block[1]/@ipd"/>

-    <eval expected="72000" xpath="//flow/block[3]/block[1]/@start-indent"/>

-    <eval expected="72000" xpath="//flow/block[3]/block[1]/@end-indent"/>

-

-    <!-- width of the second table -->

-    <eval expected="216000" xpath="//flow/block[3]/block[2]/@ipd"/>

-    <eval expected="129600" xpath="//flow/block[3]/block[2]/block[1]/@ipd"/>

-    <eval expected="86400" xpath="//flow/block[3]/block[2]/block[2]/@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 table width in certain situations.
+    </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-container width="100%" height="10pt" background-color="lightgray">
+            <fo:block/>
+          </fo:block-container>
+          <fo:table table-layout="fixed" width="100%" border-collapse="separate">
+            <fo:table-column column-width="proportional-column-width(3)"/>
+            <fo:table-column column-width="proportional-column-width(2)"/>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>cell1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="yellow">
+                  <fo:block>cell2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block start-indent="1in" end-indent="1in">
+            <fo:block-container width="100%" height="10pt" background-color="lightgray">
+              <fo:block/>
+            </fo:block-container>
+            <fo:table table-layout="fixed" width="100%" border-collapse="separate" background-color="gray">
+              <fo:table-column column-width="proportional-column-width(3)"/>
+              <fo:table-column column-width="proportional-column-width(2)"/>
+              <fo:table-body start-indent="0cm" end-indent="0cm">
+                <fo:table-row>
+                  <fo:table-cell>
+                    <fo:block>cell1</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="yellow">
+                    <fo:block>cell2</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </fo:table-body>
+            </fo:table>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- width of the first block-container -->
+    <eval expected="360000" xpath="//flow/block[1]/@ipd"/>
+
+    <!-- width of the first table -->
+    <eval expected="360000" xpath="//flow/block[2]/@ipd"/>
+    <eval expected="216000" xpath="//flow/block[2]/block[1]/@ipd"/>
+    <eval expected="144000" xpath="//flow/block[2]/block[2]/@ipd"/>
+    
+    <!-- width of the enclosing block establishing the indents -->
+    <eval expected="216000" xpath="//flow/block[3]/@ipd"/>
+    <eval expected="72000" xpath="//flow/block[3]/@start-indent"/>
+    <eval expected="72000" xpath="//flow/block[3]/@end-indent"/>
+    
+    <!-- width of the second block-container -->
+    <eval expected="216000" xpath="//flow/block[3]/block[1]/@ipd"/>
+    <eval expected="72000" xpath="//flow/block[3]/block[1]/@start-indent"/>
+    <eval expected="72000" xpath="//flow/block[3]/block[1]/@end-indent"/>
+
+    <!-- width of the second table -->
+    <eval expected="216000" xpath="//flow/block[3]/block[2]/@ipd"/>
+    <eval expected="129600" xpath="//flow/block[3]/block[2]/block[1]/@ipd"/>
+    <eval expected="86400" xpath="//flow/block[3]/block[2]/block[2]/@ipd"/>
+  </checks>
+</testcase>