From: Oleg Tkachenko Date: Sat, 30 Nov 2002 00:27:56 +0000 (+0000) Subject: Fixed overlaping regions. X-Git-Tag: fop-0_20_5rc~20 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3b0f2908f6019a93aa976e2c7b56c4c691cff2fc;p=xmlgraphics-fop.git Fixed overlaping regions. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195678 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/examples/fo/bordershorthand.fo b/docs/examples/fo/bordershorthand.fo index fc5d5b5d2..0eeb304ce 100644 --- a/docs/examples/fo/bordershorthand.fo +++ b/docs/examples/fo/bordershorthand.fo @@ -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"> - + @@ -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"> - + diff --git a/docs/examples/fo/character.fo b/docs/examples/fo/character.fo index b3f9a0e63..8e0bc9327 100644 --- a/docs/examples/fo/character.fo +++ b/docs/examples/fo/character.fo @@ -25,7 +25,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/fo/contlabel.fo b/docs/examples/fo/contlabel.fo index 3202896e8..956d28445 100644 --- a/docs/examples/fo/contlabel.fo +++ b/docs/examples/fo/contlabel.fo @@ -10,8 +10,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> - + diff --git a/docs/examples/fo/corresprop.fo b/docs/examples/fo/corresprop.fo index 93de9f06d..c7a55c0ca 100644 --- a/docs/examples/fo/corresprop.fo +++ b/docs/examples/fo/corresprop.fo @@ -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"> - + @@ -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"> - + diff --git a/docs/examples/fo/fonts.fo b/docs/examples/fo/fonts.fo index e2b0a983e..2c890bd2f 100644 --- a/docs/examples/fo/fonts.fo +++ b/docs/examples/fo/fonts.fo @@ -11,7 +11,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/fo/hyphen.fo b/docs/examples/fo/hyphen.fo index 572ea1cad..6ca5fa5ed 100644 --- a/docs/examples/fo/hyphen.fo +++ b/docs/examples/fo/hyphen.fo @@ -25,7 +25,7 @@ margin-bottom="2cm" margin-left="7cm" margin-right="3cm"> - + diff --git a/docs/examples/fo/inhprop.fo b/docs/examples/fo/inhprop.fo index 81e8cf730..734073421 100644 --- a/docs/examples/fo/inhprop.fo +++ b/docs/examples/fo/inhprop.fo @@ -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"> - + @@ -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"> - + diff --git a/docs/examples/fo/link.fo b/docs/examples/fo/link.fo index 28ab1b31e..34c5401a9 100644 --- a/docs/examples/fo/link.fo +++ b/docs/examples/fo/link.fo @@ -10,7 +10,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/fo/list.fo b/docs/examples/fo/list.fo index 92f0be94e..5d65b98af 100644 --- a/docs/examples/fo/list.fo +++ b/docs/examples/fo/list.fo @@ -27,7 +27,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/fo/normal.fo b/docs/examples/fo/normal.fo index 0959b4020..b8eedf68a 100644 --- a/docs/examples/fo/normal.fo +++ b/docs/examples/fo/normal.fo @@ -28,7 +28,7 @@ Below fo:root there is always margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + @@ -41,7 +41,7 @@ Below fo:root there is always margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/fo/normalex.fo b/docs/examples/fo/normalex.fo index 00e3e5b7e..b019d0731 100644 --- a/docs/examples/fo/normalex.fo +++ b/docs/examples/fo/normalex.fo @@ -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"> - + @@ -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"> - + diff --git a/docs/examples/fo/pdfoutline.fo b/docs/examples/fo/pdfoutline.fo index 2a3732e8b..a52819481 100644 --- a/docs/examples/fo/pdfoutline.fo +++ b/docs/examples/fo/pdfoutline.fo @@ -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"> - + @@ -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"> - + diff --git a/docs/examples/fo/readme.fo b/docs/examples/fo/readme.fo index e224c4718..0b290de9a 100644 --- a/docs/examples/fo/readme.fo +++ b/docs/examples/fo/readme.fo @@ -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"> - + @@ -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"> - + diff --git a/docs/examples/fo/simple.fo b/docs/examples/fo/simple.fo index 27c4fd962..a9c06ce9f 100644 --- a/docs/examples/fo/simple.fo +++ b/docs/examples/fo/simple.fo @@ -25,7 +25,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/fo/table.fo b/docs/examples/fo/table.fo index e3af80342..99a7f1d27 100644 --- a/docs/examples/fo/table.fo +++ b/docs/examples/fo/table.fo @@ -12,7 +12,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/fo/textdeko.fo b/docs/examples/fo/textdeko.fo index ab3a274ed..407f3dfd1 100644 --- a/docs/examples/fo/textdeko.fo +++ b/docs/examples/fo/textdeko.fo @@ -14,7 +14,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + @@ -27,7 +27,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/markers/hide.fo b/docs/examples/markers/hide.fo index 49e62fce1..8d8007069 100644 --- a/docs/examples/markers/hide.fo +++ b/docs/examples/markers/hide.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> + - diff --git a/docs/examples/pagination/basic1.fo b/docs/examples/pagination/basic1.fo index 64739cbee..7189fd8ae 100644 --- a/docs/examples/pagination/basic1.fo +++ b/docs/examples/pagination/basic1.fo @@ -13,7 +13,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/pagination/basic2.fo b/docs/examples/pagination/basic2.fo index 96f11a440..8add1d2f3 100644 --- a/docs/examples/pagination/basic2.fo +++ b/docs/examples/pagination/basic2.fo @@ -13,7 +13,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + diff --git a/docs/examples/svg/embedding.fo b/docs/examples/svg/embedding.fo index 4606e0527..908918725 100644 --- a/docs/examples/svg/embedding.fo +++ b/docs/examples/svg/embedding.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> + - diff --git a/docs/examples/svg/external.fo b/docs/examples/svg/external.fo index e96ef4760..cdd37a8a2 100644 --- a/docs/examples/svg/external.fo +++ b/docs/examples/svg/external.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> + - diff --git a/docs/examples/tables/background.fo b/docs/examples/tables/background.fo index 2b154430a..ea45310bb 100644 --- a/docs/examples/tables/background.fo +++ b/docs/examples/tables/background.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> + - diff --git a/docs/examples/tables/borders.fo b/docs/examples/tables/borders.fo index 054e95f16..d39fe266e 100644 --- a/docs/examples/tables/borders.fo +++ b/docs/examples/tables/borders.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> + - diff --git a/docs/examples/tables/break.fo b/docs/examples/tables/break.fo index 96831b942..c93064695 100644 --- a/docs/examples/tables/break.fo +++ b/docs/examples/tables/break.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="17cm" master-name="first"> + - diff --git a/docs/examples/tables/headfoot.fo b/docs/examples/tables/headfoot.fo index ccd740f2f..39315116e 100644 --- a/docs/examples/tables/headfoot.fo +++ b/docs/examples/tables/headfoot.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> + - diff --git a/docs/examples/tables/keep.fo b/docs/examples/tables/keep.fo index cbbbe6a2c..6d900d2ae 100644 --- a/docs/examples/tables/keep.fo +++ b/docs/examples/tables/keep.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="17cm" master-name="first"> + - diff --git a/docs/examples/tables/omit.fo b/docs/examples/tables/omit.fo index ff8c48335..bef85cbfc 100644 --- a/docs/examples/tables/omit.fo +++ b/docs/examples/tables/omit.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> + - diff --git a/docs/examples/tables/space.fo b/docs/examples/tables/space.fo index 0474f11c9..d96b0b38c 100644 --- a/docs/examples/tables/space.fo +++ b/docs/examples/tables/space.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> + - diff --git a/docs/examples/tables/widowsorphans.fo b/docs/examples/tables/widowsorphans.fo index 0264b0b8b..c1485fffb 100644 --- a/docs/examples/tables/widowsorphans.fo +++ b/docs/examples/tables/widowsorphans.fo @@ -9,8 +9,8 @@ page-width="21cm" page-height="17cm" master-name="first"> + -