Formatting cleanup of fo:layout-master-sets in examples.

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

7 files changed, 89 insertions, 73 deletions

diff --git a/examples/fo/basic/border.fo b/examples/fo/basic/border.fo
index 7bef67c7c..0aa110de5 100644
--- a/examples/fo/basic/border.fo
+++ b/examples/fo/basic/border.fo
@@ -1,27 +1,37 @@
 <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" master-name="first">
+        <fo:simple-page-master master-name="first"
+            margin-right="0.5cm"
+            margin-left="0.5cm"
+            margin-bottom="0.5cm"
+            margin-top="0.75cm"
+            page-width="21cm"
+            page-height="29.7cm">
             <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" master-name="rest">
+        
+        <fo:simple-page-master master-name="rest"
+            margin-right="2.5cm"
+            margin-left="2.5cm"
+            margin-bottom="2cm"
+            margin-top="1cm"
+            page-width="21cm"
+            page-height="29.7cm">
             <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-reference="first"
-          page-position="first" />
-        <fo:conditional-page-master-reference master-reference="rest"
-          page-position="rest" />
-        <!-- recommended fallback procedure -->
-        <fo:conditional-page-master-reference master-reference="rest" />
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
+        <fo:page-sequence-master master-name="psmA">
+          <fo:repeatable-page-master-alternatives>
+            <fo:conditional-page-master-reference master-reference="first"
+              page-position="first" />
+            <fo:conditional-page-master-reference master-reference="rest"
+              page-position="rest" />
+            <!-- recommended fallback procedure -->
+            <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-reference="psmA">
         <fo:flow flow-name="xsl-region-body">
             <fo:block-container height="4cm" width="12cm" top="0cm" left="0cm" position="absolute">
diff --git a/examples/fo/basic/fonts.fo b/examples/fo/basic/fonts.fo
index 7501104a2..7d3e1d64a 100644
--- a/examples/fo/basic/fonts.fo
+++ b/examples/fo/basic/fonts.fo
@@ -5,15 +5,15 @@
   <!-- 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"/>
+            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>
 
diff --git a/examples/fo/basic/images.fo b/examples/fo/basic/images.fo
index ca5d0c817..72529dddb 100644
--- a/examples/fo/basic/images.fo
+++ b/examples/fo/basic/images.fo
@@ -5,31 +5,36 @@
     xmlns:fox="http://xml.apache.org/fop/extensions">
 
 <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-reference="right"
-      page-position="first" />
-    <fo:conditional-page-master-reference master-reference="left"
-      odd-or-even="even" />
-    <fo:conditional-page-master-reference master-reference="right"
-      odd-or-even="odd" />
-    <!-- recommended fallback procedure -->
-    <fo:conditional-page-master-reference master-reference="rest" />
-  </fo:repeatable-page-master-alternatives>
-</fo:page-sequence-master>
-
+    <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-reference="right"
+          page-position="first" />
+        <fo:conditional-page-master-reference master-reference="left"
+          odd-or-even="even" />
+        <fo:conditional-page-master-reference master-reference="right"
+          odd-or-even="odd" />
+        <!-- recommended fallback procedure -->
+        <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-reference="psmOddEven">
diff --git a/examples/fo/basic/link.fo b/examples/fo/basic/link.fo
index 805d258f4..676d3eaba 100644
--- a/examples/fo/basic/link.fo
+++ b/examples/fo/basic/link.fo
@@ -5,7 +5,8 @@
   <!-- defines page layout -->
   <fo:layout-master-set>
     <fo:simple-page-master master-name="first"
-                           page-height="29.7cm" page-width="21cm"
+                           page-height="29.7cm" 
+                           page-width="21cm"
                            margin-top="1cm"
                            margin-bottom="2cm"
                            margin-left="2.5cm"
diff --git a/examples/fo/basic/normal.fo b/examples/fo/basic/normal.fo
index 6576e70a0..f3d5e0e36 100644
--- a/examples/fo/basic/normal.fo
+++ b/examples/fo/basic/normal.fo
@@ -22,12 +22,12 @@ Below fo:root there is always
 
     <!-- layout for the first page -->
     <fo:simple-page-master master-name="first"
-                  page-height="21cm"
-                  page-width="29.7cm"
-                  margin-top="1cm"
-                  margin-bottom="2cm"
-                  margin-left="2.5cm"
-                  margin-right="2.5cm">
+          page-height="21cm"
+          page-width="29.7cm"
+          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"/>
diff --git a/examples/fo/basic/normalex.fo b/examples/fo/basic/normalex.fo
index 9f063ee34..111d6013a 100644
--- a/examples/fo/basic/normalex.fo
+++ b/examples/fo/basic/normalex.fo
@@ -22,12 +22,12 @@ Below fo:root there is always
 
     <!-- layout for the first page -->
     <fo:simple-page-master master-name="first"
-                  page-height="21cm"
-                  page-width="29.7cm"
-                  margin-top="6.3cm - 3.8cm - 1.5cm"
-                  margin-bottom="3cm - (.25cm * 4)"
-                  margin-left="2.0cm + 0.5cm"
-                  margin-right="(5cm * 1cm) div 2cm">
+          page-height="21cm"
+          page-width="29.7cm"
+          margin-top="6.3cm - 3.8cm - 1.5cm"
+          margin-bottom="3cm - (.25cm * 4)"
+          margin-left="2.0cm + 0.5cm"
+          margin-right="(5cm * 1cm) div 2cm">
       <fo:region-body margin-top="3cm"/>
       <fo:region-before extent="1cm + 3cm - 1cm"/>
       <fo:region-after extent="2 * .5cm + .5cm"/>
diff --git a/examples/fo/basic/pdfoutline.fo b/examples/fo/basic/pdfoutline.fo
index 027a87bd5..0190ea020 100644
--- a/examples/fo/basic/pdfoutline.fo
+++ b/examples/fo/basic/pdfoutline.fo
@@ -43,16 +43,16 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
       <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-reference="first"
-      page-position="first" />
-    <fo:conditional-page-master-reference master-reference="rest"
-      page-position="rest" />
-    <!-- recommended fallback procedure -->
-    <fo:conditional-page-master-reference master-reference="rest" />
-  </fo:repeatable-page-master-alternatives>
-</fo:page-sequence-master>
+    <fo:page-sequence-master master-name="basicPSM" >
+      <fo:repeatable-page-master-alternatives>
+        <fo:conditional-page-master-reference master-reference="first"
+          page-position="first" />
+        <fo:conditional-page-master-reference master-reference="rest"
+          page-position="rest" />
+        <!-- recommended fallback procedure -->
+        <fo:conditional-page-master-reference master-reference="rest" />
+      </fo:repeatable-page-master-alternatives>
+    </fo:page-sequence-master>
 
   </fo:layout-master-set>
   <!-- end: defines page layout -->