gmazza 2004/02/22 05:37:07
Modified: examples/fo/advanced barcode.fo cid-fonts.fo giro.fo
examples/fo/basic border.fo fonts.fo images.fo link.fo
normal.fo normalex.fo pdfoutline.fo
examples/fo/footnotes columns.fo simple.fo
examples/fo/keeps_and_breaks columnlevel1.fo pagelevel1.fo
pagelevel2.fo pagelevel3.fo pagelevel4.fo
examples/fo/markers glossary.xsl hide.fo
examples/fo/pagination allregions.fo franklin_2pageseqs.fo
franklin_alt.fo franklin_rep.fo
franklin_rep_max_repeats.fo
franklin_rep_max_repeats_expl.fo
franklin_rep_max_repeats_nl.fo
examples/fo/region_body simplecol2.fo simplecol3.fo
simplecol4.fo
examples/fo/svg external.fo
examples/fo/tables background.fo borders.fo break.fo
headfoot.fo keep.fo omit.fo space.fo
widowsorphans.fo
Log:
Formatting cleanup of fo:layout-master-sets in examples.
Revision Changes Path
1.2 +38 -17 xml-fop/examples/fo/advanced/barcode.fo
Index: barcode.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/advanced/barcode.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- barcode.fo 29 Jan 2003 16:07:15 -0000 1.1
+++ barcode.fo 22 Feb 2004 13:37:06 -0000 1.2
@@ -1,22 +1,43 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
- <fo:layout-master-set>
- <fo:simple-page-master page-width="21cm" page-height="29.7cm"
master-name="first" margin-top="5mm">
- <fo:region-body margin-bottom="4.5in" margin-right="5mm" margin-left="5mm"
margin-top="5mm"/>
- <fo:region-after extent="4in" border-top-color="silver"
border-top-style="dotted" border-top-width="0.13mm"/>
- </fo:simple-page-master>
- <fo:simple-page-master page-width="21cm" page-height="29.7cm"
master-name="rest" margin-right="5mm" margin-left="5mm" margin-top="5mm"
margin-bottom="5mm">
- <fo:region-body/>
- </fo:simple-page-master>
- <fo:page-sequence-master master-name="A4">
- <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"/>
- <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="A4">
+
+<fo:layout-master-set>
+ <fo:simple-page-master master-name="first"
+ page-width="21cm"
+ page-height="29.7cm"
+ margin-top="5mm">
+ <fo:region-body
+ margin-bottom="4.5in"
+ margin-right="5mm"
+ margin-left="5mm"
+ margin-top="5mm"/>
+ <fo:region-after
+ extent="4in"
+ border-top-color="silver"
+ border-top-style="dotted"
+ border-top-width="0.13mm"/>
+ </fo:simple-page-master>
+
+ <fo:simple-page-master master-name="rest"
+ page-width="21cm"
+ page-height="29.7cm"
+ margin-right="5mm"
+ margin-left="5mm"
+ margin-top="5mm"
+ margin-bottom="5mm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+
+ <fo:page-sequence-master master-name="A4">
+ <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"/>
+ <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="A4">
<fo:flow flow-name="xsl-region-body">
<fo:block font-size="14pt" font-weight="bold">
1.3 +8 -2 xml-fop/examples/fo/advanced/cid-fonts.fo
Index: cid-fonts.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/advanced/cid-fonts.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cid-fonts.fo 29 Jan 2003 16:07:15 -0000 1.2
+++ cid-fonts.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -5,8 +5,14 @@
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";
xmlns:fox="http://xml.apache.org/fop/extensions";>
<fo:layout-master-set>
- <fo:simple-page-master page-width="21cm" page-height="29.7cm" master-name="A4">
- <fo:region-body margin-bottom="1.5cm" margin-right="2cm" margin-left="2cm"
margin-top="1.5cm"/>
+ <fo:simple-page-master master-name="A4"
+ page-width="21cm"
+ page-height="29.7cm" >
+ <fo:region-body
+ margin-bottom="1.5cm"
+ margin-right="2cm"
+ margin-left="2cm"
+ margin-top="1.5cm"/>
</fo:simple-page-master>
</fo:layout-master-set>
1.3 +13 -2 xml-fop/examples/fo/advanced/giro.fo
Index: giro.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/advanced/giro.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- giro.fo 29 Jan 2003 16:07:16 -0000 1.2
+++ giro.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -1,11 +1,21 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+
<fo:layout-master-set>
- <fo:simple-page-master page-width="21cm" page-height="29.7cm"
master-name="first" margin-top="5mm">
+ <fo:simple-page-master master-name="first"
+ page-width="21cm"
+ page-height="29.7cm"
+ margin-top="5mm">
<fo:region-body margin-bottom="4.5in" margin-right="5mm" margin-left="5mm"
margin-top="5mm"/>
<fo:region-after extent="4in" border-top-color="silver"
border-top-style="dotted" border-top-width="0.13mm"/>
</fo:simple-page-master>
- <fo:simple-page-master page-width="21cm" page-height="29.7cm"
master-name="rest" margin-right="5mm" margin-left="5mm" margin-top="5mm"
margin-bottom="5mm">
+ <fo:simple-page-master master-name="rest"
+ page-width="21cm"
+ page-height="29.7cm"
+ margin-right="5mm"
+ margin-left="5mm"
+ margin-top="5mm"
+ margin-bottom="5mm">
<fo:region-body/>
</fo:simple-page-master>
<fo:page-sequence-master master-name="A4">
@@ -16,6 +26,7 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
+
<fo:page-sequence master-reference="A4">
<fo:static-content flow-name="xsl-region-after">
<fo:table space-before.optimum="1in div 12" margin-left="2in div 12"
margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green">
1.3 +26 -16 xml-fop/examples/fo/basic/border.fo
Index: border.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/basic/border.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- border.fo 29 Jan 2003 16:07:18 -0000 1.2
+++ border.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -1,27 +1,37 @@
<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">
+ <fo:simple-page-master 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">
<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">
+
+ <fo:simple-page-master master-name="rest"
+ margin-right="2.5cm"
+ margin-left="2.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm">
<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">
1.3 +9 -9 xml-fop/examples/fo/basic/fonts.fo
Index: fonts.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/basic/fonts.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fonts.fo 29 Jan 2003 16:07:19 -0000 1.2
+++ fonts.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -5,15 +5,15 @@
<!-- defines the layout master -->
<fo:layout-master-set>
<fo:simple-page-master master-name="first"
- page-height="29.7cm"
- page-width="21cm"
- margin-top="1cm"
- margin-bottom="2cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
- <fo:region-body margin-top="3cm"/>
- <fo:region-before extent="3cm"/>
- <fo:region-after extent="1.5cm"/>
+ page-height="29.7cm"
+ page-width="21cm"
+ margin-top="1cm"
+ margin-bottom="2cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
+ <fo:region-body margin-top="3cm"/>
+ <fo:region-before extent="3cm"/>
+ <fo:region-after extent="1.5cm"/>
</fo:simple-page-master>
</fo:layout-master-set>
1.4 +30 -25 xml-fop/examples/fo/basic/images.fo
Index: images.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/basic/images.fo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- images.fo 12 Oct 2003 19:49:30 -0000 1.3
+++ images.fo 22 Feb 2004 13:37:06 -0000 1.4
@@ -5,31 +5,36 @@
xmlns:fox="http://xml.apache.org/fop/extensions";>
<fo:layout-master-set>
-<fo:simple-page-master master-name="right"
- margin-top="75pt" margin-bottom="25pt" margin-left="100pt" margin-right="50pt">
- <fo:region-body margin-bottom="50pt"/>
- <fo:region-after extent="25pt"/>
-</fo:simple-page-master>
-
-<fo:simple-page-master master-name="left"
- margin-top="75pt" margin-bottom="25pt" margin-left="50pt" margin-right="100pt">
- <fo:region-body margin-bottom="50pt"/>
- <fo:region-after extent="25pt"/>
-</fo:simple-page-master>
-
-<fo:page-sequence-master master-name="psmOddEven" >
- <fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-reference="right"
- page-position="first" />
- <fo:conditional-page-master-reference master-reference="left"
- odd-or-even="even" />
- <fo:conditional-page-master-reference master-reference="right"
- odd-or-even="odd" />
- <!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-reference="rest" />
- </fo:repeatable-page-master-alternatives>
-</fo:page-sequence-master>
-
+ <fo:simple-page-master master-name="right"
+ margin-top="75pt"
+ margin-bottom="25pt"
+ margin-left="100pt"
+ margin-right="50pt">
+ <fo:region-body margin-bottom="50pt"/>
+ <fo:region-after extent="25pt"/>
+ </fo:simple-page-master>
+
+ <fo:simple-page-master master-name="left"
+ margin-top="75pt"
+ margin-bottom="25pt"
+ margin-left="50pt"
+ margin-right="100pt">
+ <fo:region-body margin-bottom="50pt"/>
+ <fo:region-after extent="25pt"/>
+ </fo:simple-page-master>
+
+ <fo:page-sequence-master master-name="psmOddEven" >
+ <fo:repeatable-page-master-alternatives>
+ <fo:conditional-page-master-reference master-reference="right"
+ page-position="first" />
+ <fo:conditional-page-master-reference master-reference="left"
+ odd-or-even="even" />
+ <fo:conditional-page-master-reference master-reference="right"
+ odd-or-even="odd" />
+ <!-- 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 id="N2528" master-reference="psmOddEven">
1.3 +2 -1 xml-fop/examples/fo/basic/link.fo
Index: link.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/basic/link.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- link.fo 29 Jan 2003 16:07:20 -0000 1.2
+++ link.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -5,7 +5,8 @@
<!-- defines page layout -->
<fo:layout-master-set>
<fo:simple-page-master master-name="first"
- page-height="29.7cm" page-width="21cm"
+ page-height="29.7cm"
+ page-width="21cm"
margin-top="1cm"
margin-bottom="2cm"
margin-left="2.5cm"
1.3 +6 -6 xml-fop/examples/fo/basic/normal.fo
Index: normal.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/basic/normal.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- normal.fo 29 Jan 2003 16:07:21 -0000 1.2
+++ normal.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -22,12 +22,12 @@
<!-- layout for the first page -->
<fo:simple-page-master master-name="first"
- page-height="21cm"
- page-width="29.7cm"
- margin-top="1cm"
- margin-bottom="2cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
+ page-height="21cm"
+ page-width="29.7cm"
+ margin-top="1cm"
+ margin-bottom="2cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
<fo:region-body margin-top="3cm"/>
<fo:region-before extent="3cm"/>
<fo:region-after extent="1.5cm"/>
1.3 +6 -6 xml-fop/examples/fo/basic/normalex.fo
Index: normalex.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/basic/normalex.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- normalex.fo 29 Jan 2003 16:07:21 -0000 1.2
+++ normalex.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -22,12 +22,12 @@
<!-- layout for the first page -->
<fo:simple-page-master master-name="first"
- page-height="21cm"
- page-width="29.7cm"
- margin-top="6.3cm - 3.8cm - 1.5cm"
- margin-bottom="3cm - (.25cm * 4)"
- margin-left="2.0cm + 0.5cm"
- margin-right="(5cm * 1cm) div 2cm">
+ page-height="21cm"
+ page-width="29.7cm"
+ margin-top="6.3cm - 3.8cm - 1.5cm"
+ 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-before extent="1cm + 3cm - 1cm"/>
<fo:region-after extent="2 * .5cm + .5cm"/>
1.3 +10 -10 xml-fop/examples/fo/basic/pdfoutline.fo
Index: pdfoutline.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/basic/pdfoutline.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pdfoutline.fo 29 Jan 2003 16:07:21 -0000 1.2
+++ pdfoutline.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -43,16 +43,16 @@
<fo:region-after extent="1.5cm"/>
</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:page-sequence-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:page-sequence-master>
</fo:layout-master-set>
<!-- end: defines page layout -->
1.3 +3 -3 xml-fop/examples/fo/footnotes/columns.fo
Index: columns.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/footnotes/columns.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- columns.fo 29 Jan 2003 16:07:46 -0000 1.2
+++ columns.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -13,9 +13,9 @@
margin-bottom="1in"
margin-left="0.75in"
margin-right="0.75in">
- <fo:region-body
- margin-top="1in" margin-bottom="1in"
- column-count="2" column-gap="0.25in"/>
+ <fo:region-body
+ margin-top="1in" margin-bottom="1in"
+ column-count="2" column-gap="0.25in"/>
<fo:region-before extent="1in"/>
<fo:region-after extent="1in"/>
</fo:simple-page-master>
1.3 +12 -5 xml-fop/examples/fo/footnotes/simple.fo
Index: simple.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/footnotes/simple.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple.fo 29 Jan 2003 16:07:46 -0000 1.2
+++ simple.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -1,12 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<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="1.5cm" margin-bottom="2cm"
margin-top="0cm" page-width="21cm" page-height="20cm" master-name="one">
-<fo:region-body margin-bottom="2cm" margin-top="2cm"/>
-<fo:region-before extent="0.5cm"/>
-<fo:region-after extent="0.5cm"/>
-</fo:simple-page-master>
+ <fo:simple-page-master master-name="one"
+ margin-right="0.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="0cm"
+ page-width="21cm"
+ page-height="20cm">
+ <fo:region-body margin-bottom="2cm" margin-top="2cm"/>
+ <fo:region-before extent="0.5cm"/>
+ <fo:region-after extent="0.5cm"/>
+ </fo:simple-page-master>
</fo:layout-master-set>
+
<fo:page-sequence master-reference="one">
<fo:flow flow-name="xsl-region-body">
1.3 +3 -3 xml-fop/examples/fo/keeps_and_breaks/columnlevel1.fo
Index: columnlevel1.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/keeps_and_breaks/columnlevel1.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- columnlevel1.fo 29 Jan 2003 16:07:47 -0000 1.2
+++ columnlevel1.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -14,9 +14,9 @@
margin-bottom="2cm"
margin-left="2.5cm"
margin-right="2.5cm">
- <fo:region-body
- margin-top="3cm" margin-bottom="2cm"
- column-count="2" column-gap="0.25in"/>
+ <fo:region-body
+ margin-top="3cm" margin-bottom="2cm"
+ column-count="2" column-gap="0.25in"/>
<fo:region-before extent="3cm"/>
<fo:region-after extent="2cm"/>
</fo:simple-page-master>
1.3 +1 -2 xml-fop/examples/fo/keeps_and_breaks/pagelevel1.fo
Index: pagelevel1.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/keeps_and_breaks/pagelevel1.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pagelevel1.fo 29 Jan 2003 16:07:47 -0000 1.2
+++ pagelevel1.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -14,8 +14,7 @@
margin-bottom="2cm"
margin-left="2.5cm"
margin-right="2.5cm">
- <fo:region-body
- margin-top="3cm" margin-bottom="2cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="2cm"/>
<fo:region-before extent="3cm"/>
<fo:region-after extent="2cm"/>
</fo:simple-page-master>
1.3 +1 -2 xml-fop/examples/fo/keeps_and_breaks/pagelevel2.fo
Index: pagelevel2.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/keeps_and_breaks/pagelevel2.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pagelevel2.fo 29 Jan 2003 16:07:47 -0000 1.2
+++ pagelevel2.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -14,8 +14,7 @@
margin-bottom="2cm"
margin-left="2.5cm"
margin-right="2.5cm">
- <fo:region-body
- margin-top="3cm" margin-bottom="2cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="2cm"/>
<fo:region-before extent="3cm"/>
<fo:region-after extent="2cm"/>
</fo:simple-page-master>
1.3 +7 -8 xml-fop/examples/fo/keeps_and_breaks/pagelevel3.fo
Index: pagelevel3.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/keeps_and_breaks/pagelevel3.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pagelevel3.fo 29 Jan 2003 16:07:47 -0000 1.2
+++ pagelevel3.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -8,14 +8,13 @@
<fo:layout-master-set>
<!-- layout for all pages -->
<fo:simple-page-master master-name="all"
- page-height="29.7cm"
- page-width="21cm"
- margin-top="1cm"
- margin-bottom="2cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
- <fo:region-body
- margin-top="3cm" margin-bottom="2cm"/>
+ page-height="29.7cm"
+ page-width="21cm"
+ margin-top="1cm"
+ margin-bottom="2cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
+ <fo:region-body margin-top="3cm" margin-bottom="2cm"/>
<fo:region-before extent="3cm"/>
<fo:region-after extent="2cm"/>
</fo:simple-page-master>
1.3 +11 -11 xml-fop/examples/fo/keeps_and_breaks/pagelevel4.fo
Index: pagelevel4.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/keeps_and_breaks/pagelevel4.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pagelevel4.fo 29 Jan 2003 16:07:48 -0000 1.2
+++ pagelevel4.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -9,17 +9,17 @@
<fo:layout-master-set>
<!-- layout for all pages -->
<fo:simple-page-master master-name="all"
- page-height="29.7cm"
- page-width="21cm"
- margin-top="1cm"
- margin-bottom="2cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
- <fo:region-body
- margin-top="3cm" margin-bottom="2cm"
- column-count="2" column-gap="0.25in"/>
- <fo:region-before extent="3cm"/>
- <fo:region-after extent="2cm"/>
+ page-height="29.7cm"
+ page-width="21cm"
+ margin-top="1cm"
+ margin-bottom="2cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
+ <fo:region-body
+ margin-top="3cm" margin-bottom="2cm"
+ column-count="2" column-gap="0.25in"/>
+ <fo:region-before extent="3cm"/>
+ <fo:region-after extent="2cm"/>
</fo:simple-page-master>
</fo:layout-master-set>
1.3 +6 -3 xml-fop/examples/fo/markers/glossary.xsl
Index: glossary.xsl
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/markers/glossary.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glossary.xsl 29 Jan 2003 16:07:49 -0000 1.2
+++ glossary.xsl 22 Feb 2004 13:37:06 -0000 1.3
@@ -10,9 +10,12 @@
<fo:layout-master-set>
<fo:simple-page-master master-name="all"
- page-height="11.5in" page-width="8.5in"
- margin-top="1in" margin-bottom="1in"
- margin-left="0.75in" margin-right="0.75in">
+ page-height="11.5in"
+ page-width="8.5in"
+ margin-top="1in"
+ margin-bottom="1in"
+ margin-left="0.75in"
+ margin-right="0.75in">
<fo:region-body margin-top="1in" margin-bottom="0.75in"/>
<fo:region-before extent="0.75in"/>
<fo:region-after extent="0.5in"/>
1.3 +7 -8 xml-fop/examples/fo/markers/hide.fo
Index: hide.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/markers/hide.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hide.fo 29 Jan 2003 16:07:49 -0000 1.2
+++ hide.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm">
<fo:region-before extent="1cm"/>
<fo:region-body margin-top="1cm"/>
<fo:region-after extent="1.5cm"/>
1.3 +2 -2 xml-fop/examples/fo/pagination/allregions.fo
Index: allregions.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/pagination/allregions.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- allregions.fo 29 Jan 2003 16:07:50 -0000 1.2
+++ allregions.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -14,8 +14,8 @@
margin-left="2.5cm"
margin-right="2.5cm">
<fo:region-body
- margin-top="3cm" margin-bottom="1.5cm"
- margin-left="2cm" margin-right="2cm"/>
+ margin-top="3cm" margin-bottom="1.5cm"
+ margin-left="2cm" margin-right="2cm"/>
<fo:region-before precedence="true" extent="3cm"/>
<fo:region-after precedence="true" extent="1.5cm"/>
<fo:region-start extent="1cm"/>
1.3 +4 -4 xml-fop/examples/fo/pagination/franklin_2pageseqs.fo
Index: franklin_2pageseqs.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/pagination/franklin_2pageseqs.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- franklin_2pageseqs.fo 29 Jan 2003 16:07:50 -0000 1.2
+++ franklin_2pageseqs.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -7,7 +7,7 @@
<!-- layout for the first page -->
<fo:simple-page-master master-name="noheaders_center"
- page-height="21.7cm"
+ page-height="21.7cm"
page-width="16cm"
margin-top="1cm"
margin-bottom="1cm"
@@ -17,7 +17,7 @@
</fo:simple-page-master>
<fo:simple-page-master master-name="headers_right"
- page-height="21.7cm"
+ page-height="21.7cm"
page-width="16cm"
margin-top="1cm"
margin-bottom="1cm"
@@ -29,7 +29,7 @@
</fo:simple-page-master>
<fo:simple-page-master master-name="headers_left"
- page-height="21.7cm"
+ page-height="21.7cm"
page-width="16cm"
margin-top="1cm"
margin-bottom="1cm"
@@ -41,7 +41,7 @@
</fo:simple-page-master>
<fo:simple-page-master master-name="headers_center"
- page-height="21.7cm"
+ page-height="21.7cm"
page-width="16cm"
margin-top="1cm"
margin-bottom="1cm"
1.3 +18 -18 xml-fop/examples/fo/pagination/franklin_alt.fo
Index: franklin_alt.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/pagination/franklin_alt.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- franklin_alt.fo 29 Jan 2003 16:07:50 -0000 1.2
+++ franklin_alt.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -7,36 +7,36 @@
<!-- layout for the first page -->
<fo:simple-page-master master-name="right"
- page-height="21.7cm"
- page-width="16cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="3.5cm"
- margin-right="1.5cm">
+ page-height="21.7cm"
+ page-width="16cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="3.5cm"
+ margin-right="1.5cm">
<fo:region-body margin-top="2cm" margin-bottom="2cm"/>
<fo:region-before extent="2cm"/>
<fo:region-after extent="2cm"/>
</fo:simple-page-master>
<fo:simple-page-master master-name="left"
- page-height="21.7cm"
- page-width="16cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="3.5cm">
+ page-height="21.7cm"
+ page-width="16cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="3.5cm">
<fo:region-body margin-top="2cm" margin-bottom="2cm"/>
<fo:region-before extent="2cm"/>
<fo:region-after extent="2cm"/>
</fo:simple-page-master>
<fo:simple-page-master master-name="center"
- page-height="21.7cm"
- page-width="16cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
+ page-height="21.7cm"
+ page-width="16cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
<fo:region-body margin-top="2cm" margin-bottom="2cm"/>
<fo:region-before extent="2cm"/>
<fo:region-after extent="2cm"/>
1.3 +6 -6 xml-fop/examples/fo/pagination/franklin_rep.fo
Index: franklin_rep.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/pagination/franklin_rep.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- franklin_rep.fo 29 Jan 2003 16:07:50 -0000 1.2
+++ franklin_rep.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -7,12 +7,12 @@
<!-- layout for the first page -->
<fo:simple-page-master master-name="repeating"
- page-height="21.7cm"
- page-width="16cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
+ page-height="21.7cm"
+ page-width="16cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
<fo:region-body margin-top="2cm" margin-bottom="2cm"/>
<fo:region-before extent="2cm"/>
<fo:region-after extent="2cm"/>
1.3 +6 -6 xml-fop/examples/fo/pagination/franklin_rep_max_repeats.fo
Index: franklin_rep_max_repeats.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/pagination/franklin_rep_max_repeats.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- franklin_rep_max_repeats.fo 29 Jan 2003 16:07:51 -0000 1.2
+++ franklin_rep_max_repeats.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -7,12 +7,12 @@
<!-- layout for the first page -->
<fo:simple-page-master master-name="repeating"
- page-height="21.7cm"
- page-width="16cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
+ page-height="21.7cm"
+ page-width="16cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
<fo:region-body margin-top="2cm" margin-bottom="2cm"/>
<fo:region-before extent="2cm"/>
<fo:region-after extent="2cm"/>
1.3 +10 -10 xml-fop/examples/fo/pagination/franklin_rep_max_repeats_expl.fo
Index: franklin_rep_max_repeats_expl.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/pagination/franklin_rep_max_repeats_expl.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- franklin_rep_max_repeats_expl.fo 29 Jan 2003 16:07:51 -0000 1.2
+++ franklin_rep_max_repeats_expl.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -6,16 +6,16 @@
<fo:layout-master-set>
<!-- layout for the first page -->
- <fo:simple-page-master master-name="repeating"
- page-height="21.7cm"
- page-width="16cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
- <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
- <fo:region-before extent="2cm"/>
- <fo:region-after extent="2cm"/>
+ <fo:simple-page-master master-name="repeating"
+ page-height="21.7cm"
+ page-width="16cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
+ <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
+ <fo:region-before extent="2cm"/>
+ <fo:region-after extent="2cm"/>
</fo:simple-page-master>
<fo:page-sequence-master master-name="repeating_pm">
1.3 +6 -6 xml-fop/examples/fo/pagination/franklin_rep_max_repeats_nl.fo
Index: franklin_rep_max_repeats_nl.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/pagination/franklin_rep_max_repeats_nl.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- franklin_rep_max_repeats_nl.fo 29 Jan 2003 16:07:51 -0000 1.2
+++ franklin_rep_max_repeats_nl.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -7,12 +7,12 @@
<!-- layout for the first page -->
<fo:simple-page-master master-name="repeating"
- page-height="21.7cm"
- page-width="16cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
+ page-height="21.7cm"
+ page-width="16cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
<fo:region-body margin-top="2cm" margin-bottom="2cm"/>
<fo:region-before extent="2cm"/>
<fo:region-after extent="2cm"/>
1.3 +11 -11 xml-fop/examples/fo/region_body/simplecol2.fo
Index: simplecol2.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/region_body/simplecol2.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simplecol2.fo 29 Jan 2003 16:07:53 -0000 1.2
+++ simplecol2.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -7,17 +7,17 @@
<!-- layout for the first page -->
<fo:simple-page-master master-name="only"
- page-height="11in"
- page-width="8.5in"
- margin-top="1in"
- margin-bottom="1in"
- margin-left="0.75in"
- margin-right="0.75in">
- <fo:region-body
- margin-top="1in" margin-bottom="1in"
- column-count="2" column-gap="0.25in"/>
- <fo:region-before extent="1in" />
- <fo:region-after extent="1in" />
+ page-height="11in"
+ page-width="8.5in"
+ margin-top="1in"
+ margin-bottom="1in"
+ margin-left="0.75in"
+ margin-right="0.75in">
+ <fo:region-body
+ margin-top="1in" margin-bottom="1in"
+ column-count="2" column-gap="0.25in"/>
+ <fo:region-before extent="1in" />
+ <fo:region-after extent="1in" />
</fo:simple-page-master>
</fo:layout-master-set>
1.3 +8 -8 xml-fop/examples/fo/region_body/simplecol3.fo
Index: simplecol3.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/region_body/simplecol3.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simplecol3.fo 29 Jan 2003 16:07:54 -0000 1.2
+++ simplecol3.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -7,15 +7,15 @@
<!-- layout for the first page -->
<fo:simple-page-master master-name="only"
- page-height="11in"
- page-width="8.5in"
- margin-top="1in"
- margin-bottom="1in"
- margin-left="0.75in"
- margin-right="0.75in">
+ page-height="11in"
+ page-width="8.5in"
+ margin-top="1in"
+ margin-bottom="1in"
+ margin-left="0.75in"
+ margin-right="0.75in">
<fo:region-body
- margin-top="1in" margin-bottom="1in"
- column-count="2" column-gap="0.25in"/>
+ margin-top="1in" margin-bottom="1in"
+ column-count="2" column-gap="0.25in"/>
<fo:region-before extent="1in"/>
<fo:region-after extent="1in"/>
</fo:simple-page-master>
1.3 +2 -2 xml-fop/examples/fo/region_body/simplecol4.fo
Index: simplecol4.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/region_body/simplecol4.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simplecol4.fo 29 Jan 2003 16:07:54 -0000 1.2
+++ simplecol4.fo 22 Feb 2004 13:37:06 -0000 1.3
@@ -14,8 +14,8 @@
margin-left="0.75in"
margin-right="0.75in">
<fo:region-body
- margin-top="1in" margin-bottom="1in"
- column-count="3" column-gap="0.15in"/>
+ margin-top="1in" margin-bottom="1in"
+ column-count="3" column-gap="0.15in"/>
<fo:region-before extent="1in"/>
<fo:region-after extent="1in"/>
</fo:simple-page-master>
1.3 +7 -8 xml-fop/examples/fo/svg/external.fo
Index: external.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/svg/external.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- external.fo 29 Jan 2003 16:07:54 -0000 1.2
+++ external.fo 22 Feb 2004 13:37:07 -0000 1.3
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";
xmlns:xlink="http://www.w3.org/1999/xlink";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm">
<fo:region-before extent="1cm"/>
<fo:region-body margin-top="1cm"/>
<fo:region-after extent="1.5cm"/>
1.3 +7 -8 xml-fop/examples/fo/tables/background.fo
Index: background.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/tables/background.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- background.fo 29 Jan 2003 16:07:55 -0000 1.2
+++ background.fo 22 Feb 2004 13:37:07 -0000 1.3
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm">
<fo:region-before extent="1cm"/>
<fo:region-body margin-top="1cm"/>
<fo:region-after extent="1.5cm"/>
1.5 +7 -8 xml-fop/examples/fo/tables/borders.fo
Index: borders.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/tables/borders.fo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- borders.fo 26 Aug 2003 21:52:39 -0000 1.4
+++ borders.fo 22 Feb 2004 13:37:07 -0000 1.5
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm">
<fo:region-before extent="1cm"/>
<fo:region-body margin-top="1cm"/>
<fo:region-after extent="1.5cm"/>
1.3 +7 -8 xml-fop/examples/fo/tables/break.fo
Index: break.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/tables/break.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- break.fo 29 Jan 2003 16:07:55 -0000 1.2
+++ break.fo 22 Feb 2004 13:37:07 -0000 1.3
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="17cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="17cm">
<fo:region-before extent="1cm"/>
<fo:region-body margin-top="1cm"/>
<fo:region-after extent="1.5cm"/>
1.3 +7 -8 xml-fop/examples/fo/tables/headfoot.fo
Index: headfoot.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/tables/headfoot.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- headfoot.fo 29 Jan 2003 16:07:55 -0000 1.2
+++ headfoot.fo 22 Feb 2004 13:37:07 -0000 1.3
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm">
<fo:region-before extent="7cm"/>
<fo:region-body margin-top="7cm"/>
<fo:region-after extent="1.5cm"/>
1.3 +7 -8 xml-fop/examples/fo/tables/keep.fo
Index: keep.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/tables/keep.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keep.fo 29 Jan 2003 16:07:55 -0000 1.2
+++ keep.fo 22 Feb 2004 13:37:07 -0000 1.3
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="17cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="17cm">
<fo:region-before extent="1cm"/>
<fo:region-body margin-top="1cm"/>
<fo:region-after extent="1.5cm"/>
1.3 +7 -8 xml-fop/examples/fo/tables/omit.fo
Index: omit.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/tables/omit.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- omit.fo 29 Jan 2003 16:07:55 -0000 1.2
+++ omit.fo 22 Feb 2004 13:37:07 -0000 1.3
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm">
<fo:region-before extent="7cm"/>
<fo:region-body margin-top="7cm"/>
<fo:region-after extent="1.5cm"/>
1.3 +7 -8 xml-fop/examples/fo/tables/space.fo
Index: space.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/tables/space.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- space.fo 29 Jan 2003 16:07:55 -0000 1.2
+++ space.fo 22 Feb 2004 13:37:07 -0000 1.3
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm">
<fo:region-before extent="1cm"/>
<fo:region-body margin-top="1cm"/>
<fo:region-after extent="1.5cm"/>
1.3 +7 -8 xml-fop/examples/fo/tables/widowsorphans.fo
Index: widowsorphans.fo
===================================================================
RCS file: /home/cvs/xml-fop/examples/fo/tables/widowsorphans.fo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- widowsorphans.fo 29 Jan 2003 16:07:56 -0000 1.2
+++ widowsorphans.fo 22 Feb 2004 13:37:07 -0000 1.3
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="17cm"
- master-name="first">
+ <fo:simple-page-master master-name="first"
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="17cm">
<fo:region-before extent="1cm"/>
<fo:region-body column-count="3" margin-top="1cm"/>
<fo:region-after extent="1.5cm"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
