chrisg 2002/11/25 03:56:53 Modified: . Tag: fop-0_20_2-maintain CHANGES docs/examples/fo Tag: fop-0_20_2-maintain border.fo hyphen.fo leader.fo newlinktest.fo pdfoutline.fo readme.fo table.fo tableunits.fo textdeko.fo Log: Updated examples/fo files to remove all errors and warnings during build Submitted by: Manuel Mall <[EMAIL PROTECTED]> (see bug #13867) Revision Changes Path No revision No revision 1.10.2.30 +2 -0 xml-fop/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.29 retrieving revision 1.10.2.30 diff -u -r1.10.2.29 -r1.10.2.30 --- CHANGES 22 Nov 2002 15:10:44 -0000 1.10.2.29 +++ CHANGES 25 Nov 2002 11:56:51 -0000 1.10.2.30 @@ -1,6 +1,8 @@ ============================================================================== Done since 0.20.4 release +- Updated examples/fo files to remove all errors and warnings during build + Submitted by: Manuel Mall <[EMAIL PROTECTED]> (see bug #13867) - Perfomance tuning (reduced object creation etc.) (see bug #14103) Submitted by: Henrik Olsson <[EMAIL PROTECTED]> - Update to Xerces 2.2.1 (Jeremias Maerki) No revision No revision 1.8.2.2 +46 -47 xml-fop/docs/examples/fo/border.fo Index: border.fo =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/fo/border.fo,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -r1.8.2.1 -r1.8.2.2 --- border.fo 6 Dec 2001 21:28:18 -0000 1.8.2.1 +++ border.fo 25 Nov 2002 11:56:51 -0000 1.8.2.2 @@ -1,75 +1,74 @@ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <fo:layout-master-set> <fo:simple-page-master - margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm" - page-width="21cm" page-height="29.7cm" master-name="first"> + margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm" + page-width="21cm" page-height="29.7cm" master-name="first"> <fo:region-body></fo:region-body> </fo:simple-page-master> <fo:simple-page-master - margin-right="2.5cm" margin-left="2.5cm" margin-bottom="2cm" margin-top="1cm" - page-width="21cm" page-height="29.7cm" master-name="rest"> + margin-right="2.5cm" margin-left="2.5cm" margin-bottom="2cm" margin-top="1cm" + page-width="21cm" page-height="29.7cm" master-name="rest"> <fo:region-body></fo:region-body> </fo:simple-page-master> - - <fo:page-sequence-master master-name="psmA"> - <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-reference="first" - page-position="first" /> - <fo:conditional-page-master-reference master-reference="rest" - page-position="rest" /> - <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-reference="rest" /> - </fo:repeatable-page-master-alternatives> - </fo:page-sequence-master> + + <fo:page-sequence-master master-name="psmA"> + <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="first" + page-position="first" /> + <fo:conditional-page-master-reference master-reference="rest" + page-position="rest" /> + <!-- recommended fallback procedure --> + <fo:conditional-page-master-reference master-reference="rest" /> + </fo:repeatable-page-master-alternatives> + </fo:page-sequence-master> </fo:layout-master-set> <fo:page-sequence master-reference="psmA"> <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 - </fo:block> + PX7.net + </fo:block> <fo:block text-align="start" line-height="18pt" font-family="sans-serif" font-weight="bold" font-size="14pt"> - 44 Liberty St - </fo:block> + 44 Liberty St + </fo:block> <fo:block text-align="start" line-height="18pt" font-family="sans-serif" font-weight="bold" font-size="14pt"> - Newburyport, MA 01950 - </fo:block> + Newburyport, MA 01950 + </fo:block> <fo:block text-align="start" line-height="18pt" font-family="sans-serif" font-weight="bold" font-size="14pt"> - 978-462-1152 - </fo:block> + 978-462-1152 + </fo:block> </fo:block-container> <fo:block-container height="1cm" width="6cm" top="0cm" left="14cm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="22pt" font-family="sans-serif" font-size="23pt"> - Sales Receipt - </fo:block> + Sales Receipt + </fo:block> </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="2.49cm" top="1.2cm" left="13.8cm" padding=".6mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="12pt"> - DATE - </fo:block> + DATE + </fo:block> </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="2.49cm" top="1.87cm" left="13.8cm" padding=".6mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="10pt"> - 01/01/2000 - </fo:block> + 01/01/2000 + </fo:block> </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="2.49cm" top="1.2cm" left="16.46cm" padding=".6mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="12pt"> - SALE # - </fo:block> + SALE # + </fo:block> </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="2.49cm" top="1.87cm" left="16.46cm" padding=".6mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="10pt"> - 1 - </fo:block> + 1 + </fo:block> </fo:block-container> - <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="8.95cm" top="3cm" left="0cm" padding=".6mm" position="absolute"> <fo:block text-align="start" line-height="14pt" font-family="sans-serif" font-size="12pt"> - SOLD TO - </fo:block> + SOLD TO + </fo:block> </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="3cm" width="8.95cm" top="3.67cm" left="0cm" padding=".6mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="12pt"> @@ -77,8 +76,8 @@ </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="8.95cm" top="3cm" left="10cm" padding=".6mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="12pt"> - SHIP TO - </fo:block> + SHIP TO + </fo:block> </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="3cm" width="8.95cm" top="3.67cm" left="10cm" padding=".6mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="12pt"> @@ -88,28 +87,28 @@ <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="3.96cm" top="7.25cm" left="10.74cm" padding="1mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="12pt"> - PMT METHOD - </fo:block> + PMT METHOD + </fo:block> </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="3.96cm" top="8cm" left="10.74cm" padding="1mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="10pt"> - Check - </fo:block> + Check + </fo:block> </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="3.96cm" top="7.25cm" left="14.95cm" padding="1mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="12pt"> - CHECK # - </fo:block> + CHECK # + </fo:block> </fo:block-container> <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="3.96cm" top="8cm" left="14.95cm" padding="1mm" position="absolute"> <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="10pt"> - 1234 - </fo:block> + 1234 + </fo:block> </fo:block-container> <fo:block-container height="17cm" width="19cm" top="9.4cm" left="0cm" position="absolute"> - <fo:table border-collapse="separate" border-color="yellow" border-style="solid" border-width=".6mm" height="17cm"> + <fo:table table-layout="fixed" border-collapse="separate" border-color="yellow" border-style="solid" border-width=".6mm" height="17cm"> <fo:table-column column-width="2.5cm"/> <fo:table-column column-width="11.5cm"/> <fo:table-column column-width="2.5cm"/> 1.4.2.3 +1 -1 xml-fop/docs/examples/fo/hyphen.fo Index: hyphen.fo =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/fo/hyphen.fo,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- hyphen.fo 25 May 2002 12:20:06 -0000 1.4.2.2 +++ hyphen.fo 25 Nov 2002 11:56:51 -0000 1.4.2.3 @@ -330,7 +330,7 @@ <!-- this defines a title --> <fo:block font-size="12pt" - font-family="Palatino" + font-family="sans-serif" line-height="12pt" background-color="blue" color="white" 1.7.4.2 +2 -2 xml-fop/docs/examples/fo/leader.fo Index: leader.fo =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/fo/leader.fo,v retrieving revision 1.7.4.1 retrieving revision 1.7.4.2 diff -u -r1.7.4.1 -r1.7.4.2 --- leader.fo 6 Dec 2001 21:28:18 -0000 1.7.4.1 +++ leader.fo 25 Nov 2002 11:56:51 -0000 1.7.4.2 @@ -319,7 +319,7 @@ <!-- table start --> - <fo:table> + <fo:table table-layout="fixed"> <fo:table-column column-width="20mm"/> <fo:table-column column-width="60mm"/> <fo:table-column column-width="50mm"/> @@ -383,7 +383,7 @@ <!-- Here starts the table --> - <fo:table> + <fo:table table-layout="fixed"> <fo:table-column column-width="1cm"/> <fo:table-column column-width="14.2cm"/> <fo:table-column column-width="0.3cm"/> 1.1.2.2 +1 -1 xml-fop/docs/examples/fo/newlinktest.fo Index: newlinktest.fo =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/fo/newlinktest.fo,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- newlinktest.fo 6 Dec 2001 21:28:18 -0000 1.1.2.1 +++ newlinktest.fo 25 Nov 2002 11:56:51 -0000 1.1.2.2 @@ -78,7 +78,7 @@ </fo:block> <!-- table start --> - <fo:table> + <fo:table table-layout="fixed"> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> 1.2.4.3 +42 -42 xml-fop/docs/examples/fo/pdfoutline.fo Index: pdfoutline.fo =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/fo/pdfoutline.fo,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -u -r1.2.4.2 -r1.2.4.3 --- pdfoutline.fo 11 Feb 2002 00:43:43 -0000 1.2.4.2 +++ pdfoutline.fo 25 Nov 2002 11:56:51 -0000 1.2.4.3 @@ -44,14 +44,14 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="basicPSM" > - <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-reference="first" - page-position="first" /> - <fo:conditional-page-master-reference master-reference="rest" - page-position="rest" /> - <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-reference="rest" /> - </fo:repeatable-page-master-alternatives> + <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="first" + page-position="first" /> + <fo:conditional-page-master-reference master-reference="rest" + page-position="rest" /> + <!-- recommended fallback procedure --> + <fo:conditional-page-master-reference master-reference="rest" /> + </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> </fo:layout-master-set> @@ -951,34 +951,34 @@ </fo:block> <fo:block space-after.optimum="3pt" font-family="serif">A working basic example of a table looks like this: </fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"><fo:table></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-body font-size="10pt" font-family="sans-serif"></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-body></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-body font-size="10pt" font-family="sans-serif"></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-body></fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"></fo:table></fo:block> @@ -1207,9 +1207,9 @@ <fo:block id="sec11" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >K) Licence</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif"> ============================================================================</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif"> The Apache Software License, Version 1.1</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif"> ============================================================================</fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">==================================================================</fo:block> + <fo:block space-after.optimum="3pt" font-family="serif" text-align="center">The Apache Software License, Version 1.1</fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">==================================================================</fo:block> <fo:block space-after.optimum="3pt" font-family="serif"> Copyright (C) 1999 The Apache Software Foundation. All rights reserved.</fo:block> <fo:block space-after.optimum="3pt" font-family="serif"> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</fo:block> @@ -1243,8 +1243,8 @@ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF @@ -1264,7 +1264,7 @@ <fo:block font-size="14pt" font-family="sans-serif" line-height="10pt" space-after.optimum="15pt" font-weight="bold" start-indent="15pt" break-before="page"> Content </fo:block> -<fo:table> +<fo:table table-layout="fixed"> <fo:table-column column-width="1cm"/> <fo:table-column column-width="12cm"/> <fo:table-column column-width="1cm"/> 1.11.4.3 +42 -42 xml-fop/docs/examples/fo/readme.fo Index: readme.fo =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/fo/readme.fo,v retrieving revision 1.11.4.2 retrieving revision 1.11.4.3 diff -u -r1.11.4.2 -r1.11.4.3 --- readme.fo 11 Feb 2002 00:43:44 -0000 1.11.4.2 +++ readme.fo 25 Nov 2002 11:56:52 -0000 1.11.4.3 @@ -42,14 +42,14 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="basicPSM" > - <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-reference="first" - page-position="first" /> - <fo:conditional-page-master-reference master-reference="rest" - page-position="rest" /> - <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-reference="rest" /> - </fo:repeatable-page-master-alternatives> + <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="first" + page-position="first" /> + <fo:conditional-page-master-reference master-reference="rest" + page-position="rest" /> + <!-- recommended fallback procedure --> + <fo:conditional-page-master-reference master-reference="rest" /> + </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> </fo:layout-master-set> @@ -881,34 +881,34 @@ </fo:block> <fo:block space-after.optimum="3pt" font-family="serif">A working basic example of a table looks like this: </fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"><fo:table></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-body font-size="10pt" font-family="sans-serif"></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> - <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-body></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-body font-size="10pt" font-family="sans-serif"></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:block>text</fo:block></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-cell></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> + <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-body></fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"></fo:table></fo:block> @@ -1137,9 +1137,9 @@ <fo:block id="sec11" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >K) Licence</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif"> ============================================================================</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif"> The Apache Software License, Version 1.1</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif"> ============================================================================</fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">==================================================================</fo:block> + <fo:block space-after.optimum="3pt" font-family="serif" text-align="center">The Apache Software License, Version 1.1</fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">==================================================================</fo:block> <fo:block space-after.optimum="3pt" font-family="serif"> Copyright (C) 1999 The Apache Software Foundation. All rights reserved.</fo:block> <fo:block space-after.optimum="3pt" font-family="serif"> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</fo:block> @@ -1173,8 +1173,8 @@ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF @@ -1194,7 +1194,7 @@ <fo:block font-size="14pt" font-family="sans-serif" line-height="10pt" space-after.optimum="15pt" font-weight="bold" start-indent="15pt" break-before="page"> Content </fo:block> -<fo:table> +<fo:table table-layout="fixed"> <fo:table-column column-width="1cm"/> <fo:table-column column-width="12cm"/> <fo:table-column column-width="1cm"/> 1.7.2.2 +11 -11 xml-fop/docs/examples/fo/table.fo Index: table.fo =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/fo/table.fo,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -r1.7.2.1 -r1.7.2.2 --- table.fo 6 Dec 2001 21:28:18 -0000 1.7.2.1 +++ table.fo 25 Nov 2002 11:56:52 -0000 1.7.2.2 @@ -49,7 +49,7 @@ </fo:block> <!-- table start --> - <fo:table> + <fo:table table-layout="fixed"> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> @@ -102,7 +102,7 @@ <!-- table start --> - <fo:table border-width="0.5mm" border-style="solid" background-color="yellow"> + <fo:table table-layout="fixed" border-width="0.5mm" border-style="solid" background-color="yellow"> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> @@ -156,7 +156,7 @@ <!-- table start --> - <fo:table border-width="3mm" border-style="solid" background-color="yellow"> + <fo:table table-layout="fixed" border-width="3mm" border-style="solid" background-color="yellow"> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> @@ -210,7 +210,7 @@ <!-- table start --> - <fo:table border-collapse="separate"> + <fo:table table-layout="fixed" border-collapse="separate"> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> @@ -263,7 +263,7 @@ <!-- table start --> - <fo:table border-collapse="separate"> + <fo:table table-layout="fixed" border-collapse="separate"> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> @@ -298,7 +298,7 @@ </fo:block> <!-- table start --> - <fo:table border-collapse="separate"> + <fo:table table-layout="fixed" border-collapse="separate"> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> <fo:table-column column-width="50mm"/> @@ -350,7 +350,7 @@ </fo:block> - <fo:table border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)"> + <fo:table table-layout="fixed" border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)"> <fo:table-column column-width="150mm"/> <fo:table-body> <fo:table-row> @@ -360,7 +360,7 @@ </fo:table> - <fo:table border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)" > + <fo:table table-layout="fixed" border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)" > <fo:table-column column-width="150mm"/> <fo:table-body> <fo:table-row> @@ -370,7 +370,7 @@ </fo:table> - <fo:table border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)" > + <fo:table table-layout="fixed" border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)" > <fo:table-column column-width="150mm"/> <fo:table-body> <fo:table-row> @@ -379,7 +379,7 @@ </fo:table-body> </fo:table> - <fo:table border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)"> + <fo:table table-layout="fixed" border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)"> <fo:table-column column-width="150mm"/> <fo:table-body> <fo:table-row> @@ -405,7 +405,7 @@ </fo:block> <!-- Here starts the table --> - <fo:table> + <fo:table table-layout="fixed"> <fo:table-column column-width="1cm"/> <fo:table-column column-width="15cm"/> <fo:table-body font-size="10pt" font-family="sans-serif"> 1.1.2.2 +37 -29 xml-fop/docs/examples/fo/tableunits.fo Index: tableunits.fo =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/fo/tableunits.fo,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- tableunits.fo 6 Dec 2001 21:28:18 -0000 1.1.2.1 +++ tableunits.fo 25 Nov 2002 11:56:53 -0000 1.1.2.2 @@ -25,9 +25,9 @@ <!-- normal text --> <fo:block space-after="1cm" text-align="start" padding="0.4in" - border="thick solid red">Table unit tests</fo:block> - <fo:table border-collapse="collapse" width="6in"> - <fo:table-column column-width="(4.5in - 2cm) div 3 +1in" background-color="yellow"/> + border-width="thick" border-style="solid" border-color="red">Table unit tests</fo:block> + <fo:table table-layout="fixed" border-collapse="collapse" width="6in"> + <fo:table-column column-width="(4.5in - 2cm) div 3 + 1in" background-color="yellow"/> <fo:table-column column-width="(4.5in - 2cm) div 3 + 0.5in" background-color="blue"/> <fo:table-column column-width="(4.5in - 2cm) div 3 + 2.0cm" background-color="green"/> <fo:table-body> @@ -39,14 +39,14 @@ </fo:table-body> </fo:table> <!-- table start --> - <fo:table border-collapse="collapse" width="6in"> + <fo:table table-layout="fixed" border-collapse="collapse" width="6in"> <fo:table-column column-width="1in + proportional-column-width(1)" background-color="yellow"/> <fo:table-column column-width="2 * (proportional-column-width(1) + .5in) div 2" background-color="blue"/> <fo:table-column column-width="proportional-column-width(1) + 2.0cm" background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell -deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell> +deeper than the others to check out the alignment properties.</fo:block></fo:table-cell> <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell> <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell> </fo:table-row> @@ -68,14 +68,14 @@ 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="collapse" width="100%"> + <fo:table table-layout="fixed" border-collapse="collapse" width="100%"> <fo:table-column background-color="yellow"/> <fo:table-column background-color="blue"/> <fo:table-column background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell -deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell> +deeper than the others to check out the alignment properties.</fo:block></fo:table-cell> <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell> <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell> </fo:table-row> @@ -86,50 +86,53 @@ The next table has fixed column widths=13cm, ipd.optimum=12cm and ipd.max = 100%. </fo:block> <!-- table start --> - <fo:table border-collapse="collapse" inline-progression-dimension="12cm" - inline-progression-dimension.maximum="100%"> + <fo:table table-layout="fixed" border-collapse="collapse" inline-progression-dimension="12cm" + inline-progression-dimension.maximum="100%"> <fo:table-column column-width="8cm" background-color="yellow"/> <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/> <fo:table-column column-width="5cm" background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell -deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell> +deeper than the others to check out the alignment properties.</fo:block></fo:table-cell> <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell> <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell> </fo:table-row> </fo:table-body> - </fo:table><fo:block space-before="12pt" space-after="6pt"> -The next table has fixed column widths=16.5cm, ipd.optimum=14cm and ipd.max = 100% (16cm). + </fo:table> + +<fo:block space-before="12pt" space-after="6pt"> +The next table has fixed column widths=12.5cm, ipd.optimum=14cm and ipd.max = 100% (16cm). </fo:block> <!-- table start --> - <fo:table border-collapse="collapse" inline-progression-dimension="14cm" - inline-progression-dimension.maximum="100%"> - <fo:table-column column-width="8.5cm" background-color="yellow"/> + <fo:table table-layout="fixed" border-collapse="collapse" inline-progression-dimension="14cm" + inline-progression-dimension.maximum="100%"> + <fo:table-column column-width="6.5cm" background-color="yellow"/> <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/> - <fo:table-column column-width="8cm" background-color="green"/> + <fo:table-column column-width="6cm" background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell -deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell> +deeper than the others to check out the alignment properties.</fo:block></fo:table-cell> <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell> <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> + <fo:block space-before="12pt" space-after="6pt"> The next table has width="70% + 1cm" and fixed lengths and the first table-column has column-width="from-parent('width') div 3". </fo:block> <!-- table start --> - <fo:table border-collapse="collapse" width="70% + 1cm"> + <fo:table table-layout="fixed" border-collapse="collapse" 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-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell -deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell> +deeper than the others to check out the alignment properties.</fo:block></fo:table-cell> <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell> <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell> </fo:table-row> @@ -141,25 +144,28 @@ middle column has a fixed width; the other two have default width. </fo:block> <!-- table start --> - <fo:table border-collapse="collapse" - inline-progression-dimension="15cm"> + <fo:table table-layout="fixed" border-collapse="collapse" + inline-progression-dimension="15cm"> <fo:table-column background-color="yellow"/> <fo:table-column column-width="3cm" background-color="blue"/> <fo:table-column background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell -deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell> +deeper than the others to check out the alignment properties.</fo:block></fo:table-cell> <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell> <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> +<!-- This generates in error in FOP <fo:block space-before="12pt" space-after="6pt"> The next table specifies neither width nor inline-progression-dimenion. </fo:block> +--> <!-- table start --> +<!-- <fo:table table-layout="fixed" border-collapse="collapse"> <fo:table-column background-color="yellow"/> <fo:table-column column-width="3cm" background-color="blue"/> @@ -167,12 +173,13 @@ <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell -deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell> +deeper than the others to check out the alignment properties.</fo:block></fo:table-cell> <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell> <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> +--> <fo:block space-before="12pt" space-after="6pt"> The next table specifies inline-progression-dimenion.minimum="10cm" and @@ -180,35 +187,36 @@ </fo:block> <!-- table start --> <fo:table table-layout="fixed" border-collapse="collapse" - inline-progression-dimension.minimum="10cm"> + inline-progression-dimension.minimum="10cm"> <fo:table-column background-color="yellow"/> <fo:table-column column-width="5cm" background-color="blue"/> <fo:table-column background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell -deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell> +deeper than the others to check out the alignment properties.</fo:block></fo:table-cell> <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell> <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> + <fo:block space-before="12pt" space-after="6pt"> The next table specifies inline-progression-dimenion.minimum="10cm", -inline-progression-dimension.maximum="17cm and +inline-progression-dimension.maximum="16cm and specifies a column width of 5cm on the middle column only.. </fo:block> <!-- table start --> <fo:table table-layout="fixed" border-collapse="collapse" - inline-progression-dimension.minimum="10cm" - inline-progression-dimension.maximum="17cm"> + inline-progression-dimension.minimum="10cm" + inline-progression-dimension.maximum="16cm"> <fo:table-column background-color="yellow"/> <fo:table-column column-width="5cm" background-color="blue"/> <fo:table-column background-color="green"/> <fo:table-body> <fo:table-row> <fo:table-cell display-align="before"><fo:block>Some text to make this cell -deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell> +deeper than the others to check out the alignment properties.</fo:block></fo:table-cell> <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell> <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell> </fo:table-row> 1.3.4.5 +10 -9 xml-fop/docs/examples/fo/textdeko.fo Index: textdeko.fo =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/fo/textdeko.fo,v retrieving revision 1.3.4.4 retrieving revision 1.3.4.5 diff -u -r1.3.4.4 -r1.3.4.5 --- textdeko.fo 7 Jun 2002 20:13:23 -0000 1.3.4.4 +++ textdeko.fo 25 Nov 2002 11:56:53 -0000 1.3.4.5 @@ -33,14 +33,14 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="basicPSM" > - <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-reference="first" - page-position="first" /> - <fo:conditional-page-master-reference master-reference="rest" - page-position="rest" /> - <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-reference="rest" /> - </fo:repeatable-page-master-alternatives> + <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="first" + page-position="first" /> + <fo:conditional-page-master-reference master-reference="rest" + page-position="rest" /> + <!-- recommended fallback procedure --> + <fo:conditional-page-master-reference master-reference="rest" /> + </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> </fo:layout-master-set> @@ -202,6 +202,7 @@ </fo:list-block> + <!-- as this doesn't work its commented out to avoid user confusion <fo:block font-size="12pt" space-after.optimum="3pt"> <fo:inline text-decoration="underline overline">Combination</fo:inline> of property values should also be possible, but does not work in FOP at the moment. @@ -211,7 +212,7 @@ <fo:inline font-family="monospace"><![CDATA[<fo:inline text-decoration="underline overline"> Combination</fo:inline>]]></fo:inline> </fo:block> - + --> <fo:block space-after.optimum="13pt"> And now <fo:inline text-decoration="underline">more than a word...</fo:inline>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]