Updated examples/fo files to remove all errors and warnings during build

Submitted by: Manuel Mall <mm@arcus.com.au> (see bug #13867)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195626 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index e00679d9304f044829805f3eac85da6dbb1da1dc..4902fb3789634338bb9a6c03be498e67782b2ec4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 <mm@arcus.com.au> (see bug #13867)
 - Perfomance tuning (reduced object creation etc.) (see bug #14103)
   Submitted by: Henrik Olsson <henrik.olsson@intentia.se> 
 - Update to Xerces 2.2.1 (Jeremias Maerki)

diff --git a/docs/examples/fo/border.fo b/docs/examples/fo/border.fo
index 1e89e221f6bb7cbed6a65902bdeccc421887f230..5ce9969a2d1d305863ffdf4f456abd1df531506c 100644 (file)
--- a/docs/examples/fo/border.fo
+++ b/docs/examples/fo/border.fo
@@ -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"/>

diff --git a/docs/examples/fo/hyphen.fo b/docs/examples/fo/hyphen.fo
index d27f44c36fa4d98afdfcd311f115e5cba96048ca..572ea1cad9303fa34fe04ac9cb4e3eea305a47ea 100644 (file)
--- a/docs/examples/fo/hyphen.fo
+++ b/docs/examples/fo/hyphen.fo
@@ -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"

diff --git a/docs/examples/fo/leader.fo b/docs/examples/fo/leader.fo
index 486386ad9e7e7b04f101779f1bfd76d3818f2415..cd0bb6832391e4f9e9606212f5a5d3c56e7e1987 100644 (file)
--- a/docs/examples/fo/leader.fo
+++ b/docs/examples/fo/leader.fo
@@ -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"/>

diff --git a/docs/examples/fo/newlinktest.fo b/docs/examples/fo/newlinktest.fo
index 36484bcd537f1b9d0241ea51e333fa95266a0d0a..cc834e6e08381247ab7ba6775a55a3694c173c9c 100644 (file)
--- a/docs/examples/fo/newlinktest.fo
+++ b/docs/examples/fo/newlinktest.fo
@@ -78,7 +78,7 @@ align="justify"
   </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"/>

diff --git a/docs/examples/fo/pdfoutline.fo b/docs/examples/fo/pdfoutline.fo
index 7497625c848b8c2dcc06ca9b37f26445e2ea0d58..2a3732e8be021178dc5777f1e0d37c404c6a209e 100644 (file)
--- a/docs/examples/fo/pdfoutline.fo
+++ b/docs/examples/fo/pdfoutline.fo
@@ -44,14 +44,14 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
     </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 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p
     </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">&lt;fo:table&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-column column-width="150pt"/&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-column column-width="150pt"/&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">        &lt;fo:table-body font-size="10pt" font-family="sans-serif"&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;/fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;/fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;/fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">        &lt;/fo:table-body&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-column column-width="150pt"/&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-column column-width="150pt"/&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> &lt;fo:table-body font-size="10pt" font-family="sans-serif"&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;/fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;/fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;/fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> &lt;/fo:table-body&gt;</fo:block>
     <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">&lt;/fo:table&gt;</fo:block>
   
 
@@ -1207,9 +1207,9 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p
 
   <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 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p
      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 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p
 <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"/>

diff --git a/docs/examples/fo/readme.fo b/docs/examples/fo/readme.fo
index 3f9118e143dfa0722e237f9d05ff6e17fc9a5dac..e224c4718eb9eab30a9402463194c436a7168e60 100644 (file)
--- a/docs/examples/fo/readme.fo
+++ b/docs/examples/fo/readme.fo
@@ -42,14 +42,14 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
     </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 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p
     </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">&lt;fo:table&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-column column-width="150pt"/&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-column column-width="150pt"/&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">        &lt;fo:table-body font-size="10pt" font-family="sans-serif"&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;/fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;/fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                                &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                        &lt;/fo:table-cell&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">                &lt;/fo:table-row&gt;</fo:block>
-    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">        &lt;/fo:table-body&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-column column-width="150pt"/&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-column column-width="150pt"/&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> &lt;fo:table-body font-size="10pt" font-family="sans-serif"&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;/fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;/fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">             &lt;fo:block&gt;text&lt;/fo:block&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">         &lt;/fo:table-cell&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">     &lt;/fo:table-row&gt;</fo:block>
+    <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> &lt;/fo:table-body&gt;</fo:block>
     <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">&lt;/fo:table&gt;</fo:block>
   
 
@@ -1137,9 +1137,9 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p
 
   <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 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p
      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 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p
 <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"/>

diff --git a/docs/examples/fo/table.fo b/docs/examples/fo/table.fo
index 3d7e268b1f2bbc530f96bdef3447b82a38611386..e3af80342f3a3f37b7347d95be66ec1f42eb96ba 100644 (file)
--- a/docs/examples/fo/table.fo
+++ b/docs/examples/fo/table.fo
@@ -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">

diff --git a/docs/examples/fo/tableunits.fo b/docs/examples/fo/tableunits.fo
index 502e676fc7faaa83d3ba11d7a4487d42d2016b20..97f91ac95d03a49bdb3c55ae7376c0ea8b3e62e2 100644 (file)
--- a/docs/examples/fo/tableunits.fo
+++ b/docs/examples/fo/tableunits.fo
@@ -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 @@ of 3cm on the row </fo:block></fo:table-cell>
 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 @@ deeper than the others to check out the aliignment properties.</fo:block></fo:ta
 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 @@ The next table specifies inline-progression-dimension="15cm" instead of width. T
 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 @@ The next table specifies neither width nor inline-progression-dimenion.
       <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 @@ 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.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>

diff --git a/docs/examples/fo/textdeko.fo b/docs/examples/fo/textdeko.fo
index 1ee982ec2e5ada31fea76bc0f2061a78226d120f..ab3a274ed4cf1cad9e21e317c835d57c4b34309d 100644 (file)
--- a/docs/examples/fo/textdeko.fo
+++ b/docs/examples/fo/textdeko.fo
@@ -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>