updated to conform to xsl dtd as provided by N. Grigoriev

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

9 files changed, 42 insertions, 40 deletions

diff --git a/docs/examples/fo/extensive.fo b/docs/examples/fo/extensive.fo
index 01d27846d..5e9f9cdf8 100644
--- a/docs/examples/fo/extensive.fo
+++ b/docs/examples/fo/extensive.fo
@@ -113,12 +113,12 @@
       <fo:block space-before.optimum="12pt">This is a rather long sentence that is going to keep on going and going, not really to demonstrate anything other that normal wrapping because the following paragraph will show what happens when wrap-option is set to no-wrap.</fo:block>
       <fo:block space-before.optimum="12pt" wrap-option="no-wrap">This is a rather long sentence that is going to keep on going and going to demonstrate what happens when wrap-option is set to no-wrap which is unlike the preceding sentence where it defaults to wrap.</fo:block>
       <fo:block space-before.optimum="12pt" wrap-option="wrap">This is a rather long sentence that is going to keep on going and going, not really to demonstrate anything other that normal wrapping but it differs from the first of these three sentences in that wrap is set explicitly.</fo:block>
-      <fo:block font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt">White Space Treatment</fo:block>
+<!--       <fo:block font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt">White Space Treatment</fo:block>
 <fo:block>This            is            default!</fo:block>
 <fo:block white-space-treatment="preserve">This            is            preserve!</fo:block>
 <fo:block white-space-treatment="collapse">This            is            collapse!</fo:block>
 <fo:block white-space-treatment="ignore">This            is            ignore!</fo:block>
-<fo:block font-family="monospace" white-space-treatment="preserve">
+<fo:block font-family="monospace" white-space-treatment="preserve"> 
 <![CDATA[
 <?xml version="1.0"?>
 <document>
@@ -129,16 +129,16 @@
     </list>
 </document>
 ]]>
-</fo:block>
+</fo:block>-->
       <fo:block break-before="page" font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt">Embedded SVG</fo:block>
-      <fo:instream-foreign-object>
+      <fo:block><fo:instream-foreign-object>
         <svg:svg width="400pt" height="200pt">
           <svg:rect x="20pt" y="20pt" width="100pt" height="100pt"/>
           <svg:line x1="20pt" y1="20pt" x2="120pt" y2="120pt"/>
           <svg:line x1="120pt" y1="20pt" x2="20pt" y2="120pt"/>
           <svg:text x="20pt" y="150pt">Hello SVG!</svg:text>
         </svg:svg>
-      </fo:instream-foreign-object>
+      </fo:instream-foreign-object></fo:block>
       <fo:block>The above is an example of an SVG graphic</fo:block>
     </fo:flow>
   </fo:page-sequence>
diff --git a/docs/examples/fo/fonts.fo b/docs/examples/fo/fonts.fo
index cda97fd27..8e6e42e46 100644
--- a/docs/examples/fo/fonts.fo
+++ b/docs/examples/fo/fonts.fo
@@ -1,29 +1,26 @@
 <?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 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 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 master-name="firstAndRest">
+  <!-- defines the layout master -->
+  <fo:layout-master-set>
+    <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-body margin-top="3cm"/>
+      <fo:region-before extent="3cm"/>
+      <fo:region-after extent="1.5cm"/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+
+  <!-- starts actual layout -->
+  <fo:page-sequence master-name="first">
+
+
 <fo:flow flow-name="xsl-region-body">
 
   <fo:block font-family="Helvetica" font-size="14pt">
diff --git a/docs/examples/fo/images.fo b/docs/examples/fo/images.fo
index 5bb458276..94bdd8bd2 100644
--- a/docs/examples/fo/images.fo
+++ b/docs/examples/fo/images.fo
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <fo:root font-family="Times Roman" font-size="12pt" text-align="justify" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
 <fo:layout-master-set>
diff --git a/docs/examples/fo/leader.fo b/docs/examples/fo/leader.fo
index abde846ce..0fe7ee16f 100644
--- a/docs/examples/fo/leader.fo
+++ b/docs/examples/fo/leader.fo
@@ -14,8 +14,8 @@
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-before extent="3cm"/>
       <fo:region-body margin-top="3cm"/>
+      <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
 
diff --git a/docs/examples/fo/link.fo b/docs/examples/fo/link.fo
index 2e449d87c..ea9c226a9 100644
--- a/docs/examples/fo/link.fo
+++ b/docs/examples/fo/link.fo
@@ -10,8 +10,8 @@
                            margin-bottom="2cm" 
                            margin-left="2.5cm" 
                            margin-right="2.5cm">
-      <fo:region-before extent="3cm"/>
       <fo:region-body margin-top="3cm"/>
+      <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/docs/examples/fo/list.fo b/docs/examples/fo/list.fo
index 1b8d65d49..5cbd6f46c 100644
--- a/docs/examples/fo/list.fo
+++ b/docs/examples/fo/list.fo
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
   <!-- defines the layout master -->
@@ -9,8 +10,8 @@
                            margin-bottom="2cm" 
                            margin-left="2.5cm" 
                            margin-right="2.5cm">
-      <fo:region-before extent="3cm"/>
       <fo:region-body margin-top="3cm"/>
+      <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/docs/examples/fo/normal.fo b/docs/examples/fo/normal.fo
index 5b51f9bd4..c17f4ebc2 100644
--- a/docs/examples/fo/normal.fo
+++ b/docs/examples/fo/normal.fo
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+
 <!-- example for a simple fo file. At the beginning the page layout is set. 
 Below fo:root there is always 
 - a single fo:layout-master-set which defines one or more page layouts
@@ -27,21 +28,21 @@ Below fo:root there is always
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-before extent="3cm"/>
       <fo:region-body margin-top="3cm"/>
+      <fo:region-before extent="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"
+                  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="2.5cm"/>
       <fo:region-body margin-top="2.5cm"/>
+      <fo:region-before extent="2.5cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
 
diff --git a/docs/examples/fo/readme.fo b/docs/examples/fo/readme.fo
index c94300bf3..6da46eab6 100644
--- a/docs/examples/fo/readme.fo
+++ b/docs/examples/fo/readme.fo
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 THIS IS NOT THE LATEST VERSION OF THE FOP DOCUMENTATION BUT ONLY AN EXAMPLE FILE 
 
@@ -22,21 +23,21 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
                   margin-bottom="2cm" 
                   margin-left="2.5cm" 
                   margin-right="2.5cm">
-      <fo:region-before extent="3cm"/>
       <fo:region-body margin-top="3cm"/>
+      <fo:region-before extent="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"
+                  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="2.5cm"/>
       <fo:region-body margin-top="2.5cm"/>
+      <fo:region-before extent="2.5cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
 
diff --git a/docs/examples/fo/table.fo b/docs/examples/fo/table.fo
index 9d2643304..2e4b6bcb6 100644
--- a/docs/examples/fo/table.fo
+++ b/docs/examples/fo/table.fo
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
 
@@ -11,8 +12,8 @@
                            margin-bottom="2cm" 
                            margin-left="2.5cm" 
                            margin-right="2.5cm">
-      <fo:region-before extent="3cm"/>
       <fo:region-body margin-top="3cm"/>
+      <fo:region-before extent="3cm"/>
       <fo:region-after extent="1.5cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>