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

38 files changed, 335 insertions, 284 deletions

diff --git a/examples/fo/advanced/barcode.fo b/examples/fo/advanced/barcode.fo
index ba0ba13b3..822d6fd55 100644
--- a/examples/fo/advanced/barcode.fo
+++ b/examples/fo/advanced/barcode.fo
@@ -1,22 +1,43 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-   <fo:layout-master-set>
-      <fo:simple-page-master page-width="21cm" page-height="29.7cm" master-name="first" margin-top="5mm">
-         <fo:region-body margin-bottom="4.5in" margin-right="5mm" margin-left="5mm" margin-top="5mm"/>
-         <fo:region-after extent="4in" border-top-color="silver" border-top-style="dotted" border-top-width="0.13mm"/>
-      </fo:simple-page-master>
-      <fo:simple-page-master page-width="21cm" page-height="29.7cm" master-name="rest" margin-right="5mm" margin-left="5mm" margin-top="5mm" margin-bottom="5mm">
-         <fo:region-body/>
-      </fo:simple-page-master>
-      <fo:page-sequence-master master-name="A4">
-         <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"/>
-            <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="A4">
+
+<fo:layout-master-set>
+  <fo:simple-page-master master-name="first"
+        page-width="21cm" 
+        page-height="29.7cm"
+        margin-top="5mm">
+     <fo:region-body 
+        margin-bottom="4.5in" 
+        margin-right="5mm" 
+        margin-left="5mm" 
+        margin-top="5mm"/>
+     <fo:region-after 
+        extent="4in" 
+        border-top-color="silver" 
+        border-top-style="dotted" 
+        border-top-width="0.13mm"/>
+  </fo:simple-page-master>
+
+  <fo:simple-page-master master-name="rest"
+        page-width="21cm" 
+        page-height="29.7cm"  
+        margin-right="5mm" 
+        margin-left="5mm" 
+        margin-top="5mm" 
+        margin-bottom="5mm">
+     <fo:region-body/>
+  </fo:simple-page-master>
+  
+  <fo:page-sequence-master master-name="A4">
+     <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"/>
+        <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="A4">
       <fo:flow flow-name="xsl-region-body">
 
 <fo:block font-size="14pt" font-weight="bold">
diff --git a/examples/fo/advanced/cid-fonts.fo b/examples/fo/advanced/cid-fonts.fo
index 90ce3c952..d7623ae23 100644
--- a/examples/fo/advanced/cid-fonts.fo
+++ b/examples/fo/advanced/cid-fonts.fo
@@ -5,8 +5,14 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
          xmlns:fox="http://xml.apache.org/fop/extensions">
  <fo:layout-master-set>
-   <fo:simple-page-master page-width="21cm" page-height="29.7cm" master-name="A4">
-     <fo:region-body margin-bottom="1.5cm" margin-right="2cm" margin-left="2cm" margin-top="1.5cm"/>
+   <fo:simple-page-master master-name="A4"
+            page-width="21cm" 
+            page-height="29.7cm" >
+       <fo:region-body 
+            margin-bottom="1.5cm" 
+            margin-right="2cm" 
+            margin-left="2cm" 
+            margin-top="1.5cm"/>
    </fo:simple-page-master>
  </fo:layout-master-set>
 
diff --git a/examples/fo/advanced/giro.fo b/examples/fo/advanced/giro.fo
index 128e00dc4..d22f160f1 100644
--- a/examples/fo/advanced/giro.fo
+++ b/examples/fo/advanced/giro.fo
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
    <fo:layout-master-set>
-      <fo:simple-page-master page-width="21cm" page-height="29.7cm" master-name="first" margin-top="5mm">
+      <fo:simple-page-master master-name="first"
+            page-width="21cm"
+            page-height="29.7cm" 
+            margin-top="5mm">
          <fo:region-body margin-bottom="4.5in" margin-right="5mm" margin-left="5mm" margin-top="5mm"/>
          <fo:region-after extent="4in" border-top-color="silver" border-top-style="dotted" border-top-width="0.13mm"/>
       </fo:simple-page-master>
-      <fo:simple-page-master page-width="21cm" page-height="29.7cm" master-name="rest" margin-right="5mm" margin-left="5mm" margin-top="5mm" margin-bottom="5mm">
+      <fo:simple-page-master master-name="rest"
+            page-width="21cm"
+            page-height="29.7cm"
+            margin-right="5mm"
+            margin-left="5mm"
+            margin-top="5mm"
+            margin-bottom="5mm">
          <fo:region-body/>
       </fo:simple-page-master>
       <fo:page-sequence-master master-name="A4">
@@ -16,6 +26,7 @@
          </fo:repeatable-page-master-alternatives>
       </fo:page-sequence-master>
    </fo:layout-master-set>
+
    <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">
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 -->
diff --git a/examples/fo/footnotes/columns.fo b/examples/fo/footnotes/columns.fo
index 3a0ee029a..947af971f 100644
--- a/examples/fo/footnotes/columns.fo
+++ b/examples/fo/footnotes/columns.fo
@@ -13,9 +13,9 @@
                   margin-bottom="1in"
                   margin-left="0.75in"
                   margin-right="0.75in">
-      <fo:region-body
-      margin-top="1in" margin-bottom="1in"
-    column-count="2" column-gap="0.25in"/>
+      <fo:region-body 
+            margin-top="1in" margin-bottom="1in"
+            column-count="2" column-gap="0.25in"/>
       <fo:region-before extent="1in"/>
       <fo:region-after extent="1in"/>
     </fo:simple-page-master>
diff --git a/examples/fo/footnotes/simple.fo b/examples/fo/footnotes/simple.fo
index a1abc046a..6e627e079 100644
--- a/examples/fo/footnotes/simple.fo
+++ b/examples/fo/footnotes/simple.fo
@@ -1,12 +1,19 @@
 <?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 margin-right="0.5cm" margin-left="1.5cm" margin-bottom="2cm" margin-top="0cm" page-width="21cm" page-height="20cm" master-name="one">
-<fo:region-body margin-bottom="2cm" margin-top="2cm"/>
-<fo:region-before extent="0.5cm"/>
-<fo:region-after extent="0.5cm"/>
-</fo:simple-page-master>
+    <fo:simple-page-master master-name="one"
+            margin-right="0.5cm"
+            margin-left="1.5cm"
+            margin-bottom="2cm"
+            margin-top="0cm"
+            page-width="21cm"
+            page-height="20cm">
+        <fo:region-body margin-bottom="2cm" margin-top="2cm"/>
+        <fo:region-before extent="0.5cm"/>
+        <fo:region-after extent="0.5cm"/>
+    </fo:simple-page-master>
 </fo:layout-master-set>
+
 <fo:page-sequence master-reference="one">
 <fo:flow flow-name="xsl-region-body">
 
diff --git a/examples/fo/keeps_and_breaks/columnlevel1.fo b/examples/fo/keeps_and_breaks/columnlevel1.fo
index 2a286f342..6c77f4610 100644
--- a/examples/fo/keeps_and_breaks/columnlevel1.fo
+++ b/examples/fo/keeps_and_breaks/columnlevel1.fo
@@ -14,9 +14,9 @@ This file addresses breaks in column context.
                   margin-bottom="2cm"
                   margin-left="2.5cm"
                   margin-right="2.5cm">
-      <fo:region-body
-      margin-top="3cm" margin-bottom="2cm"
-    column-count="2" column-gap="0.25in"/>
+      <fo:region-body 
+            margin-top="3cm" margin-bottom="2cm" 
+            column-count="2" column-gap="0.25in"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="2cm"/>
     </fo:simple-page-master>
diff --git a/examples/fo/keeps_and_breaks/pagelevel1.fo b/examples/fo/keeps_and_breaks/pagelevel1.fo
index 3b674ee0f..3762e377a 100644
--- a/examples/fo/keeps_and_breaks/pagelevel1.fo
+++ b/examples/fo/keeps_and_breaks/pagelevel1.fo
@@ -14,8 +14,7 @@ This file addresses breaks in page context.
                   margin-bottom="2cm"
                   margin-left="2.5cm"
                   margin-right="2.5cm">
-      <fo:region-body
-      margin-top="3cm" margin-bottom="2cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="2cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="2cm"/>
     </fo:simple-page-master>
diff --git a/examples/fo/keeps_and_breaks/pagelevel2.fo b/examples/fo/keeps_and_breaks/pagelevel2.fo
index 9018a3d25..56557ae4b 100644
--- a/examples/fo/keeps_and_breaks/pagelevel2.fo
+++ b/examples/fo/keeps_and_breaks/pagelevel2.fo
@@ -14,8 +14,7 @@ This file addresses break-after's in page context.
                   margin-bottom="2cm"
                   margin-left="2.5cm"
                   margin-right="2.5cm">
-      <fo:region-body
-      margin-top="3cm" margin-bottom="2cm"/>
+      <fo:region-body margin-top="3cm" margin-bottom="2cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="2cm"/>
     </fo:simple-page-master>
diff --git a/examples/fo/keeps_and_breaks/pagelevel3.fo b/examples/fo/keeps_and_breaks/pagelevel3.fo
index b329a4519..13ca872df 100644
--- a/examples/fo/keeps_and_breaks/pagelevel3.fo
+++ b/examples/fo/keeps_and_breaks/pagelevel3.fo
@@ -8,14 +8,13 @@ This file addresses break-before's in page context.
   <fo:layout-master-set>
     <!-- layout for all pages -->
     <fo:simple-page-master master-name="all"
-                  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" margin-bottom="2cm"/>
+          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" margin-bottom="2cm"/>
       <fo:region-before extent="3cm"/>
       <fo:region-after extent="2cm"/>
     </fo:simple-page-master>
diff --git a/examples/fo/keeps_and_breaks/pagelevel4.fo b/examples/fo/keeps_and_breaks/pagelevel4.fo
index cd7f454a9..dc6574708 100644
--- a/examples/fo/keeps_and_breaks/pagelevel4.fo
+++ b/examples/fo/keeps_and_breaks/pagelevel4.fo
@@ -9,17 +9,17 @@ This file addresses breaks in page context, with a
   <fo:layout-master-set>
     <!-- layout for all pages -->
     <fo:simple-page-master master-name="all"
-                  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" margin-bottom="2cm"
-    column-count="2" column-gap="0.25in"/>
-      <fo:region-before extent="3cm"/>
-      <fo:region-after extent="2cm"/>
+            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" margin-bottom="2cm"
+            column-count="2" column-gap="0.25in"/>
+        <fo:region-before extent="3cm"/>
+        <fo:region-after extent="2cm"/>
     </fo:simple-page-master>
   </fo:layout-master-set>
 
diff --git a/examples/fo/markers/glossary.xsl b/examples/fo/markers/glossary.xsl
index ee679ccf0..1c744e6e0 100644
--- a/examples/fo/markers/glossary.xsl
+++ b/examples/fo/markers/glossary.xsl
@@ -10,9 +10,12 @@
   <fo:layout-master-set>
 
     <fo:simple-page-master master-name="all"
-    page-height="11.5in" page-width="8.5in"
-        margin-top="1in" margin-bottom="1in"
-        margin-left="0.75in" margin-right="0.75in">
+            page-height="11.5in" 
+            page-width="8.5in"
+            margin-top="1in" 
+            margin-bottom="1in"
+            margin-left="0.75in" 
+            margin-right="0.75in">
     <fo:region-body margin-top="1in" margin-bottom="0.75in"/>
     <fo:region-before extent="0.75in"/>
     <fo:region-after extent="0.5in"/>
diff --git a/examples/fo/markers/hide.fo b/examples/fo/markers/hide.fo
index 49e62fce1..911f933ba 100644
--- a/examples/fo/markers/hide.fo
+++ b/examples/fo/markers/hide.fo
@@ -1,14 +1,13 @@
 <?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
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="29.7cm"
-  master-name="first">
+    <fo:simple-page-master master-name="first"
+          margin-right="1.5cm"
+          margin-left="1.5cm"
+          margin-bottom="2cm"
+          margin-top="1cm"
+          page-width="21cm"
+          page-height="29.7cm">
       <fo:region-before extent="1cm"/>
       <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
diff --git a/examples/fo/pagination/allregions.fo b/examples/fo/pagination/allregions.fo
index 341f67fe6..7fb325ce7 100644
--- a/examples/fo/pagination/allregions.fo
+++ b/examples/fo/pagination/allregions.fo
@@ -14,8 +14,8 @@
                   margin-left="2.5cm"
                   margin-right="2.5cm">
       <fo:region-body
-      margin-top="3cm" margin-bottom="1.5cm"
-    margin-left="2cm" margin-right="2cm"/>
+            margin-top="3cm" margin-bottom="1.5cm"
+            margin-left="2cm" margin-right="2cm"/>
       <fo:region-before precedence="true" extent="3cm"/>
       <fo:region-after precedence="true" extent="1.5cm"/>
       <fo:region-start extent="1cm"/>
diff --git a/examples/fo/pagination/franklin_2pageseqs.fo b/examples/fo/pagination/franklin_2pageseqs.fo
index 3eabfde51..4597a2f7e 100644
--- a/examples/fo/pagination/franklin_2pageseqs.fo
+++ b/examples/fo/pagination/franklin_2pageseqs.fo
@@ -7,7 +7,7 @@
 
     <!-- layout for the first page -->
       <fo:simple-page-master master-name="noheaders_center"
-      page-height="21.7cm"
+          page-height="21.7cm"
           page-width="16cm"
           margin-top="1cm"
           margin-bottom="1cm"
@@ -17,7 +17,7 @@
     </fo:simple-page-master>
 
       <fo:simple-page-master master-name="headers_right"
-      page-height="21.7cm"
+          page-height="21.7cm"
           page-width="16cm"
           margin-top="1cm"
           margin-bottom="1cm"
@@ -29,7 +29,7 @@
     </fo:simple-page-master>
 
       <fo:simple-page-master master-name="headers_left"
-      page-height="21.7cm"
+          page-height="21.7cm"
           page-width="16cm"
           margin-top="1cm"
           margin-bottom="1cm"
@@ -41,7 +41,7 @@
     </fo:simple-page-master>
 
       <fo:simple-page-master master-name="headers_center"
-      page-height="21.7cm"
+          page-height="21.7cm"
           page-width="16cm"
           margin-top="1cm"
           margin-bottom="1cm"
diff --git a/examples/fo/pagination/franklin_alt.fo b/examples/fo/pagination/franklin_alt.fo
index 372f77bd5..154286819 100644
--- a/examples/fo/pagination/franklin_alt.fo
+++ b/examples/fo/pagination/franklin_alt.fo
@@ -7,36 +7,36 @@
 
     <!-- layout for the first page -->
       <fo:simple-page-master master-name="right"
-      page-height="21.7cm"
-          page-width="16cm"
-          margin-top="1cm"
-          margin-bottom="1cm"
-          margin-left="3.5cm"
-          margin-right="1.5cm">
+            page-height="21.7cm"
+            page-width="16cm"
+            margin-top="1cm"
+            margin-bottom="1cm"
+            margin-left="3.5cm"
+            margin-right="1.5cm">
       <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
       <fo:region-before extent="2cm"/>
       <fo:region-after extent="2cm"/>
     </fo:simple-page-master>
 
       <fo:simple-page-master master-name="left"
-      page-height="21.7cm"
-          page-width="16cm"
-          margin-top="1cm"
-          margin-bottom="1cm"
-          margin-left="1.5cm"
-          margin-right="3.5cm">
+            page-height="21.7cm"
+            page-width="16cm"
+            margin-top="1cm"
+            margin-bottom="1cm"
+            margin-left="1.5cm"
+            margin-right="3.5cm">
       <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
       <fo:region-before extent="2cm"/>
       <fo:region-after extent="2cm"/>
     </fo:simple-page-master>
 
       <fo:simple-page-master master-name="center"
-      page-height="21.7cm"
-          page-width="16cm"
-          margin-top="1cm"
-          margin-bottom="1cm"
-          margin-left="2.5cm"
-          margin-right="2.5cm">
+            page-height="21.7cm"
+            page-width="16cm"
+            margin-top="1cm"
+            margin-bottom="1cm"
+            margin-left="2.5cm"
+            margin-right="2.5cm">
       <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
       <fo:region-before extent="2cm"/>
       <fo:region-after extent="2cm"/>
diff --git a/examples/fo/pagination/franklin_rep.fo b/examples/fo/pagination/franklin_rep.fo
index 166324fff..4b0bf4de6 100644
--- a/examples/fo/pagination/franklin_rep.fo
+++ b/examples/fo/pagination/franklin_rep.fo
@@ -7,12 +7,12 @@
 
     <!-- layout for the first page -->
       <fo:simple-page-master master-name="repeating"
-      page-height="21.7cm"
-          page-width="16cm"
-          margin-top="1cm"
-          margin-bottom="1cm"
-          margin-left="2.5cm"
-          margin-right="2.5cm">
+            page-height="21.7cm"
+            page-width="16cm"
+            margin-top="1cm"
+            margin-bottom="1cm"
+            margin-left="2.5cm"
+            margin-right="2.5cm">
       <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
       <fo:region-before extent="2cm"/>
       <fo:region-after extent="2cm"/>
diff --git a/examples/fo/pagination/franklin_rep_max_repeats.fo b/examples/fo/pagination/franklin_rep_max_repeats.fo
index 9fb5f3189..2d9c1c7dc 100644
--- a/examples/fo/pagination/franklin_rep_max_repeats.fo
+++ b/examples/fo/pagination/franklin_rep_max_repeats.fo
@@ -7,12 +7,12 @@
 
     <!-- layout for the first page -->
       <fo:simple-page-master master-name="repeating"
-      page-height="21.7cm"
-          page-width="16cm"
-          margin-top="1cm"
-          margin-bottom="1cm"
-          margin-left="2.5cm"
-          margin-right="2.5cm">
+            page-height="21.7cm"
+            page-width="16cm"
+            margin-top="1cm"
+            margin-bottom="1cm"
+            margin-left="2.5cm"
+            margin-right="2.5cm">
       <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
       <fo:region-before extent="2cm"/>
       <fo:region-after extent="2cm"/>
diff --git a/examples/fo/pagination/franklin_rep_max_repeats_expl.fo b/examples/fo/pagination/franklin_rep_max_repeats_expl.fo
index f8df79662..656129528 100644
--- a/examples/fo/pagination/franklin_rep_max_repeats_expl.fo
+++ b/examples/fo/pagination/franklin_rep_max_repeats_expl.fo
@@ -6,16 +6,16 @@
   <fo:layout-master-set>
 
     <!-- layout for the first page -->
-      <fo:simple-page-master master-name="repeating"
-      page-height="21.7cm"
-          page-width="16cm"
-          margin-top="1cm"
-          margin-bottom="1cm"
-          margin-left="2.5cm"
-          margin-right="2.5cm">
-      <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
-      <fo:region-before extent="2cm"/>
-      <fo:region-after extent="2cm"/>
+    <fo:simple-page-master master-name="repeating"
+            page-height="21.7cm"
+            page-width="16cm"
+            margin-top="1cm"
+            margin-bottom="1cm"
+            margin-left="2.5cm"
+            margin-right="2.5cm">
+        <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
+        <fo:region-before extent="2cm"/>
+        <fo:region-after extent="2cm"/>
     </fo:simple-page-master>
 
     <fo:page-sequence-master master-name="repeating_pm">
diff --git a/examples/fo/pagination/franklin_rep_max_repeats_nl.fo b/examples/fo/pagination/franklin_rep_max_repeats_nl.fo
index 34c35e746..b6369b968 100644
--- a/examples/fo/pagination/franklin_rep_max_repeats_nl.fo
+++ b/examples/fo/pagination/franklin_rep_max_repeats_nl.fo
@@ -7,12 +7,12 @@
 
     <!-- layout for the first page -->
       <fo:simple-page-master master-name="repeating"
-      page-height="21.7cm"
-          page-width="16cm"
-          margin-top="1cm"
-          margin-bottom="1cm"
-          margin-left="2.5cm"
-          margin-right="2.5cm">
+            page-height="21.7cm"
+            page-width="16cm"
+            margin-top="1cm"
+            margin-bottom="1cm"
+            margin-left="2.5cm"
+            margin-right="2.5cm">
       <fo:region-body margin-top="2cm" margin-bottom="2cm"/>
       <fo:region-before extent="2cm"/>
       <fo:region-after extent="2cm"/>
diff --git a/examples/fo/region_body/simplecol2.fo b/examples/fo/region_body/simplecol2.fo
index 2e0bf0f74..2355956d7 100644
--- a/examples/fo/region_body/simplecol2.fo
+++ b/examples/fo/region_body/simplecol2.fo
@@ -7,17 +7,17 @@
 
     <!-- layout for the first page -->
     <fo:simple-page-master master-name="only"
-                  page-height="11in"
-                  page-width="8.5in"
-                  margin-top="1in"
-                  margin-bottom="1in"
-                  margin-left="0.75in"
-                  margin-right="0.75in">
-      <fo:region-body
-      margin-top="1in" margin-bottom="1in"
-    column-count="2" column-gap="0.25in"/>
-      <fo:region-before extent="1in" />
-      <fo:region-after extent="1in" />
+        page-height="11in"
+        page-width="8.5in"
+        margin-top="1in"
+        margin-bottom="1in"
+        margin-left="0.75in"
+        margin-right="0.75in">
+        <fo:region-body
+            margin-top="1in" margin-bottom="1in"
+            column-count="2" column-gap="0.25in"/>
+        <fo:region-before extent="1in" />
+        <fo:region-after extent="1in" />
     </fo:simple-page-master>
 
   </fo:layout-master-set>
diff --git a/examples/fo/region_body/simplecol3.fo b/examples/fo/region_body/simplecol3.fo
index 995174db7..8f3769f3c 100644
--- a/examples/fo/region_body/simplecol3.fo
+++ b/examples/fo/region_body/simplecol3.fo
@@ -7,15 +7,15 @@
 
     <!-- layout for the first page -->
     <fo:simple-page-master master-name="only"
-                  page-height="11in"
-                  page-width="8.5in"
-                  margin-top="1in"
-                  margin-bottom="1in"
-                  margin-left="0.75in"
-                  margin-right="0.75in">
+            page-height="11in"
+            page-width="8.5in"
+            margin-top="1in"
+            margin-bottom="1in"
+            margin-left="0.75in"
+            margin-right="0.75in">
       <fo:region-body
-      margin-top="1in" margin-bottom="1in"
-    column-count="2" column-gap="0.25in"/>
+            margin-top="1in" margin-bottom="1in"
+            column-count="2" column-gap="0.25in"/>
       <fo:region-before extent="1in"/>
       <fo:region-after extent="1in"/>
     </fo:simple-page-master>
diff --git a/examples/fo/region_body/simplecol4.fo b/examples/fo/region_body/simplecol4.fo
index 6e73fa4b1..3bc098125 100644
--- a/examples/fo/region_body/simplecol4.fo
+++ b/examples/fo/region_body/simplecol4.fo
@@ -14,8 +14,8 @@
                   margin-left="0.75in"
                   margin-right="0.75in">
       <fo:region-body
-      margin-top="1in" margin-bottom="1in"
-    column-count="3" column-gap="0.15in"/>
+          margin-top="1in" margin-bottom="1in"
+          column-count="3" column-gap="0.15in"/>
       <fo:region-before extent="1in"/>
       <fo:region-after extent="1in"/>
     </fo:simple-page-master>
diff --git a/examples/fo/svg/external.fo b/examples/fo/svg/external.fo
index e96ef4760..bd21cdddb 100644
--- a/examples/fo/svg/external.fo
+++ b/examples/fo/svg/external.fo
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink">
   <fo:layout-master-set>
-    <fo:simple-page-master
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="29.7cm"
-  master-name="first">
+    <fo:simple-page-master master-name="first"
+          margin-right="1.5cm"
+          margin-left="1.5cm"
+          margin-bottom="2cm"
+          margin-top="1cm"
+          page-width="21cm"
+          page-height="29.7cm">
       <fo:region-before extent="1cm"/>
       <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
diff --git a/examples/fo/tables/background.fo b/examples/fo/tables/background.fo
index b5b9ef183..30d322649 100644
--- a/examples/fo/tables/background.fo
+++ b/examples/fo/tables/background.fo
@@ -1,14 +1,13 @@
 <?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
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="29.7cm"
-  master-name="first">
+    <fo:simple-page-master master-name="first"
+          margin-right="1.5cm"
+          margin-left="1.5cm"
+          margin-bottom="2cm"
+          margin-top="1cm"
+          page-width="21cm"
+          page-height="29.7cm">
       <fo:region-before extent="1cm"/>
       <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
diff --git a/examples/fo/tables/borders.fo b/examples/fo/tables/borders.fo
index 948724ae4..2f9cac274 100644
--- a/examples/fo/tables/borders.fo
+++ b/examples/fo/tables/borders.fo
@@ -1,14 +1,13 @@
 <?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
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="29.7cm"
-  master-name="first">
+    <fo:simple-page-master master-name="first"
+          margin-right="1.5cm"
+          margin-left="1.5cm"
+          margin-bottom="2cm"
+          margin-top="1cm"
+          page-width="21cm"
+          page-height="29.7cm">
       <fo:region-before extent="1cm"/>
       <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
diff --git a/examples/fo/tables/break.fo b/examples/fo/tables/break.fo
index 13f3160fd..f1515915f 100644
--- a/examples/fo/tables/break.fo
+++ b/examples/fo/tables/break.fo
@@ -1,14 +1,13 @@
 <?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
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="17cm"
-  master-name="first">
+    <fo:simple-page-master master-name="first"
+      margin-right="1.5cm"
+      margin-left="1.5cm"
+      margin-bottom="2cm"
+      margin-top="1cm"
+      page-width="21cm"
+      page-height="17cm">
       <fo:region-before extent="1cm"/>
       <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
diff --git a/examples/fo/tables/headfoot.fo b/examples/fo/tables/headfoot.fo
index 641d33193..0a1ce4e04 100644
--- a/examples/fo/tables/headfoot.fo
+++ b/examples/fo/tables/headfoot.fo
@@ -1,14 +1,13 @@
 <?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
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="29.7cm"
-  master-name="first">
+    <fo:simple-page-master master-name="first"
+          margin-right="1.5cm"
+          margin-left="1.5cm"
+          margin-bottom="2cm"
+          margin-top="1cm"
+          page-width="21cm"
+          page-height="29.7cm">
       <fo:region-before extent="7cm"/>
       <fo:region-body margin-top="7cm"/>
       <fo:region-after extent="1.5cm"/>
diff --git a/examples/fo/tables/keep.fo b/examples/fo/tables/keep.fo
index c28b1f7f9..16dc6f90a 100644
--- a/examples/fo/tables/keep.fo
+++ b/examples/fo/tables/keep.fo
@@ -1,14 +1,13 @@
 <?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
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="17cm"
-  master-name="first">
+    <fo:simple-page-master   master-name="first"
+          margin-right="1.5cm"
+          margin-left="1.5cm"
+          margin-bottom="2cm"
+          margin-top="1cm"
+          page-width="21cm"
+          page-height="17cm">
       <fo:region-before extent="1cm"/>
       <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
diff --git a/examples/fo/tables/omit.fo b/examples/fo/tables/omit.fo
index b93595095..e28883aac 100644
--- a/examples/fo/tables/omit.fo
+++ b/examples/fo/tables/omit.fo
@@ -1,14 +1,13 @@
 <?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
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="29.7cm"
-  master-name="first">
+    <fo:simple-page-master master-name="first"
+          margin-right="1.5cm"
+          margin-left="1.5cm"
+          margin-bottom="2cm"
+          margin-top="1cm"
+          page-width="21cm"
+          page-height="29.7cm">
       <fo:region-before extent="7cm"/>
       <fo:region-body margin-top="7cm"/>
       <fo:region-after extent="1.5cm"/>
diff --git a/examples/fo/tables/space.fo b/examples/fo/tables/space.fo
index a0ce77815..7d2063051 100644
--- a/examples/fo/tables/space.fo
+++ b/examples/fo/tables/space.fo
@@ -1,14 +1,13 @@
 <?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
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="29.7cm"
-  master-name="first">
+    <fo:simple-page-master master-name="first"
+          margin-right="1.5cm"
+          margin-left="1.5cm"
+          margin-bottom="2cm"
+          margin-top="1cm"
+          page-width="21cm"
+          page-height="29.7cm">
       <fo:region-before extent="1cm"/>
       <fo:region-body margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>
diff --git a/examples/fo/tables/widowsorphans.fo b/examples/fo/tables/widowsorphans.fo
index 33fae4451..279b303e4 100644
--- a/examples/fo/tables/widowsorphans.fo
+++ b/examples/fo/tables/widowsorphans.fo
@@ -1,14 +1,13 @@
 <?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
-  margin-right="1.5cm"
-  margin-left="1.5cm"
-  margin-bottom="2cm"
-  margin-top="1cm"
-  page-width="21cm"
-  page-height="17cm"
-  master-name="first">
+    <fo:simple-page-master master-name="first"
+          margin-right="1.5cm"
+          margin-left="1.5cm"
+          margin-bottom="2cm"
+          margin-top="1cm"
+          page-width="21cm"
+          page-height="17cm">
       <fo:region-before extent="1cm"/>
       <fo:region-body column-count="3" margin-top="1cm"/>
       <fo:region-after extent="1.5cm"/>