From: Tore Engvig <tore@apache.org>
Date: Thu, 6 Dec 2001 21:28:22 +0000 (+0000)
Subject: PR:
X-Git-Tag: fop-0_20_5rc~240
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=27512d7a8d08bc6ab4341a6a216fde0459af8a97;p=xmlgraphics-fop.git

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 76879fde6..b8ac46615 100644
--- 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 bc42d6e68..b84d17e23 100644
--- 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 675902435..f27b2a0e6 100644
--- 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 957e34ac8..1e89e221f 100644
--- 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 f3f115f95..fc5d5b5d2 100644
--- 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 a7944a15e..b3f9a0e63 100644
--- 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 bc859f98f..93de9f06d 100644
--- 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 8b9eb826a..3b9752257 100644
--- 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 aa415e521..43ab9f331 100644
--- 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 572d320d3..73995e534 100644
--- 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 a75f04c55..b25cafae7 100644
--- 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 16b2fde0a..81e8cf730 100644
--- 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 a29c5ceb0..01dde3872 100644
--- 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 f90769dbc..486386ad9 100644
--- 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 e47d3ce8e..28ab1b31e 100644
--- 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 8ea1ca394..74d6916d9 100644
--- 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 55df88218..36484bcd5 100644
--- 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 e64feafe2..0959b4020 100644
--- 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 90941de19..00e3e5b7e 100644
--- 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 5f91c1952..4f1f74a6c 100644
--- 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 f1f7e5cda..70e089ac0 100644
--- 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 e8a49f1c4..27c4fd962 100644
--- 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 92f6dd932..3d7e268b1 100644
--- 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 6ede25aa7..502e676fc 100644
--- 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 08d01484f..af9f0dfb0 100644
--- 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 5591e5d2f..feed886b5 100644
--- 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 1af55f2ce..0245a2cbe 100644
--- 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 a76163002..bda51efe2 100644
--- 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 78ea1c2a2..c5ebfa177 100644
--- 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 fc3369a18..a5069b6c2 100644
--- 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 29ca25306..2cc73bab5 100644
--- 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 d7be73267..22fd1c0eb 100644
--- 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 a509f67bf..49deef1eb 100644
--- 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 694cb9c99..49e62fce1 100644
--- 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 6a29c75e8..e7bb5cd40 100644
--- 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 74a673137..64739cbee 100644
--- 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 747fb5f52..96f11a440 100644
--- 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 6aa18e6c7..71184797e 100644
--- 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 127c85070..dd3267964 100644
--- 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 ab71e9c54..48f9b1194 100644
--- 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 0baf0956a..321cf56f9 100644
--- 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 0baf0956a..321cf56f9 100644
--- 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 09e75969b..05e6c2aef 100644
--- 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 9536b430e..413702f8b 100644
--- 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 159320e2a..eb7f41a01 100644
--- 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 002f860c5..52d8467be 100644
--- 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 d57e332dd..53b270f57 100644
--- 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 a01e204a0..4606e0527 100644
--- 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 9d908ea96..b42a3e5af 100644
--- 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 8ebfd6084..2b154430a 100644
--- 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 60bbb6c25..054e95f16 100644
--- 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 50ed0c89c..96831b942 100644
--- 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 3813b573a..ccd740f2f 100644
--- 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 79bd6fbf1..cbbbe6a2c 100644
--- 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 01a946daa..ff8c48335 100644
--- 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 c9b7259a1..0474f11c9 100644
--- 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 2c4bba17b..0264b0b8b 100644
--- 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 a73eb40e9..533a4a540 100644
--- 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 f41cfc43a..669ee6d8d 100644
--- 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 1b6c812fa..ca439587b 100644
--- 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 2e3a81431..fba2c52c0 100644
--- 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 05300a065..0af756abf 100644
--- 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 290f19454..b0dbfb43c 100644
--- 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 6c1c68429..45d39a456 100644
--- 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