updated to look better with current fop - 0.19 cvs

Submitted by:	Daniel Bradby <dbradby@bigpond.net.au>


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

1 files changed, 50 insertions, 34 deletions

diff --git a/docs/examples/fo/border.fo b/docs/examples/fo/border.fo
index 6312578ca..5252ab6ba 100644
--- a/docs/examples/fo/border.fo
+++ b/docs/examples/fo/border.fo
@@ -43,84 +43,106 @@
 				   Sales Receipt
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="2.5cm" top="1.2cm" left="14cm" padding="2pt" position="absolute">
+            
+            <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="15pt" font-family="sans-serif" font-size="12pt">
 				   DATE
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="2.5cm" top="1.7cm" left="14cm" padding="2pt" position="absolute">
+            <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="15pt" font-family="sans-serif" font-size="10pt">
 					01/01/2000
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="2.5cm" top="1.2cm" left="16.5cm" padding="2pt" position="absolute">
+            <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="15pt" font-family="sans-serif" font-size="12pt">
 					SALE #
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="2.5cm" top="1.7cm" left="16.5cm" padding="2pt" position="absolute">
+            <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="15pt" font-family="sans-serif" font-size="10pt">
 					1
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="9cm" top="3cm" left="0cm" padding="2pt" position="absolute">
+
+            
+            <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="15pt" font-family="sans-serif" font-size="12pt">
 				    SOLD TO
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="3cm" width="9cm" top="3.5cm" left="0cm" padding="2pt" position="absolute">
+            <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="15pt" font-family="sans-serif" font-size="12pt">
                 </fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="9cm" top="3cm" left="10cm" padding="2pt" position="absolute">
+            <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="15pt" font-family="sans-serif" font-size="12pt">
 					SHIP TO
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="3cm" width="9cm" top="3.5cm" left="10cm" padding="2pt" position="absolute">
+            <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="15pt" font-family="sans-serif" font-size="12pt">
                 </fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="4cm" top="7cm" left="11cm" padding="2pt" position="absolute">
+
+            
+            <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="15pt" font-family="sans-serif" font-size="12pt">
 				   PMT METHOD
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="4cm" top="7.5cm" left="11cm" padding="2pt" position="absolute">
+            <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="15pt" font-family="sans-serif" font-size="10pt">
 					Check
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="4cm" top="7cm" left="15cm" padding="2pt" position="absolute">
+            <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="15pt" font-family="sans-serif" font-size="12pt">
 					CHECK #
 				</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="4cm" top="7.5cm" left="15cm" padding="2pt" position="absolute">
+            <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="15pt" font-family="sans-serif" font-size="10pt">
 					1234
 				</fo:block>
             </fo:block-container>
-            <fo:block-container height="17cm" width="19cm" top="8cm" left="0cm" position="absolute">
-                <fo:table border-color="yellow" border-style="solid" border-width="1pt" height="17cm">
-                    <fo:table-column column-width="2.5cm" border-color="red" border-style="solid" border-width="1pt"/>
-                    <fo:table-column column-width="11.5cm" border-color="red" border-style="solid" border-width="1pt"/>
-                    <fo:table-column column-width="2.5cm" border-color="red" border-style="solid" border-width="1pt"/>
-                    <fo:table-column column-width="2.5cm" border-color="red" border-style="solid" border-width="1pt"/>
+            
+            
+            <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-column column-width="2.5cm"/>
+                    <fo:table-column column-width="11.5cm"/>
+                    <fo:table-column column-width="2.5cm"/>
+                    <fo:table-column column-width="2.5cm"/>
                     <fo:table-body font-family="sans-serif" font-weight="normal" font-size="10pt">
                         <fo:table-row line-height="12pt">
-                            <fo:table-cell border-width="1pt" border-color="green" border-style="solid" padding="6pt">
+                            <fo:table-cell  border-width="1pt" border-color="green" border-style="solid" padding="1mm">
                                 <fo:block text-align="end">QUANTITY</fo:block>
                             </fo:table-cell>
-                            <fo:table-cell border-width="1pt" border-color="red" border-style="solid" padding="4pt">
+                            <fo:table-cell border-width="1pt" border-color="red" border-style="solid" padding="1mm">
                                 <fo:block text-align="start">DESCRIPTION</fo:block>
                             </fo:table-cell>
-                            <fo:table-cell border-width="1pt" border-color="blue" border-style="solid" padding="3pt">
+                            <fo:table-cell border-color="blue" border-style="solid" padding="1mm">
                                 <fo:block text-align="center">RATE</fo:block>
                             </fo:table-cell>
-                            <fo:table-cell border-width="1pt" border-color="orange" border-style="solid" padding="2pt">
+                            <fo:table-cell border-color="orange" border-style="solid" padding="1mm">
                                 <fo:block text-align="center">AMOUNT</fo:block>
                             </fo:table-cell>
+
+                        </fo:table-row>
+                        <fo:table-row line-height="12pt">
+                            <fo:table-cell padding="2pt">
+                                <fo:block text-align="end">1</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt">
+                                <fo:block text-align="start">Wide Widget</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt">
+                                <fo:block text-align="end">$22.23</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt">
+                                <fo:block text-align="end">22.31</fo:block>
+                            </fo:table-cell>
                         </fo:table-row>
                         <fo:table-row line-height="12pt">
                             <fo:table-cell padding="2pt">
@@ -153,20 +175,14 @@
                     </fo:table-body>
                 </fo:table>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="1cm" width="14cm" top="25cm" left="0cm" padding="2pt" position="absolute">
-                <fo:block text-align="start" space-after.optimum="3pt" line-height="15pt" font-family="sans-serif" font-size="12pt">
-					Please remit to the above address
-				</fo:block>
+            <fo:block-container border-color="black" border-style="solid" border-width="0.5mm" height="1cm" width="13.31cm" top="26.5cm" left="0cm" padding="1mm" position="absolute">
+                <fo:block text-align="start" line-height="15pt" font-family="sans-serif" font-size="12pt">Please remit to the above address</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="1cm" width="2.5cm" top="25cm" left="14cm" padding="2pt" position="absolute">
-                <fo:block text-align="start" space-after.optimum="3pt" line-height="25pt" font-family="sans-serif" font-size="22pt">
-					Total
-				</fo:block>
+            <fo:block-container border-color="black" border-style="solid" border-width="0.5mm" height="1cm" width="2.5cm" top="26.5cm" left="13.56cm" padding="1mm" position="absolute">
+                <fo:block text-align="start" space-after.optimum="3pt" line-height="25pt" font-family="sans-serif" font-size="22pt">Total</fo:block>
             </fo:block-container>
-            <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="1cm" width="2.5cm" top="25cm" left="16.5cm" padding="2pt" position="absolute">
-                <fo:block text-align="start" space-after.optimum="3pt" line-height="15pt" font-family="sans-serif" font-size="10pt">
-					$3.00
-				</fo:block>
+            <fo:block-container border-color="black" border-style="solid" border-width="0.5mm" height="1cm" width="2.5cm" top="26.5cm" left="16.31cm" padding="1mm" position="absolute">
+                <fo:block text-align="start" space-after.optimum="3pt" line-height="15pt" font-family="sans-serif" font-size="10pt">$3.00</fo:block>
             </fo:block-container>
         </fo:flow>
     </fo:page-sequence>