Spec update

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193493 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 148 insertions, 66 deletions

diff --git a/docs/examples/fo/border.fo b/docs/examples/fo/border.fo
index ac1b3415d..c1e7aa56d 100644
--- a/docs/examples/fo/border.fo
+++ b/docs/examples/fo/border.fo
@@ -1,19 +1,30 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
     <fo:layout-master-set>
-        <fo:simple-page-master margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm" page-width="21cm" page-height="29.7cm" page-master-name="first">
+        <fo:simple-page-master
+		margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm"
+		page-width="21cm" page-height="29.7cm" master-name="first">
             <fo:region-body>
             </fo:region-body>
         </fo:simple-page-master>
-        <fo:simple-page-master margin-right="2.5cm" margin-left="2.5cm" margin-bottom="2cm" margin-top="1cm" page-width="21cm" page-height="29.7cm" page-master-name="rest">
+        <fo:simple-page-master
+		margin-right="2.5cm" margin-left="2.5cm" margin-bottom="2cm" margin-top="1cm"
+		page-width="21cm" page-height="29.7cm" master-name="rest">
             <fo:region-body>
             </fo:region-body>
         </fo:simple-page-master>
+		
+		<fo:page-sequence-master master-name="psmA">
+			<fo:repeatable-page-master-alternatives>
+				<fo:conditional-page-master-reference master-name="first"
+					page-position="first" />
+				<fo:conditional-page-master-reference master-name="rest"
+					page-position="rest" />
+				<!-- recommended fallback procedure -->
+				<fo:conditional-page-master-reference master-name="rest" />
+			</fo:repeatable-page-master-alternatives>
+		</fo:page-sequence-master>
     </fo:layout-master-set>
-    <fo:page-sequence>
-        <fo:sequence-specification>
-            <fo:sequence-specifier-repeating page-master-repeating="rest" page-master-first="first">
-            </fo:sequence-specifier-repeating>
-        </fo:sequence-specification>
+    <fo:page-sequence master-name="psmA">
         <fo:flow flow-name="xsl-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/extensive.fo b/docs/examples/fo/extensive.fo
index 5647fe79a..40b50e9ce 100644
--- a/docs/examples/fo/extensive.fo
+++ b/docs/examples/fo/extensive.fo
@@ -1,13 +1,10 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/Graphics/SVG/SVG-19990812.dtd">
 <fo:layout-master-set>
-<fo:simple-page-master page-master-name="one">
+<fo:simple-page-master master-name="one">
 <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>
-<fo:sequence-specification>
-<fo:sequence-specifier-repeating page-master-first="one" page-master-repeating="one"/>
-</fo:sequence-specification>
+<fo:page-sequence master-name="one">
 <fo:flow>
 <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 32e4c5fcc..fbdf78ee6 100644
--- a/docs/examples/fo/fonts.fo
+++ b/docs/examples/fo/fonts.fo
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 <fo:layout-master-set>
-<fo:simple-page-master page-master-name="first" height="29.7cm" width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
+<fo:simple-page-master master-name="first" height="29.7cm" width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
 <fo:region-before extent="3cm"/>
 <fo:region-body margin-top="3cm"/>
 <fo:region-after extent="1.5cm"/>
 </fo:simple-page-master>
-<fo:simple-page-master page-master-name="rest" height="29.7cm" width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
+<fo:simple-page-master master-name="rest" height="29.7cm" width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
 <fo:region-before extent="2.5cm"/>
 <fo:region-body margin-top="2.5cm"/>
 <fo:region-after extent="1.5cm"/>
 </fo:simple-page-master>
+
+		<fo:page-sequence-master master-name="firstAndRest">
+			<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" />
+				<!-- recommended fallback procedure -->
+				<fo:conditional-page-master-reference master-name="rest" />
+			</fo:repeatable-page-master-alternatives>
+		</fo:page-sequence-master>
 </fo:layout-master-set>
-<fo:page-sequence>
-<fo:sequence-specification>
-<fo:sequence-specifier-repeating page-master-first="first" page-master-repeating="rest"/>
-</fo:sequence-specification>
+<fo:page-sequence master-name="firstAndRest">
 <fo:flow flow-name="xsl-body">
 
   <fo:block font-family="Helvetica" font-size="14pt">
diff --git a/docs/examples/fo/images.fo b/docs/examples/fo/images.fo
index a0a6e464c..c2f678e0e 100644
--- a/docs/examples/fo/images.fo
+++ b/docs/examples/fo/images.fo
@@ -1,4 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fo:root font-family="Times Roman" font-size="12pt" text-align="justified" xmlns:fo="http://www.w3.org/1999/XSL/Format"><fo:layout-master-set><fo:simple-page-master page-master-name="right" margin-top="75pt" margin-bottom="25pt" margin-left="100pt" margin-right="50pt"><fo:region-body margin-bottom="50pt"/><fo:region-after extent="25pt"/></fo:simple-page-master><fo:simple-page-master page-master-name="left" margin-top="75pt" margin-bottom="25pt" margin-left="50pt" margin-right="100pt"><fo:region-body margin-bottom="50pt"/><fo:region-after extent="25pt"/></fo:simple-page-master></fo:layout-master-set><fo:page-sequence id="N2528"><fo:sequence-specification><fo:sequence-specifier-alternating page-master-first="right" page-master-odd="right" page-master-even="left"/></fo:sequence-specification><fo:static-content flow-name="xsl-after"><fo:block text-align-last="centered" font-size="10pt"><fo:page-number/></fo:block></fo:static-content><fo:flow><fo:block font-size="18pt" font-weight="bold">1. FOP test for images</fo:block><fo:block id="N2531"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A GIF image in FOP</fo:block><fo:block><fo:inline-graphic href="file:../graphics/xml_feather.gif"/></fo:block></fo:block><fo:block id="N2545"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A JPEG image in FOP</fo:block><fo:block><fo:inline-graphic href="file:../graphics/fop.jpg"/></fo:block></fo:block><fo:block id="N2559"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"/>
+<fo:root font-family="Times Roman" font-size="12pt" text-align="justified" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:layout-master-set>
+<fo:simple-page-master master-name="right"
+	margin-top="75pt" margin-bottom="25pt" margin-left="100pt" margin-right="50pt">
+	<fo:region-body margin-bottom="50pt"/>
+	<fo:region-after extent="25pt"/>
+</fo:simple-page-master>
+
+<fo:simple-page-master master-name="left"
+	margin-top="75pt" margin-bottom="25pt" margin-left="50pt" margin-right="100pt">
+	<fo:region-body margin-bottom="50pt"/>
+	<fo:region-after extent="25pt"/>
+</fo:simple-page-master>
+
+<fo:page-sequence-master master-name="psmOddEven" >
+	<fo:repeatable-page-master-alternatives>
+		<fo:conditional-page-master-reference master-name="right"
+			page-position="first" />
+		<fo:conditional-page-master-reference master-name="left"
+			odd-or-even="even" />
+		<fo:conditional-page-master-reference master-name="right"
+			odd-or-even="odd" />
+		<!-- recommended fallback procedure -->
+		<fo:conditional-page-master-reference master-name="rest" />
+	</fo:repeatable-page-master-alternatives>
+</fo:page-sequence-master>
+
+</fo:layout-master-set>
+
+<fo:page-sequence id="N2528" master-name="psmOddEven">
+
+<fo:static-content flow-name="xsl-after">
+	<fo:block text-align-last="centered" font-size="10pt">
+		<fo:page-number/>
+	</fo:block>
+</fo:static-content>
+
+<fo:flow>
+<fo:block font-size="18pt" font-weight="bold">1. FOP test for images</fo:block><fo:block id="N2531">
+<fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A GIF image in FOP</fo:block><fo:block><fo:inline-graphic href="file:../../graphics/xml_feather.gif"/>
+</fo:block></fo:block><fo:block id="N2545"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A JPEG image in FOP</fo:block><fo:block><fo:inline-graphic href="file:../../graphics/fop.jpg"/></fo:block></fo:block><fo:block id="N2559"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"/>
           This section is only required to show that the layout still works.
-      </fo:block></fo:flow></fo:page-sequence><fo:page-sequence id="N2561"><fo:sequence-specification><fo:sequence-specifier-alternating page-master-first="right" page-master-odd="right" page-master-even="left"/></fo:sequence-specification><fo:static-content flow-name="xsl-after"><fo:block text-align-last="centered" font-size="10pt"><fo:page-number/></fo:block></fo:static-content><fo:flow><fo:block font-size="18pt" font-weight="bold">A. Appendix</fo:block></fo:flow></fo:page-sequence></fo:root>
+      </fo:block>
+	  </fo:flow>
+</fo:page-sequence>
+
+<fo:page-sequence id="N2561" master-name="psmOddEven">
+<fo:static-content flow-name="xsl-after">
+<fo:block text-align-last="centered" font-size="10pt"><fo:page-number/></fo:block></fo:static-content><fo:flow><fo:block font-size="18pt" font-weight="bold">A. Appendix</fo:block></fo:flow></fo:page-sequence></fo:root>
+	  
diff --git a/docs/examples/fo/link.fo b/docs/examples/fo/link.fo
index 5a15050d5..46315d8cb 100644
--- a/docs/examples/fo/link.fo
+++ b/docs/examples/fo/link.fo
@@ -4,7 +4,7 @@
 
   <!-- defines page layout -->
   <fo:layout-master-set>
-    <fo:simple-page-master page-master-name="first" 
+    <fo:simple-page-master master-name="first" 
                            page-height="29.7cm" page-width="21cm" 
                            margin-top="1cm" 
                            margin-bottom="2cm" 
@@ -18,12 +18,7 @@
   <!-- end: defines page layout -->
 
   <!-- actual layout -->
-  <fo:page-sequence>
-
-    <!-- applies layout master -->
-    <fo:sequence-specification>
-      <fo:sequence-specifier-single page-master-name="first"/>
-    </fo:sequence-specification>
+  <fo:page-sequence master-name="first">
 
     <!-- text body -->
     <fo:flow flow-name="xsl-body">
diff --git a/docs/examples/fo/list.fo b/docs/examples/fo/list.fo
index 56d1e22a9..774695c1e 100644
--- a/docs/examples/fo/list.fo
+++ b/docs/examples/fo/list.fo
@@ -3,7 +3,7 @@
 
   <!-- defines the layout master -->
   <fo:layout-master-set>
-    <fo:simple-page-master page-master-name="first" 
+    <fo:simple-page-master master-name="first" 
                            page-height="29.7cm" page-width="21cm" 
                            margin-top="1cm" 
                            margin-bottom="2cm" 
@@ -16,12 +16,7 @@
   </fo:layout-master-set>
 
   <!-- starts actual layout -->
-  <fo:page-sequence>
-
-    <!-- applies layout master -->
-    <fo:sequence-specification>
-      <fo:sequence-specifier-single page-master-name="first"/>
-    </fo:sequence-specification>
+  <fo:page-sequence master-name="first">
 
   <!-- Inserts a header with the page number -->
   <fo:static-content flow-name="xsl-before">
diff --git a/docs/examples/fo/normal.fo b/docs/examples/fo/normal.fo
index 4a078ec58..7e78dafc4 100644
--- a/docs/examples/fo/normal.fo
+++ b/docs/examples/fo/normal.fo
@@ -6,7 +6,7 @@
   <fo:layout-master-set>
 
     <!-- layout for the first page -->
-    <fo:simple-page-master page-master-name="first"
+    <fo:simple-page-master master-name="first"
                   page-height="29.7cm" 
                   page-width="21cm"
                   margin-top="1cm" 
@@ -19,7 +19,7 @@
     </fo:simple-page-master>
 
     <!-- layout for the other pages -->
-    <fo:simple-page-master page-master-name="rest"
+    <fo:simple-page-master master-name="rest"
                   height="29.7cm" 
                   width="21cm"
                   margin-top="1cm" 
@@ -31,17 +31,22 @@
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
 
+<fo:page-sequence-master master-name="basicPSM" >
+	<fo:repeatable-page-master-alternatives>
+		<fo:conditional-page-master-reference master-name="first"
+			page-position="first" />
+		<fo:conditional-page-master-reference master-name="rest"
+			page-position="rest" />
+		<!-- recommended fallback procedure -->
+		<fo:conditional-page-master-reference master-name="rest" />
+	</fo:repeatable-page-master-alternatives>
+</fo:page-sequence-master>
+
   </fo:layout-master-set>
   <!-- end: defines page layout -->
 
   <!-- actual layout -->
-  <fo:page-sequence>
-
-    <!-- usage of page layout -->
-    <fo:sequence-specification>
-      <fo:sequence-specifier-repeating page-master-first="first" 
-                                       page-master-repeating="rest"/>
-    </fo:sequence-specification>
+  <fo:page-sequence master-name="basicPSM">
 
     <!-- header -->
     <fo:static-content flow-name="xsl-before">
diff --git a/docs/examples/fo/readme.fo b/docs/examples/fo/readme.fo
index f82281df0..d8bfd9494 100644
--- a/docs/examples/fo/readme.fo
+++ b/docs/examples/fo/readme.fo
@@ -12,22 +12,51 @@ This files shows next to the trivial usage of fo:block and fo:inline-sequence ex
 
 
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-<fo:layout-master-set>
-<fo:simple-page-master page-master-name="first" page-height="29.7cm" page-width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
-<fo:region-before extent="6cm"/>
-<fo:region-body margin-top="3cm"/>
-<fo:region-after extent="1.5cm"/>
-</fo:simple-page-master>
-<fo:simple-page-master page-master-name="rest" page-height="29.7cm" page-width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
-<fo:region-before extent="6cm"/>
-<fo:region-body margin-top="2.5cm"/>
-<fo:region-after extent="1.5cm"/>
-</fo:simple-page-master>
-</fo:layout-master-set>
-<fo:page-sequence>
-<fo:sequence-specification>
-<fo:sequence-specifier-repeating page-master-first="first" page-master-repeating="rest"/>
-</fo:sequence-specification>
+  <fo:layout-master-set>
+
+    <!-- layout for the first page -->
+    <fo:simple-page-master master-name="first"
+                  page-height="29.7cm" 
+                  page-width="21cm"
+                  margin-top="1cm" 
+                  margin-bottom="2cm" 
+                  margin-left="2.5cm" 
+                  margin-right="2.5cm">
+      <fo:region-before extent="3cm"/>
+      <fo:region-body margin-top="3cm"/>
+      <fo:region-after extent="1.5cm"/>
+    </fo:simple-page-master>
+
+    <!-- layout for the other pages -->
+    <fo:simple-page-master master-name="rest"
+                  height="29.7cm" 
+                  width="21cm"
+                  margin-top="1cm" 
+                  margin-bottom="2cm" 
+                  margin-left="2.5cm" 
+                  margin-right="2.5cm">
+      <fo:region-before extent="2.5cm"/>
+      <fo:region-body margin-top="2.5cm"/>
+      <fo:region-after extent="1.5cm"/>
+    </fo:simple-page-master>
+
+<fo:page-sequence-master master-name="basicPSM" >
+	<fo:repeatable-page-master-alternatives>
+		<fo:conditional-page-master-reference master-name="first"
+			page-position="first" />
+		<fo:conditional-page-master-reference master-name="rest"
+			page-position="rest" />
+		<!-- recommended fallback procedure -->
+		<fo:conditional-page-master-reference master-name="rest" />
+	</fo:repeatable-page-master-alternatives>
+</fo:page-sequence-master>
+
+  </fo:layout-master-set>
+  <!-- end: defines page layout -->
+
+  <!-- actual layout -->
+  <fo:page-sequence master-name="basicPSM">
+
 
 <fo:static-content flow-name="xsl-before">
 <fo:block text-align="end" font-size="10pt" font-family="serif" line-height="14pt" color="red" >
diff --git a/docs/examples/fo/table.fo b/docs/examples/fo/table.fo
index 73d6ca16f..338c220e4 100644
--- a/docs/examples/fo/table.fo
+++ b/docs/examples/fo/table.fo
@@ -4,7 +4,7 @@
 
   <!-- defines the layout master -->
   <fo:layout-master-set>
-    <fo:simple-page-master page-master-name="first" 
+    <fo:simple-page-master master-name="first" 
                            page-height="29.7cm" 
                            page-width="21cm" 
                            margin-top="1cm" 
@@ -18,12 +18,7 @@
   </fo:layout-master-set>
 
   <!-- starts actual layout -->
-  <fo:page-sequence>
-
-    <!-- applies layout master -->
-    <fo:sequence-specification>
-      <fo:sequence-specifier-single page-master-name="first"/>
-    </fo:sequence-specification>
+  <fo:page-sequence master-name="first">
 
   <!-- Inserts a header with the page number -->
   <fo:static-content flow-name="xsl-before">