PR:

Obtained from:
Submitted by:	Christian Geisert [Christian.Geisert@isu-gmbh.de]

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.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@194589 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 76879fde6f9b2ddcbe3bb02ff35b01075b6b146a..b8ac46615feb100e0ee94c13d1e95a161b57a61e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,12 @@ width work. (Karen Lease)
 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 [Christian.Geisert@isu-gmbh.de]
 - Add support for inline-progression-dimension and table-layout. (Karen)
 - Add support for letter-spacing.
   Submitted by: Raymond Penners <raymond@duologix.nl>

diff --git a/docs/examples/advanced/cid-fonts.fo b/docs/examples/advanced/cid-fonts.fo
index bc42d6e68a0c19c0dffee89e9fc7eee18f0c8184..b84d17e23edbac7738852e50a0e2a2734a7b1c4c 100644 (file)
--- a/docs/examples/advanced/cid-fonts.fo
+++ b/docs/examples/advanced/cid-fonts.fo
@@ -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">

diff --git a/docs/examples/advanced/giro.fo b/docs/examples/advanced/giro.fo
index 675902435813feba3128677b1319b70acba7074b..f27b2a0e6cab8793aa32007a38a96c95ebb54169 100644 (file)
--- a/docs/examples/advanced/giro.fo
+++ b/docs/examples/advanced/giro.fo
@@ -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>

diff --git a/docs/examples/fo/border.fo b/docs/examples/fo/border.fo
index 957e34ac8b29e1081b45cb2a690a333901b6d8e6..1e89e221f6bb7cbed6a65902bdeccc421887f230 100644 (file)
--- a/docs/examples/fo/border.fo
+++ b/docs/examples/fo/border.fo
@@ -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">

diff --git a/docs/examples/fo/bordershorthand.fo b/docs/examples/fo/bordershorthand.fo
index f3f115f955ea26aae469af8a0e94e30c771b71bd..fc5d5b5d2da82f502a4903fa5fd71a37f7040e02 100644 (file)
--- a/docs/examples/fo/bordershorthand.fo
+++ b/docs/examples/fo/bordershorthand.fo
@@ -48,12 +48,12 @@ Below fo:root there is always
 
 <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 @@ Below fo:root there is always
   <!-- 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">

diff --git a/docs/examples/fo/character.fo b/docs/examples/fo/character.fo
index a7944a15ecf814554a19b4ee3757b9518827b232..b3f9a0e63acada7349705f5297d993be10236175 100644 (file)
--- a/docs/examples/fo/character.fo
+++ b/docs/examples/fo/character.fo
@@ -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 

diff --git a/docs/examples/fo/corresprop.fo b/docs/examples/fo/corresprop.fo
index bc859f98febeef9b25a4217425c9e5e3f6a5e148..93de9f06ded7896a4743c7800985e2e06e5b1880 100644 (file)
--- a/docs/examples/fo/corresprop.fo
+++ b/docs/examples/fo/corresprop.fo
@@ -48,12 +48,12 @@ Below fo:root there is always
 
 <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 @@ Below fo:root there is always
   <!-- 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">

diff --git a/docs/examples/fo/extensive.fo b/docs/examples/fo/extensive.fo
index 8b9eb826a029bf52ccc52e481d8e14564fc2f0e1..3b9752257203de8a9767451f7e11317449121466 100644 (file)
--- a/docs/examples/fo/extensive.fo
+++ b/docs/examples/fo/extensive.fo
@@ -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>

diff --git a/docs/examples/fo/fonts.fo b/docs/examples/fo/fonts.fo
index aa415e52108bffa02f0b7ba68a6a5bb37907b96d..43ab9f3319248be726426050d619a3436e146bde 100644 (file)
--- a/docs/examples/fo/fonts.fo
+++ b/docs/examples/fo/fonts.fo
@@ -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">

diff --git a/docs/examples/fo/hyphen.fo b/docs/examples/fo/hyphen.fo
index 572d320d36aca2402df781d0f5cd2de1c58f043a..73995e53460f2de5d8476385b25908128a739dca 100644 (file)
--- a/docs/examples/fo/hyphen.fo
+++ b/docs/examples/fo/hyphen.fo
@@ -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 

diff --git a/docs/examples/fo/images.fo b/docs/examples/fo/images.fo
index a75f04c55f840a53b3b492d6d37e4f593554da9b..b25cafae728f4f5afd0f567ba2317fc848ea78a3 100644 (file)
--- a/docs/examples/fo/images.fo
+++ b/docs/examples/fo/images.fo
@@ -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>

diff --git a/docs/examples/fo/inhprop.fo b/docs/examples/fo/inhprop.fo
index 16b2fde0a8f35a4dd5bb3bce874570a76b9834c7..81e8cf73008fd3b2e1964fcb85f948152e24d663 100644 (file)
--- a/docs/examples/fo/inhprop.fo
+++ b/docs/examples/fo/inhprop.fo
@@ -48,12 +48,12 @@ Below fo:root there is always
 
 <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 @@ Below fo:root there is always
   <!-- 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">

diff --git a/docs/examples/fo/instream.fo b/docs/examples/fo/instream.fo
index a29c5ceb0aa4fa100266ad7c4be7e5e4db87c9f8..01dde3872d56d4a09c34f369c69c75cf9c019501 100644 (file)
--- a/docs/examples/fo/instream.fo
+++ b/docs/examples/fo/instream.fo
@@ -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>

diff --git a/docs/examples/fo/leader.fo b/docs/examples/fo/leader.fo
index f90769dbcd9ef9258e0aed16c0fffcedc3fff9a1..486386ad9e7e7b04f101779f1bfd76d3818f2415 100644 (file)
--- a/docs/examples/fo/leader.fo
+++ b/docs/examples/fo/leader.fo
@@ -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">

diff --git a/docs/examples/fo/link.fo b/docs/examples/fo/link.fo
index e47d3ce8e4a1617980c7b0397895cba3dbc4a435..28ab1b31efb66f706240b147e929c066167d9d76 100644 (file)
--- a/docs/examples/fo/link.fo
+++ b/docs/examples/fo/link.fo
@@ -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">

diff --git a/docs/examples/fo/list.fo b/docs/examples/fo/list.fo
index 8ea1ca3945a412109ea4a65a671331adb3dae099..74d6916d9ef080c605e73d0d62fc96860612af85 100644 (file)
--- a/docs/examples/fo/list.fo
+++ b/docs/examples/fo/list.fo
@@ -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 

diff --git a/docs/examples/fo/newlinktest.fo b/docs/examples/fo/newlinktest.fo
index 55df88218fd899e515d160c208d8ffaa8db0065c..36484bcd537f1b9d0241ea51e333fa95266a0d0a 100644 (file)
--- a/docs/examples/fo/newlinktest.fo
+++ b/docs/examples/fo/newlinktest.fo
@@ -15,7 +15,7 @@
   <!-- end: defines page layout -->
 
   <!-- actual layout -->
-  <fo:page-sequence master-name="first">
+  <fo:page-sequence master-reference="first">
 
 
 

diff --git a/docs/examples/fo/normal.fo b/docs/examples/fo/normal.fo
index e64feafe23515498fdeb36befb802b38038f2726..0959b40205ccfc029bf569e2e6d72dfab74af09b 100644 (file)
--- a/docs/examples/fo/normal.fo
+++ b/docs/examples/fo/normal.fo
@@ -48,12 +48,12 @@ Below fo:root there is always
 
 <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 @@ Below fo:root there is always
        <!-- 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">

diff --git a/docs/examples/fo/normalex.fo b/docs/examples/fo/normalex.fo
index 90941de19eeefea89b7bb761b1d9240769e59155..00e3e5b7e65f728f4e0439084a2fc0cb63a38217 100644 (file)
--- a/docs/examples/fo/normalex.fo
+++ b/docs/examples/fo/normalex.fo
@@ -48,12 +48,12 @@ Below fo:root there is always
 
 <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 @@ Below fo:root there is always
   <!-- 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">

diff --git a/docs/examples/fo/pdfoutline.fo b/docs/examples/fo/pdfoutline.fo
index 5f91c1952edc2458618ef1d7680abb2a59d96f53..4f1f74a6c2f6a170d685bbf077b7b84065d11094 100644 (file)
--- a/docs/examples/fo/pdfoutline.fo
+++ b/docs/examples/fo/pdfoutline.fo
@@ -45,12 +45,12 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
 
 <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 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
 
 
   <!-- actual layout -->
-  <fo:page-sequence master-name="basicPSM">
+  <fo:page-sequence master-reference="basicPSM">
 
 
 <fo:static-content flow-name="xsl-region-before">

diff --git a/docs/examples/fo/readme.fo b/docs/examples/fo/readme.fo
index f1f7e5cda8d9ed5d749662086dda2c55fc8190e7..70e089ac014956f4a925bcda310e4623aae34910 100644 (file)
--- a/docs/examples/fo/readme.fo
+++ b/docs/examples/fo/readme.fo
@@ -43,12 +43,12 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
 
 <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 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
   <!-- 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">

diff --git a/docs/examples/fo/simple.fo b/docs/examples/fo/simple.fo
index e8a49f1c4ff4828f0788e015b83de805370fecdf..27c4fd962b6d0dda8d17981741349ffba80c286c 100644 (file)
--- a/docs/examples/fo/simple.fo
+++ b/docs/examples/fo/simple.fo
@@ -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 

diff --git a/docs/examples/fo/table.fo b/docs/examples/fo/table.fo
index 92f6dd9323a0a0fb059377cf6187449f0bf41e3f..3d7e268b1f2bbc530f96bdef3447b82a38611386 100644 (file)
--- a/docs/examples/fo/table.fo
+++ b/docs/examples/fo/table.fo
@@ -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">
 

diff --git a/docs/examples/fo/tableunits.fo b/docs/examples/fo/tableunits.fo
index 6ede25aa725d4dba1c0938ff3103553b6bc2c148..502e676fc7faaa83d3ba11d7a4487d42d2016b20 100644 (file)
--- a/docs/examples/fo/tableunits.fo
+++ b/docs/examples/fo/tableunits.fo
@@ -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">
 

diff --git a/docs/examples/fo/textdeko.fo b/docs/examples/fo/textdeko.fo
index 08d01484f93efd57abccfa466996537cf0fa9518..af9f0dfb072cac30a53deb6d5bbf4192f5ce7544 100644 (file)
--- a/docs/examples/fo/textdeko.fo
+++ b/docs/examples/fo/textdeko.fo
@@ -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">
 

diff --git a/docs/examples/footnotes/columns.fo b/docs/examples/footnotes/columns.fo
index 5591e5d2fdfa14be8e6c285d82ae4edc02a13fc3..feed886b57a385c3ea59cdcb0b72e84c1798e9f9 100644 (file)
--- a/docs/examples/footnotes/columns.fo
+++ b/docs/examples/footnotes/columns.fo
@@ -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 @@ How shall I complete the wall?
          </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" 

diff --git a/docs/examples/footnotes/simple.fo b/docs/examples/footnotes/simple.fo
index 1af55f2ce00793d6597066e8c400b62b63814c59..0245a2cbeb7f121752c518448198d0b0f9506094 100644 (file)
--- a/docs/examples/footnotes/simple.fo
+++ b/docs/examples/footnotes/simple.fo
@@ -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">

diff --git a/docs/examples/keeps_and_breaks/columnlevel1.fo b/docs/examples/keeps_and_breaks/columnlevel1.fo
index a76163002c6332737f5307d7214c23af26bc8ebc..bda51efe2ef4b91fc3d16ca0d0d3e46f5834c7a8 100644 (file)
--- a/docs/examples/keeps_and_breaks/columnlevel1.fo
+++ b/docs/examples/keeps_and_breaks/columnlevel1.fo
@@ -22,7 +22,7 @@ This file addresses breaks in column context.
     </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"

diff --git a/docs/examples/keeps_and_breaks/pagelevel1.fo b/docs/examples/keeps_and_breaks/pagelevel1.fo
index 78ea1c2a267f261bfd76d7f76213fdf98be243bb..c5ebfa177ee61f4b559f158304c13a105be9cb34 100644 (file)
--- a/docs/examples/keeps_and_breaks/pagelevel1.fo
+++ b/docs/examples/keeps_and_breaks/pagelevel1.fo
@@ -21,7 +21,7 @@ This file addresses breaks in page context.
     </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">

diff --git a/docs/examples/keeps_and_breaks/pagelevel2.fo b/docs/examples/keeps_and_breaks/pagelevel2.fo
index fc3369a18dd97d94ee7ed36a34549a3119ac9a43..a5069b6c2aa2e9154566dc26cf5ae690612f946d 100644 (file)
--- a/docs/examples/keeps_and_breaks/pagelevel2.fo
+++ b/docs/examples/keeps_and_breaks/pagelevel2.fo
@@ -21,7 +21,7 @@ This file addresses break-after's in page context.
     </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"

diff --git a/docs/examples/keeps_and_breaks/pagelevel3.fo b/docs/examples/keeps_and_breaks/pagelevel3.fo
index 29ca25306cb60f2f0b43c671f6ac5609dd29b842..2cc73bab5e4ef094ff919a1181af227463b2021d 100644 (file)
--- a/docs/examples/keeps_and_breaks/pagelevel3.fo
+++ b/docs/examples/keeps_and_breaks/pagelevel3.fo
@@ -21,7 +21,7 @@ This file addresses break-before's in page context.
     </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"

diff --git a/docs/examples/keeps_and_breaks/pagelevel4.fo b/docs/examples/keeps_and_breaks/pagelevel4.fo
index d7be7326700a96c6625aa408852fd5698983937e..22fd1c0eb44496e56f59d6d658bc8cfdbfb58592 100644 (file)
--- a/docs/examples/keeps_and_breaks/pagelevel4.fo
+++ b/docs/examples/keeps_and_breaks/pagelevel4.fo
@@ -23,7 +23,7 @@ This file addresses breaks in page context, with a
     </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"

diff --git a/docs/examples/markers/glossary.xsl b/docs/examples/markers/glossary.xsl
index a509f67bf5fa715371963d74ffa5897ac623680e..49deef1eb01ca0dc8130dac0ec7c29d41d97641b 100644 (file)
--- a/docs/examples/markers/glossary.xsl
+++ b/docs/examples/markers/glossary.xsl
@@ -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">

diff --git a/docs/examples/markers/hide.fo b/docs/examples/markers/hide.fo
index 694cb9c99e5ec2612550f1cedf63df52fb0e5bc4..49e62fce144b74da83f5310b1dd1d94cc077f2f1 100644 (file)
--- a/docs/examples/markers/hide.fo
+++ b/docs/examples/markers/hide.fo
@@ -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 @@ This page sequence only has one page so you will not see the message.
     </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"

diff --git a/docs/examples/pagination/allregions.fo b/docs/examples/pagination/allregions.fo
index 6a29c75e8bdeaf725404e19ab95d05d7bf206193..e7bb5cd408f12f29c62b7ff8fff455b26995db0f 100644 (file)
--- a/docs/examples/pagination/allregions.fo
+++ b/docs/examples/pagination/allregions.fo
@@ -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 -->

diff --git a/docs/examples/pagination/basic1.fo b/docs/examples/pagination/basic1.fo
index 74a673137f0a5d0151269e3fdf6a451a0c2e94be..64739cbee33896b16f1b0ce5d8fcf10cdc5039bc 100644 (file)
--- a/docs/examples/pagination/basic1.fo
+++ b/docs/examples/pagination/basic1.fo
@@ -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 -->

diff --git a/docs/examples/pagination/basic2.fo b/docs/examples/pagination/basic2.fo
index 747fb5f524f42f20db5705f57ae7a251674b5d9c..96f11a440d95a78da6280bf66a8ab37630e9a62e 100644 (file)
--- a/docs/examples/pagination/basic2.fo
+++ b/docs/examples/pagination/basic2.fo
@@ -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 -->

diff --git a/docs/examples/pagination/franklin_2pageseqs.fo b/docs/examples/pagination/franklin_2pageseqs.fo
index 6aa18e6c77b29b0861479b59dc7bd8b6bb502585..71184797e2f5b6ce34c80f89d5f2ab4457c2c008 100644 (file)
--- a/docs/examples/pagination/franklin_2pageseqs.fo
+++ b/docs/examples/pagination/franklin_2pageseqs.fo
@@ -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 @@ made to-day was not more than six miles.
 </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">

diff --git a/docs/examples/pagination/franklin_alt.fo b/docs/examples/pagination/franklin_alt.fo
index 127c85070a4e8a332ce39083690156fce7bfacff..dd326796437844711214d65b4cd718b13f7b02eb 100644 (file)
--- a/docs/examples/pagination/franklin_alt.fo
+++ b/docs/examples/pagination/franklin_alt.fo
@@ -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">

diff --git a/docs/examples/pagination/franklin_rep.fo b/docs/examples/pagination/franklin_rep.fo
index ab71e9c548c4ebf43d13ed643d3ceee253392cd9..48f9b11947f6605ebf7859b397323ea0bd99ba52 100644 (file)
--- a/docs/examples/pagination/franklin_rep.fo
+++ b/docs/examples/pagination/franklin_rep.fo
@@ -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">

diff --git a/docs/examples/pagination/franklin_rep_max_repeats.fo b/docs/examples/pagination/franklin_rep_max_repeats.fo
index 0baf0956a56c9a273558e5ccc8f7bb365c461406..321cf56f9f78aaa88a8a68a157057d64b2c3007c 100644 (file)
--- a/docs/examples/pagination/franklin_rep_max_repeats.fo
+++ b/docs/examples/pagination/franklin_rep_max_repeats.fo
@@ -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">

diff --git a/docs/examples/pagination/franklin_rep_max_repeats_expl.fo b/docs/examples/pagination/franklin_rep_max_repeats_expl.fo
index 0baf0956a56c9a273558e5ccc8f7bb365c461406..321cf56f9f78aaa88a8a68a157057d64b2c3007c 100644 (file)
--- a/docs/examples/pagination/franklin_rep_max_repeats_expl.fo
+++ b/docs/examples/pagination/franklin_rep_max_repeats_expl.fo
@@ -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">

diff --git a/docs/examples/pagination/franklin_rep_max_repeats_nl.fo b/docs/examples/pagination/franklin_rep_max_repeats_nl.fo
index 09e75969b4a5eed5c3772c33d624dfcb19c53ae1..05e6c2aef4864e6e52310ed112dda81f6f61880f 100644 (file)
--- a/docs/examples/pagination/franklin_rep_max_repeats_nl.fo
+++ b/docs/examples/pagination/franklin_rep_max_repeats_nl.fo
@@ -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">

diff --git a/docs/examples/region_body/simplecol.fo b/docs/examples/region_body/simplecol.fo
index 9536b430e6b2ac1785c3a8a0a46a4d3a439f512b..413702f8b68d1952bea0263fa2f15082321fc067 100644 (file)
--- a/docs/examples/region_body/simplecol.fo
+++ b/docs/examples/region_body/simplecol.fo
@@ -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" 

diff --git a/docs/examples/region_body/simplecol2.fo b/docs/examples/region_body/simplecol2.fo
index 159320e2af8f8364e7f51b2dcd9a86fa467d5328..eb7f41a011e932f5e7d083c3dac223b76aac54ca 100644 (file)
--- a/docs/examples/region_body/simplecol2.fo
+++ b/docs/examples/region_body/simplecol2.fo
@@ -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" 

diff --git a/docs/examples/region_body/simplecol3.fo b/docs/examples/region_body/simplecol3.fo
index 002f860c50ff6f792d7e91ba911f211bea702bbb..52d8467beb2a7e20db7fc5f12876ac3d26be078f 100644 (file)
--- a/docs/examples/region_body/simplecol3.fo
+++ b/docs/examples/region_body/simplecol3.fo
@@ -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" 

diff --git a/docs/examples/region_body/simplecol4.fo b/docs/examples/region_body/simplecol4.fo
index d57e332ddf72f92fb820273c2a1e6d17f057ef37..53b270f57f8d895bebb038ffbe049bb4443b7d18 100644 (file)
--- a/docs/examples/region_body/simplecol4.fo
+++ b/docs/examples/region_body/simplecol4.fo
@@ -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" 

diff --git a/docs/examples/svg/embedding.fo b/docs/examples/svg/embedding.fo
index a01e204a06047c5c2bcfe91c6f8a4776d94fc120..4606e0527c26403d287df65480d4a066a6c36338 100644 (file)
--- a/docs/examples/svg/embedding.fo
+++ b/docs/examples/svg/embedding.fo
@@ -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>

diff --git a/docs/examples/svg/external.fo b/docs/examples/svg/external.fo
index 9d908ea961f8574fb3449e1d593a9b0f6012c92e..b42a3e5afa830f2471c98878b5465551fe8351da 100644 (file)
--- a/docs/examples/svg/external.fo
+++ b/docs/examples/svg/external.fo
@@ -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>

diff --git a/docs/examples/tables/background.fo b/docs/examples/tables/background.fo
index 8ebfd6084c654a14ef0a5f37f0c04f582f03984e..2b154430a83214d55a861204fb61efa144074940 100644 (file)
--- a/docs/examples/tables/background.fo
+++ b/docs/examples/tables/background.fo
@@ -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>

diff --git a/docs/examples/tables/borders.fo b/docs/examples/tables/borders.fo
index 60bbb6c25171474182d954a0190d50c3b60635b4..054e95f16070d78e01a947a92ee9b19863732869 100644 (file)
--- a/docs/examples/tables/borders.fo
+++ b/docs/examples/tables/borders.fo
@@ -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>

diff --git a/docs/examples/tables/break.fo b/docs/examples/tables/break.fo
index 50ed0c89c21d622ae0b91a8c6712f628d72f82ba..96831b942c5b9d73cbf9cc91334ae16b859308c6 100644 (file)
--- a/docs/examples/tables/break.fo
+++ b/docs/examples/tables/break.fo
@@ -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>

diff --git a/docs/examples/tables/headfoot.fo b/docs/examples/tables/headfoot.fo
index 3813b573a199e4c17dfb5f3fa49e05dcbad8d705..ccd740f2f16a1a784881c0cf5978a108ec6a58cf 100644 (file)
--- a/docs/examples/tables/headfoot.fo
+++ b/docs/examples/tables/headfoot.fo
@@ -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>

diff --git a/docs/examples/tables/keep.fo b/docs/examples/tables/keep.fo
index 79bd6fbf16ecb76df6734cca28142bfd798ddbe3..cbbbe6a2c002475d0c66e7056ff3b957506b3560 100644 (file)
--- a/docs/examples/tables/keep.fo
+++ b/docs/examples/tables/keep.fo
@@ -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>

diff --git a/docs/examples/tables/omit.fo b/docs/examples/tables/omit.fo
index 01a946daa85402e439b073f650788bc3309d1b35..ff8c483355bbe92767184a6039f0e0b5ead5408c 100644 (file)
--- a/docs/examples/tables/omit.fo
+++ b/docs/examples/tables/omit.fo
@@ -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>

diff --git a/docs/examples/tables/space.fo b/docs/examples/tables/space.fo
index c9b7259a159cfc826386f5bcd6e18a5a6eb13d31..0474f11c93d053fc932505d0829dce86c10d5984 100644 (file)
--- a/docs/examples/tables/space.fo
+++ b/docs/examples/tables/space.fo
@@ -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>

diff --git a/docs/examples/tables/widowsorphans.fo b/docs/examples/tables/widowsorphans.fo
index 2c4bba17b614e27d0721250765c50567c472a300..0264b0b8bde69246315dacd9430327277989edbe 100644 (file)
--- a/docs/examples/tables/widowsorphans.fo
+++ b/docs/examples/tables/widowsorphans.fo
@@ -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>

diff --git a/src/codegen/foproperties.xml b/src/codegen/foproperties.xml
index a73eb40e9bba46027668a44565447118141415e2..533a4a54083c61b9db0ca30276f88f898adedc10 100644 (file)
--- a/src/codegen/foproperties.xml
+++ b/src/codegen/foproperties.xml
@@ -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>
@@ -1690,6 +1690,12 @@
     <datatype>String</datatype>
     <default></default>
   </property>
+  <property>
+    <name>master-reference</name>
+    <inherited>false</inherited>
+    <datatype>String</datatype>
+    <default></default>
+  </property>
   <property>
   <name>maximum-repeats</name>
   <inherited>false</inherited>

diff --git a/src/org/apache/fop/fo/expr/PropertyParser.java b/src/org/apache/fop/fo/expr/PropertyParser.java
index f41cfc43ad0299667b047b641c895af4990180ec..669ee6d8d31d10c65b2d5d0d4a3e4f9d2768efa6 100644 (file)
--- a/src/org/apache/fop/fo/expr/PropertyParser.java
+++ b/src/org/apache/fop/fo/expr/PropertyParser.java
@@ -53,7 +53,7 @@ public class PropertyParser extends PropertyTokenizer {
 
         /**
          * * 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());
          *

diff --git a/src/org/apache/fop/fo/flow/Block.java b/src/org/apache/fop/fo/flow/Block.java
index 1b6c812facdd873ef37ed16a3c060552daf1749d..ca439587b90dae82c861e8fe5e7a163a9f908c91 100644 (file)
--- a/src/org/apache/fop/fo/flow/Block.java
+++ b/src/org/apache/fop/fo/flow/Block.java
@@ -123,7 +123,7 @@ public class Block extends FObjMixed {
             // 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");

diff --git a/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
index 2e3a81431c7a2fab65decb28fb1c21a6cfd3bcff..fba2c52c0fe4e6cff660f9bbeb079b1418a89df7 100644 (file)
--- a/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
+++ b/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
@@ -38,8 +38,8 @@ public class ConditionalPageMasterReference extends FObj {
         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 @@ public class ConditionalPageMasterReference extends FObj {
     }
 
     /**
-     * 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 @@ public class ConditionalPageMasterReference extends FObj {
 
             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);
             }

diff --git a/src/org/apache/fop/fo/pagination/PageMasterReference.java b/src/org/apache/fop/fo/pagination/PageMasterReference.java
index 05300a065e3d71e830a91a9e9a284b77b5be5af3..0af756abf565ad2ae7ec5025b97926a2c169b4fa 100644 (file)
--- a/src/org/apache/fop/fo/pagination/PageMasterReference.java
+++ b/src/org/apache/fop/fo/pagination/PageMasterReference.java
@@ -13,7 +13,7 @@ import org.apache.fop.apps.FOPException;
 
 /**
  * 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 @@ public abstract class PageMasterReference extends FObj
             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 @@ public abstract class PageMasterReference extends FObj
     }
 
     /**
-     * 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 @@ public abstract class PageMasterReference extends FObj
 
             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);
             }

diff --git a/src/org/apache/fop/fo/pagination/PageSequence.java b/src/org/apache/fop/fo/pagination/PageSequence.java
index 290f194543e438fe2719adc4f75346adbd685fe7..b0dbfb43c30925b272d2009bf4ea7b93f27fbad7 100644 (file)
--- a/src/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/org/apache/fop/fo/pagination/PageSequence.java
@@ -82,7 +82,9 @@ public class PageSequence extends FObj {
     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 @@ public class PageSequence extends FObj {
             }
         }
 
-        masterName = this.properties.get("master-name").getString();
+        masterName = this.properties.get("master-reference").getString();
 
         // get the 'format' properties
         this.pageNumberGenerator =
@@ -527,7 +529,7 @@ public class PageSequence extends FObj {
             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;

diff --git a/src/org/apache/fop/layout/LineArea.java b/src/org/apache/fop/layout/LineArea.java
index 6c1c6842942b3a20cf1ef681bcb5db0898ba1649..45d39a456da901dadf0e6857f67b428a1c82a08b 100644 (file)
--- a/src/org/apache/fop/layout/LineArea.java
+++ b/src/org/apache/fop/layout/LineArea.java
@@ -339,7 +339,7 @@ public class LineArea extends Area {
                     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