You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ma...@apache.org on 2005/11/13 11:50:31 UTC
svn commit: r332960 - in /xmlgraphics/fop/trunk/examples/fo/basic:
blockcontainer.fo border.fo hyphen.fo leader.fo newlinktest.fo
pdfoutline.fo readme.fo table.fo tableunits.fo textdeko.fo
Author: manuel
Date: Sun Nov 13 02:50:21 2005
New Revision: 332960
URL: http://svn.apache.org/viewcvs?rev=332960&view=rev
Log:
Updated examples in examples/basic/fo to match 0.90 and to reduce warnings when they are built using the examples ant target
Modified:
xmlgraphics/fop/trunk/examples/fo/basic/blockcontainer.fo
xmlgraphics/fop/trunk/examples/fo/basic/border.fo
xmlgraphics/fop/trunk/examples/fo/basic/hyphen.fo
xmlgraphics/fop/trunk/examples/fo/basic/leader.fo
xmlgraphics/fop/trunk/examples/fo/basic/newlinktest.fo
xmlgraphics/fop/trunk/examples/fo/basic/pdfoutline.fo
xmlgraphics/fop/trunk/examples/fo/basic/readme.fo
xmlgraphics/fop/trunk/examples/fo/basic/table.fo
xmlgraphics/fop/trunk/examples/fo/basic/tableunits.fo
xmlgraphics/fop/trunk/examples/fo/basic/textdeko.fo
Modified: xmlgraphics/fop/trunk/examples/fo/basic/blockcontainer.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/blockcontainer.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/blockcontainer.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/blockcontainer.fo Sun Nov 13 02:50:21 2005
@@ -1,11 +1,11 @@
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-<fo:layout-master-set>
- <fo:simple-page-master master-name="one">
- <fo:region-body margin-top="25pt" margin-bottom="25pt" margin-left="50pt" margin-right="50pt" />
- </fo:simple-page-master>
-</fo:layout-master-set>
-<fo:page-sequence master-reference="one">
-<fo:flow flow-name="xsl-region-body">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="one">
+ <fo:region-body margin-top="25pt" margin-bottom="25pt" margin-left="50pt" margin-right="50pt" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="one">
+ <fo:flow flow-name="xsl-region-body">
<fo:block text-align="center" font-size="16pt" font-weight="bold">
Block Containers
</fo:block>
Modified: xmlgraphics/fop/trunk/examples/fo/basic/border.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/border.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/border.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/border.fo Sun Nov 13 02:50:21 2005
@@ -119,7 +119,7 @@
<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 border-collapse="separate" height="17cm" border-color="yellow" border-style="solid" border-width=".6mm" table-layout="fixed" width="100%">
<fo:table-column column-width="2.5cm"/>
<fo:table-column column-width="11.5cm"/>
<fo:table-column column-width="2.5cm"/>
Modified: xmlgraphics/fop/trunk/examples/fo/basic/hyphen.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/hyphen.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/hyphen.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/hyphen.fo Sun Nov 13 02:50:21 2005
@@ -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"
Modified: xmlgraphics/fop/trunk/examples/fo/basic/leader.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/leader.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/leader.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/leader.fo Sun Nov 13 02:50:21 2005
@@ -305,8 +305,8 @@
</fo:block>
</fo:list-item-body>
</fo:list-item>
- </fo:list-block>
- <!-- list end -->
+ </fo:list-block>
+ <!-- list end -->
<fo:block font-size="12pt"
font-family="sans-serif"
@@ -318,48 +318,48 @@
</fo:block>
- <!-- table start -->
- <fo:table>
- <fo:table-column column-width="20mm"/>
- <fo:table-column column-width="60mm"/>
- <fo:table-column column-width="50mm"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell ><fo:block>Entry 1</fo:block></fo:table-cell>
- <fo:table-cell >
+ <!-- table start -->
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate">
+ <fo:table-column column-width="20mm"/>
+ <fo:table-column column-width="60mm"/>
+ <fo:table-column column-width="50mm"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell ><fo:block>Entry 1</fo:block></fo:table-cell>
+ <fo:table-cell >
<fo:block text-align="start">
<fo:leader leader-pattern="dots"
leader-pattern-width="8pt"
leader-length="6cm"/>
</fo:block>
- </fo:table-cell>
- <fo:table-cell ><fo:block>p. 12</fo:block></fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell ><fo:block>Entry 2 </fo:block></fo:table-cell>
- <fo:table-cell >
+ </fo:table-cell>
+ <fo:table-cell ><fo:block>p. 12</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell ><fo:block>Entry 2 </fo:block></fo:table-cell>
+ <fo:table-cell >
<fo:block text-align="start">
<fo:leader leader-pattern="dots"
leader-pattern-width="8pt"
leader-length="6cm"/>
</fo:block>
- </fo:table-cell>
- <fo:table-cell ><fo:block>p. 24</fo:block></fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell ><fo:block>Entry 3 </fo:block></fo:table-cell>
- <fo:table-cell >
+ </fo:table-cell>
+ <fo:table-cell ><fo:block>p. 24</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell ><fo:block>Entry 3 </fo:block></fo:table-cell>
+ <fo:table-cell >
<fo:block text-align="start">
<fo:leader leader-pattern="dots"
leader-pattern-width="8pt"
leader-length="6cm"/>
</fo:block>
- </fo:table-cell>
- <fo:table-cell ><fo:block>p. 36</fo:block></fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- <!-- table end -->
+ </fo:table-cell>
+ <fo:table-cell ><fo:block>p. 36</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <!-- table end -->
@@ -367,23 +367,23 @@
font-size="15pt"
space-before.optimum="16pt"
space-after.optimum="12pt">
- Table of Content
+ Table of Content
</fo:block>
<fo:block text-align="start"
font-size="10pt"
space-after.optimum="12pt">
- shows the use of leader properties in combination to build a table of content.
- Following values are used for the leader:
- leader-pattern="dots"
- leader-pattern-width="8pt"
- leader-alignment="reference-area"
- no leader-length is specified, so the default values are used (min: 0, opt: 12pt, max: 100%)
+ shows the use of leader properties in combination to build a table of content.
+ Following values are used for the leader:
+ leader-pattern="dots"
+ leader-pattern-width="8pt"
+ leader-alignment="reference-area"
+ no leader-length is specified, so the default values are used (min: 0, opt: 12pt, max: 100%)
</fo:block>
<!-- Here starts the table -->
- <fo:table>
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate">
<fo:table-column column-width="1cm"/>
<fo:table-column column-width="14.2cm"/>
<fo:table-column column-width="0.3cm"/>
@@ -437,11 +437,6 @@
</fo:table-body>
</fo:table>
-
-
-
-
-
<fo:block font-size="14pt"
font-family="sans-serif"
Modified: xmlgraphics/fop/trunk/examples/fo/basic/newlinktest.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/newlinktest.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/newlinktest.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/newlinktest.fo Sun Nov 13 02:50:21 2005
@@ -91,7 +91,7 @@
</fo:block>
<!-- table start -->
- <fo:table>
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate">
<fo:table-column column-width="50mm"/>
<fo:table-column column-width="50mm"/>
<fo:table-column column-width="50mm"/>
Modified: xmlgraphics/fop/trunk/examples/fo/basic/pdfoutline.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/pdfoutline.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/pdfoutline.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/pdfoutline.fo Sun Nov 13 02:50:21 2005
@@ -1255,7 +1255,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" width="100%" border-collapse="separate">
<fo:table-column column-width="1cm"/>
<fo:table-column column-width="12cm"/>
<fo:table-column column-width="1cm"/>
Modified: xmlgraphics/fop/trunk/examples/fo/basic/readme.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/readme.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/readme.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/readme.fo Sun Nov 13 02:50:21 2005
@@ -41,28 +41,28 @@
<fo:region-after extent="1.5cm"/>
</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:page-sequence-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:page-sequence-master>
</fo:layout-master-set>
<!-- end: defines page layout -->
- <!-- actual layout -->
- <fo:page-sequence master-reference="basicPSM">
+<!-- actual layout -->
+<fo:page-sequence master-reference="basicPSM">
<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: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>
@@ -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" width="100%" border-collapse="separate">
<fo:table-column column-width="1cm"/>
<fo:table-column column-width="12cm"/>
<fo:table-column column-width="1cm"/>
Modified: xmlgraphics/fop/trunk/examples/fo/basic/table.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/table.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/table.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/table.fo Sun Nov 13 02:50:21 2005
@@ -49,7 +49,7 @@
</fo:block>
<!-- table start -->
- <fo:table>
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate">
<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 border-width="0.5mm" border-style="solid" background-color="yellow" table-layout="fixed" width="100%" border-collapse="separate">
<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 border-width="3mm" border-style="solid" background-color="yellow" table-layout="fixed" width="100%" border-collapse="separate">
<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" width="100%" 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" width="100%" 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" width="100%" 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 border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)" table-layout="fixed" width="100%" border-collapse="separate">
<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 border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)" table-layout="fixed" width="100%" border-collapse="separate">
<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 border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)" table-layout="fixed" width="100%" border-collapse="separate">
<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 border-width="1.5mm" border-style="solid" background-color="rgb(100,210,250)" table-layout="fixed" width="100%" border-collapse="separate">
<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" width="100%" border-collapse="separate">
<fo:table-column column-width="1cm"/>
<fo:table-column column-width="15cm"/>
<fo:table-body font-size="10pt" font-family="sans-serif">
Modified: xmlgraphics/fop/trunk/examples/fo/basic/tableunits.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/tableunits.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/tableunits.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/tableunits.fo Sun Nov 13 02:50:21 2005
@@ -26,7 +26,7 @@
<!-- 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 border-collapse="separate" table-layout="fixed" 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"/>
@@ -39,7 +39,7 @@
</fo:table-body>
</fo:table>
<!-- table start -->
- <fo:table border-collapse="collapse" width="6in">
+ <fo:table border-collapse="separate" table-layout="fixed" 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"/>
@@ -68,7 +68,7 @@
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 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"/>
@@ -86,8 +86,11 @@
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 border-collapse="separate"
+ table-layout="fixed"
+ 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"/>
@@ -103,8 +106,9 @@
The next table has fixed column widths=16.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 border-collapse="separate" table-layout="fixed"
+ inline-progression-dimension="14cm"
+ inline-progression-dimension.maximum="100%">
<fo:table-column column-width="8.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"/>
@@ -122,7 +126,7 @@
has column-width="from-parent('width') div 3".
</fo:block>
<!-- table start -->
- <fo:table border-collapse="collapse" width="70% + 1cm">
+ <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"/>
@@ -141,8 +145,9 @@
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 border-collapse="separate"
+ table-layout="fixed"
+ 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"/>
@@ -160,7 +165,7 @@
The next table specifies neither width nor inline-progression-dimenion.
</fo:block>
<!-- table start -->
- <fo:table table-layout="fixed" border-collapse="collapse">
+ <fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column background-color="yellow"/>
<fo:table-column column-width="3cm" background-color="blue"/>
<fo:table-column background-color="green"/>
@@ -179,8 +184,8 @@
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">
+ <fo:table table-layout="fixed" border-collapse="separate"
+ 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"/>
@@ -199,9 +204,9 @@
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">
+ <fo:table table-layout="fixed" border-collapse="separate"
+ inline-progression-dimension.minimum="10cm"
+ inline-progression-dimension.maximum="17cm">
<fo:table-column background-color="yellow"/>
<fo:table-column column-width="5cm" background-color="blue"/>
<fo:table-column background-color="green"/>
Modified: xmlgraphics/fop/trunk/examples/fo/basic/textdeko.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/examples/fo/basic/textdeko.fo?rev=332960&r1=332959&r2=332960&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/fo/basic/textdeko.fo (original)
+++ xmlgraphics/fop/trunk/examples/fo/basic/textdeko.fo Sun Nov 13 02:50:21 2005
@@ -32,16 +32,16 @@
<fo:region-after extent="1.5cm"/>
</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:page-sequence-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:page-sequence-master>
</fo:layout-master-set>
<!-- end: defines page layout -->
@@ -59,7 +59,7 @@
<fo:block font-size="12pt" font-family="sans-serif" line-height="15pt" text-align="justify" space-after.optimum="10pt">
The "text-decoration"-property describes decorations that are added to the text of an element.
If the property is specified for a block-level element, it should affect all inline-level descendants
- of the element (does not work yet!).
+ of the element .
If it is specified for (or affects) an inline-level
element, it affects all boxes generated by the element.
</fo:block>
@@ -68,6 +68,10 @@
Example: <fo:inline text-decoration="underline">underline</fo:inline>
</fo:block>
+ <fo:block font-size="12pt" font-family="sans-serif" line-height="15pt" space-after.optimum="13pt" text-decoration="underline">
+ Block level example: underline
+ </fo:block>
+
<fo:block font-size="12pt" font-family="sans-serif" line-height="15pt" space-after.optimum="10pt">
<fo:inline font-family="monospace"><![CDATA[<fo:inline text-decoration="underline">underline</fo:inline>]]></fo:inline>
</fo:block>
@@ -77,7 +81,7 @@
line-height="15pt"
space-after.optimum="10pt"
text-align="start">
- This is simple test of the text-decoration<fo:inline text-decoration="underline">underline</fo:inline>.
+ This is simple test of the text-decoration <fo:inline text-decoration="underline">underline</fo:inline>.
</fo:block>
<fo:block font-size="22pt"
font-family="sans-serif"
@@ -204,7 +208,7 @@
<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.
+ values should also be possible.
</fo:block>
<fo:block font-size="12pt" space-after.optimum="13pt">
@@ -217,19 +221,17 @@
And now <fo:inline text-decoration="underline">more than a word...</fo:inline>
</fo:block>
- <fo:block space-after.optimum="13pt" font-size="14pt" >
- <fo:inline text-decoration="underline">
- This is a whole block wrapped in fo:inline with the property text-decoration="underline".
+ <fo:block space-after.optimum="13pt" font-size="14pt" text-decoration="underline">
+ This is a whole block with the property text-decoration="underline".
Some more Text to get at least two lines.
- </fo:inline>
</fo:block>
- <fo:block font-size="22pt"
+ <fo:block
font-family="sans-serif"
- line-height="22pt"
space-after.optimum="10pt"
- text-align="start">
- This is simple test with a <fo:inline text-decoration="overline">bigger font-size</fo:inline>.
+ text-align="start"
+ text-decoration="underline">
+ This is a whole block with the property text-decoration="underline" and an inline with text-decoration="overline" <fo:inline font-size="22pt" text-decoration="overline">bigger font-size</fo:inline>.
</fo:block>
<fo:block font-size="15pt"
font-family="monospace"
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org