diff options
27 files changed, 27 insertions, 26 deletions
diff --git a/src/org/apache/fop/tools/TestConverter.java b/src/org/apache/fop/tools/TestConverter.java index aa03fe57c..094353fc3 100644 --- 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 feef6e9da..c65e3bbbf 100644 --- 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 3f6c474cd..01eb73efa 100644 --- 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 f9e49d6ce..7ce79cf5b 100644 --- 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 f77dc1765..f4dd8240f 100644 --- 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 0a55fde03..d47f15860 100644 --- 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 45ff156b1..eebb5e4a6 100644 --- 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 8538aa315..bcd0db6cc 100644 --- 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 4b46449c6..3837d1006 100644 --- 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 1ba4bb14f..5395cf0f3 100644 --- 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 d9ab2da4b..8f0e4dd6a 100644 --- 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 22dc945e2..3d3eb870f 100644 --- 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 e415f8115..13d051035 100644 --- 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 3b1e92150..ecf72bead 100644 --- 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 b17d0ed76..f2a8df010 100644 --- 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 b7507e999..b019611d1 100644 --- 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 f871ee758..aea150337 100644 --- 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 eeb29bc04..1d1e2a35b 100644 --- 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 8475a5306..d6afef6ae 100644 --- 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 13fb110b9..1a78a4870 100644 --- 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 c0a3032d6..8442f2bd0 100644 --- 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 29cf8e2df..886cb7e80 100644 --- 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 f95567595..45fd3709e 100644 --- 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 7efcf621a..67c74a64c 100644 --- 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 29668f2b6..71d90c06a 100644 --- 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 3b8147cc6..23ff154c4 100644 --- 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 09c65dd84..c138fece3 100644 --- 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> |