fixed master-name and a test setup problem

as suggested by: Peter Kullmann <p.kullmann@arenae.ch>
fixed line endings

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

diff --git a/src/org/apache/fop/tools/TestConverter.java b/src/org/apache/fop/tools/TestConverter.java
index aa03fe57cc40a16c1d8abda006e5c5704901b4e2..094353fc352978d939337fc55e017f75d179ee74 100644 (file)
--- a/src/org/apache/fop/tools/TestConverter.java
+++ b/src/org/apache/fop/tools/TestConverter.java
@@ -229,6 +229,7 @@ public class TestConverter {
             Logger logger = log.getChildLogger("fop");
             Driver driver = new Driver();
             driver.setLogger(logger);
+            driver.initialize();
             if (outputPDF) {
                 driver.setRenderer(Driver.RENDER_PDF);
             } else {

diff --git a/test/xml/bugtests/background_color.fo b/test/xml/bugtests/background_color.fo
index feef6e9da40079ae8c28ae3cd37690a34be54ee1..c65e3bbbf7711b7045cdab0923c289f78ed1340d 100644 (file)
--- a/test/xml/bugtests/background_color.fo
+++ b/test/xml/bugtests/background_color.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                <fo:block background-color="#FF0000">
                                <fo:block>

diff --git a/test/xml/bugtests/background_transparent.fo b/test/xml/bugtests/background_transparent.fo
index 3f6c474cd4f79db06c2b0cd7c7811ae5b3c64d0d..01eb73efa1e172e32f6c4183b61c00fbe441b857 100644 (file)
--- a/test/xml/bugtests/background_transparent.fo
+++ b/test/xml/bugtests/background_transparent.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                This is a simple fo block with transparent background.

diff --git a/test/xml/bugtests/block-container.fo b/test/xml/bugtests/block-container.fo
index f9e49d6ceffe6c013e561c979be1d58227c7c7a1..7ce79cf5b4aaaf0cfbbffa5c2bafa2afa3fb197b 100644 (file)
--- a/test/xml/bugtests/block-container.fo
+++ b/test/xml/bugtests/block-container.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:static-content flow-name="xsl-region-before">
             <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="2.5cm" width="4cm" padding="8pt" position="absolute">
                 <fo:block text-align="start" line-height="2cm" font-family="sans-serif" font-size="12pt">

diff --git a/test/xml/bugtests/block.fo b/test/xml/bugtests/block.fo
index f77dc17651d878e18c4a0e1f409094ee7afecbae..f4dd8240f18dae781be0fe66422f5d451547f6ff 100644 (file)
--- a/test/xml/bugtests/block.fo
+++ b/test/xml/bugtests/block.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                This is a simple fo block.

diff --git a/test/xml/bugtests/border.fo b/test/xml/bugtests/border.fo
index 0a55fde034bb040994dbe2457814f2ac00003754..d47f158601db477437936b2868c3163dd4c40f8c 100644 (file)
--- a/test/xml/bugtests/border.fo
+++ b/test/xml/bugtests/border.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                This is a simple fo block.

diff --git a/test/xml/bugtests/break-before.fo b/test/xml/bugtests/break-before.fo
index 45ff156b1e278fdf19c46da79aad128041e73944..eebb5e4a6b699ea9c6f9e6e1de744667abcd4712 100644 (file)
--- a/test/xml/bugtests/break-before.fo
+++ b/test/xml/bugtests/break-before.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                This is a simple fo block.

diff --git a/test/xml/bugtests/color.fo b/test/xml/bugtests/color.fo
index 8538aa31547945f4128953404d5dee18b1d98ddc..bcd0db6cc71c8ac3a4803669b495a0cf829efaf4 100644 (file)
--- a/test/xml/bugtests/color.fo
+++ b/test/xml/bugtests/color.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block color="#C00000">
                                This is a simple fo text in red color.

diff --git a/test/xml/bugtests/font-family.fo b/test/xml/bugtests/font-family.fo
index 4b46449c6c07752b69c8d466ff455d580131c5bf..3837d100655d07e319255f7a1f16ac026fa1fbed 100644 (file)
--- a/test/xml/bugtests/font-family.fo
+++ b/test/xml/bugtests/font-family.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                default:

diff --git a/test/xml/bugtests/font-size.fo b/test/xml/bugtests/font-size.fo
index 1ba4bb14f7d615f3d5091e7ad161f6f9ac0786bc..5395cf0f37d67191141cf6561ed66b40cd1a25f6 100644 (file)
--- a/test/xml/bugtests/font-size.fo
+++ b/test/xml/bugtests/font-size.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                This is a simple fo text in FOP default font size and default font.

diff --git a/test/xml/bugtests/font.fo b/test/xml/bugtests/font.fo
index d9ab2da4b56a7c03382f718579ec1a9a2a0dd190..8f0e4dd6a1d945e3a8295c287016f375aa27caf7 100644 (file)
--- a/test/xml/bugtests/font.fo
+++ b/test/xml/bugtests/font.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block font-family="Courier" font-size="12pt">
                                This is a simple fo text in Courier font.

diff --git a/test/xml/bugtests/header_footer.fo b/test/xml/bugtests/header_footer.fo
index 22dc945e28ed37246b5ec9bd5586c090f6b8e09a..3d3eb870f2527e8fe90244cb43a0baef451e274e 100644 (file)
--- a/test/xml/bugtests/header_footer.fo
+++ b/test/xml/bugtests/header_footer.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <!-- header -->
            <fo:static-content flow-name="xsl-region-before">
              <fo:block-container width="5cm" height="3cm" position="absolute" background-color="#22CC55">

diff --git a/test/xml/bugtests/indent.fo b/test/xml/bugtests/indent.fo
index e415f8115a4b61641e7d0303629462431a7b4aec..13d051035053c8c5d86fcc8307bdb5f89db1dc19 100644 (file)
--- a/test/xml/bugtests/indent.fo
+++ b/test/xml/bugtests/indent.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block text-align="justify" start-indent="1in">
                                This is a simple fo block with justify indented in the start.

diff --git a/test/xml/bugtests/inline.fo b/test/xml/bugtests/inline.fo
index 3b1e9215056e11d493936997edd593eb1790d3b0..ecf72bead6d42eb1505d7c1f0a2d409b38b8a7ff 100644 (file)
--- a/test/xml/bugtests/inline.fo
+++ b/test/xml/bugtests/inline.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                <fo:inline>The sentence is</fo:inline>

diff --git a/test/xml/bugtests/keep-with-next.fo b/test/xml/bugtests/keep-with-next.fo
index b17d0ed7660f0ab9b0bc0ed204496b0433de5d97..f2a8df0107a93b9dcc7213417486456983ffccbf 100644 (file)
--- a/test/xml/bugtests/keep-with-next.fo
+++ b/test/xml/bugtests/keep-with-next.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block space-before.optimum="1cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap">
  F I N A L    C A L C U L A T I O N                      AUD $      AUD $

diff --git a/test/xml/bugtests/leader.fo b/test/xml/bugtests/leader.fo
index b7507e99970fe4c5a9ca0309769e52639303e27f..b019611d163cafbc28f8a7b087423201cc71e479 100644 (file)
--- a/test/xml/bugtests/leader.fo
+++ b/test/xml/bugtests/leader.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                            <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader>                 

diff --git a/test/xml/bugtests/letter-spacing.fo b/test/xml/bugtests/letter-spacing.fo
index f871ee758c563d2c7839c6136c4f27dc517f4865..aea15033740e9d52a0b8efc78f2236ade838642f 100644 (file)
--- a/test/xml/bugtests/letter-spacing.fo
+++ b/test/xml/bugtests/letter-spacing.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block letter-spacing="normal"> 
                                This text is normally spaced.

diff --git a/test/xml/bugtests/line-height.fo b/test/xml/bugtests/line-height.fo
index eeb29bc04a03783b894b2113609e26ba2bab77db..1d1e2a35b8e730bf4d857d2bd97e50ac36ac683e 100644 (file)
--- a/test/xml/bugtests/line-height.fo
+++ b/test/xml/bugtests/line-height.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block font-weight="bold" text-align="center">
                                <fo:inline text-decoration="underline">

diff --git a/test/xml/bugtests/padding.fo b/test/xml/bugtests/padding.fo
index 8475a530691835d38fdc88189d5b056def925086..d6afef6aed8761baa7427c26853644bd7570f76b 100644 (file)
--- a/test/xml/bugtests/padding.fo
+++ b/test/xml/bugtests/padding.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
 
              <fo:block font-size="18pt" 

diff --git a/test/xml/bugtests/page-number.fo b/test/xml/bugtests/page-number.fo
index 13fb110b9c51d3df3a4bac9468ddc9426bce494c..1a78a4870811f08d50f6b8426e89ed5e9e5b898d 100644 (file)
--- a/test/xml/bugtests/page-number.fo
+++ b/test/xml/bugtests/page-number.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                This is Page Number <fo:page-number/>.

diff --git a/test/xml/bugtests/rule.fo b/test/xml/bugtests/rule.fo
index c0a3032d6d4001f216f298459a7c17d0c93a89d2..8442f2bd0609f418410146e45e926f63d64a7338 100644 (file)
--- a/test/xml/bugtests/rule.fo
+++ b/test/xml/bugtests/rule.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block space-before.optimum="1cm">
                                leader-pattern="rule" rule-style="solid" rule-thickness="0.5pt"

diff --git a/test/xml/bugtests/space-treatment.fo b/test/xml/bugtests/space-treatment.fo
index 29cf8e2dfbf00e9fcf0e8fd7286bf22690632fab..886cb7e80c765ad006aececec82ccd023de650cf 100644 (file)
--- a/test/xml/bugtests/space-treatment.fo
+++ b/test/xml/bugtests/space-treatment.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                <fo:block space-after.optimum="1cm">
                        The text below is in monospace font(useful for displayed formatted text, program code etc.)

diff --git a/test/xml/bugtests/space.fo b/test/xml/bugtests/space.fo
index f9556759523d46cad71cfbef6f5fb18a718f62b6..45fd3709e645ccc8fd9d2ab005fa4c73b6b6885d 100644 (file)
--- a/test/xml/bugtests/space.fo
+++ b/test/xml/bugtests/space.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block space-after.optimum="1cm">
                                space-after.optimum="1cm"

diff --git a/test/xml/bugtests/text-align.fo b/test/xml/bugtests/text-align.fo
index 7efcf621a1ce3410ce8fa60688dc252edfe46284..67c74a64c72b1eaa44bb773bf8371ac4494a3879 100644 (file)
--- a/test/xml/bugtests/text-align.fo
+++ b/test/xml/bugtests/text-align.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                This is a simple fo block.

diff --git a/test/xml/bugtests/text-decoration.fo b/test/xml/bugtests/text-decoration.fo
index 29668f2b6a999f1dcbbe30155adfe5348172eb78..71d90c06a6dafb20f4419aa86f5fdb219f61394e 100644 (file)
--- a/test/xml/bugtests/text-decoration.fo
+++ b/test/xml/bugtests/text-decoration.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                This is a simple fo text.

diff --git a/test/xml/bugtests/text-indent.fo b/test/xml/bugtests/text-indent.fo
index 3b8147cc6b3761013fa921dac356872a0681d5b1..23ff154c4c722760cebd84231ba6c5f7cbbbd9ff 100644 (file)
--- a/test/xml/bugtests/text-indent.fo
+++ b/test/xml/bugtests/text-indent.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block text-align="start" space-before.optimum="6pt" text-indent="1in"> 
                          This text is formatted into a left-justified paragraph.

diff --git a/test/xml/bugtests/word-spacing.fo b/test/xml/bugtests/word-spacing.fo
index 09c65dd841c602a2a7c5d4ec9238012c8f6766a2..c138fece305f5d6bcf6042ed1d6af1a20ca0ac05 100644 (file)
--- a/test/xml/bugtests/word-spacing.fo
+++ b/test/xml/bugtests/word-spacing.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block> 
                                <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>