diff options
27 files changed, 59 insertions, 59 deletions
diff --git a/docs/bugtests/list-mountjoy.fo b/docs/bugtests/list-mountjoy.fo index 8b1f758c3..a56f139d5 100644 --- a/docs/bugtests/list-mountjoy.fo +++ b/docs/bugtests/list-mountjoy.fo @@ -19,13 +19,13 @@ <fo:page-sequence master-name="first"> <!-- Inserts a header with the page number --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" line-height="14pt"> XSL-FO Example: simple list - p. <fo:page-number/> </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- title --> <fo:block font-size="14pt" diff --git a/docs/bugtests/list-nested-breaks.fo b/docs/bugtests/list-nested-breaks.fo index f5d845fa2..92826fecc 100644 --- a/docs/bugtests/list-nested-breaks.fo +++ b/docs/bugtests/list-nested-breaks.fo @@ -19,13 +19,13 @@ <fo:page-sequence master-name="first"> <!-- Inserts a header with the page number --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" line-height="14pt"> XSL-FO Example: simple list - p. <fo:page-number/> </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- title --> <fo:block font-size="14pt" diff --git a/docs/bugtests/list-nested.fo b/docs/bugtests/list-nested.fo index 5c1370296..746c50b25 100644 --- a/docs/bugtests/list-nested.fo +++ b/docs/bugtests/list-nested.fo @@ -19,13 +19,13 @@ <fo:page-sequence master-name="first"> <!-- Inserts a header with the page number --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" line-height="14pt"> XSL-FO Example: simple list - p. <fo:page-number/> </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- title --> <fo:block font-size="14pt" diff --git a/docs/bugtests/svg-apachexml.fo b/docs/bugtests/svg-apachexml.fo index 75b4175cf..fd908c090 100644 --- a/docs/bugtests/svg-apachexml.fo +++ b/docs/bugtests/svg-apachexml.fo @@ -5,7 +5,7 @@ </fo:simple-page-master> </fo:layout-master-set> <fo:page-sequence master-name="one"> -<fo:flow> +<fo:flow flow-name="xsl-region-body"> <svg:svg xml:space="preserve" width="570.129" height="754.902"> <svg:g id="Layer_x0020_1"> <svg:path style="fill-rule:nonzero;fill:#0086B3;stroke:#000000;stroke-width:2.8346;stroke-miterlimit:4;" d="M568.712,753.485H1.417V1.417h567.295v752.068z"/> diff --git a/docs/bugtests/svg-lingrad.fo b/docs/bugtests/svg-lingrad.fo index 003d5c6fc..c301f07b9 100644 --- a/docs/bugtests/svg-lingrad.fo +++ b/docs/bugtests/svg-lingrad.fo @@ -5,7 +5,7 @@ </fo:simple-page-master> </fo:layout-master-set> <fo:page-sequence master-name="one"> -<fo:flow> +<fo:flow flow-name="xsl-region-body"> <svg:svg width="500" height="400"> <svg:defs> <svg:linearGradient id="myGradient" x1="0" y1="200" x2="500" y2="350"> diff --git a/docs/examples/build.xml b/docs/examples/build.xml index 0f4e0c148..b77a061ae 100644 --- a/docs/examples/build.xml +++ b/docs/examples/build.xml @@ -2,7 +2,7 @@ <!-- =========================================================================== --> -<project default="runtest" basedir="."> +<project default="creating new test pdf files" basedir="."> <!-- =================================================================== --> <!-- Initialization target --> diff --git a/docs/examples/fo/border.fo b/docs/examples/fo/border.fo index 6e77e537c..5456b9bb5 100644 --- a/docs/examples/fo/border.fo +++ b/docs/examples/fo/border.fo @@ -25,7 +25,7 @@ </fo:page-sequence-master> </fo:layout-master-set> <fo:page-sequence master-name="psmA"> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <fo:block-container height="4cm" width="12cm" top="0cm" left="0cm" position="absolute"> <fo:block text-align="start" line-height="18pt" font-family="sans-serif" font-weight="bold" font-size="14pt"> PX7.net diff --git a/docs/examples/fo/extensive.fo b/docs/examples/fo/extensive.fo index 6b858ab62..c4f06c2b4 100644 --- a/docs/examples/fo/extensive.fo +++ b/docs/examples/fo/extensive.fo @@ -5,7 +5,7 @@ </fo:simple-page-master> </fo:layout-master-set> <fo:page-sequence master-name="one"> -<fo:flow> +<fo:flow flow-name="xsl-region-body"> <fo:block>A Block</fo:block> <fo:block text-align="end">An End Aligned Block</fo:block> <fo:block text-align="center">A Centered Block</fo:block> diff --git a/docs/examples/fo/fonts.fo b/docs/examples/fo/fonts.fo index fbdf78ee6..cda97fd27 100644 --- a/docs/examples/fo/fonts.fo +++ b/docs/examples/fo/fonts.fo @@ -24,7 +24,7 @@ </fo:page-sequence-master> </fo:layout-master-set> <fo:page-sequence master-name="firstAndRest"> -<fo:flow flow-name="xsl-body"> +<fo:flow flow-name="xsl-region-body"> <fo:block font-family="Helvetica" font-size="14pt"> Helvetica diff --git a/docs/examples/fo/images.fo b/docs/examples/fo/images.fo index c7c210526..5bb458276 100644 --- a/docs/examples/fo/images.fo +++ b/docs/examples/fo/images.fo @@ -31,13 +31,13 @@ <fo:page-sequence id="N2528" master-name="psmOddEven"> -<fo:static-content flow-name="xsl-after"> +<fo:static-content flow-name="xsl-region-after"> <fo:block text-align-last="center" font-size="10pt"> <fo:page-number/> </fo:block> </fo:static-content> -<fo:flow> +<fo:flow flow-name="xsl-region-body"> <fo:block font-size="18pt" font-weight="bold">1. FOP test for images</fo:block><fo:block id="N2531"> <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A GIF image in FOP</fo:block><fo:block><fo:external-graphic src="file:../graphics/xml_feather.gif"/> </fo:block></fo:block><fo:block id="N2545"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A JPEG image in FOP</fo:block><fo:block><fo:external-graphic src="file:../graphics/fop.jpg"/></fo:block></fo:block><fo:block id="N2559"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"/> @@ -47,6 +47,12 @@ </fo:page-sequence> <fo:page-sequence id="N2561" master-name="psmOddEven"> -<fo:static-content flow-name="xsl-after"> -<fo:block text-align-last="center" font-size="10pt"><fo:page-number/></fo:block></fo:static-content><fo:flow><fo:block font-size="18pt" font-weight="bold">A. Appendix</fo:block></fo:flow></fo:page-sequence></fo:root> +<fo:static-content flow-name="xsl-region-after"> +<fo:block text-align-last="center" font-size="10pt"> +<fo:page-number/></fo:block> +</fo:static-content> +<fo:flow flow-name="xsl-region-body"> +<fo:block font-size="18pt" font-weight="bold">A. Appendix</fo:block></fo:flow> +</fo:page-sequence> +</fo:root> diff --git a/docs/examples/fo/link.fo b/docs/examples/fo/link.fo index 2c74a8a92..2e449d87c 100644 --- a/docs/examples/fo/link.fo +++ b/docs/examples/fo/link.fo @@ -21,7 +21,7 @@ <fo:page-sequence master-name="first"> <!-- text body --> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- Normal text --> <fo:block text-align="center">0. Normal text without link diff --git a/docs/examples/fo/list.fo b/docs/examples/fo/list.fo index 774695c1e..1b8d65d49 100644 --- a/docs/examples/fo/list.fo +++ b/docs/examples/fo/list.fo @@ -19,13 +19,13 @@ <fo:page-sequence master-name="first"> <!-- Inserts a header with the page number --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" line-height="14pt"> XSL-FO Example: simple list - p. <fo:page-number/> </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- title --> <fo:block font-size="14pt" diff --git a/docs/examples/fo/normal.fo b/docs/examples/fo/normal.fo index 5facd2807..5b51f9bd4 100644 --- a/docs/examples/fo/normal.fo +++ b/docs/examples/fo/normal.fo @@ -63,7 +63,7 @@ Below fo:root there is always <fo:page-sequence master-name="basicPSM"> <!-- header --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" @@ -72,7 +72,7 @@ Below fo:root there is always </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- defines text title level 1--> <fo:block font-size="18pt" diff --git a/docs/examples/fo/readme.fo b/docs/examples/fo/readme.fo index 823e33129..5fb932b74 100644 --- a/docs/examples/fo/readme.fo +++ b/docs/examples/fo/readme.fo @@ -58,14 +58,14 @@ This files shows next to the trivial usage of fo:block and fo:inline-sequence ex <fo:page-sequence master-name="basicPSM"> -<fo:static-content flow-name="xsl-before"> +<fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" line-height="14pt" color="red" > This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:page-number/> </fo:block> </fo:static-content> -<fo:flow flow-name="xsl-body"> +<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" text-align="center" padding-top="3pt">FOP: An Open-Source XSL Formatter and Renderer</fo:block> <fo:block id="sec1" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >A) What is FOP?</fo:block> diff --git a/docs/examples/fo/table.fo b/docs/examples/fo/table.fo index 338c220e4..9d2643304 100644 --- a/docs/examples/fo/table.fo +++ b/docs/examples/fo/table.fo @@ -21,13 +21,13 @@ <fo:page-sequence master-name="first"> <!-- Inserts a header with the page number --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" line-height="14pt"> FOP - p. <fo:page-number/> </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <fo:block font-size="10pt" font-family="sans-serif" line-height="10pt" space-after.optimum="3pt" font-weight="bold" start-indent="15pt"> Content diff --git a/docs/examples/fop-examples.jar b/docs/examples/fop-examples.jar Binary files differdeleted file mode 100644 index e1ed9e343..000000000 --- a/docs/examples/fop-examples.jar +++ /dev/null diff --git a/docs/examples/pagination/basic1.fo b/docs/examples/pagination/basic1.fo index f1419c0da..feae996ba 100644 --- a/docs/examples/pagination/basic1.fo +++ b/docs/examples/pagination/basic1.fo @@ -26,7 +26,7 @@ <!-- usage of page layout --> <!-- header --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" @@ -35,7 +35,7 @@ </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- defines text title level 1--> <fo:block font-size="18pt" diff --git a/docs/examples/pagination/basic2.fo b/docs/examples/pagination/basic2.fo index 17ccf8787..a3f1432b6 100644 --- a/docs/examples/pagination/basic2.fo +++ b/docs/examples/pagination/basic2.fo @@ -29,7 +29,7 @@ <!-- usage of page layout --> <!-- header --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" @@ -38,7 +38,7 @@ </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- defines text title level 1--> <fo:block font-size="18pt" diff --git a/docs/examples/pagination/franklin_2pageseqs.fo b/docs/examples/pagination/franklin_2pageseqs.fo index 8ad034895..284091941 100644 --- a/docs/examples/pagination/franklin_2pageseqs.fo +++ b/docs/examples/pagination/franklin_2pageseqs.fo @@ -76,7 +76,7 @@ <!-- actual layout --> <fo:page-sequence master-name="run1" initial-page-number="1"> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- defines local TOC --> <fo:block font-size="10pt" @@ -454,7 +454,7 @@ made to-day was not more than six miles. <fo:page-sequence master-name="run2" initial-page-number="7"> <!-- header --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="start" font-size="10pt" font-family="sans-serif" line-height="10pt" > @@ -462,7 +462,7 @@ made to-day was not more than six miles. </fo:block> </fo:static-content> - <fo:static-content flow-name="xsl-after"> + <fo:static-content flow-name="xsl-region-after"> <fo:block text-align="end" font-size="10pt" font-family="sans-serif" @@ -471,7 +471,7 @@ made to-day was not more than six miles. </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- Normal text --> <fo:block font-size="11pt" diff --git a/docs/examples/pagination/franklin_alt.fo b/docs/examples/pagination/franklin_alt.fo index f76424ed2..9e70a9288 100644 --- a/docs/examples/pagination/franklin_alt.fo +++ b/docs/examples/pagination/franklin_alt.fo @@ -59,7 +59,7 @@ <fo:page-sequence master-name="alternating" initial-page-number="1"> <!-- header --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="start" font-size="10pt" font-family="sans-serif" line-height="10pt" > @@ -67,7 +67,7 @@ </fo:block> </fo:static-content> - <fo:static-content flow-name="xsl-after"> + <fo:static-content flow-name="xsl-region-after"> <fo:block text-align="end" font-size="10pt" font-family="sans-serif" @@ -76,7 +76,7 @@ </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- defines local TOC --> <fo:block font-size="10pt" diff --git a/docs/examples/pagination/franklin_rep.fo b/docs/examples/pagination/franklin_rep.fo index a74117dfc..892af0322 100644 --- a/docs/examples/pagination/franklin_rep.fo +++ b/docs/examples/pagination/franklin_rep.fo @@ -28,7 +28,7 @@ <fo:page-sequence master-name="repeating_pm" initial-page-number="1"> <!-- header --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="start" font-size="10pt" font-family="sans-serif" line-height="10pt" > @@ -36,7 +36,7 @@ </fo:block> </fo:static-content> - <fo:static-content flow-name="xsl-after"> + <fo:static-content flow-name="xsl-region-after"> <fo:block text-align="end" font-size="10pt" font-family="sans-serif" @@ -45,7 +45,7 @@ </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- defines local TOC --> <fo:block font-size="10pt" diff --git a/docs/examples/pagination/franklin_rep_max_repeats.fo b/docs/examples/pagination/franklin_rep_max_repeats.fo index 2f753a8b0..49dd8e3df 100644 --- a/docs/examples/pagination/franklin_rep_max_repeats.fo +++ b/docs/examples/pagination/franklin_rep_max_repeats.fo @@ -30,7 +30,7 @@ <fo:page-sequence master-name="repeating_pm" initial-page-number="1"> <!-- header --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="start" font-size="10pt" font-family="sans-serif" line-height="10pt" > @@ -38,7 +38,7 @@ </fo:block> </fo:static-content> - <fo:static-content flow-name="xsl-after"> + <fo:static-content flow-name="xsl-region-after"> <fo:block text-align="end" font-size="10pt" font-family="sans-serif" @@ -47,7 +47,7 @@ </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- defines local TOC --> <fo:block font-size="10pt" diff --git a/docs/examples/pagination/franklin_rep_max_repeats_expl.fo b/docs/examples/pagination/franklin_rep_max_repeats_expl.fo index 2f753a8b0..49dd8e3df 100644 --- a/docs/examples/pagination/franklin_rep_max_repeats_expl.fo +++ b/docs/examples/pagination/franklin_rep_max_repeats_expl.fo @@ -30,7 +30,7 @@ <fo:page-sequence master-name="repeating_pm" initial-page-number="1"> <!-- header --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="start" font-size="10pt" font-family="sans-serif" line-height="10pt" > @@ -38,7 +38,7 @@ </fo:block> </fo:static-content> - <fo:static-content flow-name="xsl-after"> + <fo:static-content flow-name="xsl-region-after"> <fo:block text-align="end" font-size="10pt" font-family="sans-serif" @@ -47,7 +47,7 @@ </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- defines local TOC --> <fo:block font-size="10pt" diff --git a/docs/examples/pagination/franklin_rep_max_repeats_nl.fo b/docs/examples/pagination/franklin_rep_max_repeats_nl.fo index 86907b693..032b8f270 100644 --- a/docs/examples/pagination/franklin_rep_max_repeats_nl.fo +++ b/docs/examples/pagination/franklin_rep_max_repeats_nl.fo @@ -30,7 +30,7 @@ <fo:page-sequence master-name="repeating_pm" initial-page-number="1"> <!-- header --> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="start" font-size="10pt" font-family="sans-serif" line-height="10pt" > @@ -38,7 +38,7 @@ </fo:block> </fo:static-content> - <fo:static-content flow-name="xsl-after"> + <fo:static-content flow-name="xsl-region-after"> <fo:block text-align="end" font-size="10pt" font-family="sans-serif" @@ -47,7 +47,7 @@ </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <!-- defines local TOC --> <fo:block font-size="10pt" diff --git a/docs/examples/results.html b/docs/examples/results.html index 3b9e87266..b518c3d38 100644 --- a/docs/examples/results.html +++ b/docs/examples/results.html @@ -1,12 +1,6 @@ <html><head><title>Test Results</title></head><body> <h2>Compare Results<br> -<font size='1'>created 14.03.2000 10:36:22</font></h2> +<font size='1'>created 02.08.2000 23:33:08</font></h2> <table cellpadding='10' border='2'><thead><th align='center'>reference file</th><th align='center'>test file</th><th align='center'>identical?</th></thead> -<tr><td><a href='reference\normal.pdf'>normal.pdf</a> </td><td> <a href='tests\normal.pdf'>normal.pdf</a> </td><td>Yes</td></tr> -<tr><td><a href='reference\table.pdf'>table.pdf</a> </td><td> <a href='tests\table.pdf'>table.pdf</a> </td><td>Yes</td></tr> -<tr><td><a href='reference\list.pdf'>list.pdf</a> </td><td> <a href='tests\list.pdf'>list.pdf</a> </td><td>Yes</td></tr> -<tr><td><a href='reference\link.pdf'>link.pdf</a> </td><td> <a href='tests\link.pdf'>link.pdf</a> </td><td>Yes</td></tr> -<tr><td><a href='reference\border.pdf'>border.pdf</a> </td><td> <a href='tests\border.pdf'>border.pdf</a> </td><td>Yes</td></tr> -<tr><td><a href='reference\extensive.pdf'>extensive.pdf</a> </td><td> <a href='tests\extensive.pdf'>extensive.pdf</a> </td><td><font color='red'>No</font></td></tr> </table></html> diff --git a/docs/examples/svg/Document.xsl b/docs/examples/svg/Document.xsl index 148946bef..0fad34be0 100644 --- a/docs/examples/svg/Document.xsl +++ b/docs/examples/svg/Document.xsl @@ -43,7 +43,7 @@ </fo:flow> </fo:page-sequence> <fo:page-sequence master-name="one"> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block-container height="1cm" width="6cm" top="0.2cm" left="0cm" position="absolute"> <fo:block text-align="start" font-size="10pt" font-family="serif" line-height="12pt"> </fo:block> @@ -63,7 +63,7 @@ <fo:display-rule space-before.optimum="0pt" space-after.optimum="0pt"/> </fo:block-container> </fo:static-content> - <fo:static-content flow-name="xsl-after"> + <fo:static-content flow-name="xsl-region-after"> <fo:block-container height="1cm" width="17cm" top="0cm" left="0cm" position="absolute"> <fo:display-rule space-before.optimum="0pt" space-after.optimum="0pt"/> </fo:block-container> diff --git a/docs/xml-docs/xml2pdf.xsl b/docs/xml-docs/xml2pdf.xsl index 19e053a5f..0d3ce7472 100644 --- a/docs/xml-docs/xml2pdf.xsl +++ b/docs/xml-docs/xml2pdf.xsl @@ -55,7 +55,7 @@ TBD: - The faq doesn't show in the content </fo:layout-master-set> <fo:page-sequence master-name="all"> - <fo:static-content flow-name="xsl-before"> + <fo:static-content flow-name="xsl-region-before"> <fo:block text-align="end" font-size="10pt" font-family="serif" @@ -64,7 +64,7 @@ TBD: - The faq doesn't show in the content </fo:block> </fo:static-content> - <fo:flow flow-name="xsl-body"> + <fo:flow flow-name="xsl-region-body"> <fo:block font-size="18pt" |