corrected some misspellings and other potential annoyances in example

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

7 files changed, 212 insertions, 224 deletions

diff --git a/examples/fo/basic/images.fo b/examples/fo/basic/images.fo
index b00ba5871..9ded34e94 100644
--- a/examples/fo/basic/images.fo
+++ b/examples/fo/basic/images.fo
@@ -48,49 +48,43 @@
 <fo:flow flow-name="xsl-region-body">
 <fo:block font-size="18pt" font-weight="bold">1. FOP test for images</fo:block>
 <fo:block id="N2531">
-  <!--fox:destination internal-destination="N2531"/-->
+
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A GIF image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/xml_feather.gif"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2535">
-  <!--fox:destination internal-destination="N2535"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A transparent GIF image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/xml_feather_transparent.gif"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2545">
-  <!--fox:destination internal-destination="N2545"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A JPEG image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/fop.jpg"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2550">
-  <!--fox:destination internal-destination="N2550"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A BMP image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/linux.bmp"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2555">
-  <!--fox:destination internal-destination="N2555"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A PNG image in FOP</fo:block>
   <fo:block>
-    <fo:external-graphic src="file:../graphics/asf-logo.png"/>
+    <fo:external-graphic src="../graphics/asf-logo.png"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2556">
-  <!--fox:destination internal-destination="N2556"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A TIFF image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/asf-logo.tif"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2559">
-  <!--fox:destination internal-destination="N2559"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"/>
   This section is only required to show that the layout still works.
 </fo:block>
@@ -121,37 +115,37 @@
     </fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: [none]</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: width="60mm" height="20mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="60mm" height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="60mm" height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: inline-progression-dimension="60mm" block-progression-dimension="20mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" inline-progression-dimension="60mm" block-progression-dimension="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" inline-progression-dimension="60mm" block-progression-dimension="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: width="30mm" height="20mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="30mm" height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="30mm" height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: width="30mm" height="20mm" overflow="hidden"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="30mm" height="20mm" overflow="hidden" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="30mm" height="20mm" overflow="hidden" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: width="60mm" height="20mm" text-align="center" display-align="center"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="60mm" height="20mm" text-align="center" display-align="center" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="60mm" height="20mm" text-align="center" display-align="center" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: content-height="20mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" content-height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" content-height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: content-width="60mm" content-height="40mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" content-width="60mm" content-height="40mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" content-width="60mm" content-height="40mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
 
     <fo:block keep-with-next.within-column="always">Properties: content-width="60mm" content-height="40mm" scaling="non-uniform"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" content-width="60mm" content-height="40mm" scaling="non-uniform" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" content-width="60mm" content-height="40mm" scaling="non-uniform" border="solid 0.1pt" background-color="yellow"/></fo:block>
 
     <fo:block keep-with-next.within-column="always">Properties: width="60mm" height="20mm" content-width="scale-to-fit"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="60mm" height="20mm" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="60mm" height="20mm" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
 
     <fo:block keep-with-next.within-column="always">Properties: width="60mm" content-width="scale-to-fit"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="60mm" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="60mm" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
   </fo:block>
 </fo:flow>
 
diff --git a/examples/fo/basic/inhprop.fo b/examples/fo/basic/inhprop.fo
index 8caf68fc5..3b7393084 100644
--- a/examples/fo/basic/inhprop.fo
+++ b/examples/fo/basic/inhprop.fo
@@ -141,7 +141,7 @@ block. This uses the <fo:inline
 font-style='oblique'>inherited-property-value</fo:inline>
 function. Here's an <fo:inline color='black' background-color='white'>inline
 object</fo:inline> with fixed colors (black on white). That doesn't
-work either. Guess it's not my problem... So let's try it with font
+work either. Guess it's not my problem ... So let's try it with font
 sizes. In this block, we'll put an
 <fo:inline font-size='inherited-property-value(font-size)+2pt'>inline
 object whose font-size is 2 pt bigger than its parent's font-size.</fo:inline></fo:block>
diff --git a/examples/fo/basic/list.fo b/examples/fo/basic/list.fo
index b9e1035f1..dedc6f04d 100644
--- a/examples/fo/basic/list.fo
+++ b/examples/fo/basic/list.fo
@@ -226,7 +226,7 @@
            url: http://www.w3.org/TR/xsl/ -->
       <fo:block text-align="center"
                 space-before.optimum="0.5cm">
-        <fo:external-graphic src="file:../graphics/listgeometry.gif"/>
+        <fo:external-graphic src="../graphics/listgeometry.gif"/>
       </fo:block>
       <fo:block font-size="10pt"
             font-family="sans-serif"
diff --git a/examples/fo/basic/pdfoutline.fo b/examples/fo/basic/pdfoutline.fo
index a61191995..0802a604b 100644
--- a/examples/fo/basic/pdfoutline.fo
+++ b/examples/fo/basic/pdfoutline.fo
@@ -1198,9 +1198,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"> ===================================================================</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">    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>
diff --git a/examples/fo/basic/readme.fo b/examples/fo/basic/readme.fo
index 06ef5b3eb..205438921 100644
--- a/examples/fo/basic/readme.fo
+++ b/examples/fo/basic/readme.fo
@@ -1137,9 +1137,9 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
 
   <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"> ===================================================================</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">    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>
diff --git a/examples/fo/basic/tableunits.fo b/examples/fo/basic/tableunits.fo
index 63833aff3..aca927c4a 100644
--- a/examples/fo/basic/tableunits.fo
+++ b/examples/fo/basic/tableunits.fo
@@ -21,205 +21,199 @@
   <!-- starts actual layout -->
   <fo:page-sequence master-reference="first">
 
-  <fo:flow flow-name="xsl-region-body">
-
-    <!-- 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="separate" table-layout="fixed" width="6in">
-      <fo:table-column column-width="(4.5in - 2cm) div 3 +1in" background-color="yellow"/>
-      <fo:table-column column-width="(4.5in - 2cm) div 3 + 0.5in" background-color="blue"/>
-      <fo:table-column column-width="(4.5in - 2cm) div 3 + 2.0cm" background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>fixed width columns</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>
-    <!-- table start -->
-    <fo:table border-collapse="separate" table-layout="fixed" width="6in">
-      <fo:table-column column-width="1in + proportional-column-width(1)" background-color="yellow"/>
-      <fo:table-column column-width="2 * (proportional-column-width(1) + .5in) div 2" background-color="blue"/>
-      <fo:table-column column-width="proportional-column-width(1) + 2.0cm" background-color="green"/>
-      <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>
-          <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-row>
-          <fo:table-cell  background-color="blue"><fo:block>default alignment
-</fo:block></fo:table-cell>
-          <fo:table-cell height="3cm" background-color="green" display-align="center"><fo:block>Centered with height=3cm</fo:block></fo:table-cell>
-          <fo:table-cell  background-color="yellow" display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-        <fo:table-row height="3cm">
-          <fo:table-cell><fo:block>default alignment but with a height
-of 3cm on the row </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=100% on the table no column widths specified on the table-column element.
-</fo:block>
-    <!-- table start -->
-    <fo:table border-collapse="separate" table-layout="fixed" width="100%">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <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>
-          <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=13cm, ipd.optimum=12cm and ipd.max = 100%.
-</fo:block>
-    <!-- table start -->
-    <fo:table border-collapse="separate" 
-       table-layout="fixed"
-       inline-progression-dimension="12cm"
-       inline-progression-dimension.maximum="100%"
-    >
-      <fo:table-column column-width="8cm" background-color="yellow"/>
-      <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/>
-      <fo:table-column column-width="5cm" background-color="green"/>
-      <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>
-          <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:block>
-    <!-- table start -->
-    <fo:table border-collapse="separate" table-layout="fixed"
-        inline-progression-dimension="14cm"
-        inline-progression-dimension.maximum="100%">
-      <fo:table-column column-width="8.5cm" background-color="yellow"/>
-      <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/>
-      <fo:table-column column-width="8cm" background-color="green"/>
-      <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>
-          <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="separate" table-layout="fixed" width="70% + 1cm">
-      <fo:table-column column-width="from-parent('width') div 3" background-color="yellow"/>
-      <fo:table-column background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <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>
-          <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-dimension="15cm" instead of width. The
-middle column has a fixed width; the other two have default width.
-</fo:block>
-    <!-- table start -->
-    <fo:table border-collapse="separate"
-        table-layout="fixed"
-        inline-progression-dimension="15cm">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column column-width="3cm" background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <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>
-          <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 neither width nor inline-progression-dimenion.
-</fo:block>
-    <!-- table start -->
-    <fo:table table-layout="fixed" border-collapse="separate">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column column-width="3cm" background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <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>
-          <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
-specifies a column width of 5cm on the middle column only..
-</fo:block>
-    <!-- table start -->
-    <fo:table table-layout="fixed" border-collapse="separate"
-        inline-progression-dimension.minimum="10cm">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column column-width="5cm" background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <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>
-          <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
-specifies a column width of 5cm on the middle column only..
-</fo:block>
-    <!-- table start -->
-    <fo:table table-layout="fixed" border-collapse="separate"
-        inline-progression-dimension.minimum="10cm"
-        inline-progression-dimension.maximum="17cm">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column column-width="5cm" background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <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>
-          <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:flow flow-name="xsl-region-body">
 
+      <fo:block space-after="1cm" text-align="start" padding="0.4in" border="thick solid red">Table unit tests</fo:block>
+
+      <fo:table border-collapse="separate" table-layout="fixed" width="6in">
+        <fo:table-column column-width="(4.5in - 2cm) div 3 +1in" background-color="yellow"/>
+        <fo:table-column column-width="(4.5in - 2cm) div 3 + 0.5in" background-color="blue"/>
+        <fo:table-column column-width="(4.5in - 2cm) div 3 + 2.0cm" background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>fixed width columns</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:table border-collapse="separate" table-layout="fixed" width="6in">
+        <fo:table-column column-width="1in + proportional-column-width(1)" background-color="yellow"/>
+        <fo:table-column column-width="2 * (proportional-column-width(1) + .5in) div 2" background-color="blue"/>
+        <fo:table-column column-width="proportional-column-width(1) + 2.0cm" background-color="green"/>
+        <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 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-row>
+            <fo:table-cell  background-color="blue"><fo:block>default alignment
+            </fo:block></fo:table-cell>
+            <fo:table-cell height="3cm" background-color="green" display-align="center"><fo:block>Centered with height=3cm</fo:block></fo:table-cell>
+            <fo:table-cell  background-color="yellow" display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+          <fo:table-row height="3cm">
+            <fo:table-cell><fo:block>default alignment but with a height
+            of 3cm on the row </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=100% on the table no column widths specified on the table-column element.</fo:block>
+      <!-- table start -->
+      <fo:table border-collapse="separate" table-layout="fixed" width="100%">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <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 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=13cm, ipd.optimum=12cm and ipd.max = 100%.</fo:block>
+      <!-- table start -->
+      <fo:table border-collapse="separate" 
+                table-layout="fixed"
+                inline-progression-dimension="12cm"
+                inline-progression-dimension.maximum="100%"
+                >
+        <fo:table-column column-width="8cm" background-color="yellow"/>
+        <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/>
+        <fo:table-column column-width="5cm" background-color="green"/>
+        <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 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:block>
+      <!-- table start -->
+      <fo:table border-collapse="separate" table-layout="fixed"
+                inline-progression-dimension="14cm"
+                inline-progression-dimension.maximum="100%">
+        <fo:table-column column-width="8.5cm" background-color="yellow"/>
+        <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/>
+        <fo:table-column column-width="8cm" background-color="green"/>
+        <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 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="separate" table-layout="fixed" width="70% + 1cm">
+        <fo:table-column column-width="from-parent('width') div 3" background-color="yellow"/>
+        <fo:table-column background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <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 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-dimension="15cm" instead of width. The
+        middle column has a fixed width; the other two have default width.
+      </fo:block>
+      <!-- table start -->
+      <fo:table border-collapse="separate"
+                table-layout="fixed"
+                inline-progression-dimension="15cm">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column column-width="3cm" background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <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 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 neither width nor inline-progression-dimension.
+      </fo:block>
+      <!-- table start -->
+      <fo:table table-layout="fixed" border-collapse="separate">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column column-width="3cm" background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <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 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-dimension.minimum="10cm" and
+        specifies a column width of 5cm on the middle column only.
+      </fo:block>
+      <!-- table start -->
+      <fo:table table-layout="fixed" border-collapse="separate"
+                inline-progression-dimension.minimum="10cm">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column column-width="5cm" background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <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 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-dimension.minimum="10cm",
+        inline-progression-dimension.maximum="17cm and
+        specifies a column width of 5cm on the middle column only.
+      </fo:block>
+      <!-- table start -->
+      <fo:table table-layout="fixed" border-collapse="separate"
+                inline-progression-dimension.minimum="10cm"
+                inline-progression-dimension.maximum="17cm">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column column-width="5cm" background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <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 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:flow>
   </fo:page-sequence>
diff --git a/examples/fo/basic/textdeko.fo b/examples/fo/basic/textdeko.fo
index eda30e49e..f3d6022e7 100644
--- a/examples/fo/basic/textdeko.fo
+++ b/examples/fo/basic/textdeko.fo
@@ -218,7 +218,7 @@
 
 
       <fo:block space-after.optimum="13pt">
-        And now <fo:inline text-decoration="underline">more than a word...</fo:inline>
+        And now <fo:inline text-decoration="underline">more than a word ...</fo:inline>
       </fo:block>
 
       <fo:block space-after.optimum="13pt" font-size="14pt" text-decoration="underline">