diff options
Diffstat (limited to 'test')
39 files changed, 1542 insertions, 1541 deletions
diff --git a/test/createpdf.sh b/test/createpdf.sh index 67e4dc2b5..9f33a945b 100755 --- a/test/createpdf.sh +++ b/test/createpdf.sh @@ -1,7 +1,8 @@ # this can be used to create pdf output of the testsuite files -$JAVA_HOME/bin/java -cp ../build/fop.jar:../lib/batik.jar:../lib/xalan-2.0.0.jar:../lib/xerces-1.2.3.jar:../lib/avalon-framework-4.0.jar:../lib/logkit-1.0b4.jar:../lib/jimi-1.0.jar org.apache.fop.tools.TestConverter -pdf -b ./ basictests.xml -$JAVA_HOME/bin/java -cp ../build/fop.jar:../lib/batik.jar:../lib/xalan-2.0.0.jar:../lib/xerces-1.2.3.jar:../lib/avalon-framework-4.0.jar:../lib/logkit-1.0b4.jar:../lib/jimi-1.0.jar org.apache.fop.tools.TestConverter -pdf -b ./ bugtests.xml +$JAVA_HOME/bin/java -cp ../build/fop.jar:../lib/batik.jar:../lib/xalan-2.3.1.jar:../lib/xercesImpl-2.0.1.jar:../lib/xml-apis.jar:../lib/avalon-framework-4.0.jar:../lib/logkit-1.0.jar:../lib/jimi-1.0.jar org.apache.fop.tools.TestConverter -pdf -b ./ basictests.xml + +$JAVA_HOME/bin/java -cp ../build/fop.jar:../lib/batik.jar:../lib/xalan-2.3.1.jar:../lib/xercesImpl-2.0.1.jar:../lib/xml-apis.jar:../lib/avalon-framework-4.0.jar:../lib/logkit-1.0.jar:../lib/jimi-1.0.jar org.apache.fop.tools.TestConverter -pdf -b ./ bugtests.xml diff --git a/test/errors/foreign.fo b/test/errors/foreign.fo index 31833717f..cc77c241d 100644 --- a/test/errors/foreign.fo +++ b/test/errors/foreign.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">Embedding SVG examples</fo:block> diff --git a/test/errors/inavlidxml2.fo b/test/errors/inavlidxml2.fo index 2e7c583c1..4ff0a6941 100644 --- a/test/errors/inavlidxml2.fo +++ b/test/errors/inavlidxml2.fo @@ -19,7 +19,7 @@ fegsdfgdsgfsdgf <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <!-- text body --> <fo:flow flow-name="xsl-region-body"> diff --git a/test/errors/unknown.fo b/test/errors/unknown.fo index 490a6375b..a1ad313d8 100644 --- a/test/errors/unknown.fo +++ b/test/errors/unknown.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:flow source-document="a" flow-name="xsl-region-body"> <fo:block source-document="inherit" space-before.optimum="3pt" space-after.optimum="15pt"> diff --git a/test/xml/bugtests/background_color.fo b/test/xml/bugtests/background_color.fo index feef6e9da..d9ba083aa 100644 --- a/test/xml/bugtests/background_color.fo +++ b/test/xml/bugtests/background_color.fo @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="#FF0000"> - <fo:block> - This is a simple fo block with red background. - </fo:block> - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block background-color="#FF0000"> + <fo:block> + This is a simple fo block with red background. + </fo:block> + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/background_transparent.fo b/test/xml/bugtests/background_transparent.fo index 3f6c474cd..5fb179511 100644 --- a/test/xml/bugtests/background_transparent.fo +++ b/test/xml/bugtests/background_transparent.fo @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - This is a simple fo block with transparent background. - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + This is a simple fo block with transparent background. + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/block-container.fo b/test/xml/bugtests/block-container.fo index f9e49d6ce..b7a28362b 100644 --- a/test/xml/bugtests/block-container.fo +++ b/test/xml/bugtests/block-container.fo @@ -1,40 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:static-content flow-name="xsl-region-before"> + <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"> - SOLD TO - </fo:block> + SOLD TO + </fo:block> <fo:block text-align="start" line-height="1cm" font-family="sans-serif" font-size="12pt"> - Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO - Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO - Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO - Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO - Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO - Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO - Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO - </fo:block> + Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO + Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO + Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO + Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO + Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO + Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO + Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO + </fo:block> </fo:block-container> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> + </fo:static-content> + <fo:flow flow-name="xsl-region-body"> <fo:block text-align="start" line-height="1cm" font-family="sans-serif" font-size="12pt"> - BBBBBBBBBBBBBBB - </fo:block> - </fo:flow> - </fo:page-sequence> + BBBBBBBBBBBBBBB + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/block.fo b/test/xml/bugtests/block.fo index f77dc1765..c404dc5b9 100644 --- a/test/xml/bugtests/block.fo +++ b/test/xml/bugtests/block.fo @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - This is a simple fo block. - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + This is a simple fo block. + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/border.fo b/test/xml/bugtests/border.fo index 0a55fde03..905c6008b 100644 --- a/test/xml/bugtests/border.fo +++ b/test/xml/bugtests/border.fo @@ -1,71 +1,71 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - This is a simple fo block. - </fo:block> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + This is a simple fo block. + </fo:block> - <fo:block space-before.optimum="1cm" border-color="blue" border-style="solid" border-width="2pt"> - This is a simple fo block with borders. - </fo:block> + <fo:block space-before.optimum="1cm" border-color="blue" border-style="solid" border-width="2pt"> + This is a simple fo block with borders. + </fo:block> - <fo:block space-before.optimum="1cm" - border-left-color="blue" border-left-style="solid" border-left-width="2pt" - border-right-color="blue" border-right-style="solid" border-right-width="2pt" - border-top-color="blue" border-top-style="solid" border-top-width="2pt" - border-bottom-color="blue" border-bottom-style="solid" border-bottom-width="2pt"> - This is a simple fo block with borders. - </fo:block> + <fo:block space-before.optimum="1cm" + border-left-color="blue" border-left-style="solid" border-left-width="2pt" + border-right-color="blue" border-right-style="solid" border-right-width="2pt" + border-top-color="blue" border-top-style="solid" border-top-width="2pt" + border-bottom-color="blue" border-bottom-style="solid" border-bottom-width="2pt"> + This is a simple fo block with borders. + </fo:block> - <fo:block space-before.optimum="1cm" border-left-color="black" border-left-style="solid" border-left-width="2pt" - border-right-color="black" border-right-style="dotted" border-right-width="1cm" - border-top-color="black" border-top-style="dashed" border-top-width="5pt" - border-bottom-color="black" border-bottom-style="double" border-bottom-width="1in"> - This is a simple fo block with different borders viz; - border-left-color="black" - border-left-style="solid" - border-left-width="2pt" - border-right-color="black" - border-right-style="dotted" - border-right-width="1cm" - border-top-color="black" - border-top-style="dashed" - border-top-width="5pt" - border-bottom-color="black" - border-bottom-style="double" - border-bottom-width="1in" - </fo:block> + <fo:block space-before.optimum="1cm" border-left-color="black" border-left-style="solid" border-left-width="2pt" + border-right-color="black" border-right-style="dotted" border-right-width="1cm" + border-top-color="black" border-top-style="dashed" border-top-width="5pt" + border-bottom-color="black" border-bottom-style="double" border-bottom-width="1in"> + This is a simple fo block with different borders viz; + border-left-color="black" + border-left-style="solid" + border-left-width="2pt" + border-right-color="black" + border-right-style="dotted" + border-right-width="1cm" + border-top-color="black" + border-top-style="dashed" + border-top-width="5pt" + border-bottom-color="black" + border-bottom-style="double" + border-bottom-width="1in" + </fo:block> - <fo:block space-before.optimum="1cm" - border-top="2pt solid blue" - border-bottom="2pt solid blue" - border-left="2pt solid blue" - border-right="2pt solid blue"> - This is a simple fo block with borders. - </fo:block> + <fo:block space-before.optimum="1cm" + border-top="2pt solid blue" + border-bottom="2pt solid blue" + border-left="2pt solid blue" + border-right="2pt solid blue"> + This is a simple fo block with borders. + </fo:block> - <fo:block space-before.optimum="1cm" - border-top="2pt || solid || blue" - border-bottom="2pt || solid || blue" - border-left="2pt || solid || blue" - border-right="2pt || solid || blue"> - This is a simple fo block with borders. - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:block space-before.optimum="1cm" + border-top="2pt || solid || blue" + border-bottom="2pt || solid || blue" + border-left="2pt || solid || blue" + border-right="2pt || solid || blue"> + This is a simple fo block with borders. + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/break-before.fo b/test/xml/bugtests/break-before.fo index 45ff156b1..4aa74301b 100644 --- a/test/xml/bugtests/break-before.fo +++ b/test/xml/bugtests/break-before.fo @@ -1,27 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - This is a simple fo block. - </fo:block> - <fo:block break-before="page"> - This is a simple fo block on a new page due to page-break using break-before="page". - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + This is a simple fo block. + </fo:block> + <fo:block break-before="page"> + This is a simple fo block on a new page due to page-break using break-before="page". + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/charwidth.fo b/test/xml/bugtests/charwidth.fo index 15772a4bc..313262b66 100644 --- a/test/xml/bugtests/charwidth.fo +++ b/test/xml/bugtests/charwidth.fo @@ -1,259 +1,259 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <fo:layout-master-set> - <fo:simple-page-master margin-right="40pt" margin-left="40pt" master-name="one"> - <fo:region-body margin-bottom="30pt" margin-top="30pt"/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-name="one"> - <fo:flow font-size="12pt" flow-name="xsl-region-body"> - <fo:block> - This file contains a list of many characters in various fonts. The text is - aligned with the end in order to check that all the characters have their - correct width set in FOP. - </fo:block> - <fo:block> - If the right hand edge is left of the other lines in the same font then - this indicates it expects one (or more) of the characters to be wider - than it really is. Also if the end is to the right of the other lines - then FOP expects a character to be smaller than it really is or the - character is missing from the lookup. - </fo:block> - <fo:block font-size="12pt" font-family="Helvetica" text-align="end"> - <fo:block> - 1 - </fo:block> - <fo:block> - abcdefghijklmnopqrstuvwxyz1 - </fo:block> - <fo:block> - ABCDEFGHIJKLMNOPQRSTUVWXYZ1 - </fo:block> - <fo:block> - 12345678901 - </fo:block> - <fo:block> - `~!@#$%^&*()-_=+1 - </fo:block> - <fo:block> - [{]}\|;:'1 - </fo:block> - <fo:block> - ",<.>/?1 - </fo:block> - <fo:block> + <fo:simple-page-master margin-right="40pt" margin-left="40pt" master-name="one"> + <fo:region-body margin-bottom="30pt" margin-top="30pt"/> + </fo:simple-page-master> + </fo:layout-master-set> + <fo:page-sequence master-reference="one"> + <fo:flow font-size="12pt" flow-name="xsl-region-body"> + <fo:block> + This file contains a list of many characters in various fonts. The text is + aligned with the end in order to check that all the characters have their + correct width set in FOP. + </fo:block> + <fo:block> + If the right hand edge is left of the other lines in the same font then + this indicates it expects one (or more) of the characters to be wider + than it really is. Also if the end is to the right of the other lines + then FOP expects a character to be smaller than it really is or the + character is missing from the lookup. + </fo:block> + <fo:block font-size="12pt" font-family="Helvetica" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> !"#$%&'()*+,-./0123456789:;<1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> =>?@ABCDEFGHIJKLMNOPQRSTUVWX1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> YZ[\]^_`abcdefghijklmnopq1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> òóôõö÷øùúûüýþ1 - </fo:block> - </fo:block> - <fo:block font-size="12pt" font-family="Times Roman" text-align="end"> - <fo:block> - 1 - </fo:block> - <fo:block> - abcdefghijklmnopqrstuvwxyz1 - </fo:block> - <fo:block> - ABCDEFGHIJKLMNOPQRSTUVWXYZ1 - </fo:block> - <fo:block> - 12345678901 - </fo:block> - <fo:block> - `~!@#$%^&*()-_=+1 - </fo:block> - <fo:block> - [{]}\|;:'1 - </fo:block> - <fo:block> - ",<.>/?1 - </fo:block> - <fo:block> + </fo:block> + </fo:block> + <fo:block font-size="12pt" font-family="Times Roman" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> !"#$%&'()*+,-./0123456789:;<1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> =>?@ABCDEFGHIJKLMNOPQRSTUVWX1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> YZ[\]^_`abcdefghijklmnopq1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> òóôõö÷øùúûüýþ1 - </fo:block> - </fo:block> - <fo:block font-family="Courier" text-align="end"> - <fo:block> - 1 - </fo:block> - <fo:block> - abcdefghijklmnopqrstuvwxyz1 - </fo:block> - <fo:block> - ABCDEFGHIJKLMNOPQRSTUVWXYZ1 - </fo:block> - <fo:block> - 12345678901 - </fo:block> - <fo:block> - `~!@#$%^&*()-_=+1 - </fo:block> - <fo:block> - [{]}\|;:'1 - </fo:block> - <fo:block> - ",<.>/?1 - </fo:block> - <fo:block> + </fo:block> + </fo:block> + <fo:block font-family="Courier" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> !"#$%&'()*+,-./0123456789:;<1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> =>?@ABCDEFGHIJKLMNOPQRSTUVWX1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> YZ[\]^_`abcdefghijklmnopq1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> òóôõö÷øùúûüýþ1 - </fo:block> - </fo:block> - <fo:block font-family="ZapfDingbats" text-align="end"> - <fo:block> - 1 - </fo:block> - <fo:block> - abcdefghijklmnopqrstuvwxyz1 - </fo:block> - <fo:block> - ABCDEFGHIJKLMNOPQRSTUVWXYZ1 - </fo:block> - <fo:block> - 12345678901 - </fo:block> - <fo:block> - `~!@#$%^&*()-_=+1 - </fo:block> - <fo:block> - [{]}\|;:'1 - </fo:block> - <fo:block> - ",<.>/?1 - </fo:block> - <fo:block> + </fo:block> + </fo:block> + <fo:block font-family="ZapfDingbats" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> !"#$%&'()*+,-./0123456789:;<1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> =>?@ABCDEFGHIJKLMNOPQRSTUVWX1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> YZ[\]^_`abcdefghijklmnopq1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> òóôõö÷øùúûüýþ1 - </fo:block> - </fo:block> - <fo:block font-family="Symbol" text-align="end"> - <fo:block> - 1 - </fo:block> - <fo:block> - abcdefghijklmnopqrstuvwxyz1 - </fo:block> - <fo:block> - ABCDEFGHIJKLMNOPQRSTUVWXYZ1 - </fo:block> - <fo:block> - 12345678901 - </fo:block> - <fo:block> - `~!@#$%^&*()-_=+1 - </fo:block> - <fo:block> - [{]}\|;:'1 - </fo:block> - <fo:block> - ",<.>/?1 - </fo:block> - <fo:block> + </fo:block> + </fo:block> + <fo:block font-family="Symbol" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> !"#$%&'()*+,-./0123456789:;<1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> =>?@ABCDEFGHIJKLMNOPQRSTUVWX1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> YZ[\]^_`abcdefghijklmnopq1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 - </fo:block> - <fo:block> + </fo:block> + <fo:block> òóôõö÷øùúûüýþ1 - </fo:block> - </fo:block> - </fo:flow> - </fo:page-sequence> + </fo:block> + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/color.fo b/test/xml/bugtests/color.fo index 8538aa315..6d360637b 100644 --- a/test/xml/bugtests/color.fo +++ b/test/xml/bugtests/color.fo @@ -1,38 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block color="#C00000"> - This is a simple fo text in red color. - <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader> - </fo:block> + <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. + <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader> + </fo:block> - <fo:block color="#00C000"> - This is a simple fo text in green color followed by black line. - <fo:leader color="#000000" leader-pattern="rule" rule-thickness="3.0pt"></fo:leader> - </fo:block> + <fo:block color="#00C000"> + This is a simple fo text in green color followed by black line. + <fo:leader color="#000000" leader-pattern="rule" rule-thickness="3.0pt"></fo:leader> + </fo:block> - <fo:block color="#0000C0"> - This is a simple fo text in blue color. - <fo:inline color="#C055C0">This is in</fo:inline> - <fo:inline color="#550055">the same sentence</fo:inline> - This is text in blue again - <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader> - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:block color="#0000C0"> + This is a simple fo text in blue color. + <fo:inline color="#C055C0">This is in</fo:inline> + <fo:inline color="#550055">the same sentence</fo:inline> + This is text in blue again + <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader> + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/external-graphic.fo b/test/xml/bugtests/external-graphic.fo index ec7e1d178..aa40910a6 100644 --- a/test/xml/bugtests/external-graphic.fo +++ b/test/xml/bugtests/external-graphic.fo @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-body/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:external-graphic src="file:../graphics/page.gif"/> - </fo:block> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + <fo:external-graphic src="file:../graphics/page.gif"/> + </fo:block> - </fo:flow> - </fo:page-sequence> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/font-family.fo b/test/xml/bugtests/font-family.fo index 4b46449c6..d0908908b 100644 --- a/test/xml/bugtests/font-family.fo +++ b/test/xml/bugtests/font-family.fo @@ -1,76 +1,76 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - default: - </fo:block> - <fo:block text-align="center"> - This is a simple fo text in FOP default font. - </fo:block> - <fo:block> - sans-serif: - </fo:block> - <fo:block text-align="center" font-family="sans-serif"> - This is a simple fo text in sans-serif font. - </fo:block> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + default: + </fo:block> + <fo:block text-align="center"> + This is a simple fo text in FOP default font. + </fo:block> + <fo:block> + sans-serif: + </fo:block> + <fo:block text-align="center" font-family="sans-serif"> + This is a simple fo text in sans-serif font. + </fo:block> - <fo:block> - monospace: - </fo:block> - <fo:block text-align="center" font-family="monospace"> - This is a simple fo text in monospace font. - </fo:block> + <fo:block> + monospace: + </fo:block> + <fo:block text-align="center" font-family="monospace"> + This is a simple fo text in monospace font. + </fo:block> - <fo:block> - Courier: - </fo:block> - <fo:block text-align="center" font-family="Courier"> - This is a simple fo text in Courier font. - </fo:block> + <fo:block> + Courier: + </fo:block> + <fo:block text-align="center" font-family="Courier"> + This is a simple fo text in Courier font. + </fo:block> - <fo:block> - Helvetica: - </fo:block> - <fo:block text-align="center" font-family="Helvetica"> - This is a simple fo text in Helvetica font. - </fo:block> + <fo:block> + Helvetica: + </fo:block> + <fo:block text-align="center" font-family="Helvetica"> + This is a simple fo text in Helvetica font. + </fo:block> - <fo:block> - Symbol: - </fo:block> - <fo:block text-align="center" font-family="Symbol"> - This is a simple fo text in Symbol font. - </fo:block> + <fo:block> + Symbol: + </fo:block> + <fo:block text-align="center" font-family="Symbol"> + This is a simple fo text in Symbol font. + </fo:block> - <fo:block> - Times Roman: - </fo:block> - <fo:block text-align="center" font-family="Times Roman"> - This is a simple fo text in Times Roman font. - </fo:block> + <fo:block> + Times Roman: + </fo:block> + <fo:block text-align="center" font-family="Times Roman"> + This is a simple fo text in Times Roman font. + </fo:block> - <fo:block> - ZapfDingbats: - </fo:block> - <fo:block text-align="center" font-family="ZapfDingbats"> - This is a simple fo text in ZapfDingBats font. - </fo:block> - - </fo:flow> - </fo:page-sequence> + <fo:block> + ZapfDingbats: + </fo:block> + <fo:block text-align="center" font-family="ZapfDingbats"> + This is a simple fo text in ZapfDingBats font. + </fo:block> + + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/font-size.fo b/test/xml/bugtests/font-size.fo index 1ba4bb14f..83e6ef388 100644 --- a/test/xml/bugtests/font-size.fo +++ b/test/xml/bugtests/font-size.fo @@ -1,53 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - This is a simple fo text in FOP default font size and default font. - </fo:block> + <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. + </fo:block> - <fo:block font-family="Courier" font-size="8pt"> - This is a simple fo text in 8pt font Courier. - </fo:block> - <fo:block font-family="Courier" font-size="10pt"> - This is a simple fo text in 10pt font. - </fo:block> - <fo:block font-family="Courier" font-size="12pt"> - This is a simple fo text in 12pt font. - </fo:block> - <fo:block font-family="Courier" font-size="14pt"> - This is a simple fo text in 14pt font. - </fo:block> - <fo:block font-family="Courier" font-size="16pt"> - This is a simple fo text in 16pt font. - </fo:block> - <fo:block font-family="Courier" font-size="18pt"> - This is a simple fo text in 18pt font. - </fo:block> - <fo:block font-family="Courier" font-size="20pt"> - This is a simple fo text in 20pt font. - </fo:block> - <fo:block font-family="Courier" font-size="24pt"> - This is a simple fo text in 24pt font. - </fo:block> - <fo:block font-family="Courier" font-size="32pt"> - This is a simple fo text in 32pt font. - </fo:block> - - </fo:flow> - </fo:page-sequence> + <fo:block font-family="Courier" font-size="8pt"> + This is a simple fo text in 8pt font Courier. + </fo:block> + <fo:block font-family="Courier" font-size="10pt"> + This is a simple fo text in 10pt font. + </fo:block> + <fo:block font-family="Courier" font-size="12pt"> + This is a simple fo text in 12pt font. + </fo:block> + <fo:block font-family="Courier" font-size="14pt"> + This is a simple fo text in 14pt font. + </fo:block> + <fo:block font-family="Courier" font-size="16pt"> + This is a simple fo text in 16pt font. + </fo:block> + <fo:block font-family="Courier" font-size="18pt"> + This is a simple fo text in 18pt font. + </fo:block> + <fo:block font-family="Courier" font-size="20pt"> + This is a simple fo text in 20pt font. + </fo:block> + <fo:block font-family="Courier" font-size="24pt"> + This is a simple fo text in 24pt font. + </fo:block> + <fo:block font-family="Courier" font-size="32pt"> + This is a simple fo text in 32pt font. + </fo:block> + + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/font.fo b/test/xml/bugtests/font.fo index d9ab2da4b..43f75a694 100644 --- a/test/xml/bugtests/font.fo +++ b/test/xml/bugtests/font.fo @@ -1,85 +1,85 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="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. - </fo:block> - <fo:block font-family="Courier" font-size="12pt" - font-weight="bold"> - This is a simple fo text in bold. - </fo:block> - <fo:block font-family="Courier" font-size="12pt" - font-style="italic"> - This is a simple fo text in italic. - </fo:block> - <fo:block font-family="Courier" font-size="12pt" - font-style="italic" font-weight="bold"> - This is a simple fo text in italic and bold. - </fo:block> - <fo:block font-family="Courier" font-size="12pt" - font-variant="small-caps"> - This is a simple fo text in small caps. - </fo:block> + <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. + </fo:block> + <fo:block font-family="Courier" font-size="12pt" + font-weight="bold"> + This is a simple fo text in bold. + </fo:block> + <fo:block font-family="Courier" font-size="12pt" + font-style="italic"> + This is a simple fo text in italic. + </fo:block> + <fo:block font-family="Courier" font-size="12pt" + font-style="italic" font-weight="bold"> + This is a simple fo text in italic and bold. + </fo:block> + <fo:block font-family="Courier" font-size="12pt" + font-variant="small-caps"> + This is a simple fo text in small caps. + </fo:block> - <fo:block space-before.optimum="1cm"></fo:block> - - <fo:block font-family="Times" font-size="12pt"> - This is a simple fo text in Times font. - </fo:block> - <fo:block font-family="Times" font-size="12pt" - font-weight="bold"> - This is a simple fo text in bold. - </fo:block> - <fo:block font-family="Times" font-size="12pt" - font-style="italic"> - This is a simple fo text in italic. - </fo:block> - <fo:block font-family="Times" font-size="12pt" - font-style="italic" font-weight="bold"> - This is a simple fo text in italic and bold. - </fo:block> - <fo:block font-family="Times" font-size="12pt" - font-variant="small-caps"> - This is a simple fo text in small caps. - </fo:block> + <fo:block space-before.optimum="1cm"></fo:block> + + <fo:block font-family="Times" font-size="12pt"> + This is a simple fo text in Times font. + </fo:block> + <fo:block font-family="Times" font-size="12pt" + font-weight="bold"> + This is a simple fo text in bold. + </fo:block> + <fo:block font-family="Times" font-size="12pt" + font-style="italic"> + This is a simple fo text in italic. + </fo:block> + <fo:block font-family="Times" font-size="12pt" + font-style="italic" font-weight="bold"> + This is a simple fo text in italic and bold. + </fo:block> + <fo:block font-family="Times" font-size="12pt" + font-variant="small-caps"> + This is a simple fo text in small caps. + </fo:block> - <fo:block space-before.optimum="1cm"></fo:block> + <fo:block space-before.optimum="1cm"></fo:block> - <fo:block font-family="Helvetica" font-size="12pt"> - This is a simple fo text in Helvetica font. - </fo:block> - <fo:block font-family="Helvetica" font-size="12pt" - font-weight="bold"> - This is a simple fo text in bold. - </fo:block> - <fo:block font-family="Helvetica" font-size="12pt" - font-style="italic"> - This is a simple fo text in italic. - </fo:block> - <fo:block font-family="Helvetica" font-size="12pt" - font-style="italic" font-weight="bold"> - This is a simple fo text in italic and bold. - </fo:block> - <fo:block font-family="Helvetica" font-size="12pt" - font-variant="small-caps"> - This is a simple fo text in small caps. - </fo:block> - - </fo:flow> - </fo:page-sequence> + <fo:block font-family="Helvetica" font-size="12pt"> + This is a simple fo text in Helvetica font. + </fo:block> + <fo:block font-family="Helvetica" font-size="12pt" + font-weight="bold"> + This is a simple fo text in bold. + </fo:block> + <fo:block font-family="Helvetica" font-size="12pt" + font-style="italic"> + This is a simple fo text in italic. + </fo:block> + <fo:block font-family="Helvetica" font-size="12pt" + font-style="italic" font-weight="bold"> + This is a simple fo text in italic and bold. + </fo:block> + <fo:block font-family="Helvetica" font-size="12pt" + font-variant="small-caps"> + This is a simple fo text in small caps. + </fo:block> + + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/header_footer.fo b/test/xml/bugtests/header_footer.fo index 22dc945e2..565830c97 100644 --- a/test/xml/bugtests/header_footer.fo +++ b/test/xml/bugtests/header_footer.fo @@ -1,137 +1,137 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="18cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="3cm"/> - <fo:region-body margin-top="4cm" margin-bottom="3cm"/> - <fo:region-after extent="3cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="18cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="3cm"/> + <fo:region-body margin-top="4cm" margin-bottom="3cm"/> + <fo:region-after extent="3cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <!-- header --> - <fo:static-content flow-name="xsl-region-before"> - <fo:block-container width="5cm" height="3cm" position="absolute" background-color="#22CC55"> - <fo:block text-align="start"> - Left - </fo:block> - </fo:block-container> - <fo:block-container width="5cm" height="3cm" left="5cm" position="absolute" background-color="#55AA55"> - <fo:block text-align="center"> - Center - </fo:block> - </fo:block-container> - <fo:block-container width="5cm" height="3cm" left="10cm" position="absolute" background-color="#FFCCFF"> - <fo:block text-align="end"> - Right - </fo:block> - </fo:block-container> - - </fo:static-content> - - <!-- footer --> - <fo:static-content flow-name="xsl-region-after"> - <fo:block-container width="5cm" height="3cm" position="absolute"> - <fo:block text-align="start"> - Left - </fo:block> - </fo:block-container> - <fo:block-container width="5cm" height="3cm" left="5cm" position="absolute"> - <fo:block text-align="center"> - Center - </fo:block> - </fo:block-container> - <fo:block-container width="5cm" height="3cm" left="10cm" position="absolute"> - <fo:block text-align="end"> - Right - </fo:block> - </fo:block-container> - - </fo:static-content> + <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"> + <fo:block text-align="start"> + Left + </fo:block> + </fo:block-container> + <fo:block-container width="5cm" height="3cm" left="5cm" position="absolute" background-color="#55AA55"> + <fo:block text-align="center"> + Center + </fo:block> + </fo:block-container> + <fo:block-container width="5cm" height="3cm" left="10cm" position="absolute" background-color="#FFCCFF"> + <fo:block text-align="end"> + Right + </fo:block> + </fo:block-container> + + </fo:static-content> + + <!-- footer --> + <fo:static-content flow-name="xsl-region-after"> + <fo:block-container width="5cm" height="3cm" position="absolute"> + <fo:block text-align="start"> + Left + </fo:block> + </fo:block-container> + <fo:block-container width="5cm" height="3cm" left="5cm" position="absolute"> + <fo:block text-align="center"> + Center + </fo:block> + </fo:block-container> + <fo:block-container width="5cm" height="3cm" left="10cm" position="absolute"> + <fo:block text-align="end"> + Right + </fo:block> + </fo:block-container> + + </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - There is top-margin for body region.This is bcos margin-top for body is greater than extent of region-before. - </fo:block> - <fo:block> - There is NO bottom-margin for body region. Bcos margin-bottom for body = extent for region-after. - </fo:block> - <fo:block> - </fo:block> - <fo:block> - The fo:static-content formatting object holds a sequence or a tree of formatting objects that is to be presented in a single region or repeated in like-named regions on one or more pages in the page-sequence. Its common use is for repeating or running headers and footers. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> - This content is repeated, in its entirety, on every page to which it is assigned. - </fo:block> - <fo:block> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + There is top-margin for body region.This is bcos margin-top for body is greater than extent of region-before. + </fo:block> + <fo:block> + There is NO bottom-margin for body region. Bcos margin-bottom for body = extent for region-after. + </fo:block> + <fo:block> + </fo:block> + <fo:block> + The fo:static-content formatting object holds a sequence or a tree of formatting objects that is to be presented in a single region or repeated in like-named regions on one or more pages in the page-sequence. Its common use is for repeating or running headers and footers. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> + This content is repeated, in its entirety, on every page to which it is assigned. + </fo:block> + <fo:block> The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content. - </fo:block> - <fo:block> + </fo:block> + <fo:block> The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content. - </fo:block> - <fo:block> + </fo:block> + <fo:block> The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content. - </fo:block> - <fo:block> + </fo:block> + <fo:block> The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content. - </fo:block> + </fo:block> - </fo:flow> + </fo:flow> - </fo:page-sequence> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/image.fo b/test/xml/bugtests/image.fo index 8c5b3c7c6..2e55738ce 100644 --- a/test/xml/bugtests/image.fo +++ b/test/xml/bugtests/image.fo @@ -1,43 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="10cm" - margin-top="3cm" - margin-bottom="2cm" - margin-left="3cm" - margin-right="2cm"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="10cm" + margin-top="3cm" + margin-bottom="2cm" + margin-left="3cm" + margin-right="2cm"> + <fo:region-body/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:external-graphic src="file:../graphics/page.gif"/> - </fo:block> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + <fo:external-graphic src="file:../graphics/page.gif"/> + </fo:block> - <fo:block> - <fo:external-graphic height="3in" width="3in" src="file:../graphics/page.gif"/> - height=3in width=3in - </fo:block> + <fo:block> + <fo:external-graphic height="3in" width="3in" src="file:../graphics/page.gif"/> + height=3in width=3in + </fo:block> - <fo:block> - <fo:external-graphic height="3in" src="file:../graphics/page.gif"/> - height="3in" - </fo:block> - - <fo:block> - <fo:external-graphic width="1.5in" src="file:../graphics/page.gif"/> - width="1.5in" - </fo:block> + <fo:block> + <fo:external-graphic height="3in" src="file:../graphics/page.gif"/> + height="3in" + </fo:block> + + <fo:block> + <fo:external-graphic width="1.5in" src="file:../graphics/page.gif"/> + width="1.5in" + </fo:block> - <fo:block> - <fo:external-graphic height="6in" width="4in" src="file:../graphics/page.gif"/> - height="6in" width="4in" - </fo:block> + <fo:block> + <fo:external-graphic height="6in" width="4in" src="file:../graphics/page.gif"/> + height="6in" width="4in" + </fo:block> - </fo:flow> - </fo:page-sequence> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/indent.fo b/test/xml/bugtests/indent.fo index e415f8115..3ec82e547 100644 --- a/test/xml/bugtests/indent.fo +++ b/test/xml/bugtests/indent.fo @@ -1,55 +1,55 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="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. - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - </fo:block> - <fo:block text-align="justify" end-indent="1in"> - This is a simple fo block with justify indented in the end. - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - </fo:block> - <fo:block start-indent="1in"> - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - This is a simple fo block indented in the start. - </fo:block> - <fo:block end-indent="1in"> - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - This is a simple fo block indented in the end. - </fo:block> - </fo:flow> - </fo:page-sequence> + <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. + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + </fo:block> + <fo:block text-align="justify" end-indent="1in"> + This is a simple fo block with justify indented in the end. + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + </fo:block> + <fo:block start-indent="1in"> + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + This is a simple fo block indented in the start. + </fo:block> + <fo:block end-indent="1in"> + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + This is a simple fo block indented in the end. + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/inline.fo b/test/xml/bugtests/inline.fo index 3b1e92150..f27cfd037 100644 --- a/test/xml/bugtests/inline.fo +++ b/test/xml/bugtests/inline.fo @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:inline>The sentence is</fo:inline> - <fo:inline>in the same line.</fo:inline> - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + <fo:inline>The sentence is</fo:inline> + <fo:inline>in the same line.</fo:inline> + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/keep-with-next.fo b/test/xml/bugtests/keep-with-next.fo index b17d0ed76..90ca40e52 100644 --- a/test/xml/bugtests/keep-with-next.fo +++ b/test/xml/bugtests/keep-with-next.fo @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="11in" - page-width="8.5in" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1in" - margin-right="0.75in"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="11in" + page-width="8.5in" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1in" + margin-right="0.75in"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="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"> + <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 $ ---------------------------------- L A B O U R TIME BASIS 10 WU = 1 HR @@ -32,8 +32,8 @@ R E P A I R C O S T S....................................... 1 466.70 ---------------------- C O M M E N T S : -E-PART PRICES = MANUFACTURERS RRP. *-POSITION = USER SUPPLIED DATA -E-PART NUMBER IS NOT ORDER NUMBER NN = NO MANUFACTURERS CODE EXISTS +E-PART PRICES = MANUFACTURERS RRP. *-POSITION = USER SUPPLIED DATA +E-PART NUMBER IS NOT ORDER NUMBER NN = NO MANUFACTURERS CODE EXISTS SKEZAX=WORKING UNITS AS PER AUDATEX )=WU PARTIAL INCL IN OTHER POSITIONS C O N T R O L - I N F O R M A T I O N NO 666 25.08.2000 OWNER MRS SARAH @@ -54,14 +54,14 @@ MO-CODE - MODEL-OPTIONS : E3 F3 I4 I7 J6 K2 M8 P8 Q6 Q7 V3 V6 W4 Z8 PARTS / PAINTING - REP-METHOD/CODE-NO : N 0741 LO - </fo:block> - - <fo:block keep-with-next="true" font-family="Helvetica" font-size="10pt"> - The following is the control page for the Repair Assessment. It includes the - <fo:inline font-weight="bold">Owner</fo:inline><fo:inline>, Reference No, Make, Reg No, and Options.</fo:inline> - </fo:block> + </fo:block> + + <fo:block keep-with-next="true" font-family="Helvetica" font-size="10pt"> + The following is the control page for the Repair Assessment. It includes the + <fo:inline font-weight="bold">Owner</fo:inline><fo:inline>, Reference No, Make, Reg No, and Options.</fo:inline> + </fo:block> - <fo:block space-before.optimum="2cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap"> + <fo:block space-before.optimum="2cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap"> R E P A I R /-/ A S S E S S M E N T NO 666 25.08.2000 OWNER MRS SARAH SCHAER GUNDELDINGERSTRASSE 131 @@ -82,7 +82,7 @@ OPTIONS FROM VIN X_200001 LUGGAGE NET ELECTRIC FRONT SEATS ALTERNATOR 120 AMP 4-SPEED AUTOMATIC SPORTS SUSPENSION ANTI-LOCK BRAKES ELECT STABILITY PROG SUNROOF (ACCESSORY) 2.7 LTR V6 - </fo:block> - </fo:flow> - </fo:page-sequence> + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/leader.fo b/test/xml/bugtests/leader.fo index b7507e999..6a08d3aff 100644 --- a/test/xml/bugtests/leader.fo +++ b/test/xml/bugtests/leader.fo @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader> - </fo:block> - </fo:flow> - </fo:page-sequence> + <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> + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/letter-spacing.fo b/test/xml/bugtests/letter-spacing.fo index f871ee758..145fd608c 100644 --- a/test/xml/bugtests/letter-spacing.fo +++ b/test/xml/bugtests/letter-spacing.fo @@ -1,59 +1,59 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block letter-spacing="normal"> - This text is normally spaced. - This text is normally spaced. - This text is normally spaced. - This text is normally spaced. - This text is normally spaced. - </fo:block> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block letter-spacing="normal"> + This text is normally spaced. + This text is normally spaced. + This text is normally spaced. + This text is normally spaced. + This text is normally spaced. + </fo:block> - <fo:block letter-spacing="1pt"> - This text has inter-character intervals increased by 1pt. - This text has inter-character intervals increased by 1pt. - This text has inter-character intervals increased by 1pt. - This text has inter-character intervals increased by 1pt. - </fo:block> + <fo:block letter-spacing="1pt"> + This text has inter-character intervals increased by 1pt. + This text has inter-character intervals increased by 1pt. + This text has inter-character intervals increased by 1pt. + This text has inter-character intervals increased by 1pt. + </fo:block> - <fo:block letter-spacing="8pt"> - This text has inter-character intervals increased by 8pt. - This text has inter-character intervals increased by 8pt. - This text has inter-character intervals increased by 8pt. - This text has inter-character intervals increased by 8pt. - </fo:block> + <fo:block letter-spacing="8pt"> + This text has inter-character intervals increased by 8pt. + This text has inter-character intervals increased by 8pt. + This text has inter-character intervals increased by 8pt. + This text has inter-character intervals increased by 8pt. + </fo:block> - <fo:block letter-spacing="0pt"> - This text has inter-character intervals increased by 0pt (i.e. normally spaced). - This text has inter-character intervals increased by 0pt (i.e. normally spaced). - This text has inter-character intervals increased by 0pt (i.e. normally spaced). - This text has inter-character intervals increased by 0pt (i.e. normally spaced). - </fo:block> + <fo:block letter-spacing="0pt"> + This text has inter-character intervals increased by 0pt (i.e. normally spaced). + This text has inter-character intervals increased by 0pt (i.e. normally spaced). + This text has inter-character intervals increased by 0pt (i.e. normally spaced). + This text has inter-character intervals increased by 0pt (i.e. normally spaced). + </fo:block> - <fo:block letter-spacing="-1pt"> - This text has inter-character intervals increased by reduced by -1pt. - This text has inter-character intervals increased by reduced by -1pt. - This text has inter-character intervals increased by reduced by -1pt. - This text has inter-character intervals increased by reduced by -1pt. - </fo:block> + <fo:block letter-spacing="-1pt"> + This text has inter-character intervals increased by reduced by -1pt. + This text has inter-character intervals increased by reduced by -1pt. + This text has inter-character intervals increased by reduced by -1pt. + This text has inter-character intervals increased by reduced by -1pt. + </fo:block> - </fo:flow> - </fo:page-sequence> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/line-height.fo b/test/xml/bugtests/line-height.fo index eeb29bc04..200ee6a32 100644 --- a/test/xml/bugtests/line-height.fo +++ b/test/xml/bugtests/line-height.fo @@ -1,108 +1,108 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block font-weight="bold" text-align="center"> - <fo:inline text-decoration="underline"> - Absolute Values - </fo:inline> - </fo:block> + <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"> + Absolute Values + </fo:inline> + </fo:block> - <fo:block line-height="12pt" font-size="8pt"> - This text has a fixed line height of 12pt and its font size is 8pt. - This text has a fixed line height of 12pt and its font size is 8pt. - This text has a fixed line height of 12pt and its font size is 8pt. - This text has a fixed line height of 12pt and its font size is 8pt. - This text has a fixed line height of 12pt and its font size is 8pt. - </fo:block> + <fo:block line-height="12pt" font-size="8pt"> + This text has a fixed line height of 12pt and its font size is 8pt. + This text has a fixed line height of 12pt and its font size is 8pt. + This text has a fixed line height of 12pt and its font size is 8pt. + This text has a fixed line height of 12pt and its font size is 8pt. + This text has a fixed line height of 12pt and its font size is 8pt. + </fo:block> - <fo:block text-align="start" space-before.optimum="6pt" line-height="12pt" font-size="12pt"> - This text has a fixed line height of 12pt and its font size is 12pt. - This text has a fixed line height of 12pt and its font size is 12pt. - This text has a fixed line height of 12pt and its font size is 12pt. - This text has a fixed line height of 12pt and its font size is 12pt. - This text has a fixed line height of 12pt and its font size is 12pt. - </fo:block> + <fo:block text-align="start" space-before.optimum="6pt" line-height="12pt" font-size="12pt"> + This text has a fixed line height of 12pt and its font size is 12pt. + This text has a fixed line height of 12pt and its font size is 12pt. + This text has a fixed line height of 12pt and its font size is 12pt. + This text has a fixed line height of 12pt and its font size is 12pt. + This text has a fixed line height of 12pt and its font size is 12pt. + </fo:block> - <fo:block text-align="start" space-before.optimum="6pt" line-height="12pt" font-size="16pt"> - This text has a fixed line height of 12pt and its font size is 16pt. - This text has a fixed line height of 12pt and its font size is 16pt. - This text has a fixed line height of 12pt and its font size is 16pt. - This text has a fixed line height of 12pt and its font size is 16pt. - This text has a fixed line height of 12pt and its font size is 16pt. - </fo:block> + <fo:block text-align="start" space-before.optimum="6pt" line-height="12pt" font-size="16pt"> + This text has a fixed line height of 12pt and its font size is 16pt. + This text has a fixed line height of 12pt and its font size is 16pt. + This text has a fixed line height of 12pt and its font size is 16pt. + This text has a fixed line height of 12pt and its font size is 16pt. + This text has a fixed line height of 12pt and its font size is 16pt. + </fo:block> - <fo:block font-weight="bold" text-align="center"> - <fo:inline text-decoration="underline"> - Relative Values - </fo:inline> - </fo:block> + <fo:block font-weight="bold" text-align="center"> + <fo:inline text-decoration="underline"> + Relative Values + </fo:inline> + </fo:block> - <fo:block text-align="start" space-before.optimum="6pt" line-height="normal" font-size="10pt"> - This text has a normal line height at font size of 10pt. - This text has a normal line height at font size of 10pt. - This text has a normal line height at font size of 10pt. - This text has a normal line height at font size of 10pt. - This text has a normal line height at font size of 10pt. - </fo:block> + <fo:block text-align="start" space-before.optimum="6pt" line-height="normal" font-size="10pt"> + This text has a normal line height at font size of 10pt. + This text has a normal line height at font size of 10pt. + This text has a normal line height at font size of 10pt. + This text has a normal line height at font size of 10pt. + This text has a normal line height at font size of 10pt. + </fo:block> - <fo:block text-align="start" space-before.optimum="6pt" line-height="normal" font-size="14pt"> - This text has a normal line height at font size of 14pt. - This text has a normal line height at font size of 14pt. - This text has a normal line height at font size of 14pt. - This text has a normal line height at font size of 14pt. - This text has a normal line height at font size of 14pt. - </fo:block> + <fo:block text-align="start" space-before.optimum="6pt" line-height="normal" font-size="14pt"> + This text has a normal line height at font size of 14pt. + This text has a normal line height at font size of 14pt. + This text has a normal line height at font size of 14pt. + This text has a normal line height at font size of 14pt. + This text has a normal line height at font size of 14pt. + </fo:block> - <fo:block text-align="start" space-before.optimum="6pt" line-height="1.0" font-size="10pt"> - This text is single-spaced at font size of 10pt. - This text is single-spaced at font size of 10pt. - This text is single-spaced at font size of 10pt. - This text is single-spaced at font size of 10pt. - This text is single-spaced at font size of 10pt. - </fo:block> + <fo:block text-align="start" space-before.optimum="6pt" line-height="1.0" font-size="10pt"> + This text is single-spaced at font size of 10pt. + This text is single-spaced at font size of 10pt. + This text is single-spaced at font size of 10pt. + This text is single-spaced at font size of 10pt. + This text is single-spaced at font size of 10pt. + </fo:block> - <fo:block text-align="start" space-before.optimum="6pt" line-height="1.0" font-size="14pt"> - This text is single-spaced at font size of 14pt. - This text is single-spaced at font size of 14pt. - This text is single-spaced at font size of 14pt. - This text is single-spaced at font size of 14pt. - This text is single-spaced at font size of 14pt. - </fo:block> + <fo:block text-align="start" space-before.optimum="6pt" line-height="1.0" font-size="14pt"> + This text is single-spaced at font size of 14pt. + This text is single-spaced at font size of 14pt. + This text is single-spaced at font size of 14pt. + This text is single-spaced at font size of 14pt. + This text is single-spaced at font size of 14pt. + </fo:block> - <fo:block text-align="start" space-before.optimum="6pt" line-height="2.0" font-size="10pt"> - This text is double-spaced at font size of 10pt. - This text is double-spaced at font size of 10pt. - This text is double-spaced at font size of 10pt. - This text is double-spaced at font size of 10pt. - This text is double-spaced at font size of 10pt. - </fo:block> + <fo:block text-align="start" space-before.optimum="6pt" line-height="2.0" font-size="10pt"> + This text is double-spaced at font size of 10pt. + This text is double-spaced at font size of 10pt. + This text is double-spaced at font size of 10pt. + This text is double-spaced at font size of 10pt. + This text is double-spaced at font size of 10pt. + </fo:block> - <fo:block text-align="start" space-before.optimum="6pt" line-height="2.0" font-size="14pt"> - This text is double-spaced at font size of 14pt. - This text is double-spaced at font size of 14pt. - This text is double-spaced at font size of 14pt. - This text is double-spaced at font size of 14pt. - This text is double-spaced at font size of 14pt. - </fo:block> + <fo:block text-align="start" space-before.optimum="6pt" line-height="2.0" font-size="14pt"> + This text is double-spaced at font size of 14pt. + This text is double-spaced at font size of 14pt. + This text is double-spaced at font size of 14pt. + This text is double-spaced at font size of 14pt. + This text is double-spaced at font size of 14pt. + </fo:block> - </fo:flow> - </fo:page-sequence> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/list-mountjoy.fo b/test/xml/bugtests/list-mountjoy.fo index 6ee1fa5ae..752034aaa 100644 --- a/test/xml/bugtests/list-mountjoy.fo +++ b/test/xml/bugtests/list-mountjoy.fo @@ -16,7 +16,7 @@ </fo:layout-master-set> <!-- starts actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <!-- Inserts a header with the page number --> <fo:static-content flow-name="xsl-region-before"> diff --git a/test/xml/bugtests/list-nested-breaks.fo b/test/xml/bugtests/list-nested-breaks.fo index 1e7742d89..c2ec3a7e8 100644 --- a/test/xml/bugtests/list-nested-breaks.fo +++ b/test/xml/bugtests/list-nested-breaks.fo @@ -16,7 +16,7 @@ </fo:layout-master-set> <!-- starts actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <!-- Inserts a header with the page number --> <fo:static-content flow-name="xsl-region-before"> diff --git a/test/xml/bugtests/list-nested.fo b/test/xml/bugtests/list-nested.fo index c7f5c7057..1c3768d2c 100644 --- a/test/xml/bugtests/list-nested.fo +++ b/test/xml/bugtests/list-nested.fo @@ -16,7 +16,7 @@ </fo:layout-master-set> <!-- starts actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <!-- Inserts a header with the page number --> <fo:static-content flow-name="xsl-region-before"> diff --git a/test/xml/bugtests/padding.fo b/test/xml/bugtests/padding.fo index 8475a5306..487734da2 100644 --- a/test/xml/bugtests/padding.fo +++ b/test/xml/bugtests/padding.fo @@ -1,88 +1,88 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> - <fo:block font-size="18pt" - font-family="sans-serif" - line-height="24pt" - space-after.optimum="15pt" - background-color="blue" - color="white" - padding-top="6pt"> - Extensible Markup Language (XML) 1.0 with padding - </fo:block> + <fo:block font-size="18pt" + font-family="sans-serif" + line-height="24pt" + space-after.optimum="15pt" + background-color="blue" + color="white" + padding-top="6pt"> + Extensible Markup Language (XML) 1.0 with padding + </fo:block> - <fo:block font-size="18pt" - font-family="sans-serif" - line-height="24pt" - space-after.optimum="15pt" - background-color="blue" - color="white"> - Extensible Markup Language (XML) 1.0 without padding - </fo:block> - - <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-top="1cm"> - <fo:block> - This block-container has a top padding of 1 cm. - </fo:block> - </fo:block-container> + <fo:block font-size="18pt" + font-family="sans-serif" + line-height="24pt" + space-after.optimum="15pt" + background-color="blue" + color="white"> + Extensible Markup Language (XML) 1.0 without padding + </fo:block> + + <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-top="1cm"> + <fo:block> + This block-container has a top padding of 1 cm. + </fo:block> + </fo:block-container> - <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-bottom="1cm"> - <fo:block> - bottom padding of 1 cm. - </fo:block> - </fo:block-container> + <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-bottom="1cm"> + <fo:block> + bottom padding of 1 cm. + </fo:block> + </fo:block-container> - <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-left="1cm"> - <fo:block> - left padding of 1 cm. - </fo:block> - </fo:block-container> + <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-left="1cm"> + <fo:block> + left padding of 1 cm. + </fo:block> + </fo:block-container> - <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-right="1cm"> - <fo:block> - right padding of 1 cm. - </fo:block> - </fo:block-container> - - <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-before="1cm"> - <fo:block> - This block-container has a before padding of 1 cm. - </fo:block> - </fo:block-container> + <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-right="1cm"> + <fo:block> + right padding of 1 cm. + </fo:block> + </fo:block-container> + + <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-before="1cm"> + <fo:block> + This block-container has a before padding of 1 cm. + </fo:block> + </fo:block-container> - <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-after="1cm"> - <fo:block> - after padding of 1 cm. - </fo:block> - </fo:block-container> + <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-after="1cm"> + <fo:block> + after padding of 1 cm. + </fo:block> + </fo:block-container> - <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-start="1cm"> - <fo:block> - start padding of 1 cm. - </fo:block> - </fo:block-container> + <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-start="1cm"> + <fo:block> + start padding of 1 cm. + </fo:block> + </fo:block-container> - <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-end="1cm"> - <fo:block> - end padding of 1 cm. - </fo:block> - </fo:block-container> - </fo:flow> - </fo:page-sequence> + <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-end="1cm"> + <fo:block> + end padding of 1 cm. + </fo:block> + </fo:block-container> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/page-number.fo b/test/xml/bugtests/page-number.fo index 13fb110b9..7adb5f1db 100644 --- a/test/xml/bugtests/page-number.fo +++ b/test/xml/bugtests/page-number.fo @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - This is Page Number <fo:page-number/>. - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + This is Page Number <fo:page-number/>. + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/rule.fo b/test/xml/bugtests/rule.fo index c0a3032d6..15b5da8db 100644 --- a/test/xml/bugtests/rule.fo +++ b/test/xml/bugtests/rule.fo @@ -1,85 +1,85 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block space-before.optimum="1cm"> - leader-pattern="rule" rule-style="solid" rule-thickness="0.5pt" - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="0.5pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="1pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="3pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="3mm"></fo:leader> - </fo:block> + <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" + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="0.5pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="1pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="3pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="3mm"></fo:leader> + </fo:block> - <fo:block space-before.optimum="1cm"> - leader-pattern="rule" rule-style="dotted" rule-thickness="0.5pt" - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="0.5pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="1pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="3pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="5mm"></fo:leader> - </fo:block> + <fo:block space-before.optimum="1cm"> + leader-pattern="rule" rule-style="dotted" rule-thickness="0.5pt" + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="0.5pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="1pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="3pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="5mm"></fo:leader> + </fo:block> - <fo:block space-before.optimum="1cm"> - leader-pattern="rule" rule-dashed="dotted" rule-thickness="0.5pt" - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="0.5pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="1pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="3pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="1mm"></fo:leader> - </fo:block> + <fo:block space-before.optimum="1cm"> + leader-pattern="rule" rule-dashed="dotted" rule-thickness="0.5pt" + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="0.5pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="1pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="3pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="1mm"></fo:leader> + </fo:block> - <fo:block space-before.optimum="1cm"> - leader-pattern="rule" rule-style="double" rule-thickness="0.5pt" - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="0.5pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="1pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="3pt"></fo:leader> - </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="1mm"></fo:leader> - </fo:block> + <fo:block space-before.optimum="1cm"> + leader-pattern="rule" rule-style="double" rule-thickness="0.5pt" + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="0.5pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="1pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="3pt"></fo:leader> + </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="1mm"></fo:leader> + </fo:block> - </fo:flow> - </fo:page-sequence> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/simple-link.fo b/test/xml/bugtests/simple-link.fo index 75f22ee59..b27b00334 100644 --- a/test/xml/bugtests/simple-link.fo +++ b/test/xml/bugtests/simple-link.fo @@ -1,29 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block text-align="start"> - <fo:basic-link external-destination="font.pdf">Link to font.pdf</fo:basic-link> - </fo:block> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block text-align="start"> + <fo:basic-link external-destination="font.pdf">Link to font.pdf</fo:basic-link> + </fo:block> - <fo:block text-align="start"> - <fo:basic-link external-destination="http://www.wilco-int.com">Link to Wilco International</fo:basic-link> - </fo:block> + <fo:block text-align="start"> + <fo:basic-link external-destination="http://www.wilco-int.com">Link to Wilco International</fo:basic-link> + </fo:block> - </fo:flow> - </fo:page-sequence> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/space-treatment.fo b/test/xml/bugtests/space-treatment.fo index 29cf8e2df..dc66e519e 100644 --- a/test/xml/bugtests/space-treatment.fo +++ b/test/xml/bugtests/space-treatment.fo @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="11in" - page-width="8.5in" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1in" - margin-right="0.75in"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="11in" + page-width="8.5in" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1in" + margin-right="0.75in"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="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.) - </fo:block> + <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.) + </fo:block> - <fo:block space-before.optimum="1cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap"> + <fo:block space-before.optimum="1cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap"> OWNER MR DHARAMVEER SALECHA @@ -33,7 +33,7 @@ OPTIONS FROM VIN X_200001 LUGGAGE NET ELECTRIC FRONT SEATS ALTERNATOR 120 AMP 4-SPEED AUTOMATIC SPORTS SUSPENSION ANTI-LOCK BRAKES ELECT STABILITY PROG SUNROOF (ACCESSORY) 2.7 LTR V6 - </fo:block> - </fo:flow> - </fo:page-sequence> + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/space.fo b/test/xml/bugtests/space.fo index f95567595..d31c9af28 100644 --- a/test/xml/bugtests/space.fo +++ b/test/xml/bugtests/space.fo @@ -1,67 +1,67 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block space-after.optimum="1cm"> - space-after.optimum="1cm" - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - </fo:block> - <fo:block> - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - </fo:block> - <fo:block space-before.optimum="1cm" space-after.optimum="1cm"> - space-before.optimum="1cm" space-after.optimum="1cm" - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - </fo:block> - <fo:block space-before.optimum="1cm" space-after.optimum="1cm"> - space-before.optimum="1cm" space-after.optimum="1cm" - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - </fo:block> - <fo:block> - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - </fo:block> - <fo:block space-before.optimum="1cm"> - space-before.optimum="1cm" - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - </fo:block> - <fo:block> - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - This is a simple fo block. - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block space-after.optimum="1cm"> + space-after.optimum="1cm" + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + </fo:block> + <fo:block> + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + </fo:block> + <fo:block space-before.optimum="1cm" space-after.optimum="1cm"> + space-before.optimum="1cm" space-after.optimum="1cm" + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + </fo:block> + <fo:block space-before.optimum="1cm" space-after.optimum="1cm"> + space-before.optimum="1cm" space-after.optimum="1cm" + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + </fo:block> + <fo:block> + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + </fo:block> + <fo:block space-before.optimum="1cm"> + space-before.optimum="1cm" + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + </fo:block> + <fo:block> + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + This is a simple fo block. + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/text-align.fo b/test/xml/bugtests/text-align.fo index 7efcf621a..451c0e6f2 100644 --- a/test/xml/bugtests/text-align.fo +++ b/test/xml/bugtests/text-align.fo @@ -1,42 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - This is a simple fo block. - </fo:block> - <fo:block space-before.optimum="1cm" text-align="start"> - This is a simple fo block with text aligned to start. - dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf - dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf - dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf - </fo:block> - <fo:block space-before.optimum="1cm" text-align="justify"> - This is a simple fo block with text justified. - dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf - dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf - dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf - </fo:block> - <fo:block space-before.optimum="1cm" text-align="end"> - This is a simple fo block with text aligned to end. - dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf - dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf - dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + This is a simple fo block. + </fo:block> + <fo:block space-before.optimum="1cm" text-align="start"> + This is a simple fo block with text aligned to start. + dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf + dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf + dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf + </fo:block> + <fo:block space-before.optimum="1cm" text-align="justify"> + This is a simple fo block with text justified. + dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf + dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf + dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf + </fo:block> + <fo:block space-before.optimum="1cm" text-align="end"> + This is a simple fo block with text aligned to end. + dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf + dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf + dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/text-decoration.fo b/test/xml/bugtests/text-decoration.fo index 29668f2b6..bcee852b2 100644 --- a/test/xml/bugtests/text-decoration.fo +++ b/test/xml/bugtests/text-decoration.fo @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - This is a simple fo text. - <fo:inline text-decoration="underline"> - This is a simple fo text and underlined. - </fo:inline> - <fo:inline text-decoration="line-through"> - This is a simple fo text and line-through. - </fo:inline> - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + This is a simple fo text. + <fo:inline text-decoration="underline"> + This is a simple fo text and underlined. + </fo:inline> + <fo:inline text-decoration="line-through"> + This is a simple fo text and line-through. + </fo:inline> + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/text-indent.fo b/test/xml/bugtests/text-indent.fo index 3b8147cc6..43ed88462 100644 --- a/test/xml/bugtests/text-indent.fo +++ b/test/xml/bugtests/text-indent.fo @@ -1,36 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="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. - The first line has an indent of 1 inch from the left. - - This text is formatted into a left-justified paragraph. - The first line has an indent of 1 inch from the left. - </fo:block> + <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. + The first line has an indent of 1 inch from the left. + + This text is formatted into a left-justified paragraph. + The first line has an indent of 1 inch from the left. + </fo:block> - <fo:block space-before.optimum="6pt" text-indent="40%"> - This text is formatted into a left-justified paragraph. - The first line has an indent of 30% from the left. - - This text is formatted into a left-justified paragraph. - The first line has an indent of 30% inch from the left. - </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:block space-before.optimum="6pt" text-indent="40%"> + This text is formatted into a left-justified paragraph. + The first line has an indent of 30% from the left. + + This text is formatted into a left-justified paragraph. + The first line has an indent of 30% inch from the left. + </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/word-spacing.fo b/test/xml/bugtests/word-spacing.fo index 09c65dd84..7215f8e3b 100644 --- a/test/xml/bugtests/word-spacing.fo +++ b/test/xml/bugtests/word-spacing.fo @@ -1,50 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> - <fo:page-sequence master-name="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> - <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline> - <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline> - <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline> - <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline> - </fo:block> + <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> + <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline> + <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline> + <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline> + <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline> + </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> - <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> - <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> - <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> - <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> - </fo:block> - - <fo:block space-before.optimum="1cm"> - <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> - <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> - <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> - <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> - <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> - </fo:block> + <fo:block space-before.optimum="1cm"> + <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> + <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> + <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> + <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> + <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline> + </fo:block> + + <fo:block space-before.optimum="1cm"> + <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> + <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> + <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> + <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> + <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline> + </fo:block> - <fo:block space-before.optimum="1cm"> - <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> </fo:block> - </fo:flow> - </fo:page-sequence> + <fo:block space-before.optimum="1cm"> + <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> </fo:block> + </fo:flow> + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/wrap.fo b/test/xml/bugtests/wrap.fo index c1e4b6272..a67a78063 100644 --- a/test/xml/bugtests/wrap.fo +++ b/test/xml/bugtests/wrap.fo @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="simplePM" - page-height="25cm" - page-width="20cm" - margin-top="1cm" - margin-bottom="1cm" - margin-left="1.5cm" - margin-right="1.5cm"> - <fo:region-before extent="2.5cm"/> - <fo:region-body margin-top="3cm" margin-bottom="3cm"/> - <fo:region-after extent="2.5cm"/> - </fo:simple-page-master> + <fo:layout-master-set> + <fo:simple-page-master master-name="simplePM" + page-height="25cm" + page-width="20cm" + margin-top="1cm" + margin-bottom="1cm" + margin-left="1.5cm" + margin-right="1.5cm"> + <fo:region-before extent="2.5cm"/> + <fo:region-body margin-top="3cm" margin-bottom="3cm"/> + <fo:region-after extent="2.5cm"/> + </fo:simple-page-master> <fo:simple-page-master master-name="no-overflow" page-height="25cm" page-width="20cm" @@ -23,28 +23,28 @@ <fo:region-body overflow="hidden" margin-top="3cm" margin-bottom="3cm"/> <fo:region-after extent="2.5cm"/> </fo:simple-page-master> - </fo:layout-master-set> + </fo:layout-master-set> - <fo:page-sequence master-name="simplePM"> - <fo:flow flow-name="xsl-region-body"> + <fo:page-sequence master-reference="simplePM"> + <fo:flow flow-name="xsl-region-body"> <fo:block> This test is to check a number of different possibilities when dealing with text being wrapped at the end of an area. </fo:block> - <fo:block wrap-option="no-wrap"> - <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> - <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> - <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> - <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> - - <fo:block space-before.optimum="1cm" wrap-option="wrap"> - <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> - <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> - <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> - </fo:block> - This is simple fo block.This is simple fo block.This is simple fo block.This is simple fo block. - This is simple fo block.This is simple fo block.This is simple fo block.This is simple fo block. - </fo:block> + <fo:block wrap-option="no-wrap"> + <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> + <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> + <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> + <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> + + <fo:block space-before.optimum="1cm" wrap-option="wrap"> + <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> + <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> + <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> + </fo:block> + This is simple fo block.This is simple fo block.This is simple fo block.This is simple fo block. + This is simple fo block.This is simple fo block.This is simple fo block.This is simple fo block. + </fo:block> <fo:block space-before.optimum="10pt"> Some examples in a table. </fo:block> @@ -118,9 +118,9 @@ words with hypenation the activated when not doing lots of wrapping </fo:table-row> </fo:table-body> </fo:table> - </fo:flow> - </fo:page-sequence> - <fo:page-sequence master-name="no-overflow"> + </fo:flow> + </fo:page-sequence> + <fo:page-sequence master-reference="no-overflow"> <fo:flow flow-name="xsl-region-body"> <fo:block wrap-option="no-wrap"> <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline> diff --git a/test/xsl/doc.xsl b/test/xsl/doc.xsl index 71a2cc434..44924865b 100644 --- a/test/xsl/doc.xsl +++ b/test/xsl/doc.xsl @@ -1,35 +1,35 @@ <?xml version="1.0"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <xsl:output method="xml" indent="yes"/> - <xsl:template match="test"> - <fo:root> - <fo:layout-master-set> - <fo:simple-page-master master-name="one" page-height="29.7cm" page-width="21cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="1.5cm" margin-right="1.5cm"> - <fo:region-before extent="1.5cm"/> - <fo:region-body margin-top="1.5cm" margin-bottom="2cm"/> - <fo:region-after extent="1.5cm"/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-name="one"> - <fo:flow font-size="10pt" line-height="10pt" flow-name="xsl-region-body"> - <xsl:apply-templates select="data"/> - </fo:flow> - </fo:page-sequence> - </fo:root> - </xsl:template> + <xsl:output method="xml" indent="yes"/> + <xsl:template match="test"> + <fo:root> + <fo:layout-master-set> + <fo:simple-page-master master-name="one" page-height="29.7cm" page-width="21cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="1.5cm" margin-right="1.5cm"> + <fo:region-before extent="1.5cm"/> + <fo:region-body margin-top="1.5cm" margin-bottom="2cm"/> + <fo:region-after extent="1.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> + <fo:page-sequence master-reference="one"> + <fo:flow font-size="10pt" line-height="10pt" flow-name="xsl-region-body"> + <xsl:apply-templates select="data"/> + </fo:flow> + </fo:page-sequence> + </fo:root> + </xsl:template> - <xsl:template match="data"> - <xsl:apply-templates/> - </xsl:template> + <xsl:template match="data"> + <xsl:apply-templates/> + </xsl:template> <!-- note: this causes any node not otherwise defined to be copied --> - <xsl:template match="@*|node()"> - <xsl:copy> - <xsl:apply-templates select="@*|node()"/> - </xsl:copy> - </xsl:template> + <xsl:template match="@*|node()"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> - <xsl:template match="title"> - <xsl:apply-templates/> - </xsl:template> + <xsl:template match="title"> + <xsl:apply-templates/> + </xsl:template> </xsl:stylesheet> |