Christian,

When is page-position "last" correct implemented ?

Claus




                                                                                       
                                   
                    Christian Geisert                                                  
                                   
                    <Christian.Geisert@is       To:     [EMAIL PROTECTED]         
                                   
                    u-gmbh.de>                  cc:                                    
                                   
                                                Subject:     [PATCH] update FOP 
(maintenance branch) to REC syntax        
                    05-12-2001 16:38                                                   
                                   
                    Please respond to                                                  
                                   
                    fop-dev                                                            
                                   
                                                                                       
                                   
                                                                                       
                                   




Hi,

I finally managed to update FOP to REC syntax..

According to the documented changes at:

http://www.w3.org/TR/2001/REC-xsl-20011015/sliceF.html#changes
http://www.w3.org/TR/2001/PR-xsl-20010828/sliceF.html#changes

the biggest thing was the renaming of the "master-name" property to
"master-reference" on fo:page-sequence, fo:single-page-master-reference,
fo:repeatable-page-master-reference and
fo:conditional-page-master-reference.

I've also updated all files in docs/examples, run the tests - and it looks
good :-)

Next I will have a look a the test directory


Christian
Index: docs/examples/advanced/cid-fonts.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/advanced/cid-fonts.fo,v
retrieving revision 1.2
diff -u -u -r1.2 cid-fonts.fo
--- docs/examples/advanced/cid-fonts.fo  2001/05/18 09:55:46      1.2
+++ docs/examples/advanced/cid-fonts.fo  2001/12/05 14:11:04
@@ -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">
Index: docs/examples/advanced/giro.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/advanced/giro.fo,v
retrieving revision 1.1
diff -u -u -r1.1 giro.fo
--- docs/examples/advanced/giro.fo 2001/03/04 18:00:38  1.1
+++ docs/examples/advanced/giro.fo 2001/12/05 14:11:18
@@ -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>
Index: docs/examples/fo/border.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/border.fo,v
retrieving revision 1.8
diff -u -u -r1.8 border.fo
--- docs/examples/fo/border.fo     2001/10/14 21:03:14  1.8
+++ docs/examples/fo/border.fo     2001/12/05 14:11:20
@@ -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">
Index: docs/examples/fo/bordershorthand.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/bordershorthand.fo,v
retrieving revision 1.1
diff -u -u -r1.1 bordershorthand.fo
--- docs/examples/fo/bordershorthand.fo  2001/03/04 21:47:40      1.1
+++ docs/examples/fo/bordershorthand.fo  2001/12/05 14:11:21
@@ -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">
Index: docs/examples/fo/character.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/character.fo,v
retrieving revision 1.1
diff -u -u -r1.1 character.fo
--- docs/examples/fo/character.fo  2000/12/15 21:44:08  1.1
+++ docs/examples/fo/character.fo  2001/12/05 14:11:21
@@ -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
Index: docs/examples/fo/corresprop.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/corresprop.fo,v
retrieving revision 1.1
diff -u -u -r1.1 corresprop.fo
--- docs/examples/fo/corresprop.fo 2001/01/02 21:49:15  1.1
+++ docs/examples/fo/corresprop.fo 2001/12/05 14:11:23
@@ -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">
Index: docs/examples/fo/extensive.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/extensive.fo,v
retrieving revision 1.15
diff -u -u -r1.15 extensive.fo
--- docs/examples/fo/extensive.fo  2001/06/19 10:47:13  1.15
+++ docs/examples/fo/extensive.fo  2001/12/05 14:11:25
@@ -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>
Index: docs/examples/fo/fonts.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/fonts.fo,v
retrieving revision 1.7
diff -u -u -r1.7 fonts.fo
--- docs/examples/fo/fonts.fo 2001/02/13 16:50:54  1.7
+++ docs/examples/fo/fonts.fo 2001/12/05 14:11:26
@@ -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">
Index: docs/examples/fo/hyphen.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/hyphen.fo,v
retrieving revision 1.4
diff -u -u -r1.4 hyphen.fo
--- docs/examples/fo/hyphen.fo     2001/06/07 21:06:13  1.4
+++ docs/examples/fo/hyphen.fo     2001/12/05 14:11:29
@@ -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
Index: docs/examples/fo/images.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/images.fo,v
retrieving revision 1.11
diff -u -u -r1.11 images.fo
--- docs/examples/fo/images.fo     2001/06/21 14:18:08  1.11
+++ docs/examples/fo/images.fo     2001/12/05 14:11:29
@@ -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>
Index: docs/examples/fo/inhprop.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/inhprop.fo,v
retrieving revision 1.2
diff -u -u -r1.2 inhprop.fo
--- docs/examples/fo/inhprop.fo    2001/01/02 21:49:15  1.2
+++ docs/examples/fo/inhprop.fo    2001/12/05 14:11:30
@@ -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">
Index: docs/examples/fo/instream.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/instream.fo,v
retrieving revision 1.3
diff -u -u -r1.3 instream.fo
--- docs/examples/fo/instream.fo   2001/05/17 08:41:34  1.3
+++ docs/examples/fo/instream.fo   2001/12/05 14:11:31
@@ -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>
Index: docs/examples/fo/leader.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/leader.fo,v
retrieving revision 1.7
diff -u -u -r1.7 leader.fo
--- docs/examples/fo/leader.fo     2001/02/23 06:00:19  1.7
+++ docs/examples/fo/leader.fo     2001/12/05 14:11:34
@@ -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">
Index: docs/examples/fo/link.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/link.fo,v
retrieving revision 1.7
diff -u -u -r1.7 link.fo
--- docs/examples/fo/link.fo  2001/01/25 15:13:56  1.7
+++ docs/examples/fo/link.fo  2001/12/05 14:11:35
@@ -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">
Index: docs/examples/fo/list.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/list.fo,v
retrieving revision 1.6
diff -u -u -r1.6 list.fo
--- docs/examples/fo/list.fo  2001/02/23 06:00:19  1.6
+++ docs/examples/fo/list.fo  2001/12/05 14:11:49
@@ -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
Index: docs/examples/fo/newlinktest.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/newlinktest.fo,v
retrieving revision 1.1
diff -u -u -r1.1 newlinktest.fo
--- docs/examples/fo/newlinktest.fo      2001/03/29 07:34:56      1.1
+++ docs/examples/fo/newlinktest.fo      2001/12/05 14:11:49
@@ -15,7 +15,7 @@
   <!-- end: defines page layout -->

   <!-- actual layout -->
-  <fo:page-sequence master-name="first">
+  <fo:page-sequence master-reference="first">



Index: docs/examples/fo/normal.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/normal.fo,v
retrieving revision 1.7
diff -u -u -r1.7 normal.fo
--- docs/examples/fo/normal.fo     2001/01/23 16:02:37  1.7
+++ docs/examples/fo/normal.fo     2001/12/05 14:11:50
@@ -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">
Index: docs/examples/fo/normalex.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/normalex.fo,v
retrieving revision 1.1
diff -u -u -r1.1 normalex.fo
--- docs/examples/fo/normalex.fo   2000/11/10 22:36:15  1.1
+++ docs/examples/fo/normalex.fo   2001/12/05 14:11:51
@@ -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">
Index: docs/examples/fo/pdfoutline.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/pdfoutline.fo,v
retrieving revision 1.2
diff -u -u -r1.2 pdfoutline.fo
--- docs/examples/fo/pdfoutline.fo 2001/02/23 06:00:20  1.2
+++ docs/examples/fo/pdfoutline.fo 2001/12/05 14:12:00
@@ -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">
Index: docs/examples/fo/readme.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/readme.fo,v
retrieving revision 1.11
diff -u -u -r1.11 readme.fo
--- docs/examples/fo/readme.fo     2001/02/23 06:00:20  1.11
+++ docs/examples/fo/readme.fo     2001/12/05 14:12:08
@@ -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">
Index: docs/examples/fo/simple.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/simple.fo,v
retrieving revision 1.1
diff -u -u -r1.1 simple.fo
--- docs/examples/fo/simple.fo     2000/11/11 23:27:47  1.1
+++ docs/examples/fo/simple.fo     2001/12/05 14:12:09
@@ -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
Index: docs/examples/fo/table.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/table.fo,v
retrieving revision 1.7
diff -u -u -r1.7 table.fo
--- docs/examples/fo/table.fo 2001/04/11 22:01:01  1.7
+++ docs/examples/fo/table.fo 2001/12/05 14:12:12
@@ -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">

Index: docs/examples/fo/tableunits.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/tableunits.fo,v
retrieving revision 1.1
diff -u -u -r1.1 tableunits.fo
--- docs/examples/fo/tableunits.fo 2001/10/14 21:04:12  1.1
+++ docs/examples/fo/tableunits.fo 2001/12/05 14:12:13
@@ -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">

Index: docs/examples/fo/textdeko.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/fo/textdeko.fo,v
retrieving revision 1.3
diff -u -u -r1.3 textdeko.fo
--- docs/examples/fo/textdeko.fo   2001/02/23 06:00:20  1.3
+++ docs/examples/fo/textdeko.fo   2001/12/05 14:12:15
@@ -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">

Index: docs/examples/footnotes/columns.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/footnotes/columns.fo,v
retrieving revision 1.1
diff -u -u -r1.1 columns.fo
--- docs/examples/footnotes/columns.fo   2000/12/28 05:42:54      1.1
+++ docs/examples/footnotes/columns.fo   2001/12/05 14:12:16
@@ -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"
Index: docs/examples/footnotes/simple.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/footnotes/simple.fo,v
retrieving revision 1.1
diff -u -u -r1.1 simple.fo
--- docs/examples/footnotes/simple.fo    2000/12/28 04:37:14      1.1
+++ docs/examples/footnotes/simple.fo    2001/12/05 14:12:16
@@ -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">
Index: docs/examples/keeps_and_breaks/columnlevel1.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/keeps_and_breaks/columnlevel1.fo,v
retrieving revision 1.1
diff -u -u -r1.1 columnlevel1.fo
--- docs/examples/keeps_and_breaks/columnlevel1.fo      2000/12/27 03:57:47
1.1
+++ docs/examples/keeps_and_breaks/columnlevel1.fo      2001/12/05 14:12:18
@@ -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"
Index: docs/examples/keeps_and_breaks/pagelevel1.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/keeps_and_breaks/pagelevel1.fo,v
retrieving revision 1.1
diff -u -u -r1.1 pagelevel1.fo
--- docs/examples/keeps_and_breaks/pagelevel1.fo   2000/12/27 03:56:25
1.1
+++ docs/examples/keeps_and_breaks/pagelevel1.fo   2001/12/05 14:12:19
@@ -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">
Index: docs/examples/keeps_and_breaks/pagelevel2.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/keeps_and_breaks/pagelevel2.fo,v
retrieving revision 1.1
diff -u -u -r1.1 pagelevel2.fo
--- docs/examples/keeps_and_breaks/pagelevel2.fo   2000/12/27 03:56:44
1.1
+++ docs/examples/keeps_and_breaks/pagelevel2.fo   2001/12/05 14:12:21
@@ -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"
Index: docs/examples/keeps_and_breaks/pagelevel3.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/keeps_and_breaks/pagelevel3.fo,v
retrieving revision 1.1
diff -u -u -r1.1 pagelevel3.fo
--- docs/examples/keeps_and_breaks/pagelevel3.fo   2000/12/27 03:57:03
1.1
+++ docs/examples/keeps_and_breaks/pagelevel3.fo   2001/12/05 14:12:22
@@ -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"
Index: docs/examples/keeps_and_breaks/pagelevel4.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/keeps_and_breaks/pagelevel4.fo,v
retrieving revision 1.1
diff -u -u -r1.1 pagelevel4.fo
--- docs/examples/keeps_and_breaks/pagelevel4.fo   2000/12/27 03:57:19
1.1
+++ docs/examples/keeps_and_breaks/pagelevel4.fo   2001/12/05 14:12:24
@@ -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"
Index: docs/examples/markers/glossary.xsl
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/markers/glossary.xsl,v
retrieving revision 1.1
diff -u -u -r1.1 glossary.xsl
--- docs/examples/markers/glossary.xsl   2001/07/27 02:13:24      1.1
+++ docs/examples/markers/glossary.xsl   2001/12/05 14:12:24
@@ -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">
Index: docs/examples/markers/hide.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/markers/hide.fo,v
retrieving revision 1.1
diff -u -u -r1.1 hide.fo
--- docs/examples/markers/hide.fo  2001/09/21 09:11:21  1.1
+++ docs/examples/markers/hide.fo  2001/12/05 14:12:25
@@ -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"
Index: docs/examples/pagination/allregions.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/pagination/allregions.fo,v
retrieving revision 1.1
diff -u -u -r1.1 allregions.fo
--- docs/examples/pagination/allregions.fo    2001/03/04 22:58:04      1.1
+++ docs/examples/pagination/allregions.fo    2001/12/05 14:12:26
@@ -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 -->
Index: docs/examples/pagination/basic1.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/pagination/basic1.fo,v
retrieving revision 1.4
diff -u -u -r1.4 basic1.fo
--- docs/examples/pagination/basic1.fo   2000/11/11 23:30:24      1.4
+++ docs/examples/pagination/basic1.fo   2001/12/05 14:12:26
@@ -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 -->
Index: docs/examples/pagination/basic2.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/pagination/basic2.fo,v
retrieving revision 1.4
diff -u -u -r1.4 basic2.fo
--- docs/examples/pagination/basic2.fo   2000/11/11 23:30:24      1.4
+++ docs/examples/pagination/basic2.fo   2001/12/05 14:12:27
@@ -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 -->
Index: docs/examples/pagination/franklin_2pageseqs.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/pagination/franklin_2pageseqs.fo,v
retrieving revision 1.3
diff -u -u -r1.3 franklin_2pageseqs.fo
--- docs/examples/pagination/franklin_2pageseqs.fo      2000/08/11 19:08:10
1.3
+++ docs/examples/pagination/franklin_2pageseqs.fo      2001/12/05 14:12:34
@@ -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">
Index: docs/examples/pagination/franklin_alt.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/pagination/franklin_alt.fo,v
retrieving revision 1.3
diff -u -u -r1.3 franklin_alt.fo
--- docs/examples/pagination/franklin_alt.fo  2000/08/11 19:08:10      1.3
+++ docs/examples/pagination/franklin_alt.fo  2001/12/05 14:12:40
@@ -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">
Index: docs/examples/pagination/franklin_rep.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/pagination/franklin_rep.fo,v
retrieving revision 1.3
diff -u -u -r1.3 franklin_rep.fo
--- docs/examples/pagination/franklin_rep.fo  2000/08/11 19:08:11      1.3
+++ docs/examples/pagination/franklin_rep.fo  2001/12/05 14:12:47
@@ -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">
Index: docs/examples/pagination/franklin_rep_max_repeats.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/pagination/franklin_rep_max_repeats.fo,v

retrieving revision 1.3
diff -u -u -r1.3 franklin_rep_max_repeats.fo
--- docs/examples/pagination/franklin_rep_max_repeats.fo     2000/08/11
19:08:11  1.3
+++ docs/examples/pagination/franklin_rep_max_repeats.fo     2001/12/05
14:12:54
@@ -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">
Index: docs/examples/pagination/franklin_rep_max_repeats_expl.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/pagination/franklin_rep_max_repeats_expl.fo,v

retrieving revision 1.3
diff -u -u -r1.3 franklin_rep_max_repeats_expl.fo
--- docs/examples/pagination/franklin_rep_max_repeats_expl.fo
2000/08/11 19:08:11 1.3
+++ docs/examples/pagination/franklin_rep_max_repeats_expl.fo
2001/12/05 14:13:00
@@ -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">
Index: docs/examples/pagination/franklin_rep_max_repeats_nl.fo
===================================================================
RCS file:
/home/cvspublic/xml-fop/docs/examples/pagination/franklin_rep_max_repeats_nl.fo,v

retrieving revision 1.3
diff -u -u -r1.3 franklin_rep_max_repeats_nl.fo
--- docs/examples/pagination/franklin_rep_max_repeats_nl.fo  2000/08/11
19:08:11  1.3
+++ docs/examples/pagination/franklin_rep_max_repeats_nl.fo  2001/12/05
14:13:07
@@ -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">
Index: docs/examples/region_body/simplecol.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/region_body/simplecol.fo,v
retrieving revision 1.1
diff -u -u -r1.1 simplecol.fo
--- docs/examples/region_body/simplecol.fo    2000/12/18 03:55:30      1.1
+++ docs/examples/region_body/simplecol.fo    2001/12/05 14:13:08
@@ -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"
Index: docs/examples/region_body/simplecol2.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/region_body/simplecol2.fo,v
retrieving revision 1.2
diff -u -u -r1.2 simplecol2.fo
--- docs/examples/region_body/simplecol2.fo   2000/12/22 02:05:27      1.2
+++ docs/examples/region_body/simplecol2.fo   2001/12/05 14:13:09
@@ -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"
Index: docs/examples/region_body/simplecol3.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/region_body/simplecol3.fo,v
retrieving revision 1.1
diff -u -u -r1.1 simplecol3.fo
--- docs/examples/region_body/simplecol3.fo   2000/12/18 03:56:35      1.1
+++ docs/examples/region_body/simplecol3.fo   2001/12/05 14:13:10
@@ -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"
Index: docs/examples/region_body/simplecol4.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/region_body/simplecol4.fo,v
retrieving revision 1.1
diff -u -u -r1.1 simplecol4.fo
--- docs/examples/region_body/simplecol4.fo   2000/12/18 03:57:04      1.1
+++ docs/examples/region_body/simplecol4.fo   2001/12/05 14:13:11
@@ -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"
Index: docs/examples/svg/embedding.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/svg/embedding.fo,v
retrieving revision 1.4
diff -u -u -r1.4 embedding.fo
--- docs/examples/svg/embedding.fo 2001/08/30 10:09:02  1.4
+++ docs/examples/svg/embedding.fo 2001/12/05 14:13:26
@@ -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>
Index: docs/examples/svg/external.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/svg/external.fo,v
retrieving revision 1.3
diff -u -u -r1.3 external.fo
--- docs/examples/svg/external.fo  2001/08/30 10:09:02  1.3
+++ docs/examples/svg/external.fo  2001/12/05 14:13:26
@@ -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>
Index: docs/examples/tables/background.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/tables/background.fo,v
retrieving revision 1.1
diff -u -u -r1.1 background.fo
--- docs/examples/tables/background.fo   2001/01/04 05:27:05      1.1
+++ docs/examples/tables/background.fo   2001/12/05 14:13:29
@@ -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>
Index: docs/examples/tables/borders.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/tables/borders.fo,v
retrieving revision 1.3
diff -u -u -r1.3 borders.fo
--- docs/examples/tables/borders.fo      2001/04/11 22:02:35      1.3
+++ docs/examples/tables/borders.fo      2001/12/05 14:13:33
@@ -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>
Index: docs/examples/tables/break.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/tables/break.fo,v
retrieving revision 1.1
diff -u -u -r1.1 break.fo
--- docs/examples/tables/break.fo  2001/02/18 23:59:10  1.1
+++ docs/examples/tables/break.fo  2001/12/05 14:13:34
@@ -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>
Index: docs/examples/tables/headfoot.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/tables/headfoot.fo,v
retrieving revision 1.2
diff -u -u -r1.2 headfoot.fo
--- docs/examples/tables/headfoot.fo     2001/07/04 21:19:00      1.2
+++ docs/examples/tables/headfoot.fo     2001/12/05 14:13:40
@@ -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>
Index: docs/examples/tables/keep.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/tables/keep.fo,v
retrieving revision 1.2
diff -u -u -r1.2 keep.fo
--- docs/examples/tables/keep.fo   2001/04/20 20:53:09  1.2
+++ docs/examples/tables/keep.fo   2001/12/05 14:13:42
@@ -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>
Index: docs/examples/tables/omit.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/tables/omit.fo,v
retrieving revision 1.1
diff -u -u -r1.1 omit.fo
--- docs/examples/tables/omit.fo   2000/12/29 04:17:36  1.1
+++ docs/examples/tables/omit.fo   2001/12/05 14:13:47
@@ -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>
Index: docs/examples/tables/space.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/tables/space.fo,v
retrieving revision 1.2
diff -u -u -r1.2 space.fo
--- docs/examples/tables/space.fo  2001/04/20 20:53:09  1.2
+++ docs/examples/tables/space.fo  2001/12/05 14:13:49
@@ -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>
Index: docs/examples/tables/widowsorphans.fo
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/examples/tables/widowsorphans.fo,v
retrieving revision 1.1
diff -u -u -r1.1 widowsorphans.fo
--- docs/examples/tables/widowsorphans.fo     2001/01/10 23:07:47      1.1
+++ docs/examples/tables/widowsorphans.fo     2001/12/05 14:13:51
@@ -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>
Index: src/codegen/foproperties.xml
===================================================================
RCS file: /home/cvspublic/xml-fop/src/codegen/foproperties.xml,v
retrieving revision 1.25.2.1
diff -u -u -r1.25.2.1 foproperties.xml
--- src/codegen/foproperties.xml   2001/12/02 22:17:28  1.25.2.1
+++ src/codegen/foproperties.xml   2001/12/05 14:14:03
@@ -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>
Index: src/org/apache/fop/fo/expr/PropertyParser.java
===================================================================
RCS file:
/home/cvspublic/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v
retrieving revision 1.6
diff -u -u -r1.6 PropertyParser.java
--- src/org/apache/fop/fo/expr/PropertyParser.java      2001/10/14 20:38:25
1.6
+++ src/org/apache/fop/fo/expr/PropertyParser.java      2001/12/05 14:14:06
@@ -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());
          *
Index: src/org/apache/fop/fo/flow/Block.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.41
diff -u -u -r1.41 Block.java
--- src/org/apache/fop/fo/flow/Block.java     2001/08/20 11:19:23      1.41
+++ src/org/apache/fop/fo/flow/Block.java     2001/12/05 14:14:08
@@ -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");
Index: src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
===================================================================
RCS file:
/home/cvspublic/xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v

retrieving revision 1.5
diff -u -u -r1.5 ConditionalPageMasterReference.java
--- src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
2001/09/11 10:04:25 1.5
+++ src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
2001/12/05 14:14:09
@@ -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);

             }
Index: src/org/apache/fop/fo/pagination/PageMasterReference.java
===================================================================
RCS file:
/home/cvspublic/xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java,v

retrieving revision 1.5
diff -u -u -r1.5 PageMasterReference.java
--- src/org/apache/fop/fo/pagination/PageMasterReference.java
2001/09/11 10:04:25 1.5
+++ src/org/apache/fop/fo/pagination/PageMasterReference.java
2001/12/05 14:14:10
@@ -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);
             }
Index: src/org/apache/fop/fo/pagination/PageSequence.java
===================================================================
RCS file:
/home/cvspublic/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v

retrieving revision 1.39
diff -u -u -r1.39 PageSequence.java
--- src/org/apache/fop/fo/pagination/PageSequence.java  2001/09/11 10:04:25
1.39
+++ src/org/apache/fop/fo/pagination/PageSequence.java  2001/12/05 14:14:13
@@ -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;
Index: src/org/apache/fop/layout/LineArea.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/layout/LineArea.java,v
retrieving revision 1.53
diff -u -u -r1.53 LineArea.java
--- src/org/apache/fop/layout/LineArea.java   2001/10/12 06:40:12      1.53
+++ src/org/apache/fop/layout/LineArea.java   2001/12/05 14:14:20
@@ -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, email: [EMAIL PROTECTED]




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to