renames white-space-treatment to white-space-collapse

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193813 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/examples/fo/extensive.fo b/docs/examples/fo/extensive.fo
index ad8c183635b57a3262332aadca7b32edbec207af..16b004b46c99652c43b217aa74e15bcbe6df5836 100644 (file)
--- a/docs/examples/fo/extensive.fo
+++ b/docs/examples/fo/extensive.fo
@@ -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>

diff --git a/docs/examples/fo/list2.fo b/docs/examples/fo/list2.fo
index c4fc6496e807c89fe3561f5be86c260e8a1c8e47..e3ef2fd0a6f21ccf394e020fb5106976e645b3a6 100644 (file)
--- a/docs/examples/fo/list2.fo
+++ b/docs/examples/fo/list2.fo
@@ -163,112 +163,36 @@
                 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">
-      &lt;fo:list-block >
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-        &lt;!-- list item -->
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-        &lt;fo:list-item>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;!-- insert a bullet -->
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;fo:list-item-label>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-            &lt;fo:block>&lt;fo:inline font-family="Symbol">&amp;#183;&lt;/fo:inline>&lt;/fo:block>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;/fo:list-item-label>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;!-- list text --> 
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;fo:list-item-body>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-            &lt;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">
-            &lt;/fo:block>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;/fo:list-item-body>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-        &lt;/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">&amp;#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">
-      &lt;!-- end start -->
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-      &lt;/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,118 +296,40 @@
       </fo:list-block>
       <!-- end list -->
 
-
       <!-- code -->
       <fo:block font-size="10pt" 
                 font-family="Courier" 
                 line-height="10pt"
                 text-align="start"
-                space-before.optimum="2cm">
-      &lt;!-- list start -->
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-      &lt;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">
-        &lt;!-- list item -->
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-        &lt;fo:list-item>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;!-- insert a bullet -->
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;fo:list-item-label>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-            &lt;fo:block>&lt;fo:inline font-family="Symbol">&amp;#183;&lt;/fo:inline>&lt;/fo:block>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;/fo:list-item-label>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;!-- list text --> 
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;fo:list-item-body>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-            &lt;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">
-            &lt;/fo:block>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-          &lt;/fo:list-item-body>
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-        &lt;/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">&amp;#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">
-      &lt;!-- end start -->
-      </fo:block>        
-      <fo:block font-size="10pt" 
-                font-family="Courier" 
-                line-height="10pt"
-                text-align="start">
-      &lt;/fo:list-block>
-      </fo:block>        
+    </fo:list-item-body>
+  </fo:list-item>
+
+  [other list items...] 
+
+</fo:list-block>
+<!-- end list -->
+]]>
+</fo:block>        
 
       <!-- code ends -->
 
@@ -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>
@@ -2297,6 +2143,544 @@
       </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">&#183;</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">&#183;</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">&#183;</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">&#183;</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">&#183;</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">&#183;</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">&#183;</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">&#183;</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">&#183;</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">&#183;</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">&#183;</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">&#183;</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" 
+                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 -->
+
 
 
 

diff --git a/docs/examples/svg/Document.xsl b/docs/examples/svg/Document.xsl
index 98b7644835d96a7a8120e29b8e7867d954389141..04967e87b0698931fbc4c6e9fc3c58128a671321 100644 (file)
--- a/docs/examples/svg/Document.xsl
+++ b/docs/examples/svg/Document.xsl
@@ -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">&lt;</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>