diff options
| author | William Victor Mote <vmote@apache.org> | 2002-11-29 20:42:35 +0000 |
|---|---|---|
| committer | William Victor Mote <vmote@apache.org> | 2002-11-29 20:42:35 +0000 |
| commit | 728652fb0a5c1c1feba55af0c0231978c6d5a171 (patch) | |
| tree | 08925175e93aba8c008832b5f3851b97c3817c24 /test/xml/bugtests | |
| parent | 273947ee0d25e5190e3196ded6a71cc401a7e208 (diff) | |
| download | xmlgraphics-fop-728652fb0a5c1c1feba55af0c0231978c6d5a171.tar.gz xmlgraphics-fop-728652fb0a5c1c1feba55af0c0231978c6d5a171.zip | |
white-space and line-ending cleanup
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195675 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/xml/bugtests')
34 files changed, 1612 insertions, 1612 deletions
diff --git a/test/xml/bugtests/background_color.fo b/test/xml/bugtests/background_color.fo index c65e3bbbf..c18109794 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-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: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 01eb73efa..e8aca5b02 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-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: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 7ce79cf5b..8ed2485ea 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-reference="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 f4dd8240f..a3443bf8a 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-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: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 d47f15860..b4a800577 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-reference="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 eebb5e4a6..901468f40 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-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: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 6fd9178fe..7d5ca565b 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-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> + <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 bcd0db6cc..2e3eb6112 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-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: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 34229b9a0..f359fb5a5 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-reference="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 3837d1006..5269c7a29 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-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: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 5395cf0f3..b0516a4bc 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-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: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 8f0e4dd6a..5a29b22d3 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-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: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 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 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 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:root> diff --git a/test/xml/bugtests/header_footer.fo b/test/xml/bugtests/header_footer.fo index 3d3eb870f..df3d030b3 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-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: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: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> -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> -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> -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:static-content> - </fo:flow> - - </fo:page-sequence> + <!-- 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> +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> +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> +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> +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:flow> + + </fo:page-sequence> </fo:root> diff --git a/test/xml/bugtests/image.fo b/test/xml/bugtests/image.fo index 287b7d35e..cc9270056 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-reference="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 height="6in" width="4in" src="file:../graphics/page.gif"/> - height="6in" width="4in" - </fo:block> + <fo:block> + <fo:external-graphic width="1.5in" src="file:../graphics/page.gif"/> + width="1.5in" + </fo:block> - </fo:flow> - </fo:page-sequence> + <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:root> diff --git a/test/xml/bugtests/indent.fo b/test/xml/bugtests/indent.fo index 13d051035..31f6eb251 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-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: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 ecf72bead..6e2f48e5e 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-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: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 f2a8df010..d6f43d432 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-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"> + <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 space-before.optimum="2cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap"> + <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"> 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 b019611d1..b7cce9e2b 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-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: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 aea150337..31ddf5bc9 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: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="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="-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: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-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="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="-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:root> diff --git a/test/xml/bugtests/line-height.fo b/test/xml/bugtests/line-height.fo index 1d1e2a35b..267bec7c1 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-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: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:flow> - </fo:page-sequence> + <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:root> diff --git a/test/xml/bugtests/list-mountjoy.fo b/test/xml/bugtests/list-mountjoy.fo index 752034aaa..c2b8a6eb9 100644 --- a/test/xml/bugtests/list-mountjoy.fo +++ b/test/xml/bugtests/list-mountjoy.fo @@ -3,11 +3,11 @@ <!-- defines the layout master --> <fo:layout-master-set> - <fo:simple-page-master master-name="first" - page-height="29.7cm" page-width="21cm" - margin-top="1cm" - margin-bottom="2cm" - margin-left="2.5cm" + <fo:simple-page-master master-name="first" + page-height="29.7cm" page-width="21cm" + margin-top="1cm" + margin-bottom="2cm" + margin-left="2.5cm" margin-right="2.5cm"> <fo:region-body margin-top="3cm"/> <fo:region-before extent="3cm"/> @@ -28,38 +28,38 @@ <fo:flow flow-name="xsl-region-body"> <!-- title --> - <fo:block font-size="14pt" - font-family="sans-serif" - line-height="18pt" - space-before.optimum="3pt" - space-after.optimum="3pt" - font-weight="bold" + <fo:block font-size="14pt" + font-family="sans-serif" + line-height="18pt" + space-before.optimum="3pt" + space-after.optimum="3pt" + font-weight="bold" start-indent="15pt"> Validity Constraint: Standalone Document Declaration </fo:block> <!-- normal text --> - <fo:block font-size="12pt" - font-family="sans-serif" - line-height="15pt" + <fo:block font-size="12pt" + font-family="sans-serif" + line-height="15pt" space-after.optimum="3pt" > - The standalone document declaration must have the value "no" if + The standalone document declaration must have the value "no" if any external markup declarations contain declarations of: </fo:block> <!-- list --> <fo:list-block> - + <!-- list item --> <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or + attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -70,10 +70,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or + entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -84,7 +84,7 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with values subject to normalization, where the attribute appears in the document with a value which will @@ -98,10 +98,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - change as a result of normalization, or + change as a result of normalization, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -112,12 +112,12 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfsssssssssssssss thin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssssthin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssssthin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssssthin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssss - element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. sfg sfd gdg d d + element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. sfg sfd gdg d d </fo:block> </fo:list-item-body> </fo:list-item> @@ -126,20 +126,20 @@ <fo:list-item> - <fo:list-item-label end-indent="label-end()"> <fo:block/></fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block/></fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:list-block> - + <!-- list item --> <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or + attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -149,10 +149,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or + attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -162,10 +162,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or + attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -175,10 +175,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or + attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -193,10 +193,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. + element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. </fo:block> </fo:list-item-body> </fo:list-item> @@ -206,10 +206,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. + element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. </fo:block> </fo:list-item-body> </fo:list-item> @@ -219,10 +219,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. + element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. </fo:block> </fo:list-item-body> </fo:list-item> @@ -233,7 +233,7 @@ - + </fo:list-block> diff --git a/test/xml/bugtests/list-nested-breaks.fo b/test/xml/bugtests/list-nested-breaks.fo index c2ec3a7e8..6d75b5969 100644 --- a/test/xml/bugtests/list-nested-breaks.fo +++ b/test/xml/bugtests/list-nested-breaks.fo @@ -3,11 +3,11 @@ <!-- defines the layout master --> <fo:layout-master-set> - <fo:simple-page-master master-name="first" - page-height="29.7cm" page-width="21cm" - margin-top="1cm" - margin-bottom="2cm" - margin-left="2.5cm" + <fo:simple-page-master master-name="first" + page-height="29.7cm" page-width="21cm" + margin-top="1cm" + margin-bottom="2cm" + margin-left="2.5cm" margin-right="2.5cm"> <fo:region-body margin-top="3cm"/> <fo:region-before extent="3cm"/> @@ -28,38 +28,38 @@ <fo:flow flow-name="xsl-region-body"> <!-- title --> - <fo:block font-size="14pt" - font-family="sans-serif" - line-height="18pt" - space-before.optimum="3pt" - space-after.optimum="3pt" - font-weight="bold" + <fo:block font-size="14pt" + font-family="sans-serif" + line-height="18pt" + space-before.optimum="3pt" + space-after.optimum="3pt" + font-weight="bold" start-indent="15pt"> Validity Constraint: Standalone Document Declaration </fo:block> <!-- normal text --> - <fo:block font-size="12pt" - font-family="sans-serif" - line-height="15pt" + <fo:block font-size="12pt" + font-family="sans-serif" + line-height="15pt" space-after.optimum="3pt" > - The standalone document declaration must have the value "no" if + The standalone document declaration must have the value "no" if any external markup declarations contain declarations of: </fo:block> <!-- list --> <fo:list-block> - + <!-- list item --> <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or + attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -70,10 +70,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or + entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -84,7 +84,7 @@ <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with values subject to normalization, where the attribute appears in the document with a value which will @@ -98,10 +98,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - change as a result of normalization, or + change as a result of normalization, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -112,10 +112,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - element types with element content, if white space occurs directly within any instance of those types. + element types with element content, if white space occurs directly within any instance of those types. <fo:list-block> <fo:list-item> <fo:list-item-label end-indent="label-end()"> diff --git a/test/xml/bugtests/list-nested.fo b/test/xml/bugtests/list-nested.fo index 1c3768d2c..b52fb42c9 100644 --- a/test/xml/bugtests/list-nested.fo +++ b/test/xml/bugtests/list-nested.fo @@ -3,11 +3,11 @@ <!-- defines the layout master --> <fo:layout-master-set> - <fo:simple-page-master master-name="first" - page-height="29.7cm" page-width="21cm" - margin-top="1cm" - margin-bottom="2cm" - margin-left="2.5cm" + <fo:simple-page-master master-name="first" + page-height="29.7cm" page-width="21cm" + margin-top="1cm" + margin-bottom="2cm" + margin-left="2.5cm" margin-right="2.5cm"> <fo:region-body margin-top="3cm"/> <fo:region-before extent="3cm"/> @@ -28,38 +28,38 @@ <fo:flow flow-name="xsl-region-body"> <!-- title --> - <fo:block font-size="14pt" - font-family="sans-serif" - line-height="18pt" - space-before.optimum="3pt" - space-after.optimum="3pt" - font-weight="bold" + <fo:block font-size="14pt" + font-family="sans-serif" + line-height="18pt" + space-before.optimum="3pt" + space-after.optimum="3pt" + font-weight="bold" start-indent="15pt"> Validity Constraint: Standalone Document Declaration </fo:block> <!-- normal text --> - <fo:block font-size="12pt" - font-family="sans-serif" - line-height="15pt" + <fo:block font-size="12pt" + font-family="sans-serif" + line-height="15pt" space-after.optimum="3pt" > - The standalone document declaration must have the value "no" if + The standalone document declaration must have the value "no" if any external markup declarations contain declarations of: </fo:block> <!-- list --> <fo:list-block> - + <!-- list item --> <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or + attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -70,10 +70,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or + entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -84,7 +84,7 @@ <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with values subject to normalization, where the attribute appears in the document with a value which will @@ -98,10 +98,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - change as a result of normalization, or + change as a result of normalization, or </fo:block> </fo:list-item-body> </fo:list-item> @@ -112,10 +112,10 @@ <fo:list-item-label end-indent="label-end()"> <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <!-- list text --> + <!-- list text --> <fo:list-item-body start-indent="body-start()"> <fo:block> - element types with element content, if white space occurs directly within any instance of those types. + element types with element content, if white space occurs directly within any instance of those types. <fo:list-block> <fo:list-item> <fo:list-item-label end-indent="label-end()"> diff --git a/test/xml/bugtests/padding.fo b/test/xml/bugtests/padding.fo index d6afef6ae..2052f4579 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-reference="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-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-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-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-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-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-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-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-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-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-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-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-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-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 1a78a4870..b352970be 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-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: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 8442f2bd0..4e4dcf7ed 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-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: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 017ba31ab..2e3d7ce5b 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-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: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 886cb7e80..c29e18734 100644 --- a/test/xml/bugtests/space-treatment.fo +++ b/test/xml/bugtests/space-treatment.fo @@ -1,28 +1,28 @@ <?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-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: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 + SALECHA REFER. NO. 999 @@ -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 45fd3709e..12ac01113 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-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: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 67c74a64c..d5505ca0f 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-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: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 71d90c06a..4f4b57d60 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-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: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 23ff154c4..98889e444 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-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: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. - <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> + 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:root> diff --git a/test/xml/bugtests/word-spacing.fo b/test/xml/bugtests/word-spacing.fo index c138fece3..d02bceeea 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-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: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="-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="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:root> diff --git a/test/xml/bugtests/wrap.fo b/test/xml/bugtests/wrap.fo index 235082da1..79a421925 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-reference="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,8 +118,8 @@ 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:flow> + </fo:page-sequence> <fo:page-sequence master-reference="no-overflow"> <fo:flow flow-name="xsl-region-body"> <fo:block wrap-option="no-wrap"> |