Reorganize test resources into src/test/resources.

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

682 files changed, 5 insertions, 7 deletions

diff --git a/fop/pom.xml b/fop/pom.xml
index de6193248..3844d1303 100644
--- a/fop/pom.xml
+++ b/fop/pom.xml
@@ -248,17 +248,15 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${surefire.plugin.version}</version><!--$NO-MVN-MAN-VER$-->
         <configuration>
-          <!--
           <includes>
             <include>**/*TestCase.java</include>
-            <include>**/*TestCases.java</include>
           </includes>
-          -->
           <excludes>
-            <exclude>**/*Test.java</exclude>
-            <exclude>**/*TestCase.java</exclude>
-            <exclude>**/*TestCases.java</exclude>
-            <exclude>**/*TestSuite.java</exclude>
+            <exclude>**/BasicEventTestCase.java</exclude>
+            <exclude>**/HyphenationLayoutTestCase.java</exclude>
+            <exclude>**/IFTestCase.java</exclude>
+            <exclude>**/PDFVTTestCase.java</exclude>
+            <exclude>**/PDFEncodingTestCase.java</exclude>
           </excludes>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
         </configuration>
diff --git a/fop/src/test/java/org/apache/fop/accessibility/fo/abb.fo b/fop/src/test/resources/org/apache/fop/accessibility/fo/abb.fo
index 4ebc16398..4ebc16398 100644
--- a/fop/src/test/java/org/apache/fop/accessibility/fo/abb.fo
+++ b/fop/src/test/resources/org/apache/fop/accessibility/fo/abb.fo
diff --git a/fop/src/test/java/org/apache/fop/accessibility/fo/artifact.fo b/fop/src/test/resources/org/apache/fop/accessibility/fo/artifact.fo
index c3d5fadf3..c3d5fadf3 100644
--- a/fop/src/test/java/org/apache/fop/accessibility/fo/artifact.fo
+++ b/fop/src/test/resources/org/apache/fop/accessibility/fo/artifact.fo
diff --git a/fop/src/test/java/org/apache/fop/accessibility/fo/fo2StructureTree.xsl b/fop/src/test/resources/org/apache/fop/accessibility/fo/fo2StructureTree.xsl
index f21b079a4..f21b079a4 100644
--- a/fop/src/test/java/org/apache/fop/accessibility/fo/fo2StructureTree.xsl
+++ b/fop/src/test/resources/org/apache/fop/accessibility/fo/fo2StructureTree.xsl
diff --git a/fop/src/test/java/org/apache/fop/accessibility/fo/language.fo b/fop/src/test/resources/org/apache/fop/accessibility/fo/language.fo
index 8dfb2694a..8dfb2694a 100644
--- a/fop/src/test/java/org/apache/fop/accessibility/fo/language.fo
+++ b/fop/src/test/resources/org/apache/fop/accessibility/fo/language.fo
diff --git a/fop/src/test/java/org/apache/fop/accessibility/fo/table-footers.fo b/fop/src/test/resources/org/apache/fop/accessibility/fo/table-footers.fo
index 6dcb9b68d..6dcb9b68d 100644
--- a/fop/src/test/java/org/apache/fop/accessibility/fo/table-footers.fo
+++ b/fop/src/test/resources/org/apache/fop/accessibility/fo/table-footers.fo
diff --git a/fop/src/test/java/org/apache/fop/accessibility/fo/table-header_scope.fo b/fop/src/test/resources/org/apache/fop/accessibility/fo/table-header_scope.fo
index c6272d546..c6272d546 100644
--- a/fop/src/test/java/org/apache/fop/accessibility/fo/table-header_scope.fo
+++ b/fop/src/test/resources/org/apache/fop/accessibility/fo/table-header_scope.fo
diff --git a/fop/src/test/java/org/apache/fop/accessibility/pdf/missing-language.fo b/fop/src/test/resources/org/apache/fop/accessibility/pdf/missing-language.fo
index a774d3c3b..a774d3c3b 100644
--- a/fop/src/test/java/org/apache/fop/accessibility/pdf/missing-language.fo
+++ b/fop/src/test/resources/org/apache/fop/accessibility/pdf/missing-language.fo
diff --git a/fop/src/test/java/org/apache/fop/afp/expected_named_resource.afp b/fop/src/test/resources/org/apache/fop/afp/expected_named_resource.afp
index 9fe45c388..9fe45c388 100644
--- a/fop/src/test/java/org/apache/fop/afp/expected_named_resource.afp
+++ b/fop/src/test/resources/org/apache/fop/afp/expected_named_resource.afp
diff --git a/fop/src/test/java/org/apache/fop/afp/expected_resource.afp b/fop/src/test/resources/org/apache/fop/afp/expected_resource.afp
index a98ac0e5e..a98ac0e5e 100644
--- a/fop/src/test/java/org/apache/fop/afp/expected_resource.afp
+++ b/fop/src/test/resources/org/apache/fop/afp/expected_resource.afp
diff --git a/fop/src/test/java/org/apache/fop/afp/resource_any_name.afp b/fop/src/test/resources/org/apache/fop/afp/resource_any_name.afp
index a91cabfae..a91cabfae 100644
--- a/fop/src/test/java/org/apache/fop/afp/resource_any_name.afp
+++ b/fop/src/test/resources/org/apache/fop/afp/resource_any_name.afp
diff --git a/fop/src/test/java/org/apache/fop/afp/resource_name_match.afp b/fop/src/test/resources/org/apache/fop/afp/resource_name_match.afp
index 53999574e..53999574e 100644
--- a/fop/src/test/java/org/apache/fop/afp/resource_name_match.afp
+++ b/fop/src/test/resources/org/apache/fop/afp/resource_name_match.afp
diff --git a/fop/src/test/java/org/apache/fop/afp/resource_name_mismatch.afp b/fop/src/test/resources/org/apache/fop/afp/resource_name_mismatch.afp
index d4f2c7f81..d4f2c7f81 100644
--- a/fop/src/test/java/org/apache/fop/afp/resource_name_mismatch.afp
+++ b/fop/src/test/resources/org/apache/fop/afp/resource_name_mismatch.afp
diff --git a/fop/src/test/java/org/apache/fop/afp/resource_no_end_name.afp b/fop/src/test/resources/org/apache/fop/afp/resource_no_end_name.afp
index 517e4cb15..517e4cb15 100644
--- a/fop/src/test/java/org/apache/fop/afp/resource_no_end_name.afp
+++ b/fop/src/test/resources/org/apache/fop/afp/resource_no_end_name.afp
diff --git a/fop/src/test/java/org/apache/fop/afp/simple.fo b/fop/src/test/resources/org/apache/fop/afp/simple.fo
index 760ff4b63..760ff4b63 100644
--- a/fop/src/test/java/org/apache/fop/afp/simple.fo
+++ b/fop/src/test/resources/org/apache/fop/afp/simple.fo
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD0.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD0.ser
index 6eccb4b6f..6eccb4b6f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD0.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD0.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD1.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD1.ser
index 8a7a802d2..8a7a802d2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD1.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD1.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD10.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD10.ser
index 74a52f212..74a52f212 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD10.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD10.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD100.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD100.ser
index 4058da121..4058da121 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD100.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD100.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD101.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD101.ser
index 321ed2682..321ed2682 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD101.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD101.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD102.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD102.ser
index f5e3973dd..f5e3973dd 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD102.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD102.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD103.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD103.ser
index 0235952c9..0235952c9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD103.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD103.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD104.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD104.ser
index 00d9ff6b4..00d9ff6b4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD104.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD104.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD105.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD105.ser
index b924c8d19..b924c8d19 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD105.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD105.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD106.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD106.ser
index 2cdabbf17..2cdabbf17 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD106.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD106.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD107.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD107.ser
index 24e41ceab..24e41ceab 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD107.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD107.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD108.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD108.ser
index 8c9d014f2..8c9d014f2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD108.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD108.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD109.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD109.ser
index fc2fc255e..fc2fc255e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD109.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD109.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD11.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD11.ser
index 2a40fe758..2a40fe758 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD11.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD11.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD110.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD110.ser
index 89ef3a341..89ef3a341 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD110.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD110.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD111.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD111.ser
index 0691f5f96..0691f5f96 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD111.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD111.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD112.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD112.ser
index c3bd6103e..c3bd6103e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD112.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD112.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD113.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD113.ser
index 54d27e213..54d27e213 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD113.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD113.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD114.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD114.ser
index 0ba52993a..0ba52993a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD114.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD114.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD115.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD115.ser
index 0b95e6283..0b95e6283 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD115.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD115.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD116.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD116.ser
index ca1111447..ca1111447 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD116.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD116.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD117.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD117.ser
index fbce0f949..fbce0f949 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD117.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD117.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD118.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD118.ser
index c7bee5162..c7bee5162 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD118.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD118.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD119.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD119.ser
index 83ad166ef..83ad166ef 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD119.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD119.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD12.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD12.ser
index 81ff5dcbd..81ff5dcbd 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD12.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD12.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD120.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD120.ser
index 2a84369ef..2a84369ef 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD120.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD120.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD121.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD121.ser
index 3c3f08edf..3c3f08edf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD121.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD121.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD122.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD122.ser
index 81a342bc0..81a342bc0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD122.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD122.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD123.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD123.ser
index f2fdba316..f2fdba316 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD123.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD123.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD124.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD124.ser
index 5bebb054f..5bebb054f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD124.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD124.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD125.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD125.ser
index 1292a8a01..1292a8a01 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD125.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD125.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD126.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD126.ser
index f7c910fb0..f7c910fb0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD126.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD126.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD127.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD127.ser
index bb2d2353a..bb2d2353a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD127.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD127.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD128.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD128.ser
index 4ef886527..4ef886527 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD128.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD128.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD129.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD129.ser
index 7538307f8..7538307f8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD129.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD129.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD13.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD13.ser
index 5a81f8f76..5a81f8f76 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD13.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD13.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD130.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD130.ser
index dfa56bb42..dfa56bb42 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD130.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD130.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD131.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD131.ser
index 04c0e6b02..04c0e6b02 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD131.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD131.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD132.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD132.ser
index 5389ec53c..5389ec53c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD132.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD132.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD133.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD133.ser
index 6ec49f1c7..6ec49f1c7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD133.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD133.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD134.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD134.ser
index 381b6b741..381b6b741 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD134.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD134.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD135.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD135.ser
index e991a278f..e991a278f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD135.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD135.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD136.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD136.ser
index 84eb27fa3..84eb27fa3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD136.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD136.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD137.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD137.ser
index 3e3ceb4f0..3e3ceb4f0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD137.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD137.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD138.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD138.ser
index 52f01ebbf..52f01ebbf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD138.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD138.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD139.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD139.ser
index 54a66ac43..54a66ac43 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD139.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD139.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD14.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD14.ser
index 5bad9fe23..5bad9fe23 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD14.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD14.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD140.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD140.ser
index 7e58aea97..7e58aea97 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD140.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD140.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD141.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD141.ser
index 60811580c..60811580c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD141.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD141.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD142.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD142.ser
index bfa39bf75..bfa39bf75 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD142.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD142.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD143.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD143.ser
index 5df598aa7..5df598aa7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD143.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD143.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD144.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD144.ser
index f46f6a289..f46f6a289 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD144.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD144.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD145.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD145.ser
index 825930ea8..825930ea8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD145.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD145.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD146.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD146.ser
index 3d2efe600..3d2efe600 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD146.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD146.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD147.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD147.ser
index 5e3667df8..5e3667df8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD147.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD147.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD148.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD148.ser
index 4a04343a5..4a04343a5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD148.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD148.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD149.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD149.ser
index 85260e0f8..85260e0f8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD149.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD149.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD15.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD15.ser
index c1cb2878d..c1cb2878d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD15.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD15.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD150.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD150.ser
index ab5dd0c00..ab5dd0c00 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD150.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD150.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD151.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD151.ser
index df304a84b..df304a84b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD151.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD151.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD152.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD152.ser
index 887699163..887699163 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD152.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD152.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD153.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD153.ser
index fa70ead76..fa70ead76 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD153.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD153.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD154.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD154.ser
index 73402d898..73402d898 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD154.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD154.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD155.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD155.ser
index c611d952e..c611d952e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD155.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD155.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD156.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD156.ser
index a5a70cf81..a5a70cf81 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD156.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD156.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD157.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD157.ser
index 736576c15..736576c15 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD157.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD157.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD158.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD158.ser
index 4667a5a4a..4667a5a4a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD158.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD158.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD159.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD159.ser
index 9a07236c3..9a07236c3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD159.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD159.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD16.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD16.ser
index 6a8e667fb..6a8e667fb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD16.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD16.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD160.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD160.ser
index abfeac3ec..abfeac3ec 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD160.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD160.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD161.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD161.ser
index 1b225c825..1b225c825 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD161.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD161.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD162.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD162.ser
index 36aab1fd1..36aab1fd1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD162.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD162.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD163.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD163.ser
index 77a744263..77a744263 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD163.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD163.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD164.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD164.ser
index 6f340e971..6f340e971 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD164.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD164.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD165.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD165.ser
index 92ab48e50..92ab48e50 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD165.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD165.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD166.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD166.ser
index 412885433..412885433 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD166.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD166.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD167.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD167.ser
index 3b4b83607..3b4b83607 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD167.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD167.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD168.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD168.ser
index 3e04f60f7..3e04f60f7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD168.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD168.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD169.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD169.ser
index 5e58d00f8..5e58d00f8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD169.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD169.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD17.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD17.ser
index 290d0e5b4..290d0e5b4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD17.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD17.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD170.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD170.ser
index fb1f6b7ae..fb1f6b7ae 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD170.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD170.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD171.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD171.ser
index 7ba80984d..7ba80984d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD171.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD171.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD172.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD172.ser
index 594645bdc..594645bdc 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD172.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD172.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD173.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD173.ser
index 5d995d076..5d995d076 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD173.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD173.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD174.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD174.ser
index e57c46d8e..e57c46d8e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD174.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD174.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD175.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD175.ser
index ad4317529..ad4317529 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD175.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD175.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD176.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD176.ser
index 52cdcd567..52cdcd567 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD176.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD176.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD177.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD177.ser
index e786ab17e..e786ab17e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD177.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD177.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD178.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD178.ser
index 2f9e41f08..2f9e41f08 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD178.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD178.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD179.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD179.ser
index 94f739223..94f739223 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD179.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD179.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD18.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD18.ser
index 53073211e..53073211e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD18.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD18.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD180.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD180.ser
index 172498f80..172498f80 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD180.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD180.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD181.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD181.ser
index c5a9b434d..c5a9b434d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD181.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD181.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD182.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD182.ser
index 1c98e34a4..1c98e34a4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD182.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD182.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD183.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD183.ser
index 4e8c8e30c..4e8c8e30c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD183.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD183.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD184.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD184.ser
index 824fad23d..824fad23d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD184.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD184.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD185.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD185.ser
index 969e34a37..969e34a37 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD185.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD185.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD186.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD186.ser
index 0867d2e55..0867d2e55 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD186.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD186.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD187.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD187.ser
index dd052d7a1..dd052d7a1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD187.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD187.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD188.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD188.ser
index d52c97d1d..d52c97d1d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD188.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD188.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD189.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD189.ser
index 2bdb9dab4..2bdb9dab4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD189.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD189.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD19.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD19.ser
index 21128bf86..21128bf86 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD19.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD19.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD190.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD190.ser
index d153d3442..d153d3442 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD190.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD190.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD191.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD191.ser
index 5019d6fea..5019d6fea 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD191.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD191.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD192.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD192.ser
index e726e2651..e726e2651 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD192.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD192.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD193.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD193.ser
index c37e1cdd0..c37e1cdd0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD193.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD193.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD194.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD194.ser
index 1ba7b2877..1ba7b2877 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD194.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD194.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD195.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD195.ser
index 62215ed07..62215ed07 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD195.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD195.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD196.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD196.ser
index 709279994..709279994 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD196.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD196.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD197.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD197.ser
index 788ac372f..788ac372f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD197.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD197.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD198.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD198.ser
index 9d4a14249..9d4a14249 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD198.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD198.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD199.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD199.ser
index 6cbb79535..6cbb79535 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD199.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD199.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD2.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD2.ser
index 05cf07859..05cf07859 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD2.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD2.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD20.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD20.ser
index 9c10e367c..9c10e367c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD20.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD20.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD200.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD200.ser
index 583084f0b..583084f0b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD200.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD200.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD201.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD201.ser
index d8ed032c6..d8ed032c6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD201.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD201.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD202.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD202.ser
index 21e97fff0..21e97fff0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD202.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD202.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD203.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD203.ser
index 5e3e01293..5e3e01293 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD203.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD203.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD204.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD204.ser
index eba9874c5..eba9874c5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD204.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD204.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD205.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD205.ser
index 182c5fc35..182c5fc35 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD205.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD205.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD206.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD206.ser
index 47ed04ba6..47ed04ba6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD206.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD206.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD207.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD207.ser
index b56f3ee7c..b56f3ee7c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD207.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD207.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD208.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD208.ser
index 302b20c39..302b20c39 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD208.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD208.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD209.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD209.ser
index c97cbbe12..c97cbbe12 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD209.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD209.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD21.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD21.ser
index e7eb886be..e7eb886be 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD21.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD21.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD210.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD210.ser
index 4da33f6c0..4da33f6c0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD210.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD210.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD211.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD211.ser
index 46f29b71a..46f29b71a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD211.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD211.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD212.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD212.ser
index b84d2efaa..b84d2efaa 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD212.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD212.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD213.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD213.ser
index 2d0995a6f..2d0995a6f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD213.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD213.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD214.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD214.ser
index 66a505aae..66a505aae 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD214.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD214.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD215.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD215.ser
index cbd99924e..cbd99924e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD215.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD215.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD216.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD216.ser
index 46b5315a0..46b5315a0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD216.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD216.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD217.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD217.ser
index 4afc67dbc..4afc67dbc 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD217.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD217.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD218.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD218.ser
index 992177ded..992177ded 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD218.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD218.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD219.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD219.ser
index e75b1d344..e75b1d344 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD219.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD219.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD22.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD22.ser
index ca7478b6c..ca7478b6c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD22.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD22.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD220.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD220.ser
index 3f754847c..3f754847c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD220.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD220.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD221.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD221.ser
index 02efa8786..02efa8786 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD221.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD221.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD222.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD222.ser
index 1897b09f8..1897b09f8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD222.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD222.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD223.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD223.ser
index cd24d1101..cd24d1101 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD223.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD223.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD224.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD224.ser
index aba011dba..aba011dba 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD224.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD224.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD225.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD225.ser
index dad463960..dad463960 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD225.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD225.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD226.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD226.ser
index 6430967e4..6430967e4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD226.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD226.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD227.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD227.ser
index 4f2bde014..4f2bde014 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD227.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD227.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD228.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD228.ser
index 7be09ec92..7be09ec92 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD228.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD228.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD229.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD229.ser
index 6ffa285db..6ffa285db 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD229.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD229.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD23.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD23.ser
index d6c532596..d6c532596 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD23.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD23.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD230.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD230.ser
index 3519adb5e..3519adb5e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD230.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD230.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD231.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD231.ser
index 7540663aa..7540663aa 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD231.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD231.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD232.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD232.ser
index 788e4c7e1..788e4c7e1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD232.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD232.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD233.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD233.ser
index c36265614..c36265614 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD233.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD233.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD234.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD234.ser
index 772b72aef..772b72aef 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD234.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD234.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD235.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD235.ser
index e5fa50b85..e5fa50b85 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD235.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD235.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD236.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD236.ser
index 13fdb364c..13fdb364c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD236.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD236.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD237.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD237.ser
index c600524d6..c600524d6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD237.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD237.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD238.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD238.ser
index 6043e0155..6043e0155 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD238.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD238.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD239.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD239.ser
index 14250a315..14250a315 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD239.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD239.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD24.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD24.ser
index 209e8179e..209e8179e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD24.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD24.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD240.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD240.ser
index bdbc02f69..bdbc02f69 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD240.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD240.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD241.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD241.ser
index d3f40a8de..d3f40a8de 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD241.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD241.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD242.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD242.ser
index 03b94bc76..03b94bc76 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD242.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD242.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD243.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD243.ser
index cb0321933..cb0321933 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD243.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD243.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD244.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD244.ser
index 3cdc87c9c..3cdc87c9c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD244.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD244.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD245.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD245.ser
index 7c50f1284..7c50f1284 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD245.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD245.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD246.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD246.ser
index b04164e4c..b04164e4c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD246.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD246.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD247.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD247.ser
index bdce40f9c..bdce40f9c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD247.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD247.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD248.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD248.ser
index e50ed7988..e50ed7988 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD248.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD248.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD249.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD249.ser
index 14ac62043..14ac62043 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD249.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD249.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD25.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD25.ser
index c1b31fcce..c1b31fcce 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD25.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD25.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD250.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD250.ser
index d96343972..d96343972 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD250.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD250.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD251.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD251.ser
index 7b3168b23..7b3168b23 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD251.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD251.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD252.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD252.ser
index 7f9b9056d..7f9b9056d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD252.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD252.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD253.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD253.ser
index d5849ec9d..d5849ec9d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD253.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD253.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD254.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD254.ser
index 00a2b4a0e..00a2b4a0e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD254.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD254.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD255.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD255.ser
index 5cc330f12..5cc330f12 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD255.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD255.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD256.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD256.ser
index 23e032ac9..23e032ac9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD256.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD256.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD257.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD257.ser
index 7ba16c21a..7ba16c21a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD257.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD257.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD258.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD258.ser
index 334737ecd..334737ecd 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD258.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD258.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD259.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD259.ser
index 26defabff..26defabff 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD259.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD259.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD26.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD26.ser
index 09dc4ca08..09dc4ca08 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD26.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD26.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD260.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD260.ser
index 03cb82426..03cb82426 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD260.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD260.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD261.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD261.ser
index 6d00960cf..6d00960cf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD261.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD261.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD262.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD262.ser
index 920e4c5b1..920e4c5b1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD262.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD262.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD263.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD263.ser
index dbbee5d7f..dbbee5d7f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD263.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD263.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD264.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD264.ser
index 716661a75..716661a75 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD264.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD264.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD265.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD265.ser
index b418d9b9f..b418d9b9f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD265.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD265.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD266.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD266.ser
index bc16ddcff..bc16ddcff 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD266.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD266.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD267.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD267.ser
index a105347f0..a105347f0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD267.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD267.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD268.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD268.ser
index f75552dc3..f75552dc3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD268.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD268.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD269.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD269.ser
index a3f6eab8f..a3f6eab8f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD269.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD269.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD27.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD27.ser
index 604170dcc..604170dcc 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD27.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD27.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD270.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD270.ser
index 755d6cd60..755d6cd60 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD270.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD270.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD271.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD271.ser
index 9b29a7d1e..9b29a7d1e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD271.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD271.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD272.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD272.ser
index 5685e40b8..5685e40b8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD272.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD272.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD273.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD273.ser
index 49a7c0739..49a7c0739 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD273.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD273.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD274.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD274.ser
index 1697a421b..1697a421b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD274.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD274.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD275.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD275.ser
index ea0d9adf1..ea0d9adf1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD275.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD275.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD276.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD276.ser
index 067dca228..067dca228 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD276.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD276.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD277.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD277.ser
index 9f9078678..9f9078678 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD277.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD277.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD278.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD278.ser
index 9cd498c3c..9cd498c3c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD278.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD278.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD279.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD279.ser
index c5c4c6ab0..c5c4c6ab0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD279.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD279.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD28.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD28.ser
index 890ce30bb..890ce30bb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD28.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD28.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD280.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD280.ser
index fac475452..fac475452 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD280.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD280.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD281.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD281.ser
index 4711e4586..4711e4586 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD281.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD281.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD282.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD282.ser
index 1fcea5dbf..1fcea5dbf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD282.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD282.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD283.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD283.ser
index bf2a0bcc5..bf2a0bcc5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD283.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD283.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD284.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD284.ser
index 29a3c23d4..29a3c23d4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD284.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD284.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD285.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD285.ser
index fea28c7d2..fea28c7d2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD285.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD285.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD286.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD286.ser
index 48663053e..48663053e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD286.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD286.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD287.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD287.ser
index 43f440cf7..43f440cf7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD287.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD287.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD288.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD288.ser
index 385ac7184..385ac7184 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD288.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD288.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD289.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD289.ser
index 8a032f261..8a032f261 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD289.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD289.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD29.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD29.ser
index fdc27290b..fdc27290b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD29.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD29.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD290.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD290.ser
index 264c28e08..264c28e08 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD290.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD290.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD291.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD291.ser
index daf236abf..daf236abf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD291.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD291.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD292.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD292.ser
index 8f972bf5a..8f972bf5a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD292.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD292.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD293.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD293.ser
index 647424ee0..647424ee0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD293.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD293.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD294.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD294.ser
index 9e8b99773..9e8b99773 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD294.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD294.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD295.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD295.ser
index 486bcf475..486bcf475 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD295.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD295.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD296.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD296.ser
index 856d72fd1..856d72fd1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD296.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD296.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD297.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD297.ser
index ce0b5bf4c..ce0b5bf4c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD297.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD297.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD298.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD298.ser
index cad0d5049..cad0d5049 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD298.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD298.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD299.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD299.ser
index b14aa4597..b14aa4597 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD299.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD299.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD3.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD3.ser
index 6657a3593..6657a3593 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD3.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD3.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD30.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD30.ser
index b30faf809..b30faf809 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD30.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD30.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD300.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD300.ser
index 4baca2704..4baca2704 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD300.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD300.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD301.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD301.ser
index 630a13467..630a13467 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD301.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD301.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD302.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD302.ser
index 0f8e3d7d8..0f8e3d7d8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD302.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD302.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD303.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD303.ser
index 42a05ced7..42a05ced7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD303.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD303.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD304.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD304.ser
index 13ba94a7e..13ba94a7e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD304.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD304.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD305.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD305.ser
index e5a3a925e..e5a3a925e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD305.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD305.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD306.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD306.ser
index 1ada57413..1ada57413 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD306.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD306.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD307.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD307.ser
index a14a0bebf..a14a0bebf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD307.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD307.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD308.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD308.ser
index c66ae933f..c66ae933f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD308.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD308.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD309.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD309.ser
index fd1e62ca8..fd1e62ca8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD309.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD309.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD31.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD31.ser
index 4914c3b65..4914c3b65 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD31.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD31.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD310.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD310.ser
index e8aad8cad..e8aad8cad 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD310.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD310.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD311.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD311.ser
index 0d8f4cf1e..0d8f4cf1e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD311.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD311.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD312.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD312.ser
index 54d856156..54d856156 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD312.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD312.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD313.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD313.ser
index 5bd0e8286..5bd0e8286 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD313.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD313.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD314.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD314.ser
index 37a4d8c68..37a4d8c68 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD314.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD314.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD315.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD315.ser
index a16a7b8f9..a16a7b8f9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD315.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD315.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD316.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD316.ser
index 6e5747ed9..6e5747ed9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD316.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD316.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD317.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD317.ser
index 3ee6650ed..3ee6650ed 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD317.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD317.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD318.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD318.ser
index 8c6f200a2..8c6f200a2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD318.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD318.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD319.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD319.ser
index 4774611b5..4774611b5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD319.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD319.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD32.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD32.ser
index 09332a05e..09332a05e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD32.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD32.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD320.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD320.ser
index 88327e077..88327e077 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD320.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD320.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD321.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD321.ser
index 600eb2ac3..600eb2ac3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD321.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD321.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD322.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD322.ser
index eed01d875..eed01d875 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD322.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD322.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD323.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD323.ser
index cc2db9896..cc2db9896 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD323.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD323.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD324.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD324.ser
index d0ae70999..d0ae70999 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD324.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD324.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD325.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD325.ser
index eb2a30d19..eb2a30d19 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD325.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD325.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD326.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD326.ser
index 5825c9571..5825c9571 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD326.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD326.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD327.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD327.ser
index c1b927a19..c1b927a19 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD327.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD327.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD328.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD328.ser
index 5d7eb7f7e..5d7eb7f7e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD328.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD328.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD329.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD329.ser
index a78094615..a78094615 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD329.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD329.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD33.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD33.ser
index efb28b562..efb28b562 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD33.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD33.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD330.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD330.ser
index 686c66e20..686c66e20 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD330.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD330.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD331.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD331.ser
index b210f7896..b210f7896 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD331.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD331.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD332.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD332.ser
index da93f81fc..da93f81fc 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD332.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD332.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD333.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD333.ser
index 8a0f567f1..8a0f567f1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD333.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD333.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD334.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD334.ser
index 622bdd1e1..622bdd1e1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD334.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD334.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD335.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD335.ser
index 4baa13941..4baa13941 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD335.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD335.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD336.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD336.ser
index 1d40b0818..1d40b0818 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD336.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD336.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD337.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD337.ser
index ef0b76e42..ef0b76e42 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD337.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD337.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD338.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD338.ser
index bd0a0456f..bd0a0456f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD338.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD338.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD339.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD339.ser
index 73ee20cbe..73ee20cbe 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD339.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD339.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD34.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD34.ser
index 9e33d39e9..9e33d39e9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD34.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD34.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD340.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD340.ser
index 6afa6bf7c..6afa6bf7c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD340.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD340.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD341.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD341.ser
index 84782b980..84782b980 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD341.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD341.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD342.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD342.ser
index fdde6d7a5..fdde6d7a5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD342.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD342.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD343.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD343.ser
index 2654a884a..2654a884a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD343.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD343.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD344.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD344.ser
index b24a2a444..b24a2a444 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD344.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD344.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD345.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD345.ser
index 613d80bee..613d80bee 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD345.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD345.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD346.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD346.ser
index df1df5fbf..df1df5fbf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD346.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD346.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD347.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD347.ser
index 3f68bd344..3f68bd344 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD347.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD347.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD348.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD348.ser
index 361734a3c..361734a3c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD348.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD348.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD349.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD349.ser
index 009e2419c..009e2419c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD349.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD349.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD35.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD35.ser
index 7c142c3e3..7c142c3e3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD35.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD35.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD350.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD350.ser
index 6e14a51a4..6e14a51a4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD350.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD350.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD351.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD351.ser
index ed8f2450d..ed8f2450d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD351.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD351.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD352.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD352.ser
index 80489aa41..80489aa41 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD352.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD352.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD353.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD353.ser
index ede61bef1..ede61bef1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD353.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD353.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD354.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD354.ser
index e837ec5a6..e837ec5a6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD354.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD354.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD355.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD355.ser
index 0dbeb4a18..0dbeb4a18 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD355.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD355.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD356.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD356.ser
index fdbc6a8f2..fdbc6a8f2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD356.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD356.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD357.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD357.ser
index 47665da0c..47665da0c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD357.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD357.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD358.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD358.ser
index aae718782..aae718782 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD358.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD358.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD359.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD359.ser
index 5bc6e4083..5bc6e4083 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD359.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD359.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD36.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD36.ser
index 07d3b8d15..07d3b8d15 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD36.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD36.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD360.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD360.ser
index 81af1c964..81af1c964 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD360.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD360.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD361.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD361.ser
index 4abfa7c14..4abfa7c14 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD361.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD361.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD362.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD362.ser
index aec3af860..aec3af860 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD362.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD362.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD363.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD363.ser
index ac1eecb96..ac1eecb96 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD363.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD363.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD364.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD364.ser
index 1f1367be6..1f1367be6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD364.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD364.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD365.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD365.ser
index 3cf337cda..3cf337cda 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD365.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD365.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD366.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD366.ser
index 19f7fd9e9..19f7fd9e9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD366.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD366.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD367.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD367.ser
index 8c92df043..8c92df043 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD367.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD367.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD368.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD368.ser
index dad7f014b..dad7f014b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD368.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD368.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD369.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD369.ser
index b0022c672..b0022c672 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD369.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD369.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD37.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD37.ser
index bfbb586fb..bfbb586fb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD37.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD37.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD370.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD370.ser
index b435feea0..b435feea0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD370.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD370.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD371.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD371.ser
index dafe64d04..dafe64d04 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD371.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD371.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD372.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD372.ser
index 973fcdc92..973fcdc92 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD372.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD372.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD373.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD373.ser
index a49d73cfe..a49d73cfe 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD373.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD373.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD374.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD374.ser
index 892a50d1b..892a50d1b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD374.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD374.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD375.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD375.ser
index 0fa29c84b..0fa29c84b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD375.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD375.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD376.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD376.ser
index a29b52179..a29b52179 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD376.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD376.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD377.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD377.ser
index e7c2a5a36..e7c2a5a36 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD377.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD377.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD378.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD378.ser
index 0ec361014..0ec361014 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD378.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD378.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD379.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD379.ser
index bca795879..bca795879 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD379.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD379.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD38.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD38.ser
index 49ca3d106..49ca3d106 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD38.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD38.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD380.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD380.ser
index 0a340e65e..0a340e65e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD380.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD380.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD381.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD381.ser
index 2e73aff87..2e73aff87 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD381.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD381.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD382.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD382.ser
index d3a437077..d3a437077 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD382.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD382.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD383.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD383.ser
index 963e0a877..963e0a877 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD383.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD383.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD384.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD384.ser
index 092300f46..092300f46 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD384.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD384.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD385.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD385.ser
index 0c4c00312..0c4c00312 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD385.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD385.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD386.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD386.ser
index 9abf70ed9..9abf70ed9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD386.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD386.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD387.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD387.ser
index 7e518db09..7e518db09 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD387.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD387.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD388.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD388.ser
index 797d08f9c..797d08f9c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD388.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD388.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD389.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD389.ser
index 672e36e4a..672e36e4a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD389.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD389.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD39.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD39.ser
index de9d5aadb..de9d5aadb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD39.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD39.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD390.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD390.ser
index 44c076196..44c076196 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD390.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD390.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD391.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD391.ser
index 2706725f7..2706725f7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD391.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD391.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD392.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD392.ser
index 1cc61a4ed..1cc61a4ed 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD392.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD392.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD393.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD393.ser
index 33305fe62..33305fe62 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD393.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD393.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD394.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD394.ser
index 278fb38d7..278fb38d7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD394.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD394.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD395.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD395.ser
index 3d2ff817c..3d2ff817c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD395.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD395.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD396.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD396.ser
index 45833bacc..45833bacc 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD396.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD396.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD397.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD397.ser
index 54e88ffc0..54e88ffc0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD397.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD397.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD398.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD398.ser
index 751b118a7..751b118a7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD398.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD398.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD399.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD399.ser
index 4acd804ca..4acd804ca 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD399.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD399.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD4.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD4.ser
index c65761df1..c65761df1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD4.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD4.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD40.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD40.ser
index d6759145b..d6759145b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD40.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD40.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD400.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD400.ser
index 4c9b21368..4c9b21368 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD400.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD400.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD401.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD401.ser
index e3e6c6ec2..e3e6c6ec2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD401.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD401.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD402.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD402.ser
index 92e5a6187..92e5a6187 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD402.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD402.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD403.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD403.ser
index 873595ead..873595ead 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD403.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD403.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD404.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD404.ser
index 1709012da..1709012da 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD404.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD404.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD405.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD405.ser
index 5ad6315e3..5ad6315e3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD405.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD405.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD406.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD406.ser
index aa04c95e2..aa04c95e2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD406.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD406.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD407.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD407.ser
index 12edd65ab..12edd65ab 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD407.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD407.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD408.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD408.ser
index 40290ec4c..40290ec4c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD408.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD408.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD409.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD409.ser
index b59671610..b59671610 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD409.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD409.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD41.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD41.ser
index 5d664e82c..5d664e82c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD41.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD41.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD410.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD410.ser
index 9c5866504..9c5866504 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD410.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD410.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD411.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD411.ser
index 01fe69955..01fe69955 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD411.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD411.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD412.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD412.ser
index b71d6c546..b71d6c546 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD412.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD412.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD413.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD413.ser
index 5ad3f0613..5ad3f0613 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD413.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD413.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD414.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD414.ser
index b89491a41..b89491a41 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD414.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD414.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD415.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD415.ser
index 289f9b48d..289f9b48d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD415.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD415.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD416.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD416.ser
index 24d1e1cbe..24d1e1cbe 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD416.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD416.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD417.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD417.ser
index 927349572..927349572 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD417.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD417.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD418.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD418.ser
index 8208a5005..8208a5005 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD418.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD418.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD419.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD419.ser
index 346fb131d..346fb131d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD419.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD419.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD42.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD42.ser
index 28c0e15e1..28c0e15e1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD42.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD42.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD420.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD420.ser
index 53d6b158d..53d6b158d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD420.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD420.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD421.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD421.ser
index c324000e4..c324000e4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD421.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD421.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD422.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD422.ser
index d99423cbb..d99423cbb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD422.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD422.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD423.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD423.ser
index d78b800db..d78b800db 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD423.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD423.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD424.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD424.ser
index eabb33cc3..eabb33cc3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD424.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD424.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD425.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD425.ser
index 571728da3..571728da3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD425.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD425.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD426.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD426.ser
index 25d9cb0aa..25d9cb0aa 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD426.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD426.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD427.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD427.ser
index d493f3859..d493f3859 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD427.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD427.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD428.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD428.ser
index 06b90d501..06b90d501 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD428.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD428.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD429.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD429.ser
index 5b97f90ca..5b97f90ca 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD429.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD429.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD43.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD43.ser
index 22b1b8d9b..22b1b8d9b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD43.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD43.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD430.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD430.ser
index db3749949..db3749949 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD430.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD430.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD431.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD431.ser
index 272364c6f..272364c6f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD431.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD431.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD432.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD432.ser
index 078a31f84..078a31f84 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD432.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD432.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD433.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD433.ser
index b4aaf015b..b4aaf015b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD433.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD433.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD434.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD434.ser
index 52c01f7e9..52c01f7e9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD434.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD434.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD435.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD435.ser
index 626e52df0..626e52df0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD435.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD435.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD436.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD436.ser
index 2de03dae5..2de03dae5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD436.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD436.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD437.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD437.ser
index 041c1a4cf..041c1a4cf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD437.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD437.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD438.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD438.ser
index c8da3b083..c8da3b083 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD438.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD438.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD439.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD439.ser
index 74f71d784..74f71d784 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD439.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD439.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD44.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD44.ser
index d1321181b..d1321181b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD44.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD44.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD440.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD440.ser
index bcf11b73c..bcf11b73c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD440.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD440.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD441.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD441.ser
index a9ba2dea1..a9ba2dea1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD441.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD441.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD442.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD442.ser
index fe728d89c..fe728d89c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD442.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD442.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD443.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD443.ser
index 23d7eb22b..23d7eb22b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD443.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD443.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD444.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD444.ser
index 58f06cbce..58f06cbce 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD444.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD444.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD445.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD445.ser
index bd56f8524..bd56f8524 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD445.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD445.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD446.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD446.ser
index 54d14da06..54d14da06 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD446.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD446.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD447.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD447.ser
index ee6f83422..ee6f83422 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD447.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD447.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD448.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD448.ser
index f94d24f69..f94d24f69 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD448.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD448.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD449.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD449.ser
index feef36694..feef36694 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD449.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD449.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD45.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD45.ser
index 93720aeac..93720aeac 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD45.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD45.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD450.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD450.ser
index d1a58aaa5..d1a58aaa5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD450.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD450.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD451.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD451.ser
index 11f0d14b3..11f0d14b3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD451.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD451.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD452.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD452.ser
index 2aef6789e..2aef6789e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD452.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD452.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD453.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD453.ser
index e60e00a75..e60e00a75 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD453.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD453.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD454.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD454.ser
index e7ed6f17e..e7ed6f17e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD454.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD454.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD455.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD455.ser
index 49062bd27..49062bd27 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD455.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD455.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD456.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD456.ser
index 5b4049240..5b4049240 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD456.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD456.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD457.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD457.ser
index c051bb336..c051bb336 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD457.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD457.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD458.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD458.ser
index bb781c485..bb781c485 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD458.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD458.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD459.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD459.ser
index 289e7e587..289e7e587 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD459.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD459.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD46.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD46.ser
index c4b5db34b..c4b5db34b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD46.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD46.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD460.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD460.ser
index bacc29cf6..bacc29cf6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD460.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD460.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD461.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD461.ser
index d791c7d59..d791c7d59 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD461.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD461.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD462.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD462.ser
index eac181fa5..eac181fa5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD462.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD462.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD463.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD463.ser
index 4d4c36621..4d4c36621 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD463.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD463.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD464.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD464.ser
index ab10d3c9d..ab10d3c9d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD464.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD464.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD465.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD465.ser
index ada0cfb53..ada0cfb53 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD465.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD465.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD466.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD466.ser
index b2f924cb4..b2f924cb4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD466.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD466.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD467.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD467.ser
index 4965ccab3..4965ccab3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD467.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD467.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD468.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD468.ser
index f04ae6182..f04ae6182 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD468.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD468.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD469.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD469.ser
index 27fc5e31f..27fc5e31f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD469.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD469.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD47.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD47.ser
index dd2f2f73d..dd2f2f73d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD47.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD47.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD470.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD470.ser
index 868c0718f..868c0718f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD470.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD470.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD471.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD471.ser
index 95ba064e9..95ba064e9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD471.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD471.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD472.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD472.ser
index ec1bcb735..ec1bcb735 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD472.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD472.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD473.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD473.ser
index d4bfab753..d4bfab753 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD473.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD473.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD474.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD474.ser
index bf4de5393..bf4de5393 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD474.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD474.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD475.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD475.ser
index b01e493df..b01e493df 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD475.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD475.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD476.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD476.ser
index 247977216..247977216 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD476.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD476.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD477.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD477.ser
index 0a4655675..0a4655675 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD477.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD477.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD478.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD478.ser
index 7847c8b34..7847c8b34 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD478.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD478.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD479.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD479.ser
index 6ac093714..6ac093714 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD479.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD479.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD48.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD48.ser
index 1fb8a568a..1fb8a568a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD48.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD48.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD480.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD480.ser
index 4f5ce8e37..4f5ce8e37 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD480.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD480.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD481.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD481.ser
index b9cf2310e..b9cf2310e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD481.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD481.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD482.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD482.ser
index d8cc78a39..d8cc78a39 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD482.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD482.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD483.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD483.ser
index 44438e065..44438e065 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD483.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD483.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD484.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD484.ser
index a6227255a..a6227255a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD484.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD484.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD485.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD485.ser
index 415f6c049..415f6c049 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD485.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD485.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD486.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD486.ser
index 8ea2f93ad..8ea2f93ad 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD486.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD486.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD487.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD487.ser
index ca7f77129..ca7f77129 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD487.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD487.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD488.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD488.ser
index 5aaf07824..5aaf07824 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD488.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD488.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD489.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD489.ser
index 655516191..655516191 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD489.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD489.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD49.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD49.ser
index 3cc2d4a75..3cc2d4a75 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD49.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD49.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD490.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD490.ser
index 94f1d83fd..94f1d83fd 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD490.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD490.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD491.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD491.ser
index 14b49f0a4..14b49f0a4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD491.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD491.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD492.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD492.ser
index adb3d3737..adb3d3737 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD492.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD492.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD493.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD493.ser
index b2c4902eb..b2c4902eb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD493.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD493.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD494.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD494.ser
index 8b28deac8..8b28deac8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD494.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD494.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD495.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD495.ser
index 5d238271b..5d238271b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD495.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD495.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD496.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD496.ser
index ab8f4d6d1..ab8f4d6d1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD496.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD496.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD497.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD497.ser
index 901e4173d..901e4173d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD497.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD497.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD498.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD498.ser
index d6fd495bb..d6fd495bb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD498.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD498.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD499.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD499.ser
index 52400b507..52400b507 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD499.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD499.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD5.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD5.ser
index 4d03b7211..4d03b7211 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD5.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD5.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD50.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD50.ser
index 975618522..975618522 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD50.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD50.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD500.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD500.ser
index 33e7b0c7d..33e7b0c7d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD500.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD500.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD501.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD501.ser
index 8e101db57..8e101db57 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD501.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD501.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD502.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD502.ser
index f8246c2d2..f8246c2d2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD502.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD502.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD503.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD503.ser
index c8707cd48..c8707cd48 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD503.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD503.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD504.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD504.ser
index 41e6c694a..41e6c694a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD504.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD504.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD505.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD505.ser
index 595e24ff2..595e24ff2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD505.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD505.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD506.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD506.ser
index 731b47fd2..731b47fd2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD506.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD506.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD507.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD507.ser
index 8bf1d99fa..8bf1d99fa 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD507.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD507.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD508.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD508.ser
index bc63d7e97..bc63d7e97 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD508.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD508.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD509.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD509.ser
index d7415c13a..d7415c13a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD509.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD509.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD51.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD51.ser
index e8d28148e..e8d28148e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD51.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD51.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD510.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD510.ser
index b94811af6..b94811af6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD510.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD510.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD511.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD511.ser
index 91a3bd4ea..91a3bd4ea 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD511.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD511.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD512.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD512.ser
index 2e31b49d8..2e31b49d8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD512.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD512.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD513.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD513.ser
index 2cef55911..2cef55911 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD513.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD513.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD514.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD514.ser
index 84c1bdeb8..84c1bdeb8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD514.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD514.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD515.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD515.ser
index 431fe2dd8..431fe2dd8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD515.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD515.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD516.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD516.ser
index 37c17f168..37c17f168 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD516.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD516.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD517.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD517.ser
index 087847d57..087847d57 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD517.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD517.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD518.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD518.ser
index 8bd76318d..8bd76318d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD518.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD518.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD519.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD519.ser
index 318fc84a7..318fc84a7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD519.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD519.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD52.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD52.ser
index 5e853ec29..5e853ec29 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD52.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD52.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD520.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD520.ser
index e72f8d30e..e72f8d30e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD520.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD520.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD521.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD521.ser
index cbd161b83..cbd161b83 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD521.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD521.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD522.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD522.ser
index a2c4ccff7..a2c4ccff7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD522.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD522.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD523.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD523.ser
index cbd7fa3b8..cbd7fa3b8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD523.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD523.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD524.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD524.ser
index b876b1b27..b876b1b27 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD524.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD524.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD525.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD525.ser
index 64e50de82..64e50de82 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD525.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD525.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD526.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD526.ser
index e5f094eeb..e5f094eeb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD526.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD526.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD527.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD527.ser
index 537459e7f..537459e7f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD527.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD527.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD528.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD528.ser
index 577b66158..577b66158 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD528.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD528.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD529.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD529.ser
index 4679568f4..4679568f4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD529.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD529.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD53.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD53.ser
index 389261a05..389261a05 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD53.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD53.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD530.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD530.ser
index 635151fa9..635151fa9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD530.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD530.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD531.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD531.ser
index 69e85f02b..69e85f02b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD531.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD531.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD532.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD532.ser
index c28ba450a..c28ba450a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD532.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD532.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD533.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD533.ser
index fe26705e5..fe26705e5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD533.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD533.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD534.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD534.ser
index 19595d9e3..19595d9e3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD534.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD534.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD535.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD535.ser
index 95e9836b4..95e9836b4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD535.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD535.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD536.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD536.ser
index d179f7c8c..d179f7c8c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD536.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD536.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD537.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD537.ser
index 1b91641ad..1b91641ad 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD537.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD537.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD538.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD538.ser
index fc83f4562..fc83f4562 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD538.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD538.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD539.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD539.ser
index ea2af6364..ea2af6364 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD539.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD539.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD54.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD54.ser
index 0f76396bb..0f76396bb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD54.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD54.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD540.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD540.ser
index 143d5894a..143d5894a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD540.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD540.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD541.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD541.ser
index 671cf26d1..671cf26d1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD541.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD541.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD542.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD542.ser
index 1a7fda27b..1a7fda27b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD542.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD542.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD543.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD543.ser
index 5aee466d8..5aee466d8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD543.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD543.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD544.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD544.ser
index 37f124113..37f124113 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD544.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD544.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD545.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD545.ser
index 8bc00e144..8bc00e144 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD545.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD545.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD546.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD546.ser
index 9d9b9c119..9d9b9c119 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD546.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD546.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD547.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD547.ser
index 88411a216..88411a216 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD547.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD547.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD548.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD548.ser
index f8324788b..f8324788b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD548.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD548.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD549.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD549.ser
index 2d3118a56..2d3118a56 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD549.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD549.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD55.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD55.ser
index 51a8b7095..51a8b7095 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD55.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD55.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD550.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD550.ser
index e939d4754..e939d4754 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD550.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD550.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD551.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD551.ser
index 61e5e3f3c..61e5e3f3c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD551.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD551.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD552.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD552.ser
index 496e6912a..496e6912a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD552.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD552.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD553.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD553.ser
index 0fc2f1a23..0fc2f1a23 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD553.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD553.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD554.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD554.ser
index dc5183342..dc5183342 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD554.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD554.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD555.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD555.ser
index de477db15..de477db15 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD555.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD555.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD556.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD556.ser
index 6a4e51c29..6a4e51c29 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD556.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD556.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD557.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD557.ser
index fccb593ae..fccb593ae 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD557.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD557.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD558.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD558.ser
index 828b3a72e..828b3a72e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD558.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD558.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD559.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD559.ser
index 3b14d4a8f..3b14d4a8f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD559.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD559.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD56.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD56.ser
index 373392279..373392279 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD56.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD56.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD560.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD560.ser
index a91b8512a..a91b8512a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD560.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD560.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD561.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD561.ser
index 639a7be49..639a7be49 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD561.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD561.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD562.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD562.ser
index 68dd4089b..68dd4089b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD562.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD562.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD563.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD563.ser
index 2908e3f63..2908e3f63 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD563.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD563.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD564.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD564.ser
index 391e3e14a..391e3e14a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD564.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD564.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD565.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD565.ser
index 5bd9c1e71..5bd9c1e71 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD565.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD565.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD566.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD566.ser
index d4ecb3a88..d4ecb3a88 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD566.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD566.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD567.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD567.ser
index d68ca24ac..d68ca24ac 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD567.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD567.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD568.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD568.ser
index 73cd97bf6..73cd97bf6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD568.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD568.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD569.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD569.ser
index a6d766289..a6d766289 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD569.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD569.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD57.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD57.ser
index d0af60722..d0af60722 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD57.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD57.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD570.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD570.ser
index 231290df6..231290df6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD570.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD570.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD571.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD571.ser
index 21e85e747..21e85e747 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD571.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD571.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD572.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD572.ser
index e99365766..e99365766 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD572.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD572.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD573.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD573.ser
index 4f844be2e..4f844be2e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD573.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD573.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD574.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD574.ser
index ccb6d70f1..ccb6d70f1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD574.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD574.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD575.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD575.ser
index aa3909601..aa3909601 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD575.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD575.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD576.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD576.ser
index 5d1bb4981..5d1bb4981 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD576.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD576.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD577.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD577.ser
index 64823ec47..64823ec47 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD577.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD577.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD578.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD578.ser
index 09d6843e8..09d6843e8 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD578.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD578.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD579.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD579.ser
index 59f2572ad..59f2572ad 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD579.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD579.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD58.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD58.ser
index cb600cfca..cb600cfca 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD58.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD58.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD580.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD580.ser
index b1faa848b..b1faa848b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD580.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD580.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD581.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD581.ser
index 1e057fdf4..1e057fdf4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD581.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD581.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD582.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD582.ser
index cdd3cbec1..cdd3cbec1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD582.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD582.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD583.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD583.ser
index 84eed41fe..84eed41fe 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD583.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD583.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD584.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD584.ser
index 7b91077fc..7b91077fc 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD584.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD584.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD585.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD585.ser
index 259194e4e..259194e4e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD585.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD585.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD586.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD586.ser
index 0616c3c12..0616c3c12 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD586.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD586.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD587.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD587.ser
index 22430bd97..22430bd97 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD587.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD587.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD588.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD588.ser
index b583a1a1b..b583a1a1b 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD588.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD588.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD589.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD589.ser
index 841747bdf..841747bdf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD589.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD589.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD59.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD59.ser
index 23521f3cd..23521f3cd 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD59.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD59.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD590.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD590.ser
index 168552d3c..168552d3c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD590.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD590.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD591.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD591.ser
index c0da95a76..c0da95a76 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD591.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD591.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD592.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD592.ser
index 276e0ffed..276e0ffed 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD592.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD592.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD593.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD593.ser
index 363f4f695..363f4f695 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD593.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD593.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD594.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD594.ser
index a0f6639ba..a0f6639ba 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD594.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD594.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD595.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD595.ser
index cdc9eb94a..cdc9eb94a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD595.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD595.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD596.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD596.ser
index c6223a7ce..c6223a7ce 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD596.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD596.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD597.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD597.ser
index 74f023e83..74f023e83 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD597.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD597.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD598.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD598.ser
index 9755e4a3c..9755e4a3c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD598.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD598.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD599.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD599.ser
index 986a332f3..986a332f3 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD599.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD599.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD6.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD6.ser
index edc35abdc..edc35abdc 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD6.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD6.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD60.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD60.ser
index 6ed639c5e..6ed639c5e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD60.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD60.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD600.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD600.ser
index d2c52eba1..d2c52eba1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD600.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD600.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD601.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD601.ser
index f34830970..f34830970 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD601.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD601.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD602.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD602.ser
index 7cea4a6c6..7cea4a6c6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD602.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD602.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD603.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD603.ser
index e2c08df91..e2c08df91 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD603.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD603.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD604.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD604.ser
index 7a37cd019..7a37cd019 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD604.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD604.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD605.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD605.ser
index 85f679da2..85f679da2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD605.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD605.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD606.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD606.ser
index 8f1d6966d..8f1d6966d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD606.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD606.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD607.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD607.ser
index f82e37287..f82e37287 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD607.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD607.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD608.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD608.ser
index f22902dd5..f22902dd5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD608.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD608.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD609.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD609.ser
index bb7f98e41..bb7f98e41 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD609.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD609.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD61.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD61.ser
index d25cb04c7..d25cb04c7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD61.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD61.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD610.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD610.ser
index 8ddaeb744..8ddaeb744 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD610.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD610.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD611.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD611.ser
index b11de6c32..b11de6c32 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD611.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD611.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD612.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD612.ser
index 2b1ea8898..2b1ea8898 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD612.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD612.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD613.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD613.ser
index 1d2ea017c..1d2ea017c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD613.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD613.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD614.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD614.ser
index ae74ca063..ae74ca063 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD614.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD614.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD615.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD615.ser
index fed68df6e..fed68df6e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD615.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD615.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD616.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD616.ser
index 94b09c1e1..94b09c1e1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD616.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD616.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD617.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD617.ser
index 0af062be1..0af062be1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD617.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD617.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD618.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD618.ser
index bd93b288c..bd93b288c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD618.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD618.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD619.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD619.ser
index ea7a544bf..ea7a544bf 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD619.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD619.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD62.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD62.ser
index c3510ec9e..c3510ec9e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD62.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD62.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD620.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD620.ser
index c02164344..c02164344 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD620.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD620.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD621.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD621.ser
index 16cf973f2..16cf973f2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD621.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD621.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD63.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD63.ser
index f827db274..f827db274 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD63.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD63.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD64.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD64.ser
index c079752d6..c079752d6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD64.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD64.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD65.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD65.ser
index 18d091c4a..18d091c4a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD65.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD65.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD66.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD66.ser
index 2628ac645..2628ac645 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD66.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD66.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD67.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD67.ser
index e0a656874..e0a656874 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD67.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD67.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD68.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD68.ser
index cd908264a..cd908264a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD68.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD68.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD69.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD69.ser
index da9a56794..da9a56794 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD69.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD69.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD7.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD7.ser
index 1eec94eeb..1eec94eeb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD7.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD7.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD70.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD70.ser
index 1458485b6..1458485b6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD70.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD70.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD71.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD71.ser
index 0bb894af9..0bb894af9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD71.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD71.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD72.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD72.ser
index 596af011c..596af011c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD72.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD72.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD73.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD73.ser
index adac3305c..adac3305c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD73.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD73.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD74.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD74.ser
index 1440bb78a..1440bb78a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD74.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD74.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD75.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD75.ser
index 2a1091e9c..2a1091e9c 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD75.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD75.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD76.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD76.ser
index a519dc078..a519dc078 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD76.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD76.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD77.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD77.ser
index 533579a8f..533579a8f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD77.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD77.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD78.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD78.ser
index cd8bea1c7..cd8bea1c7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD78.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD78.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD79.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD79.ser
index 16635b605..16635b605 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD79.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD79.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD8.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD8.ser
index 05616a937..05616a937 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD8.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD8.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD80.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD80.ser
index 44ce6375e..44ce6375e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD80.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD80.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD81.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD81.ser
index cfd698d7d..cfd698d7d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD81.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD81.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD82.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD82.ser
index 415f1bf8e..415f1bf8e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD82.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD82.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD83.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD83.ser
index 2fc94de93..2fc94de93 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD83.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD83.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD84.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD84.ser
index a7e226ec1..a7e226ec1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD84.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD84.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD85.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD85.ser
index 573c8ce87..573c8ce87 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD85.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD85.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD86.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD86.ser
index e8df233a5..e8df233a5 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD86.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD86.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD87.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD87.ser
index abcad78d0..abcad78d0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD87.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD87.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD88.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD88.ser
index e702881e7..e702881e7 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD88.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD88.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD89.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD89.ser
index 1b76a8499..1b76a8499 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD89.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD89.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD9.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD9.ser
index 13edb5406..13edb5406 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD9.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD9.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD90.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD90.ser
index da2ee39ec..da2ee39ec 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD90.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD90.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD91.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD91.ser
index 7f9f0a3fd..7f9f0a3fd 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD91.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD91.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD92.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD92.ser
index 6cbe89840..6cbe89840 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD92.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD92.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD93.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD93.ser
index 423f92310..423f92310 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD93.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD93.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD94.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD94.ser
index 331ba261f..331ba261f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD94.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD94.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD95.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD95.ser
index 0c4e54135..0c4e54135 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD95.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD95.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD96.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD96.ser
index 20afc295a..20afc295a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD96.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD96.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD97.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD97.ser
index e801916f4..e801916f4 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD97.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD97.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD98.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD98.ser
index 7fc398de9..7fc398de9 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD98.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD98.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD99.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD99.ser
index 5c7a0de21..5c7a0de21 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$LD99.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$LD99.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD0.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD0.ser
index f7b1fbed1..f7b1fbed1 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD0.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD0.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD1.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD1.ser
index dc3634dec..dc3634dec 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD1.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD1.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD10.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD10.ser
index a3108b43e..a3108b43e 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD10.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD10.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD11.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD11.ser
index f561c2d2f..f561c2d2f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD11.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD11.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD12.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD12.ser
index 1dc99e434..1dc99e434 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD12.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD12.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD13.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD13.ser
index e1b97d053..e1b97d053 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD13.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD13.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD14.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD14.ser
index 5600cbfa2..5600cbfa2 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD14.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD14.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD15.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD15.ser
index fe4068c42..fe4068c42 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD15.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD15.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD16.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD16.ser
index 59ad5e462..59ad5e462 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD16.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD16.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD17.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD17.ser
index b11600cd0..b11600cd0 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD17.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD17.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD18.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD18.ser
index 5abc2b1b6..5abc2b1b6 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD18.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD18.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD2.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD2.ser
index 37814223f..37814223f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD2.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD2.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD3.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD3.ser
index 58bb75a7f..58bb75a7f 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD3.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD3.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD4.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD4.ser
index f905fc364..f905fc364 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD4.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD4.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD5.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD5.ser
index 0c1e74beb..0c1e74beb 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD5.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD5.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD6.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD6.ser
index 1032043be..1032043be 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD6.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD6.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD7.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD7.ser
index d0e34603a..d0e34603a 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD7.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD7.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD8.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD8.ser
index 4d47ada2d..4d47ada2d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD8.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD8.ser
diff --git a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD9.ser b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD9.ser
index eb522634d..eb522634d 100644
--- a/fop/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData$TD9.ser
+++ b/fop/src/test/resources/org/apache/fop/complexscripts/bidi/BidiTestData$TD9.ser
diff --git a/fop/src/test/java/org/apache/fop/fo/complete_document.fo b/fop/src/test/resources/org/apache/fop/fo/complete_document.fo
index b103744ae..b103744ae 100644
--- a/fop/src/test/java/org/apache/fop/fo/complete_document.fo
+++ b/fop/src/test/resources/org/apache/fop/fo/complete_document.fo
diff --git a/fop/src/test/java/org/apache/fop/fo/extract-events.xsl b/fop/src/test/resources/org/apache/fop/fo/extract-events.xsl
index eae794754..eae794754 100644
--- a/fop/src/test/java/org/apache/fop/fo/extract-events.xsl
+++ b/fop/src/test/resources/org/apache/fop/fo/extract-events.xsl
diff --git a/fop/src/test/java/org/apache/fop/fo/pagination/side-regions.fo b/fop/src/test/resources/org/apache/fop/fo/pagination/side-regions.fo
index 8a0fba2ec..8a0fba2ec 100644
--- a/fop/src/test/java/org/apache/fop/fo/pagination/side-regions.fo
+++ b/fop/src/test/resources/org/apache/fop/fo/pagination/side-regions.fo
diff --git a/fop/src/test/java/org/apache/fop/fonts/substituted-font.fo b/fop/src/test/resources/org/apache/fop/fonts/substituted-font.fo
index 551527522..551527522 100644
--- a/fop/src/test/java/org/apache/fop/fonts/substituted-font.fo
+++ b/fop/src/test/resources/org/apache/fop/fonts/substituted-font.fo
diff --git a/fop/src/test/java/org/apache/fop/fonts/type1/AdobeStandardEncoding.txt b/fop/src/test/resources/org/apache/fop/fonts/type1/AdobeStandardEncoding.txt
index e39486a31..e39486a31 100644
--- a/fop/src/test/java/org/apache/fop/fonts/type1/AdobeStandardEncoding.txt
+++ b/fop/src/test/resources/org/apache/fop/fonts/type1/AdobeStandardEncoding.txt
diff --git a/fop/src/test/java/org/apache/fop/fonts/type1/adobe-charset_adobe-encoding.afm b/fop/src/test/resources/org/apache/fop/fonts/type1/adobe-charset_adobe-encoding.afm
index 50f8c3381..50f8c3381 100644
--- a/fop/src/test/java/org/apache/fop/fonts/type1/adobe-charset_adobe-encoding.afm
+++ b/fop/src/test/resources/org/apache/fop/fonts/type1/adobe-charset_adobe-encoding.afm
diff --git a/fop/src/test/java/org/apache/fop/fonts/type1/adobe-charset_unknown-encoding.afm b/fop/src/test/resources/org/apache/fop/fonts/type1/adobe-charset_unknown-encoding.afm
index 8edbe0d76..8edbe0d76 100644
--- a/fop/src/test/java/org/apache/fop/fonts/type1/adobe-charset_unknown-encoding.afm
+++ b/fop/src/test/resources/org/apache/fop/fonts/type1/adobe-charset_unknown-encoding.afm
diff --git a/fop/src/test/java/org/apache/fop/fonts/type1/notadobe-charset_adobe-encoding.afm b/fop/src/test/resources/org/apache/fop/fonts/type1/notadobe-charset_adobe-encoding.afm
index 11cecb17f..11cecb17f 100644
--- a/fop/src/test/java/org/apache/fop/fonts/type1/notadobe-charset_adobe-encoding.afm
+++ b/fop/src/test/resources/org/apache/fop/fonts/type1/notadobe-charset_adobe-encoding.afm
diff --git a/fop/src/test/java/org/apache/fop/fonts/type1/notadobe-charset_unknown-encoding.afm b/fop/src/test/resources/org/apache/fop/fonts/type1/notadobe-charset_unknown-encoding.afm
index 1714288ab..1714288ab 100644
--- a/fop/src/test/java/org/apache/fop/fonts/type1/notadobe-charset_unknown-encoding.afm
+++ b/fop/src/test/resources/org/apache/fop/fonts/type1/notadobe-charset_unknown-encoding.afm
diff --git a/fop/src/test/java/org/apache/fop/fonts/type1/underline.afm b/fop/src/test/resources/org/apache/fop/fonts/type1/underline.afm
index 8137b41eb..8137b41eb 100644
--- a/fop/src/test/java/org/apache/fop/fonts/type1/underline.afm
+++ b/fop/src/test/resources/org/apache/fop/fonts/type1/underline.afm
diff --git a/fop/src/test/java/org/apache/fop/pdf/PDFVT.fo b/fop/src/test/resources/org/apache/fop/pdf/PDFVT.fo
index 6919afcf6..6919afcf6 100644
--- a/fop/src/test/java/org/apache/fop/pdf/PDFVT.fo
+++ b/fop/src/test/resources/org/apache/fop/pdf/PDFVT.fo
diff --git a/fop/src/test/java/org/apache/fop/pdf/PDFVT.xconf b/fop/src/test/resources/org/apache/fop/pdf/PDFVT.xconf
index 52588f0b0..52588f0b0 100644
--- a/fop/src/test/java/org/apache/fop/pdf/PDFVT.xconf
+++ b/fop/src/test/resources/org/apache/fop/pdf/PDFVT.xconf
diff --git a/fop/src/test/java/org/apache/fop/render/afp/nops.fo b/fop/src/test/resources/org/apache/fop/render/afp/nops.fo
index 96c6e0d24..96c6e0d24 100644
--- a/fop/src/test/java/org/apache/fop/render/afp/nops.fo
+++ b/fop/src/test/resources/org/apache/fop/render/afp/nops.fo
diff --git a/fop/src/test/java/org/apache/fop/render/ps/ps-jpeg-image.fo b/fop/src/test/resources/org/apache/fop/render/ps/ps-jpeg-image.fo
index 50ed2d6e4..50ed2d6e4 100644
--- a/fop/src/test/java/org/apache/fop/render/ps/ps-jpeg-image.fo
+++ b/fop/src/test/resources/org/apache/fop/render/ps/ps-jpeg-image.fo
diff --git a/fop/src/test/java/org/apache/fop/render/ps/ps-resources.fo b/fop/src/test/resources/org/apache/fop/render/ps/ps-resources.fo
index 7982d35bd..7982d35bd 100644
--- a/fop/src/test/java/org/apache/fop/render/ps/ps-resources.fo
+++ b/fop/src/test/resources/org/apache/fop/render/ps/ps-resources.fo
diff --git a/fop/src/test/java/org/apache/fop/render/ps/svg/expected-linear-gradient.ps b/fop/src/test/resources/org/apache/fop/render/ps/svg/expected-linear-gradient.ps
index 8ddc64486..8ddc64486 100644
--- a/fop/src/test/java/org/apache/fop/render/ps/svg/expected-linear-gradient.ps
+++ b/fop/src/test/resources/org/apache/fop/render/ps/svg/expected-linear-gradient.ps
diff --git a/fop/src/test/java/org/apache/fop/render/ps/svg/expected-radial-gradient.ps b/fop/src/test/resources/org/apache/fop/render/ps/svg/expected-radial-gradient.ps
index 527f27965..527f27965 100644
--- a/fop/src/test/java/org/apache/fop/render/ps/svg/expected-radial-gradient.ps
+++ b/fop/src/test/resources/org/apache/fop/render/ps/svg/expected-radial-gradient.ps
diff --git a/fop/src/test/java/org/apache/fop/svg/baseline-shift.svg b/fop/src/test/resources/org/apache/fop/svg/baseline-shift.svg
index 0f375b9af..0f375b9af 100644
--- a/fop/src/test/java/org/apache/fop/svg/baseline-shift.svg
+++ b/fop/src/test/resources/org/apache/fop/svg/baseline-shift.svg
diff --git a/fop/src/test/java/org/apache/fop/svg/dx-dy.svg b/fop/src/test/resources/org/apache/fop/svg/dx-dy.svg
index cfdc2de01..cfdc2de01 100644
--- a/fop/src/test/java/org/apache/fop/svg/dx-dy.svg
+++ b/fop/src/test/resources/org/apache/fop/svg/dx-dy.svg
diff --git a/fop/src/test/java/org/apache/fop/svg/glyph-orientation.svg b/fop/src/test/resources/org/apache/fop/svg/glyph-orientation.svg
index 4900a3b02..4900a3b02 100644
--- a/fop/src/test/java/org/apache/fop/svg/glyph-orientation.svg
+++ b/fop/src/test/resources/org/apache/fop/svg/glyph-orientation.svg
diff --git a/fop/src/test/java/org/apache/fop/svg/rotated-glyph.svg b/fop/src/test/resources/org/apache/fop/svg/rotated-glyph.svg
index 8b942905e..8b942905e 100644
--- a/fop/src/test/java/org/apache/fop/svg/rotated-glyph.svg
+++ b/fop/src/test/resources/org/apache/fop/svg/rotated-glyph.svg
diff --git a/fop/src/test/java/org/apache/fop/svg/spacing.svg b/fop/src/test/resources/org/apache/fop/svg/spacing.svg
index 943ab1d04..943ab1d04 100644
--- a/fop/src/test/java/org/apache/fop/svg/spacing.svg
+++ b/fop/src/test/resources/org/apache/fop/svg/spacing.svg
diff --git a/fop/src/test/java/org/apache/fop/threading/sample.cfg.xml b/fop/src/test/resources/org/apache/fop/threading/sample.cfg.xml
index a4de0d754..a4de0d754 100644
--- a/fop/src/test/java/org/apache/fop/threading/sample.cfg.xml
+++ b/fop/src/test/resources/org/apache/fop/threading/sample.cfg.xml
diff --git a/fop/src/test/java/org/apache/fop/util/XMLResourceBundleTestCase.xml b/fop/src/test/resources/org/apache/fop/util/XMLResourceBundleTestCase.xml
index 5cdee49ec..5cdee49ec 100644
--- a/fop/src/test/java/org/apache/fop/util/XMLResourceBundleTestCase.xml
+++ b/fop/src/test/resources/org/apache/fop/util/XMLResourceBundleTestCase.xml
diff --git a/fop/src/test/java/org/apache/fop/util/XMLResourceBundleTestCase_de.xml b/fop/src/test/resources/org/apache/fop/util/XMLResourceBundleTestCase_de.xml
index 44cf5a5b4..44cf5a5b4 100644
--- a/fop/src/test/java/org/apache/fop/util/XMLResourceBundleTestCase_de.xml
+++ b/fop/src/test/resources/org/apache/fop/util/XMLResourceBundleTestCase_de.xml
diff --git a/fop/src/test/java/org/apache/fop/util/invalid-translation-file.xml b/fop/src/test/resources/org/apache/fop/util/invalid-translation-file.xml
index 09306b7cc..09306b7cc 100644
--- a/fop/src/test/java/org/apache/fop/util/invalid-translation-file.xml
+++ b/fop/src/test/resources/org/apache/fop/util/invalid-translation-file.xml