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 fo...@locus.apache.org on 2000/11/15 22:51:56 UTC
cvs commit: xml-fop/docs/examples/svg Document.xsl
fotis 00/11/15 13:51:56
Modified: docs/examples/fo extensive.fo list2.fo
docs/examples/svg Document.xsl
Log:
renames white-space-treatment to white-space-collapse
Revision Changes Path
1.13 +4 -5 xml-fop/docs/examples/fo/extensive.fo
Index: extensive.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/extensive.fo,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- extensive.fo 2000/09/15 00:09:03 1.12
+++ extensive.fo 2000/11/15 21:51:55 1.13
@@ -113,12 +113,11 @@
<fo:block space-before.optimum="12pt">This is a rather long sentence that is going to keep on going and going, not really to demonstrate anything other that normal wrapping because the following paragraph will show what happens when wrap-option is set to no-wrap.</fo:block>
<fo:block space-before.optimum="12pt" wrap-option="no-wrap">This is a rather long sentence that is going to keep on going and going to demonstrate what happens when wrap-option is set to no-wrap which is unlike the preceding sentence where it defaults to wrap.</fo:block>
<fo:block space-before.optimum="12pt" wrap-option="wrap">This is a rather long sentence that is going to keep on going and going, not really to demonstrate anything other that normal wrapping but it differs from the first of these three sentences in that wrap is set explicitly.</fo:block>
-<!-- <fo:block font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt">White Space Treatment</fo:block>
+ <fo:block font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt">White Space Collapse</fo:block>
<fo:block>This is default!</fo:block>
-<fo:block white-space-treatment="preserve">This is preserve!</fo:block>
-<fo:block white-space-treatment="collapse">This is collapse!</fo:block>
-<fo:block white-space-treatment="ignore">This is ignore!</fo:block>
-<fo:block font-family="monospace" white-space-treatment="preserve">
+<fo:block white-space-collapse="false">This is false!</fo:block>
+<fo:block white-space-collapse="true">This is true!</fo:block>
+<fo:block font-family="monospace" white-space-collapse="false">
<![CDATA[
<?xml version="1.0"?>
<document>
1.2 +594 -210 xml-fop/docs/examples/fo/list2.fo
Index: list2.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/list2.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list2.fo 2000/11/14 15:13:16 1.1
+++ list2.fo 2000/11/15 21:51:56 1.2
@@ -163,113 +163,37 @@
font-family="Courier"
line-height="10pt"
text-align="start"
- space-before.optimum="3cm">
- <!-- list start -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:list-block >
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <!-- list item -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:list-item>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <!-- insert a bullet -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:list-item-label>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:list-item-label>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <!-- list text -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:list-item-body>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:block>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- here is text in the list item body
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:block>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:list-item-body>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:list-item>
+ space-before.optimum="3cm"
+ white-space-collapse="false"
+ wrap-option="no-wrap">
+<![CDATA[
+<!-- list start -->
+<fo:list-block >
+ <!-- list item -->
+ <fo:list-item>
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block>
+ <fo:inline font-family="Symbol">&#183;</fo:inline>
</fo:block>
-
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- [other list items...]
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block>
+ here is text in the list item body
</fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <!-- end start -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:list-block>
- </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ [other list items...]
+
+</fo:list-block>
+<!-- end list -->
+]]>
+
+</fo:block>
+
<!-- code ends -->
@@ -372,119 +296,41 @@
</fo:list-block>
<!-- end list -->
-
<!-- code -->
<fo:block font-size="10pt"
font-family="Courier"
line-height="10pt"
text-align="start"
- space-before.optimum="2cm">
- <!-- list start -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:list-block provisional-distance-between-starts="0.3cm" provisional-label-separation="0.15cm">
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <!-- list item -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:list-item>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <!-- insert a bullet -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:list-item-label>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:list-item-label>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <!-- list text -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:list-item-body>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <fo:block>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- here is text in the list item body
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:block>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:list-item-body>
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:list-item>
+ space-before.optimum="0.7cm"
+ white-space-collapse="false"
+ wrap-option="no-wrap">
+<![CDATA[
+<!-- list start -->
+<fo:list-block provisional-distance-between-starts="0.3cm"
+ provisional-label-separation="0.15cm">
+ <!-- list item -->
+ <fo:list-item>
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block>
+ <fo:inline font-family="Symbol">&#183;</fo:inline>
</fo:block>
-
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- [other list items...]
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block>
+ here is text in the list item body
</fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- <!-- end start -->
- </fo:block>
- <fo:block font-size="10pt"
- font-family="Courier"
- line-height="10pt"
- text-align="start">
- </fo:list-block>
- </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ [other list items...]
+</fo:list-block>
+<!-- end list -->
+]]>
+</fo:block>
+
<!-- code ends -->
<!-- ***************************** Next page ************************ -->
@@ -597,7 +443,6 @@
</fo:block>
<!-- normal text ends -->
-
<!-- ***************************** Next page ************************ -->
<!-- this defines a title level 2-->
@@ -2234,6 +2079,7 @@
</fo:list-block >
<!-- end nested list -->
+ <!-- continuing list-->
</fo:block>
</fo:list-item-body>
</fo:list-item>
@@ -2284,6 +2130,544 @@
</fo:list-block>
<!-- end list -->
+
+ <!-- this defines normal text -->
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ line-height="15pt"
+ space-after.optimum="3pt"
+ text-align="justify"
+ >
+ This is normal text. This is normal text. This is normal text. This is normal text. This is normal text.
+ This is normal text. This is normal text. This is normal text. This is normal text. This is normal text.
+ </fo:block>
+ <!-- normal text ends -->
+
+<!-- ****************************** Next Page ************************* -->
+
+ <!-- code -->
+ <fo:block font-size="10pt"
+ font-family="Courier"
+ line-height="10pt"
+ text-align="start"
+ space-before.optimum="3cm"
+ white-space-collapse="false"
+ wrap-option="no-wrap">
+
+
+<![CDATA[
+<!-- list level 1 -->
+<fo:list-block provisional-distance-between-starts="0.4cm"
+ provisional-label-separation="0.15cm">
+
+ <!-- list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body. here is text in the list item body.
+ here is text in the list item body. here is text in the list item body.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">here comes a nested list with numbers
+
+ <!-- start nested list -->
+ <!-- list level 1 -->
+ <fo:list-block provisional-distance-between-starts="0.7cm"
+ provisional-label-separation="0.15cm">
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">1.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ [more item in nested list ...]
+
+ </fo:list-block >
+ <!-- end nested list -->
+
+ <!-- continuing list-->
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ [more item in list ...]
+
+</fo:list-block>
+<!-- end list -->
+
+]]>
+</fo:block>
+<!-- ***************************** Next page ************************ -->
+
+ <!-- this defines a title level 2-->
+ <fo:block font-size="16pt"
+ font-family="sans-serif"
+ space-after.optimum="15pt"
+ text-align="center"
+ break-before="page"
+ white-space-collapse="true">
+ A long nested list
+ </fo:block>
+
+ <!-- this defines normal text -->
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ line-height="15pt"
+ text-align="justify"
+ >
+ This is normal text. This is normal text. This is normal text. This is normal text. This is normal text.
+ This is normal text. This is normal text. This is normal text. This is normal text. This is normal text.
+ </fo:block>
+
+ <!-- list level 1 -->
+ <fo:list-block provisional-distance-between-starts="0.4cm"
+ provisional-label-separation="0.15cm">
+
+ <!-- list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body. here is text in the list item body.
+ here is text in the list item body. here is text in the list item body.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body. here is text in the list item body.
+ here is text in the list item body. here is text in the list item body.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body. here is text in the list item body.
+ here is text in the list item body. here is text in the list item body.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body. here is text in the list item body.
+ here is text in the list item body. here is text in the list item body.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body. here is text in the list item body.
+ here is text in the list item body. here is text in the list item body.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body. here is text in the list item body.
+ here is text in the list item body. here is text in the list item body.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">here comes a nested list with numbers
+
+ <!-- start nested list -->
+ <!-- list level 1 -->
+ <fo:list-block provisional-distance-between-starts="0.9cm"
+ provisional-label-separation="0.15cm">
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">1.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">2.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">3.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">4.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">5.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">6.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">7.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">8.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">9.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">10.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">11.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">12.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">13.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">14.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">15.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">16.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- nested list item -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a number -->
+ <fo:list-item-label>
+ <fo:block text-align="end">17.)</fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ nested list item with more text. nested list item with more text.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ </fo:list-block >
+ <!-- end nested list -->
+
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list entry -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body. here is text in the list item body.
+ here is text in the list item body. here is text in the list item body.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list entry -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ <!-- list entry -->
+ <fo:list-item start-indent="0.5cm">
+ <!-- insert a bullet -->
+ <fo:list-item-label>
+ <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block>
+ </fo:list-item-label>
+ <!-- list text -->
+ <fo:list-item-body>
+ <fo:block text-align="justify">
+ here is text in the list item body. here is text in the list item body.
+ here is text in the list item body. here is text in the list item body.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+
+ </fo:list-block>
+ <!-- end list -->
+
<!-- this defines normal text -->
<fo:block font-size="12pt"
1.10 +2 -2 xml-fop/docs/examples/svg/Document.xsl
Index: Document.xsl
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/svg/Document.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Document.xsl 2000/09/15 00:09:05 1.9
+++ Document.xsl 2000/11/15 21:51:56 1.10
@@ -111,7 +111,7 @@
</fo:block>
<xsl:if test="@showcode='true'">
- <fo:block start-indent="-50pt" text-align="start" font-family="monospace" white-space-treatment="preserve" font-size="9pt" line-height="9pt">
+ <fo:block start-indent="-50pt" text-align="start" font-family="monospace" white-space-collapse="false" font-size="9pt" line-height="9pt">
<xsl:text disable-output-escaping="yes"><</xsl:text>![CDATA[
<xsl:for-each select="document(@file)/Diagrams/Diagram">
<xsl:if test="$name=@entry">
@@ -244,7 +244,7 @@
</xsl:template>
<xsl:template match="code">
- <fo:block font-family="monospace" text-align="start" white-space-treatment="preserve">
+ <fo:block font-family="monospace" text-align="start" white-space-collapse="false">
<xsl:apply-templates/>
</fo:block>
</xsl:template>