]> source.dussan.org Git - xmlgraphics-fop.git/commitdiff
Fixed overlaping regions.
authorOleg Tkachenko <olegt@apache.org>
Sat, 30 Nov 2002 00:27:56 +0000 (00:27 +0000)
committerOleg Tkachenko <olegt@apache.org>
Sat, 30 Nov 2002 00:27:56 +0000 (00:27 +0000)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195678 13f79535-47bb-0310-9956-ffa450edef68

29 files changed:
docs/examples/fo/bordershorthand.fo
docs/examples/fo/character.fo
docs/examples/fo/contlabel.fo
docs/examples/fo/corresprop.fo
docs/examples/fo/fonts.fo
docs/examples/fo/hyphen.fo
docs/examples/fo/inhprop.fo
docs/examples/fo/link.fo
docs/examples/fo/list.fo
docs/examples/fo/normal.fo
docs/examples/fo/normalex.fo
docs/examples/fo/pdfoutline.fo
docs/examples/fo/readme.fo
docs/examples/fo/simple.fo
docs/examples/fo/table.fo
docs/examples/fo/textdeko.fo
docs/examples/markers/hide.fo
docs/examples/pagination/basic1.fo
docs/examples/pagination/basic2.fo
docs/examples/svg/embedding.fo
docs/examples/svg/external.fo
docs/examples/tables/background.fo
docs/examples/tables/borders.fo
docs/examples/tables/break.fo
docs/examples/tables/headfoot.fo
docs/examples/tables/keep.fo
docs/examples/tables/omit.fo
docs/examples/tables/space.fo
docs/examples/tables/widowsorphans.fo

index fc5d5b5d2da82f502a4903fa5fd71a37f7040e02..0eeb304ce5587fb741d1dfd6a5b8a6a7fe2a3e87 100644 (file)
@@ -28,7 +28,7 @@ Below fo:root there is always
                   margin-bottom="2cm" 
                   margin-left="2.0cm + 0.5cm" 
                   margin-right="(5cm * 1cm) div 2cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
@@ -41,7 +41,7 @@ Below fo:root there is always
                   margin-bottom="round(2.4) * 1cm"
                   margin-left="2.5 * 1cm" 
                   margin-right="5.5cm - 3cm">
-      <fo:region-body margin-top="2.5cm"/>
+      <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index b3f9a0e63acada7349705f5297d993be10236175..8e0bc9327c103842f37e3e5324aaae513793d233 100644 (file)
@@ -25,7 +25,7 @@
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 3202896e852bd4798c83e682a889d298e89b1351..956d28445f93edac2c9c83d96937277bf6a77504 100644 (file)
@@ -10,8 +10,8 @@
        page-width="21cm"
        page-height="29.7cm"
        master-name="first">
-      <fo:region-before extent="1cm"/>
       <fo:region-body margin-top="2cm" margin-bottom="1.5cm"/>
+      <fo:region-before extent="1cm"/>
       <fo:region-after extent="1.0cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index 93de9f06ded7896a4743c7800985e2e06e5b1880..c7a55c0cad6c5fbd388d9e7eecd37791f76aee0e 100644 (file)
@@ -28,7 +28,7 @@ Below fo:root there is always
                   margin-bottom="2cm" 
                   margin-left="2.0cm + 0.5cm" 
                   margin-right="(5cm * 1cm) div 2cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
@@ -41,7 +41,7 @@ Below fo:root there is always
                   margin-bottom="round(2.4) * 1cm"
                   margin-left="2.5 * 1cm" 
                   margin-right="5.5cm - 3cm">
-      <fo:region-body margin-top="2.5cm"/>
+      <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index e2b0a983ee692e9984d723208baaf13a27adb2cf..2c890bd2fc697094b48115bc9f2ff142c000588f 100644 (file)
@@ -11,7 +11,7 @@
                            margin-bottom="2cm" 
                            margin-left="2.5cm" 
                            margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 572ea1cad9303fa34fe04ac9cb4e3eea305a47ea..6ca5fa5ed1cf446fe31666e9205334b8ac261ee0 100644 (file)
@@ -25,7 +25,7 @@
                   margin-bottom="2cm" 
                   margin-left="7cm" 
                   margin-right="3cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 81e8cf73008fd3b2e1964fcb85f948152e24d663..734073421a03aaf13f2bb79a962ce228f8a2c02e 100644 (file)
@@ -28,7 +28,7 @@ Below fo:root there is always
                   margin-bottom="2cm" 
                   margin-left="2.0cm + 0.5cm" 
                   margin-right="(5cm * 1cm) div 2cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
@@ -41,7 +41,7 @@ Below fo:root there is always
                   margin-bottom="round(2.4) * 1cm"
                   margin-left="2.5 * 1cm" 
                   margin-right="5.5cm - 3cm">
-      <fo:region-body margin-top="2.5cm"/>
+      <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 28ab1b31efb66f706240b147e929c066167d9d76..34c5401a9d8e5080184ed668a3efe1db5bbf5d46 100644 (file)
@@ -10,7 +10,7 @@
                                                                                                         margin-bottom="2cm"
                                                                                                         margin-left="2.5cm"
                                                                                                         margin-right="2.5cm">
-                       <fo:region-body margin-top="3cm"/>
+                       <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
                        <fo:region-before extent="3cm"/>
                        <fo:region-after extent="1.5cm"/>
                </fo:simple-page-master>
index 92f0be94e9312f206ef6e858acbe7a51f3f6d3c5..5d65b98af1231a95ac9348efc7f9bec747e5d84c 100644 (file)
@@ -27,7 +27,7 @@
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="0cm"/>
+      <fo:region-body margin-top="2cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 0959b40205ccfc029bf569e2e6d72dfab74af09b..b8eedf68a936558581523f971ea42fc19ccb1547 100644 (file)
@@ -28,7 +28,7 @@ Below fo:root there is always
                                                                        margin-bottom="2cm"
                                                                        margin-left="2.5cm"
                                                                        margin-right="2.5cm">
-                       <fo:region-body margin-top="3cm"/>
+                       <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
                        <fo:region-before extent="3cm"/>
                        <fo:region-after extent="1.5cm"/>
                </fo:simple-page-master>
@@ -41,7 +41,7 @@ Below fo:root there is always
                                                                        margin-bottom="2cm"
                                                                        margin-left="2.5cm"
                                                                        margin-right="2.5cm">
-                       <fo:region-body margin-top="2.5cm"/>
+                       <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
                        <fo:region-before extent="2.5cm"/>
                        <fo:region-after extent="1.5cm"/>
                </fo:simple-page-master>
index 00e3e5b7e65f728f4e0439084a2fc0cb63a38217..b019d0731e212c7341cc94b49caf9237ea892d61 100644 (file)
@@ -28,7 +28,7 @@ Below fo:root there is always
                   margin-bottom="3cm - (.25cm * 4)" 
                   margin-left="2.0cm + 0.5cm"
                   margin-right="(5cm * 1cm) div 2cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm + 3cm - 1cm"/>
       <fo:region-after extent="2 * .5cm + .5cm"/>
     </fo:simple-page-master>
@@ -41,7 +41,7 @@ Below fo:root there is always
                   margin-bottom="round(2.4) * 1cm"
                   margin-left="2.5 * 1cm" 
                   margin-right="5.5cm - 3cm">
-      <fo:region-body margin-top="2.5cm"/>
+      <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 2a3732e8be021178dc5777f1e0d37c404c6a209e..a52819481f9ca345728a6ad22347041e1878c293 100644 (file)
@@ -25,7 +25,7 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
@@ -38,7 +38,7 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="2.5cm"/>
+      <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index e224c4718eb9eab30a9402463194c436a7168e60..0b290de9a95cb41530b3858afaeae024d201a858 100644 (file)
@@ -23,7 +23,7 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
@@ -36,7 +36,7 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="2.5cm"/>
+      <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 27c4fd962b6d0dda8d17981741349ffba80c286c..a9c06ce9f3f361699fcf168d777c14bd00670eb0 100644 (file)
@@ -25,7 +25,7 @@
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index e3af80342f3a3f37b7347d95be66ec1f42eb96ba..99a7f1d2749fc5efa8028065dd622955846281c3 100644 (file)
@@ -12,7 +12,7 @@
                            margin-bottom="2cm" 
                            margin-left="2.5cm" 
                            margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index ab3a274ed4cf1cad9e21e317c835d57c4b34309d..407f3dfd1c81e239de74e90ae88db3445ba8de5b 100644 (file)
@@ -14,7 +14,7 @@
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
@@ -27,7 +27,7 @@
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="2.5cm"/>
+      <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 49e62fce144b74da83f5310b1dd1d94cc077f2f1..8d80070694259e04078d7f1eea0bff4afba918f5 100644 (file)
@@ -9,8 +9,8 @@
   page-width="21cm"
   page-height="29.7cm"
   master-name="first">
+      <fo:region-body margin-top="1cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm"/>
-      <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index 64739cbee33896b16f1b0ce5d8fcf10cdc5039bc..7189fd8aed5eefb5227ba230ceaeb79b77a8c1da 100644 (file)
@@ -13,7 +13,7 @@
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 96f11a440d95a78da6280bf66a8ab37630e9a62e..8add1d2f304407027932cb160b04e7c52179c145 100644 (file)
@@ -13,7 +13,7 @@
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
index 4606e0527c26403d287df65480d4a066a6c36338..908918725eed0b6012a4bed375d85fbf725016db 100644 (file)
@@ -9,8 +9,8 @@
   page-width="21cm"
   page-height="29.7cm"
   master-name="first">
+      <fo:region-body margin-top="1cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm"/>
-      <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index e96ef476068f3ac507349fddc70a31b3c00c4d21..cdd37a8a27b0d14b1b03d82d548a8195e4107084 100644 (file)
@@ -9,8 +9,8 @@
   page-width="21cm"
   page-height="29.7cm"
   master-name="first">
+      <fo:region-body margin-top="1cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm"/>
-      <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index 2b154430a83214d55a861204fb61efa144074940..ea45310bbffd0c1adc3d70f3b0bd33f14a749143 100644 (file)
@@ -9,8 +9,8 @@
        page-width="21cm"
        page-height="29.7cm"
        master-name="first">
+      <fo:region-body margin-top="1cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm"/>
-      <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index 054e95f16070d78e01a947a92ee9b19863732869..d39fe266e50c815c4e18c19f5e4e1e1e171cbe34 100644 (file)
@@ -9,8 +9,8 @@
        page-width="21cm"
        page-height="29.7cm"
        master-name="first">
+      <fo:region-body margin-top="1cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm"/>
-      <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index 96831b942c5b9d73cbf9cc91334ae16b859308c6..c93064695d91c69f2de8392073d093a47b3d4aa4 100644 (file)
@@ -9,8 +9,8 @@
        page-width="21cm"
        page-height="17cm"
        master-name="first">
+      <fo:region-body margin-top="1cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm"/>
-      <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index ccd740f2f16a1a784881c0cf5978a108ec6a58cf..39315116e712511a32b4788286e3e251f7aa5649 100644 (file)
@@ -9,8 +9,8 @@
        page-width="21cm"
        page-height="29.7cm"
        master-name="first">
+      <fo:region-body margin-top="7cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="7cm"/>
-      <fo:region-body margin-top="7cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index cbbbe6a2c002475d0c66e7056ff3b957506b3560..6d900d2ae65ffd18637f6859b0f7f2eb313f2ec1 100644 (file)
@@ -9,8 +9,8 @@
        page-width="21cm"
        page-height="17cm"
        master-name="first">
+      <fo:region-body margin-top="1cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm"/>
-      <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index ff8c483355bbe92767184a6039f0e0b5ead5408c..bef85cbfc94b0f9f6c4db8f652bccb2258b97a12 100644 (file)
@@ -9,8 +9,8 @@
        page-width="21cm"
        page-height="29.7cm"
        master-name="first">
+      <fo:region-body margin-top="7cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="7cm"/>
-      <fo:region-body margin-top="7cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index 0474f11c93d053fc932505d0829dce86c10d5984..d96b0b38c12c3f56212740fb939658e56bf0c0d2 100644 (file)
@@ -9,8 +9,8 @@
        page-width="21cm"
        page-height="29.7cm"
        master-name="first">
+      <fo:region-body margin-top="1cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm"/>
-      <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
index 0264b0b8bde69246315dacd9430327277989edbe..c1485fffb7021b41b8586bd64a536528e37b2de0 100644 (file)
@@ -9,8 +9,8 @@
        page-width="21cm"
        page-height="17cm"
        master-name="first">
+      <fo:region-body column-count="3" margin-top="1cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="1cm"/>
-      <fo:region-body column-count="3" margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>