tore 01/12/06 13:28:22
Modified: . Tag: fop-0_20_2-maintain CHANGES
docs/examples/advanced Tag: fop-0_20_2-maintain cid-fonts.fo
giro.fo
docs/examples/fo Tag: fop-0_20_2-maintain border.fo
bordershorthand.fo character.fo corresprop.fo
extensive.fo fonts.fo hyphen.fo images.fo
inhprop.fo instream.fo leader.fo link.fo list.fo
newlinktest.fo normal.fo normalex.fo pdfoutline.fo
readme.fo simple.fo table.fo tableunits.fo
textdeko.fo
docs/examples/footnotes Tag: fop-0_20_2-maintain columns.fo
simple.fo
docs/examples/keeps_and_breaks Tag: fop-0_20_2-maintain
columnlevel1.fo pagelevel1.fo pagelevel2.fo
pagelevel3.fo pagelevel4.fo
docs/examples/markers Tag: fop-0_20_2-maintain glossary.xsl
hide.fo
docs/examples/pagination Tag: fop-0_20_2-maintain
allregions.fo basic1.fo basic2.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
docs/examples/region_body Tag: fop-0_20_2-maintain
simplecol.fo simplecol2.fo simplecol3.fo
simplecol4.fo
docs/examples/svg Tag: fop-0_20_2-maintain embedding.fo
external.fo
docs/examples/tables Tag: fop-0_20_2-maintain background.fo
borders.fo break.fo headfoot.fo keep.fo omit.fo
space.fo widowsorphans.fo
src/codegen Tag: fop-0_20_2-maintain foproperties.xml
src/org/apache/fop/fo/expr Tag: fop-0_20_2-maintain
PropertyParser.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java
src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
ConditionalPageMasterReference.java
PageMasterReference.java PageSequence.java
src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
Log:
Submitted by: Christian Geisert [[EMAIL PROTECTED]]
Changed "master-name" to "master-reference" on fo:page-sequence,
fo:single-page-master-reference, fo:repeatable-page-master-reference and
fo:conditional-page-master-reference to comply with the latest XSL recommendation.
Also changed the unimplemented property space-treatment to white-space-treatment and
updated examples to use the new syntax.
Revision Changes Path
No revision
No revision
1.10.2.3 +6 -0 xml-fop/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/xml-fop/CHANGES,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- CHANGES 2001/12/04 06:49:32 1.10.2.2
+++ CHANGES 2001/12/06 21:28:18 1.10.2.3
@@ -27,6 +27,12 @@
remaining for content. (Karen Lease)
*** Properties
+- Changed "master-name" to "master-reference" on fo:page-sequence,
+ fo:single-page-master-reference, fo:repeatable-page-master-reference and
+ fo:conditional-page-master-reference to comply with the latest XSL recommendation.
+ Also changed the unimplemented property space-treatment to white-space-treatment
and
+ updated examples to use the new syntax.
+ Submitted by: Christian Geisert [[EMAIL PROTECTED]]
- Add support for inline-progression-dimension and table-layout. (Karen)
- Add support for letter-spacing.
Submitted by: Raymond Penners <[EMAIL PROTECTED]>
No revision
No revision
1.2.2.1 +1 -1 xml-fop/docs/examples/advanced/cid-fonts.fo
Index: cid-fonts.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/advanced/cid-fonts.fo,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- cid-fonts.fo 2001/05/18 09:55:46 1.2
+++ cid-fonts.fo 2001/12/06 21:28:18 1.2.2.1
@@ -70,7 +70,7 @@
</fox:outline>
- <fo:page-sequence master-name="A4">
+ <fo:page-sequence master-reference="A4">
<fo:flow flow-name="xsl-region-body">
<fo:wrapper font-family="Times" font-size="12pt" text-align="justify">
1.1.2.1 +5 -5 xml-fop/docs/examples/advanced/giro.fo
Index: giro.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/advanced/giro.fo,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- giro.fo 2001/03/04 18:00:38 1.1
+++ giro.fo 2001/12/06 21:28:18 1.1.2.1
@@ -10,13 +10,13 @@
</fo:simple-page-master>
<fo:page-sequence-master master-name="A4">
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="first"
page-position="first"/>
- <fo:conditional-page-master-reference master-name="rest"
page-position="rest"/>
- <fo:conditional-page-master-reference master-name="rest"/>
+ <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-name="A4">
+ <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">
<fo:table-column column-width="8in div 10 - 2in div 12"/>
@@ -1241,4 +1241,4 @@
<fo:block>SVG logo and bar code</fo:block>
</fo:flow>
</fo:page-sequence>
-</fo:root>
\ No newline at end of file
+</fo:root>
No revision
No revision
1.8.2.1 +4 -4 xml-fop/docs/examples/fo/border.fo
Index: border.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/border.fo,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- border.fo 2001/10/14 21:03:14 1.8
+++ border.fo 2001/12/06 21:28:18 1.8.2.1
@@ -13,16 +13,16 @@
<fo:page-sequence-master master-name="psmA">
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference
master-name="first"
+ <fo:conditional-page-master-reference
master-reference="first"
page-position="first" />
- <fo:conditional-page-master-reference
master-name="rest"
+ <fo:conditional-page-master-reference
master-reference="rest"
page-position="rest" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference
master-name="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-name="psmA">
+ <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">
<fo:block text-align="start" line-height="18pt"
font-family="sans-serif" font-weight="bold" font-size="14pt">
1.1.2.1 +4 -4 xml-fop/docs/examples/fo/bordershorthand.fo
Index: bordershorthand.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/bordershorthand.fo,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- bordershorthand.fo 2001/03/04 21:47:40 1.1
+++ bordershorthand.fo 2001/12/06 21:28:18 1.1.2.1
@@ -48,12 +48,12 @@
<fo:page-sequence-master master-name="basicPSM" >
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="first"
+ <fo:conditional-page-master-reference master-reference="first"
page-position="first" />
- <fo:conditional-page-master-reference master-name="rest"
+ <fo:conditional-page-master-reference master-reference="rest"
page-position="rest" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-name="rest" />
+ <fo:conditional-page-master-reference master-reference="rest" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -61,7 +61,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="basicPSM">
+ <fo:page-sequence master-reference="basicPSM">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.1.4.1 +1 -1 xml-fop/docs/examples/fo/character.fo
Index: character.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/character.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- character.fo 2000/12/15 21:44:08 1.1
+++ character.fo 2001/12/06 21:28:18 1.1.4.1
@@ -39,7 +39,7 @@
the attribute value of master-name refers to the page layout
which is to be used to layout the text contained in this
page-sequence-->
- <fo:page-sequence master-name="simple">
+ <fo:page-sequence master-reference="simple">
<!-- start fo:flow
each flow is targeted
1.1.4.1 +4 -4 xml-fop/docs/examples/fo/corresprop.fo
Index: corresprop.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/corresprop.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- corresprop.fo 2001/01/02 21:49:15 1.1
+++ corresprop.fo 2001/12/06 21:28:18 1.1.4.1
@@ -48,12 +48,12 @@
<fo:page-sequence-master master-name="basicPSM" >
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="first"
+ <fo:conditional-page-master-reference master-reference="first"
page-position="first" />
- <fo:conditional-page-master-reference master-name="rest"
+ <fo:conditional-page-master-reference master-reference="rest"
page-position="rest" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-name="rest" />
+ <fo:conditional-page-master-reference master-reference="rest" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -61,7 +61,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="basicPSM">
+ <fo:page-sequence master-reference="basicPSM">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.15.2.1 +1 -1 xml-fop/docs/examples/fo/extensive.fo
Index: extensive.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/extensive.fo,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- extensive.fo 2001/06/19 10:47:13 1.15
+++ extensive.fo 2001/12/06 21:28:18 1.15.2.1
@@ -4,7 +4,7 @@
<fo:region-body margin-top="50pt" margin-bottom="50pt" margin-left="100pt"
margin-right="100pt"/>
</fo:simple-page-master>
</fo:layout-master-set>
-<fo:page-sequence master-name="one">
+<fo:page-sequence master-reference="one">
<fo:flow flow-name="xsl-region-body">
<fo:block>A Block</fo:block>
<fo:block text-align="end">An End Aligned Block</fo:block>
1.7.4.1 +1 -1 xml-fop/docs/examples/fo/fonts.fo
Index: fonts.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/fonts.fo,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- fonts.fo 2001/02/13 16:50:54 1.7
+++ fonts.fo 2001/12/06 21:28:18 1.7.4.1
@@ -18,7 +18,7 @@
</fo:layout-master-set>
<!-- starts actual layout -->
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:flow flow-name="xsl-region-body">
1.4.2.1 +1 -1 xml-fop/docs/examples/fo/hyphen.fo
Index: hyphen.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/hyphen.fo,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- hyphen.fo 2001/06/07 21:06:13 1.4
+++ hyphen.fo 2001/12/06 21:28:18 1.4.2.1
@@ -39,7 +39,7 @@
the attribute value of master-name refers to the page layout
which is to be used to layout the text contained in this
page-sequence-->
- <fo:page-sequence master-name="simple">
+ <fo:page-sequence master-reference="simple">
<!-- start fo:flow
each flow is targeted
1.11.2.1 +6 -6 xml-fop/docs/examples/fo/images.fo
Index: images.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/images.fo,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- images.fo 2001/06/21 14:18:08 1.11
+++ images.fo 2001/12/06 21:28:18 1.11.2.1
@@ -17,20 +17,20 @@
<fo:page-sequence-master master-name="psmOddEven" >
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="right"
+ <fo:conditional-page-master-reference master-reference="right"
page-position="first" />
- <fo:conditional-page-master-reference master-name="left"
+ <fo:conditional-page-master-reference master-reference="left"
odd-or-even="even" />
- <fo:conditional-page-master-reference master-name="right"
+ <fo:conditional-page-master-reference master-reference="right"
odd-or-even="odd" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-name="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 id="N2528" master-name="psmOddEven">
+<fo:page-sequence id="N2528" master-reference="psmOddEven">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align-last="center" font-size="10pt">
@@ -71,7 +71,7 @@
</fo:flow>
</fo:page-sequence>
-<fo:page-sequence id="N2561" master-name="psmOddEven">
+<fo:page-sequence id="N2561" master-reference="psmOddEven">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align-last="center" font-size="10pt">
<fo:page-number/></fo:block>
1.2.4.1 +4 -4 xml-fop/docs/examples/fo/inhprop.fo
Index: inhprop.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/inhprop.fo,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- inhprop.fo 2001/01/02 21:49:15 1.2
+++ inhprop.fo 2001/12/06 21:28:18 1.2.4.1
@@ -48,12 +48,12 @@
<fo:page-sequence-master master-name="basicPSM" >
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="first"
+ <fo:conditional-page-master-reference master-reference="first"
page-position="first" />
- <fo:conditional-page-master-reference master-name="rest"
+ <fo:conditional-page-master-reference master-reference="rest"
page-position="rest" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-name="rest" />
+ <fo:conditional-page-master-reference master-reference="rest" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -61,7 +61,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="basicPSM">
+ <fo:page-sequence master-reference="basicPSM">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.3.2.1 +1 -1 xml-fop/docs/examples/fo/instream.fo
Index: instream.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/instream.fo,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- instream.fo 2001/05/17 08:41:34 1.3
+++ instream.fo 2001/12/06 21:28:18 1.3.2.1
@@ -4,7 +4,7 @@
<fo:region-body margin-top="25pt" margin-bottom="25pt" margin-left="50pt"
margin-right="50pt" />
</fo:simple-page-master>
</fo:layout-master-set>
-<fo:page-sequence master-name="one">
+<fo:page-sequence master-reference="one">
<fo:flow flow-name="xsl-region-body">
<fo:block>This is used to show how foreign objects are placed in a line
area.</fo:block>
<fo:block>
1.7.4.1 +1 -1 xml-fop/docs/examples/fo/leader.fo
Index: leader.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/leader.fo,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- leader.fo 2001/02/23 06:00:19 1.7
+++ leader.fo 2001/12/06 21:28:18 1.7.4.1
@@ -23,7 +23,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:flow flow-name="xsl-region-body">
1.7.4.1 +1 -1 xml-fop/docs/examples/fo/link.fo
Index: link.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/link.fo,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- link.fo 2001/01/25 15:13:56 1.7
+++ link.fo 2001/12/06 21:28:18 1.7.4.1
@@ -18,7 +18,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<!-- text body -->
<fo:flow flow-name="xsl-region-body">
1.6.4.1 +1 -1 xml-fop/docs/examples/fo/list.fo
Index: list.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/list.fo,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- list.fo 2001/02/23 06:00:19 1.6
+++ list.fo 2001/12/06 21:28:18 1.6.4.1
@@ -41,7 +41,7 @@
the attribute value of master-name refers to the page layout
which is to be used to layout the text contained in this
page-sequence-->
- <fo:page-sequence master-name="simple">
+ <fo:page-sequence master-reference="simple">
<!-- start fo:flow
each flow is targeted
1.1.2.1 +1 -1 xml-fop/docs/examples/fo/newlinktest.fo
Index: newlinktest.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/newlinktest.fo,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- newlinktest.fo 2001/03/29 07:34:56 1.1
+++ newlinktest.fo 2001/12/06 21:28:18 1.1.2.1
@@ -15,7 +15,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
1.7.4.1 +4 -4 xml-fop/docs/examples/fo/normal.fo
Index: normal.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/normal.fo,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- normal.fo 2001/01/23 16:02:37 1.7
+++ normal.fo 2001/12/06 21:28:18 1.7.4.1
@@ -48,12 +48,12 @@
<fo:page-sequence-master master-name="basicPSM" >
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="first"
+ <fo:conditional-page-master-reference master-reference="first"
page-position="first" />
- <fo:conditional-page-master-reference master-name="rest"
+ <fo:conditional-page-master-reference master-reference="rest"
page-position="rest" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-name="rest" />
+ <fo:conditional-page-master-reference master-reference="rest" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -61,7 +61,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="basicPSM">
+ <fo:page-sequence master-reference="basicPSM">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.1.4.1 +4 -4 xml-fop/docs/examples/fo/normalex.fo
Index: normalex.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/normalex.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- normalex.fo 2000/11/10 22:36:15 1.1
+++ normalex.fo 2001/12/06 21:28:18 1.1.4.1
@@ -48,12 +48,12 @@
<fo:page-sequence-master master-name="basicPSM" >
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="first"
+ <fo:conditional-page-master-reference master-reference="first"
page-position="first" />
- <fo:conditional-page-master-reference master-name="rest"
+ <fo:conditional-page-master-reference master-reference="rest"
page-position="rest" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-name="rest" />
+ <fo:conditional-page-master-reference master-reference="rest" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -61,7 +61,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="basicPSM">
+ <fo:page-sequence master-reference="basicPSM">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.2.4.1 +4 -4 xml-fop/docs/examples/fo/pdfoutline.fo
Index: pdfoutline.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/pdfoutline.fo,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- pdfoutline.fo 2001/02/23 06:00:20 1.2
+++ pdfoutline.fo 2001/12/06 21:28:18 1.2.4.1
@@ -45,12 +45,12 @@
<fo:page-sequence-master master-name="basicPSM" >
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="first"
+ <fo:conditional-page-master-reference master-reference="first"
page-position="first" />
- <fo:conditional-page-master-reference master-name="rest"
+ <fo:conditional-page-master-reference master-reference="rest"
page-position="rest" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-name="rest" />
+ <fo:conditional-page-master-reference master-reference="rest" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -123,7 +123,7 @@
<!-- actual layout -->
- <fo:page-sequence master-name="basicPSM">
+ <fo:page-sequence master-reference="basicPSM">
<fo:static-content flow-name="xsl-region-before">
1.11.4.1 +4 -4 xml-fop/docs/examples/fo/readme.fo
Index: readme.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/readme.fo,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -u -r1.11 -r1.11.4.1
--- readme.fo 2001/02/23 06:00:20 1.11
+++ readme.fo 2001/12/06 21:28:18 1.11.4.1
@@ -43,12 +43,12 @@
<fo:page-sequence-master master-name="basicPSM" >
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="first"
+ <fo:conditional-page-master-reference master-reference="first"
page-position="first" />
- <fo:conditional-page-master-reference master-name="rest"
+ <fo:conditional-page-master-reference master-reference="rest"
page-position="rest" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-name="rest" />
+ <fo:conditional-page-master-reference master-reference="rest" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -56,7 +56,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="basicPSM">
+ <fo:page-sequence master-reference="basicPSM">
<fo:static-content flow-name="xsl-region-before">
1.1.4.1 +1 -1 xml-fop/docs/examples/fo/simple.fo
Index: simple.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/simple.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- simple.fo 2000/11/11 23:27:47 1.1
+++ simple.fo 2001/12/06 21:28:18 1.1.4.1
@@ -39,7 +39,7 @@
the attribute value of master-name refers to the page layout
which is to be used to layout the text contained in this
page-sequence-->
- <fo:page-sequence master-name="simple">
+ <fo:page-sequence master-reference="simple">
<!-- start fo:flow
each flow is targeted
1.7.2.1 +1 -1 xml-fop/docs/examples/fo/table.fo
Index: table.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/table.fo,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- table.fo 2001/04/11 22:01:01 1.7
+++ table.fo 2001/12/06 21:28:18 1.7.2.1
@@ -19,7 +19,7 @@
</fo:layout-master-set>
<!-- starts actual layout -->
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:flow flow-name="xsl-region-body">
1.1.2.1 +1 -1 xml-fop/docs/examples/fo/tableunits.fo
Index: tableunits.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/tableunits.fo,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- tableunits.fo 2001/10/14 21:04:12 1.1
+++ tableunits.fo 2001/12/06 21:28:18 1.1.2.1
@@ -19,7 +19,7 @@
</fo:layout-master-set>
<!-- starts actual layout -->
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:flow flow-name="xsl-region-body">
1.3.4.1 +4 -4 xml-fop/docs/examples/fo/textdeko.fo
Index: textdeko.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/fo/textdeko.fo,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- textdeko.fo 2001/02/23 06:00:20 1.3
+++ textdeko.fo 2001/12/06 21:28:18 1.3.4.1
@@ -34,12 +34,12 @@
<fo:page-sequence-master master-name="basicPSM" >
<fo:repeatable-page-master-alternatives>
- <fo:conditional-page-master-reference master-name="first"
+ <fo:conditional-page-master-reference master-reference="first"
page-position="first" />
- <fo:conditional-page-master-reference master-name="rest"
+ <fo:conditional-page-master-reference master-reference="rest"
page-position="rest" />
<!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-name="rest" />
+ <fo:conditional-page-master-reference master-reference="rest" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -47,7 +47,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="basicPSM">
+ <fo:page-sequence master-reference="basicPSM">
<fo:flow flow-name="xsl-region-body">
No revision
No revision
1.1.4.1 +2 -2 xml-fop/docs/examples/footnotes/columns.fo
Index: columns.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/footnotes/columns.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- columns.fo 2000/12/28 05:42:54 1.1
+++ columns.fo 2001/12/06 21:28:19 1.1.4.1
@@ -37,7 +37,7 @@
</fo:layout-master-set>
<!-- actual layout -->
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block font-size="16pt"
font-family="sans-serif"
@@ -142,7 +142,7 @@
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence master-name="next">
+ <fo:page-sequence master-reference="next">
<fo:static-content flow-name="xsl-region-before">
<fo:block font-size="16pt"
font-family="sans-serif"
1.1.4.1 +1 -1 xml-fop/docs/examples/footnotes/simple.fo
Index: simple.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/footnotes/simple.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- simple.fo 2000/12/28 04:37:14 1.1
+++ simple.fo 2001/12/06 21:28:19 1.1.4.1
@@ -7,7 +7,7 @@
<fo:region-after extent="0.5cm"/>
</fo:simple-page-master>
</fo:layout-master-set>
-<fo:page-sequence master-name="one">
+<fo:page-sequence master-reference="one">
<fo:flow flow-name="xsl-region-body">
<fo:block space-after.optimum="10pt" font-weight="bold" font-size="16pt"
text-align="center">
No revision
No revision
1.1.4.1 +1 -1 xml-fop/docs/examples/keeps_and_breaks/columnlevel1.fo
Index: columnlevel1.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/keeps_and_breaks/columnlevel1.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- columnlevel1.fo 2000/12/27 03:57:47 1.1
+++ columnlevel1.fo 2001/12/06 21:28:19 1.1.4.1
@@ -22,7 +22,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="all">
+ <fo:page-sequence master-reference="all">
<fo:static-content flow-name="xsl-region-after">
<fo:block font-size="10pt" text-align="start"
border-style="solid" border-color="blue" border-width="0.5pt"
1.1.4.1 +1 -1 xml-fop/docs/examples/keeps_and_breaks/pagelevel1.fo
Index: pagelevel1.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/keeps_and_breaks/pagelevel1.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- pagelevel1.fo 2000/12/27 03:56:25 1.1
+++ pagelevel1.fo 2001/12/06 21:28:19 1.1.4.1
@@ -21,7 +21,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="all">
+ <fo:page-sequence master-reference="all">
<fo:static-content flow-name="xsl-region-after">
<fo:block font-size="10pt" text-align="start"
border-style="solid" border-color="blue" border-width="0.5pt">
1.1.4.1 +1 -1 xml-fop/docs/examples/keeps_and_breaks/pagelevel2.fo
Index: pagelevel2.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/keeps_and_breaks/pagelevel2.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- pagelevel2.fo 2000/12/27 03:56:44 1.1
+++ pagelevel2.fo 2001/12/06 21:28:19 1.1.4.1
@@ -21,7 +21,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="all">
+ <fo:page-sequence master-reference="all">
<fo:static-content flow-name="xsl-region-after">
<fo:block font-size="10pt" text-align="start"
border-style="solid" border-color="blue" border-width="0.5pt"
1.1.4.1 +1 -1 xml-fop/docs/examples/keeps_and_breaks/pagelevel3.fo
Index: pagelevel3.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/keeps_and_breaks/pagelevel3.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- pagelevel3.fo 2000/12/27 03:57:03 1.1
+++ pagelevel3.fo 2001/12/06 21:28:19 1.1.4.1
@@ -21,7 +21,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="all">
+ <fo:page-sequence master-reference="all">
<fo:static-content flow-name="xsl-region-after">
<fo:block font-size="10pt" text-align="start"
border-style="solid" border-color="blue" border-width="0.5pt"
1.1.4.1 +1 -1 xml-fop/docs/examples/keeps_and_breaks/pagelevel4.fo
Index: pagelevel4.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/keeps_and_breaks/pagelevel4.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- pagelevel4.fo 2000/12/27 03:57:19 1.1
+++ pagelevel4.fo 2001/12/06 21:28:19 1.1.4.1
@@ -23,7 +23,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="all">
+ <fo:page-sequence master-reference="all">
<fo:static-content flow-name="xsl-region-after">
<fo:block font-size="10pt" text-align="start"
border-style="solid" border-color="blue" border-width="0.5pt"
No revision
No revision
1.1.2.1 +1 -1 xml-fop/docs/examples/markers/glossary.xsl
Index: glossary.xsl
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/markers/glossary.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- glossary.xsl 2001/07/27 02:13:24 1.1
+++ glossary.xsl 2001/12/06 21:28:19 1.1.2.1
@@ -20,7 +20,7 @@
</fo:layout-master-set>
- <fo:page-sequence master-name="all" format="i">
+ <fo:page-sequence master-reference="all" format="i">
<!-- header with running glossary entries -->
<fo:static-content flow-name="xsl-region-before">
1.1.2.1 +2 -2 xml-fop/docs/examples/markers/hide.fo
Index: hide.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/markers/hide.fo,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- hide.fo 2001/09/21 09:11:21 1.1
+++ hide.fo 2001/12/06 21:28:19 1.1.2.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block-container height="1cm" width="15cm" top="0cm" left="0cm"
position="absolute">
<fo:block>
@@ -74,7 +74,7 @@
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence master-name="first" initial-page-number="1">
+ <fo:page-sequence master-reference="first" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block-container height="1cm" width="15cm" top="0cm" left="0cm"
position="absolute"> <fo:block>
<fo:retrieve-marker retrieve-class-name="message"
No revision
No revision
1.1.2.1 +1 -1 xml-fop/docs/examples/pagination/allregions.fo
Index: allregions.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/pagination/allregions.fo,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- allregions.fo 2001/03/04 22:58:04 1.1
+++ allregions.fo 2001/12/06 21:28:20 1.1.2.1
@@ -26,7 +26,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="only" initial-page-number="1">
+ <fo:page-sequence master-reference="only" initial-page-number="1">
<!-- usage of page layout -->
<!-- header -->
1.4.4.1 +1 -1 xml-fop/docs/examples/pagination/basic1.fo
Index: basic1.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/pagination/basic1.fo,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- basic1.fo 2000/11/11 23:30:24 1.4
+++ basic1.fo 2001/12/06 21:28:20 1.4.4.1
@@ -22,7 +22,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="only" initial-page-number="1">
+ <fo:page-sequence master-reference="only" initial-page-number="1">
<!-- usage of page layout -->
<!-- header -->
1.4.4.1 +2 -2 xml-fop/docs/examples/pagination/basic2.fo
Index: basic2.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/pagination/basic2.fo,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- basic2.fo 2000/11/11 23:30:24 1.4
+++ basic2.fo 2001/12/06 21:28:20 1.4.4.1
@@ -19,13 +19,13 @@
</fo:simple-page-master>
<fo:page-sequence-master master-name="single">
- <fo:single-page-master-reference master-name="only"/>
+ <fo:single-page-master-reference master-reference="only"/>
</fo:page-sequence-master>
</fo:layout-master-set>
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="single" initial-page-number="1">
+ <fo:page-sequence master-reference="single" initial-page-number="1">
<!-- usage of page layout -->
<!-- header -->
1.3.6.1 +6 -6 xml-fop/docs/examples/pagination/franklin_2pageseqs.fo
Index: franklin_2pageseqs.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/pagination/franklin_2pageseqs.fo,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- franklin_2pageseqs.fo 2000/08/11 19:08:10 1.3
+++ franklin_2pageseqs.fo 2001/12/06 21:28:20 1.3.6.1
@@ -53,20 +53,20 @@
</fo:simple-page-master>
<fo:page-sequence-master master-name="run1">
- <fo:repeatable-page-master-reference
master-name="noheaders_center"
+ <fo:repeatable-page-master-reference
master-reference="noheaders_center"
maximum-repeats="6"/>
</fo:page-sequence-master>
<fo:page-sequence-master master-name="run2">
<fo:repeatable-page-master-alternatives>
<fo:conditional-page-master-reference
- master-name="headers_center"
+ master-reference="headers_center"
page-position="first" />
<fo:conditional-page-master-reference
- master-name="headers_right"
+ master-reference="headers_right"
odd-or-even="odd" />
<fo:conditional-page-master-reference
- master-name="headers_left"
+ master-reference="headers_left"
odd-or-even="even" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -74,7 +74,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="run1" initial-page-number="1">
+ <fo:page-sequence master-reference="run1" initial-page-number="1">
<fo:flow flow-name="xsl-region-body">
@@ -451,7 +451,7 @@
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence master-name="run2" initial-page-number="7">
+ <fo:page-sequence master-reference="run2" initial-page-number="7">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.3.6.1 +4 -4 xml-fop/docs/examples/pagination/franklin_alt.fo
Index: franklin_alt.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/pagination/franklin_alt.fo,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- franklin_alt.fo 2000/08/11 19:08:10 1.3
+++ franklin_alt.fo 2001/12/06 21:28:20 1.3.6.1
@@ -44,11 +44,11 @@
<fo:page-sequence-master master-name="alternating">
<fo:repeatable-page-master-alternatives maximum-repeats="no-limit">
- <fo:conditional-page-master-reference master-name="right"
+ <fo:conditional-page-master-reference master-reference="right"
odd-or-even="odd" />
- <fo:conditional-page-master-reference master-name="left"
+ <fo:conditional-page-master-reference master-reference="left"
odd-or-even="even" />
- <fo:conditional-page-master-reference master-name="center"/>
+ <fo:conditional-page-master-reference
master-reference="center"/>
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
@@ -56,7 +56,7 @@
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="alternating" initial-page-number="1">
+ <fo:page-sequence master-reference="alternating" initial-page-number="1">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.3.6.1 +2 -2 xml-fop/docs/examples/pagination/franklin_rep.fo
Index: franklin_rep.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/pagination/franklin_rep.fo,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- franklin_rep.fo 2000/08/11 19:08:11 1.3
+++ franklin_rep.fo 2001/12/06 21:28:20 1.3.6.1
@@ -19,13 +19,13 @@
</fo:simple-page-master>
<fo:page-sequence-master master-name="repeating_pm">
- <fo:repeatable-page-master-reference master-name="repeating"/>
+ <fo:repeatable-page-master-reference
master-reference="repeating"/>
</fo:page-sequence-master>
</fo:layout-master-set>
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="repeating_pm" initial-page-number="1">
+ <fo:page-sequence master-reference="repeating_pm" initial-page-number="1">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.3.6.1 +3 -3 xml-fop/docs/examples/pagination/franklin_rep_max_repeats.fo
Index: franklin_rep_max_repeats.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/pagination/franklin_rep_max_repeats.fo,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- franklin_rep_max_repeats.fo 2000/08/11 19:08:11 1.3
+++ franklin_rep_max_repeats.fo 2001/12/06 21:28:20 1.3.6.1
@@ -19,15 +19,15 @@
</fo:simple-page-master>
<fo:page-sequence-master master-name="repeating_pm">
- <fo:repeatable-page-master-reference master-name="repeating"
+ <fo:repeatable-page-master-reference
master-reference="repeating"
maximum-repeats="15"/>
- <fo:single-page-master-reference master-name="repeating"/>
+ <fo:single-page-master-reference master-reference="repeating"/>
</fo:page-sequence-master>
</fo:layout-master-set>
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="repeating_pm" initial-page-number="1">
+ <fo:page-sequence master-reference="repeating_pm" initial-page-number="1">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.3.6.1 +3 -3
xml-fop/docs/examples/pagination/franklin_rep_max_repeats_expl.fo
Index: franklin_rep_max_repeats_expl.fo
===================================================================
RCS file:
/home/cvs/xml-fop/docs/examples/pagination/franklin_rep_max_repeats_expl.fo,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- franklin_rep_max_repeats_expl.fo 2000/08/11 19:08:11 1.3
+++ franklin_rep_max_repeats_expl.fo 2001/12/06 21:28:20 1.3.6.1
@@ -19,15 +19,15 @@
</fo:simple-page-master>
<fo:page-sequence-master master-name="repeating_pm">
- <fo:repeatable-page-master-reference master-name="repeating"
+ <fo:repeatable-page-master-reference
master-reference="repeating"
maximum-repeats="15"/>
- <fo:single-page-master-reference master-name="repeating"/>
+ <fo:single-page-master-reference master-reference="repeating"/>
</fo:page-sequence-master>
</fo:layout-master-set>
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="repeating_pm" initial-page-number="1">
+ <fo:page-sequence master-reference="repeating_pm" initial-page-number="1">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
1.3.6.1 +3 -3 xml-fop/docs/examples/pagination/franklin_rep_max_repeats_nl.fo
Index: franklin_rep_max_repeats_nl.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/pagination/franklin_rep_max_repeats_nl.fo,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- franklin_rep_max_repeats_nl.fo 2000/08/11 19:08:11 1.3
+++ franklin_rep_max_repeats_nl.fo 2001/12/06 21:28:20 1.3.6.1
@@ -19,15 +19,15 @@
</fo:simple-page-master>
<fo:page-sequence-master master-name="repeating_pm">
- <fo:repeatable-page-master-reference master-name="repeating"
+ <fo:repeatable-page-master-reference
master-reference="repeating"
maximum-repeats="no-limit"/>
- <fo:single-page-master-reference master-name="repeating"/>
+ <fo:single-page-master-reference master-reference="repeating"/>
</fo:page-sequence-master>
</fo:layout-master-set>
<!-- end: defines page layout -->
<!-- actual layout -->
- <fo:page-sequence master-name="repeating_pm" initial-page-number="1">
+ <fo:page-sequence master-reference="repeating_pm" initial-page-number="1">
<!-- header -->
<fo:static-content flow-name="xsl-region-before">
No revision
No revision
1.1.4.1 +1 -1 xml-fop/docs/examples/region_body/simplecol.fo
Index: simplecol.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/region_body/simplecol.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- simplecol.fo 2000/12/18 03:55:30 1.1
+++ simplecol.fo 2001/12/06 21:28:20 1.1.4.1
@@ -23,7 +23,7 @@
</fo:layout-master-set>
<!-- actual layout -->
- <fo:page-sequence master-name="only">
+ <fo:page-sequence master-reference="only">
<fo:static-content flow-name="xsl-region-before">
<fo:block font-size="16pt"
font-family="sans-serif"
1.2.4.1 +1 -1 xml-fop/docs/examples/region_body/simplecol2.fo
Index: simplecol2.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/region_body/simplecol2.fo,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- simplecol2.fo 2000/12/22 02:05:27 1.2
+++ simplecol2.fo 2001/12/06 21:28:20 1.2.4.1
@@ -23,7 +23,7 @@
</fo:layout-master-set>
<!-- actual layout -->
- <fo:page-sequence master-name="only" >
+ <fo:page-sequence master-reference="only" >
<fo:static-content flow-name="xsl-region-before" >
<fo:block font-size="16pt"
font-family="sans-serif"
1.1.4.1 +1 -1 xml-fop/docs/examples/region_body/simplecol3.fo
Index: simplecol3.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/region_body/simplecol3.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- simplecol3.fo 2000/12/18 03:56:35 1.1
+++ simplecol3.fo 2001/12/06 21:28:20 1.1.4.1
@@ -23,7 +23,7 @@
</fo:layout-master-set>
<!-- actual layout -->
- <fo:page-sequence master-name="only">
+ <fo:page-sequence master-reference="only">
<fo:static-content flow-name="xsl-region-before">
<fo:block font-size="16pt"
font-family="sans-serif"
1.1.4.1 +1 -1 xml-fop/docs/examples/region_body/simplecol4.fo
Index: simplecol4.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/region_body/simplecol4.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- simplecol4.fo 2000/12/18 03:57:04 1.1
+++ simplecol4.fo 2001/12/06 21:28:20 1.1.4.1
@@ -23,7 +23,7 @@
</fo:layout-master-set>
<!-- actual layout -->
- <fo:page-sequence master-name="only">
+ <fo:page-sequence master-reference="only">
<fo:static-content flow-name="xsl-region-before">
<fo:block font-size="16pt"
font-family="sans-serif"
No revision
No revision
1.4.2.1 +1 -1 xml-fop/docs/examples/svg/embedding.fo
Index: embedding.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/svg/embedding.fo,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- embedding.fo 2001/08/30 10:09:02 1.4
+++ embedding.fo 2001/12/06 21:28:20 1.4.2.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">Embedding SVG examples</fo:block>
1.3.2.1 +1 -1 xml-fop/docs/examples/svg/external.fo
Index: external.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/svg/external.fo,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- external.fo 2001/08/30 10:09:02 1.3
+++ external.fo 2001/12/06 21:28:20 1.3.2.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">External SVG examples</fo:block>
No revision
No revision
1.1.4.1 +1 -1 xml-fop/docs/examples/tables/background.fo
Index: background.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/tables/background.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- background.fo 2001/01/04 05:27:05 1.1
+++ background.fo 2001/12/06 21:28:20 1.1.4.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">table examples</fo:block>
1.3.2.1 +1 -1 xml-fop/docs/examples/tables/borders.fo
Index: borders.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/tables/borders.fo,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- borders.fo 2001/04/11 22:02:35 1.3
+++ borders.fo 2001/12/06 21:28:20 1.3.2.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">table examples</fo:block>
1.1.4.1 +1 -1 xml-fop/docs/examples/tables/break.fo
Index: break.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/tables/break.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- break.fo 2001/02/18 23:59:10 1.1
+++ break.fo 2001/12/06 21:28:20 1.1.4.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">table examples</fo:block>
1.2.2.1 +1 -1 xml-fop/docs/examples/tables/headfoot.fo
Index: headfoot.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/tables/headfoot.fo,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- headfoot.fo 2001/07/04 21:19:00 1.2
+++ headfoot.fo 2001/12/06 21:28:20 1.2.2.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">table examples</fo:block>
1.2.2.1 +1 -1 xml-fop/docs/examples/tables/keep.fo
Index: keep.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/tables/keep.fo,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- keep.fo 2001/04/20 20:53:09 1.2
+++ keep.fo 2001/12/06 21:28:20 1.2.2.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">table examples</fo:block>
1.1.4.1 +1 -1 xml-fop/docs/examples/tables/omit.fo
Index: omit.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/tables/omit.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- omit.fo 2000/12/29 04:17:36 1.1
+++ omit.fo 2001/12/06 21:28:20 1.1.4.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">table examples</fo:block>
1.2.2.1 +1 -1 xml-fop/docs/examples/tables/space.fo
Index: space.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/tables/space.fo,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- space.fo 2001/04/20 20:53:09 1.2
+++ space.fo 2001/12/06 21:28:20 1.2.2.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">table examples</fo:block>
1.1.4.1 +1 -1 xml-fop/docs/examples/tables/widowsorphans.fo
Index: widowsorphans.fo
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/tables/widowsorphans.fo,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- widowsorphans.fo 2001/01/10 23:07:47 1.1
+++ widowsorphans.fo 2001/12/06 21:28:20 1.1.4.1
@@ -15,7 +15,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-name="first">
+ <fo:page-sequence master-reference="first">
<fo:static-content flow-name="xsl-region-before">
<fo:block line-height="14pt" font-size="10pt"
text-align="end">table examples</fo:block>
No revision
No revision
1.25.2.2 +7 -1 xml-fop/src/codegen/foproperties.xml
Index: foproperties.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/foproperties.xml,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -r1.25.2.1 -r1.25.2.2
--- foproperties.xml 2001/12/02 22:17:28 1.25.2.1
+++ foproperties.xml 2001/12/06 21:28:21 1.25.2.2
@@ -1148,7 +1148,7 @@
<default>treat-as-space</default>
</property>
<property>
- <name>space-treatment</name>
+ <name>white-space-treatment</name>
<inherited>true</inherited>
<datatype>ToBeImplemented</datatype>
<default>preserve</default>
@@ -1686,6 +1686,12 @@
</property>
<property>
<name>master-name</name>
+ <inherited>false</inherited>
+ <datatype>String</datatype>
+ <default></default>
+ </property>
+ <property>
+ <name>master-reference</name>
<inherited>false</inherited>
<datatype>String</datatype>
<default></default>
No revision
No revision
1.6.2.1 +2 -2 xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java
Index: PropertyParser.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- PropertyParser.java 2001/10/14 20:38:25 1.6
+++ PropertyParser.java 2001/12/06 21:28:21 1.6.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: PropertyParser.java,v 1.6 2001/10/14 20:38:25 klease Exp $
+ * $Id: PropertyParser.java,v 1.6.2.1 2001/12/06 21:28:21 tore Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -53,7 +53,7 @@
/**
* * NOT YET IMPLEMENTED!!!
- * functionTable.put("icc-color", new ICCcolorFunction());
+ * functionTable.put("rgb-icc", new RgbICCFunction());
* functionTable.put("system-color", new SystemColorFunction());
* functionTable.put("system-font", new SystemFontFunction());
*
No revision
No revision
1.41.2.1 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -r1.41 -r1.41.2.1
--- Block.java 2001/08/20 11:19:23 1.41
+++ Block.java 2001/12/06 21:28:21 1.41.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Block.java,v 1.41 2001/08/20 11:19:23 keiron Exp $
+ * $Id: Block.java,v 1.41.2.1 2001/12/06 21:28:21 tore Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -123,7 +123,7 @@
// this.properties.get("line-height-shift-adjustment");
// this.properties.get("line-stacking-strategy");
// this.properties.get("orphans");
- // this.properties.get("space-treatment");
+ // this.properties.get("white-space-treatment");
// this.properties.get("span");
// this.properties.get("text-align");
// this.properties.get("text-align-last");
No revision
No revision
1.5.2.1 +5 -5
xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- ConditionalPageMasterReference.java 2001/09/11 10:04:25 1.5
+++ ConditionalPageMasterReference.java 2001/12/06 21:28:21 1.5.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: ConditionalPageMasterReference.java,v 1.5 2001/09/11 10:04:25 keiron Exp $
+ * $Id: ConditionalPageMasterReference.java,v 1.5.2.1 2001/12/06 21:28:21 tore Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -38,8 +38,8 @@
super(parent, propertyList);
this.name = getElementName();
- if (getProperty("master-name") != null) {
- setMasterName(getProperty("master-name").getString());
+ if (getProperty("master-reference") != null) {
+ setMasterName(getProperty("master-reference").getString());
}
validateParent(parent);
@@ -56,7 +56,7 @@
}
/**
- * Returns the "master-name" attribute of this page master reference
+ * Returns the "master-reference" attribute of this page master reference
*/
public String getMasterName() {
return masterName;
@@ -148,7 +148,7 @@
if (getMasterName() == null) {
log.warn("single-page-master-reference"
- + "does not have a master-name and so is
being ignored");
+ + "does not have a master-reference and so
is being ignored");
} else {
this.repeatablePageMasterAlternatives.addConditionalPageMasterReference(this);
}
1.5.2.1 +6 -6
xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java
Index: PageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- PageMasterReference.java 2001/09/11 10:04:25 1.5
+++ PageMasterReference.java 2001/12/06 21:28:21 1.5.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: PageMasterReference.java,v 1.5 2001/09/11 10:04:25 keiron Exp $
+ * $Id: PageMasterReference.java,v 1.5.2.1 2001/12/06 21:28:21 tore Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -13,7 +13,7 @@
/**
* Base PageMasterReference class. Provides implementation for handling the
- * master-name attribute and containment within a PageSequenceMaster
+ * master-reference attribute and containment within a PageSequenceMaster
*/
public abstract class PageMasterReference extends FObj
implements SubSequenceSpecifier {
@@ -25,8 +25,8 @@
throws FOPException {
super(parent, propertyList);
this.name = getElementName();
- if (getProperty("master-name") != null) {
- setMasterName(getProperty("master-name").getString());
+ if (getProperty("master-reference") != null) {
+ setMasterName(getProperty("master-reference").getString());
}
validateParent(parent);
@@ -37,7 +37,7 @@
}
/**
- * Returns the "master-name" attribute of this page master reference
+ * Returns the "master-reference" attribute of this page master reference
*/
public String getMasterName() {
return _masterName;
@@ -72,7 +72,7 @@
if (getMasterName() == null) {
log.warn("" + getElementName()
- + " does not have a master-name and so is
being ignored");
+ + " does not have a master-reference and so
is being ignored");
} else {
_pageSequenceMaster.addSubsequenceSpecifier(this);
}
1.39.2.1 +6 -4 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -r1.39 -r1.39.2.1
--- PageSequence.java 2001/09/11 10:04:25 1.39
+++ PageSequence.java 2001/12/06 21:28:21 1.39.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: PageSequence.java,v 1.39 2001/09/11 10:04:25 keiron Exp $
+ * $Id: PageSequence.java,v 1.39.2.1 2001/12/06 21:28:21 tore Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -82,7 +82,9 @@
private Hashtable _flowMap;
/**
- * the "master-name" attribute
+ * the "master-reference" attribute,
+ * which specifies the name of the page-sequence-master or
+ * page-master to be used to create pages in the sequence
*/
private String masterName;
@@ -176,7 +178,7 @@
}
}
- masterName = this.properties.get("master-name").getString();
+ masterName = this.properties.get("master-reference").getString();
// get the 'format' properties
this.pageNumberGenerator =
@@ -527,7 +529,7 @@
SimplePageMaster simpleMaster =
this.layoutMasterSet.getSimplePageMaster(pageSequenceName);
if (simpleMaster == null) {
- throw new FOPException("'master-name' for 'fo:page-sequence'"
+ throw new FOPException("'master-reference' for 'fo:page-sequence'"
+ "matches no 'simple-page-master' or
'page-sequence-master'");
}
currentPageMasterName = pageSequenceName;
No revision
No revision
1.53.2.1 +2 -2 xml-fop/src/org/apache/fop/layout/LineArea.java
Index: LineArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/LineArea.java,v
retrieving revision 1.53
retrieving revision 1.53.2.1
diff -u -r1.53 -r1.53.2.1
--- LineArea.java 2001/10/12 06:40:12 1.53
+++ LineArea.java 2001/12/06 21:28:22 1.53.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: LineArea.java,v 1.53 2001/10/12 06:40:12 keiron Exp $
+ * $Id: LineArea.java,v 1.53.2.1 2001/12/06 21:28:22 tore Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -339,7 +339,7 @@
spaceWidth = getCharWidth(c);
/*
- * here is the place for space-treatment value 'ignore':
+ * here is the place for white-space-treatment value 'ignore':
* if (this.spaceTreatment ==
* SpaceTreatment.IGNORE) {
* // do nothing
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
