diff options
author | Glenn Adams <gadams@apache.org> | 2012-06-27 18:08:31 +0000 |
---|---|---|
committer | Glenn Adams <gadams@apache.org> | 2012-06-27 18:08:31 +0000 |
commit | 015538e0f11f031e3d7bd05db8c29e2a40365678 (patch) | |
tree | 9ef14b7cb480004c82fcf226ac1b819c49529e73 /examples | |
parent | 63f9e3bd728b7692e577b4889de051c80fc5178c (diff) | |
download | xmlgraphics-fop-015538e0f11f031e3d7bd05db8c29e2a40365678.tar.gz xmlgraphics-fop-015538e0f11f031e3d7bd05db8c29e2a40365678.zip |
Fix errors and warnings in example files. Add build.xml for documentation examples.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1354651 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'examples')
-rw-r--r-- | examples/fo/advanced/cid-fonts.fo | 2 | ||||
-rw-r--r-- | examples/fo/advanced/giro.fo | 14 | ||||
-rw-r--r-- | examples/fo/basic/images.fo | 2 | ||||
-rw-r--r-- | examples/fo/basic/tableunits.fo | 40 | ||||
-rw-r--r-- | examples/fo/build.xml | 5 | ||||
-rw-r--r-- | examples/fo/svg/embedding.fo | 4 | ||||
-rw-r--r-- | examples/fo/tables/background.fo | 22 | ||||
-rw-r--r-- | examples/fo/tables/borders.fo | 39 | ||||
-rw-r--r-- | examples/fo/tables/break.fo | 10 | ||||
-rw-r--r-- | examples/fo/tables/headfoot.fo | 14 | ||||
-rw-r--r-- | examples/fo/tables/keep.fo | 12 | ||||
-rw-r--r-- | examples/fo/tables/omit.fo | 10 | ||||
-rw-r--r-- | examples/fo/tables/space.fo | 18 |
13 files changed, 97 insertions, 95 deletions
diff --git a/examples/fo/advanced/cid-fonts.fo b/examples/fo/advanced/cid-fonts.fo index 526ebea06..cdcb4737c 100644 --- a/examples/fo/advanced/cid-fonts.fo +++ b/examples/fo/advanced/cid-fonts.fo @@ -369,7 +369,7 @@ This font contains no embedding license restrictions </fo:block> </fo:wrapper> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> diff --git a/examples/fo/advanced/giro.fo b/examples/fo/advanced/giro.fo index 5b5422ec9..9f1a6723a 100644 --- a/examples/fo/advanced/giro.fo +++ b/examples/fo/advanced/giro.fo @@ -32,7 +32,7 @@ <fo:block-container absolute-position="absolute" width="100%" height="100%" border-top-color="silver" border-top-style="dotted" border-top-width="0.13mm"> <fo:block/> </fo:block-container> - <fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green"> + <fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green" table-layout="fixed" width="100%"> <fo:table-column column-width="8in div 10 - 2in div 12"/> <fo:table-column border-right-style="solid" border-right-width="0.5mm" column-width="36in div 10"/> <fo:table-column column-width="5in div 10"/> @@ -107,7 +107,7 @@ <fo:block>Från konto nr</fo:block> </fo:table-cell> <fo:table-cell border-bottom-style="solid" border-bottom-width="0.13mm" padding-top="6mm" display-align="after"> - <fo:table height="3mm"> + <fo:table height="3mm" table-layout="fixed" width="100%"> <fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> <fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> <fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> @@ -182,7 +182,7 @@ <fo:block color="black">16.6.2006</fo:block> </fo:table-cell> <fo:table-cell border-bottom-style="solid" border-bottom-width="0.5mm" padding-left="2mm" padding-top="4mm" font-size="10pt"> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="0.5cm"/> <fo:table-column column-width="2cm"/> <fo:table-body> @@ -201,7 +201,7 @@ <fo:table-row height="13in div 12 - 5mm"> <fo:table-cell number-columns-spanned="4" padding-left="40mm" display-align="after"> <fo:block> - <fo:table height="5in div 12" margin-left="2.5mm" margin-right="2.5mm"><!--105--> + <fo:table height="5in div 12" margin-left="2.5mm" margin-right="2.5mm" table-layout="fixed" width="100%"><!--105--> <fo:table-column column-width="0.5mm"/> <fo:table-column column-width="0.25mm"/> <fo:table-column column-width="0.25mm"/> @@ -950,7 +950,7 @@ </fo:page-sequence> <fo:page-sequence master-reference="A4"> <fo:static-content flow-name="xsl-region-after"> - <fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green"> + <fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green" table-layout="fixed" width="100%"> <fo:table-column column-width="8in div 10 - 2in div 12"/> <fo:table-column border-right-style="solid" border-right-width="0.5mm" column-width="36in div 10"/> <fo:table-column column-width="5in div 10"/> @@ -1025,7 +1025,7 @@ <fo:block>Från konto nr</fo:block> </fo:table-cell> <fo:table-cell border-bottom-style="solid" border-bottom-width="0.13mm" padding-top="6mm" display-align="after"> - <fo:table height="3mm"> + <fo:table height="3mm" table-layout="fixed" width="100%"> <fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> <fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> <fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> @@ -1100,7 +1100,7 @@ <fo:block color="black">16.6.2006</fo:block> </fo:table-cell> <fo:table-cell border-bottom-style="solid" border-bottom-width="0.5mm" padding-left="2mm" padding-top="4mm" font-size="10pt"> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="0.5cm"/> <fo:table-column column-width="2cm"/> <fo:table-body> diff --git a/examples/fo/basic/images.fo b/examples/fo/basic/images.fo index 3bb864fd8..daabcd31b 100644 --- a/examples/fo/basic/images.fo +++ b/examples/fo/basic/images.fo @@ -31,8 +31,6 @@ odd-or-even="even" /> <fo:conditional-page-master-reference master-reference="right" odd-or-even="odd" /> - <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> </fo:layout-master-set> diff --git a/examples/fo/basic/tableunits.fo b/examples/fo/basic/tableunits.fo index aca927c4a..1a1c8c9e1 100644 --- a/examples/fo/basic/tableunits.fo +++ b/examples/fo/basic/tableunits.fo @@ -67,9 +67,9 @@ <fo:block space-before="12pt" space-after="6pt">The next table has width=100% on the table no column widths specified on the table-column element.</fo:block> <!-- table start --> <fo:table border-collapse="separate" table-layout="fixed" width="100%"> - <fo:table-column background-color="yellow"/> - <fo:table-column background-color="blue"/> - <fo:table-column background-color="green"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="blue"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell @@ -83,7 +83,7 @@ <fo:block space-before="12pt" space-after="6pt">The next table has fixed column widths=13cm, ipd.optimum=12cm and ipd.max = 100%.</fo:block> <!-- table start --> <fo:table border-collapse="separate" - table-layout="fixed" + table-layout="fixed" width="100%" inline-progression-dimension="12cm" inline-progression-dimension.maximum="100%" > @@ -122,8 +122,8 @@ <!-- table start --> <fo:table border-collapse="separate" table-layout="fixed" width="70% + 1cm"> <fo:table-column column-width="from-parent('width') div 3" background-color="yellow"/> - <fo:table-column background-color="blue"/> - <fo:table-column background-color="green"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="blue"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell @@ -140,11 +140,11 @@ </fo:block> <!-- table start --> <fo:table border-collapse="separate" - table-layout="fixed" + table-layout="fixed" width="100%" inline-progression-dimension="15cm"> - <fo:table-column background-color="yellow"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> <fo:table-column column-width="3cm" background-color="blue"/> - <fo:table-column background-color="green"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell @@ -159,10 +159,10 @@ The next table specifies neither width nor inline-progression-dimension. </fo:block> <!-- table start --> - <fo:table table-layout="fixed" border-collapse="separate"> - <fo:table-column background-color="yellow"/> + <fo:table table-layout="fixed" width="100%" border-collapse="separate"> + <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> <fo:table-column column-width="3cm" background-color="blue"/> - <fo:table-column background-color="green"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell @@ -178,11 +178,11 @@ specifies a column width of 5cm on the middle column only. </fo:block> <!-- table start --> - <fo:table table-layout="fixed" border-collapse="separate" + <fo:table table-layout="fixed" width="100%" border-collapse="separate" inline-progression-dimension.minimum="10cm"> - <fo:table-column background-color="yellow"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> <fo:table-column column-width="5cm" background-color="blue"/> - <fo:table-column background-color="green"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell @@ -194,17 +194,17 @@ </fo:table> <fo:block space-before="12pt" space-after="6pt"> - The next table specifies inline-progression-dimension.minimum="10cm", - inline-progression-dimension.maximum="17cm and + The next table specifies inline-progression-dimension.minimum="10cm", + inline-progression-dimension.maximum="17cm and specifies a column width of 5cm on the middle column only. </fo:block> <!-- table start --> - <fo:table table-layout="fixed" border-collapse="separate" + <fo:table table-layout="fixed" width="100%" border-collapse="separate" inline-progression-dimension.minimum="10cm" inline-progression-dimension.maximum="17cm"> - <fo:table-column background-color="yellow"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> <fo:table-column column-width="5cm" background-color="blue"/> - <fo:table-column background-color="green"/> + <fo:table-column column-width="proportional-column-width(1)" background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell diff --git a/examples/fo/build.xml b/examples/fo/build.xml index 2c7c18259..de83b945c 100644 --- a/examples/fo/build.xml +++ b/examples/fo/build.xml @@ -127,6 +127,7 @@ </target> <!-- =================================================================== --> <!-- Compares new test pdf files to reference pdf files --> + <!-- N.B. All comparisons fail due to differences in /CreationDate --> <!-- =================================================================== --> <target name="comparePDF" depends="newPDF"> <compare referenceDirectory="${referenceDir}" testDirectory="${testDir}" filenames="normal.pdf,table.pdf,list.pdf,link.pdf,border.pdf,images.pdf,extensive.pdf,readme.pdf,fonts.pdf,bordershorthand.pdf,character.pdf,corresprop.pdf,hyphen.pdf,inhprop.pdf,instream.pdf,leader.pdf,newlinktest.pdf,normalex.pdf,pdfoutline.pdf,simple.pdf,textdeko.pdf,tableunits.pdf"/> @@ -144,6 +145,7 @@ <!-- =================================================================== --> <!-- Starts the test --> + <!-- N.B. All tests fail due to differences in /CreationDate --> <!-- =================================================================== --> <target name="runtest" depends="comparePDF"> <echo message="Running Fop tests"/> @@ -154,6 +156,9 @@ <target name="clean" depends="init"> <delete dir="${testDir}"/> </target> + <target name="cleantest" depends="init"> + <delete dir="${referenceDir}"/> + </target> </project> <!-- End of file --> diff --git a/examples/fo/svg/embedding.fo b/examples/fo/svg/embedding.fo index dbcac747b..a4af1675e 100644 --- a/examples/fo/svg/embedding.fo +++ b/examples/fo/svg/embedding.fo @@ -794,7 +794,7 @@ XML Syntax <fo:block> Here we have some examples of how the XML can be specified in the fo document. <fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="350pt"/> <fo:table-column column-width="150pt"/> <fo:table-body> @@ -932,7 +932,7 @@ Sizing The size of the instream-foreign-object is obtained in a number of ways. <fo:block> - <fo:table xmlns:svg="http://www.w3.org/2000/svg"> + <fo:table xmlns:svg="http://www.w3.org/2000/svg" table-layout="fixed" width="100%"> <fo:table-column column-width="350pt"/> <fo:table-column column-width="150pt"/> <fo:table-body> diff --git a/examples/fo/tables/background.fo b/examples/fo/tables/background.fo index fe2cf128d..e516348da 100644 --- a/examples/fo/tables/background.fo +++ b/examples/fo/tables/background.fo @@ -30,7 +30,7 @@ Table 1: cell background </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -72,7 +72,7 @@ Table 1: row background </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -152,7 +152,7 @@ Table 1: column background </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="3cm" background-color="green"/> <fo:table-column column-width="3cm" background-color="red"/> <fo:table-column column-width="3cm" background-color="blue"/> @@ -219,7 +219,7 @@ Table 1: column backgrounds over page </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="3cm" background-color="green"/> <fo:table-column column-width="3cm" background-color="red"/> <fo:table-column column-width="3cm" background-color="blue"/> @@ -286,7 +286,7 @@ Table 1: body background </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -323,7 +323,7 @@ </fo:table-body> </fo:table> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -360,7 +360,7 @@ </fo:table-body> </fo:table> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -397,7 +397,7 @@ </fo:table-body> </fo:table> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -438,7 +438,7 @@ Table 1: table background </fo:block> - <fo:table background-color="green"> + <fo:table background-color="green" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -475,7 +475,7 @@ </fo:table-body> </fo:table> - <fo:table background-color="red"> + <fo:table background-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -516,7 +516,7 @@ Table 1: combinations </fo:block> - <fo:table background-color="green"> + <fo:table background-color="green" table-layout="fixed" width="100%"> <fo:table-column column-width="2.5cm"/> <fo:table-column column-width="2.5cm" background-color="green"/> <fo:table-column column-width="2.5cm" background-color="red"/> diff --git a/examples/fo/tables/borders.fo b/examples/fo/tables/borders.fo index a38a6b148..f6704ef61 100644 --- a/examples/fo/tables/borders.fo +++ b/examples/fo/tables/borders.fo @@ -30,7 +30,7 @@ Table 1: cell borders </fo:block> - <fo:table border-collapse="separate"> + <fo:table border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -186,7 +186,7 @@ Table 2: row borders </fo:block> - <fo:table border-collapse="collapse"> + <fo:table border-collapse="collapse" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -310,7 +310,7 @@ Table 3: column borders </fo:block> - <fo:table border-collapse="collapse"> + <fo:table border-collapse="collapse" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm" border-left-color="green" border-left-width="0.5pt" border-left-style="solid"/> <fo:table-column column-width="3cm" border-top-color="red" border-top-width="0.5pt" border-top-style="solid"/> <fo:table-column column-width="3cm" border-right-color="blue" border-right-width="0.5pt" border-right-style="solid"/> @@ -377,7 +377,7 @@ Table 4: column borders over page </fo:block> - <fo:table border-collapse="collapse"> + <fo:table border-collapse="collapse" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm" border-left-color="green" border-left-width="0.5pt" border-left-style="solid"/> <fo:table-column column-width="3cm" border-top-color="red" border-top-width="0.5pt" border-top-style="solid"/> <fo:table-column column-width="3cm" border-right-color="blue" border-right-width="0.5pt" border-right-style="solid"/> @@ -444,7 +444,7 @@ Table 5: body borders </fo:block> - <fo:table border-collapse="separate"> + <fo:table border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -480,7 +480,7 @@ </fo:table-body> </fo:table> - <fo:table border-collapse="separate"> + <fo:table border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -516,7 +516,7 @@ </fo:table-body> </fo:table> - <fo:table border-collapse="separate"> + <fo:table border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -552,7 +552,7 @@ </fo:table-body> </fo:table> - <fo:table border-collapse="separate"> + <fo:table border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -588,7 +588,7 @@ </fo:table-body> </fo:table> - <fo:table border-collapse="separate"> + <fo:table border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -628,8 +628,7 @@ Table 6: table borders </fo:block> - <fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" - border-collapse="separate"> + <fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -665,7 +664,7 @@ </fo:table-body> </fo:table> - <fo:table border-top-color="red" border-top-width="0.5pt" border-top-style="solid" border-collapse="separate"> + <fo:table border-top-color="red" border-top-width="0.5pt" border-top-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -701,7 +700,7 @@ </fo:table-body> </fo:table> - <fo:table border-right-color="blue" border-right-width="0.5pt" border-right-style="solid" border-collapse="separate"> + <fo:table border-right-color="blue" border-right-width="0.5pt" border-right-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -737,7 +736,7 @@ </fo:table-body> </fo:table> - <fo:table border-bottom-color="yellow" border-bottom-width="0.5pt" border-bottom-style="solid" border-collapse="separate"> + <fo:table border-bottom-color="yellow" border-bottom-width="0.5pt" border-bottom-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -773,7 +772,7 @@ </fo:table-body> </fo:table> - <fo:table border-color="orange" border-width="0.5pt" border-style="solid" border-collapse="separate"> + <fo:table border-color="orange" border-width="0.5pt" border-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -813,7 +812,7 @@ Table 7: combinations </fo:block> - <fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" border-collapse="collapse"> + <fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" border-collapse="collapse" table-layout="fixed" width="100%"> <fo:table-column column-width="2.5cm"/> <fo:table-column column-width="2.5cm" border-left-color="green" border-left-width="0.5pt" border-left-style="solid"/> <fo:table-column column-width="2.5cm" border-top-color="red" border-top-width="0.5pt" border-top-style="solid"/> @@ -1025,7 +1024,7 @@ implementation status. </fo:block> - <fo:table border-collapse="collapse" table-layout="fixed"> + <fo:table border-collapse="collapse" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm" border-color="blue" border-width="0.5pt" border-style="solid"/> <fo:table-column column-width="3cm" border-color="blue" border-width="0.5pt" border-style="solid"/> <fo:table-column column-width="3cm" border-color="blue" border-width="0.5pt" border-style="solid"/> @@ -1090,7 +1089,7 @@ fo:table-cell level. </fo:block> - <fo:table border-collapse="collapse" table-layout="fixed"> + <fo:table border-collapse="collapse" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -1159,7 +1158,7 @@ Check the FOP compliance page for current implementation status. </fo:block> - <fo:table border-collapse="collapse" table-layout="fixed" + <fo:table border-collapse="collapse" table-layout="fixed" width="100%" border-style="solid" border-width="5pt" border-color="yellow"> <fo:table-column column-width="3cm" border-style="solid" border-width="3pt" border-color="black"/> @@ -1264,7 +1263,7 @@ the border properties differ only on color. </fo:block> - <fo:table border-collapse="collapse" table-layout="fixed"> + <fo:table border-collapse="collapse" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm" border-style="solid" border-width="3pt" border-color="black"/> diff --git a/examples/fo/tables/break.fo b/examples/fo/tables/break.fo index 81325c4ed..91559699d 100644 --- a/examples/fo/tables/break.fo +++ b/examples/fo/tables/break.fo @@ -34,7 +34,7 @@ Table 1: basic break after with next </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -81,7 +81,7 @@ Table 2: basic break before with next </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -128,7 +128,7 @@ Table 3: basic break before a keep with next </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -175,7 +175,7 @@ Table 4: basic break after a keep with previous </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -222,7 +222,7 @@ Table 5: basic break after a keep with previous </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> diff --git a/examples/fo/tables/headfoot.fo b/examples/fo/tables/headfoot.fo index fd0a14590..4401a2c77 100644 --- a/examples/fo/tables/headfoot.fo +++ b/examples/fo/tables/headfoot.fo @@ -30,7 +30,7 @@ Table 1: with header </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> @@ -311,7 +311,7 @@ Table 2: with footer </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> @@ -592,7 +592,7 @@ Table 3: with header and footer and keeps </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> @@ -888,7 +888,7 @@ Table 4: cells spanning columns </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> @@ -940,7 +940,7 @@ Table 5: cells spanning rows </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="48pt"/> <fo:table-column column-width="48pt"/> <fo:table-column column-width="48pt"/> @@ -1054,7 +1054,7 @@ Table 6: table with header and multiple body's </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> @@ -1242,7 +1242,7 @@ Table 6: table with footer and multiple body's </fo:block> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> diff --git a/examples/fo/tables/keep.fo b/examples/fo/tables/keep.fo index b369d7162..929ee760d 100644 --- a/examples/fo/tables/keep.fo +++ b/examples/fo/tables/keep.fo @@ -34,7 +34,7 @@ Table 1: basic keep with next </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -81,7 +81,7 @@ Table 1: basic keep with previous </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -128,7 +128,7 @@ Table 1: basic keep with next and keep with previous </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -192,7 +192,7 @@ Table 1: basic multiple keep with next after normal row </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -324,7 +324,7 @@ Table 1: basic multiple keep (next and previous) after normal row </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="6cm"/> @@ -456,7 +456,7 @@ Table 1: basic multiple keep with next after normal row with normal row in middle </fo:block> - <fo:table border-width="0.5pt" border-color="red"> + <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="6cm"/> diff --git a/examples/fo/tables/omit.fo b/examples/fo/tables/omit.fo index 042f557ed..875afe77e 100644 --- a/examples/fo/tables/omit.fo +++ b/examples/fo/tables/omit.fo @@ -30,7 +30,7 @@ Table 1: with header </fo:block> - <fo:table table-omit-header-at-break="true"> + <fo:table table-omit-header-at-break="true" table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> @@ -311,7 +311,7 @@ Table 2: with footer </fo:block> - <fo:table table-omit-footer-at-break="true"> + <fo:table table-omit-footer-at-break="true" table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> @@ -592,7 +592,7 @@ Table 3: with header and footer and keeps </fo:block> - <fo:table table-omit-header-at-break="true" table-omit-footer-at-break="true"> + <fo:table table-omit-header-at-break="true" table-omit-footer-at-break="true" table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> @@ -888,7 +888,7 @@ Table 6: table with multiple body's </fo:block> - <fo:table table-omit-header-at-break="true"> + <fo:table table-omit-header-at-break="true" table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> @@ -1076,7 +1076,7 @@ Table 6: table with multiple body's </fo:block> - <fo:table table-omit-footer-at-break="true"> + <fo:table table-omit-footer-at-break="true" table-layout="fixed" width="100%"> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> <fo:table-column column-width="2cm"/> diff --git a/examples/fo/tables/space.fo b/examples/fo/tables/space.fo index c0562d8f9..e409720bb 100644 --- a/examples/fo/tables/space.fo +++ b/examples/fo/tables/space.fo @@ -30,7 +30,7 @@ Table 1: spaces around cells </fo:block> - <fo:table border-style="solid" border-width="0.5pt" border-color="red"> + <fo:table border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -109,7 +109,7 @@ Table 2: spaces around rows </fo:block> - <fo:table border-style="solid" border-width="0.5pt" border-color="red"> + <fo:table border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -190,7 +190,7 @@ Table 3: spaces around body </fo:block> - <fo:table border-style="solid" border-width="0.5pt" border-color="red"> + <fo:table border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -281,7 +281,7 @@ </fo:block> <fo:block border-style="solid" border-width="0.5pt"> - <fo:table space-before.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red"> + <fo:table space-before.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -309,7 +309,7 @@ </fo:block> <fo:block border-style="solid" border-width="0.5pt"> - <fo:table padding-left="5pt" border-style="solid" border-width="0.5pt" border-color="red"> + <fo:table padding-left="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -337,7 +337,7 @@ </fo:block> <fo:block border-style="solid" border-width="0.5pt"> - <fo:table padding-right="5pt" border-style="solid" border-width="0.5pt" border-color="red"> + <fo:table padding-right="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -365,7 +365,7 @@ </fo:block> <fo:block border-style="solid" border-width="0.5pt"> - <fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red"> + <fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -397,7 +397,7 @@ </fo:block> <fo:block border-style="solid" border-width="0.5pt"> - <fo:table space-after.optimum="20pt" border-style="solid" border-width="0.5pt" border-color="red"> + <fo:table space-after.optimum="20pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> @@ -462,7 +462,7 @@ </fo:block> <fo:block border-style="solid" border-width="0.5pt"> - <fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red"> + <fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> <fo:table-column column-width="3cm"/> |