1. Implemented validateChildNode() for fo:simple-page-master. This may cause some stress with the user community--as any declared fo:region-xxxx children must follow a specific ordering.

2. Modified several of our sample and test FO files to be compliant with the XSL spec with respect to the change above.

3. @todo's added to FO's still missing validateChildNode()

4. New FONode missingPropertyError() method created, for the major cases where missing properties should halt processing.

5. Various cleanup in our layout-master-set and region classes, including the removal of error checks that are no longer needed due to validateChildNode() being implemented.


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

29 files changed, 29 insertions, 29 deletions

diff --git a/test/xml/bugtests/background_color.fo b/test/xml/bugtests/background_color.fo
index c18109794..6f393b054 100644
--- a/test/xml/bugtests/background_color.fo
+++ b/test/xml/bugtests/background_color.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/background_transparent.fo b/test/xml/bugtests/background_transparent.fo
index e8aca5b02..013a8db8a 100644
--- a/test/xml/bugtests/background_transparent.fo
+++ b/test/xml/bugtests/background_transparent.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/block-container.fo b/test/xml/bugtests/block-container.fo
index 8ed2485ea..8757f763b 100644
--- a/test/xml/bugtests/block-container.fo
+++ b/test/xml/bugtests/block-container.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/block.fo b/test/xml/bugtests/block.fo
index a3443bf8a..b729e9ab6 100644
--- a/test/xml/bugtests/block.fo
+++ b/test/xml/bugtests/block.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/border.fo b/test/xml/bugtests/border.fo
index b4a800577..01ea34c24 100644
--- a/test/xml/bugtests/border.fo
+++ b/test/xml/bugtests/border.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/break-before.fo b/test/xml/bugtests/break-before.fo
index 901468f40..37701285b 100644
--- a/test/xml/bugtests/break-before.fo
+++ b/test/xml/bugtests/break-before.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/color.fo b/test/xml/bugtests/color.fo
index 2e3eb6112..a4b252ac4 100644
--- a/test/xml/bugtests/color.fo
+++ b/test/xml/bugtests/color.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/font-family.fo b/test/xml/bugtests/font-family.fo
index 5269c7a29..998458d38 100644
--- a/test/xml/bugtests/font-family.fo
+++ b/test/xml/bugtests/font-family.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/font-size.fo b/test/xml/bugtests/font-size.fo
index b0516a4bc..a9c920b7b 100644
--- a/test/xml/bugtests/font-size.fo
+++ b/test/xml/bugtests/font-size.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/font.fo b/test/xml/bugtests/font.fo
index 5a29b22d3..8740f4429 100644
--- a/test/xml/bugtests/font.fo
+++ b/test/xml/bugtests/font.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/header_footer.fo b/test/xml/bugtests/header_footer.fo
index df3d030b3..d278e818a 100644
--- a/test/xml/bugtests/header_footer.fo
+++ b/test/xml/bugtests/header_footer.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="3cm"/>
         <fo:region-body margin-top="4cm" margin-bottom="3cm"/>
+        <fo:region-before extent="3cm"/>
         <fo:region-after extent="3cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/indent.fo b/test/xml/bugtests/indent.fo
index 31f6eb251..ab3d91be0 100644
--- a/test/xml/bugtests/indent.fo
+++ b/test/xml/bugtests/indent.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/inline.fo b/test/xml/bugtests/inline.fo
index 6e2f48e5e..8ae7aeee8 100644
--- a/test/xml/bugtests/inline.fo
+++ b/test/xml/bugtests/inline.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/keep-with-next.fo b/test/xml/bugtests/keep-with-next.fo
index d6f43d432..ba808219b 100644
--- a/test/xml/bugtests/keep-with-next.fo
+++ b/test/xml/bugtests/keep-with-next.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1in"
                     margin-right="0.75in">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/leader.fo b/test/xml/bugtests/leader.fo
index b7cce9e2b..384ecf21f 100644
--- a/test/xml/bugtests/leader.fo
+++ b/test/xml/bugtests/leader.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/letter-spacing.fo b/test/xml/bugtests/letter-spacing.fo
index 31ddf5bc9..abd022c93 100644
--- a/test/xml/bugtests/letter-spacing.fo
+++ b/test/xml/bugtests/letter-spacing.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/line-height.fo b/test/xml/bugtests/line-height.fo
index 267bec7c1..640fe462c 100644
--- a/test/xml/bugtests/line-height.fo
+++ b/test/xml/bugtests/line-height.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/list-mountjoy.fo b/test/xml/bugtests/list-mountjoy.fo
index c2b8a6eb9..9c47fd93c 100644
--- a/test/xml/bugtests/list-mountjoy.fo
+++ b/test/xml/bugtests/list-mountjoy.fo
@@ -9,7 +9,7 @@
                            margin-bottom="2cm"
                            margin-left="2.5cm"
                            margin-right="2.5cm">
-    <fo:region-body margin-top="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/test/xml/bugtests/padding.fo b/test/xml/bugtests/padding.fo
index 2052f4579..74028f13f 100644
--- a/test/xml/bugtests/padding.fo
+++ b/test/xml/bugtests/padding.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/page-number.fo b/test/xml/bugtests/page-number.fo
index b352970be..cd3b37bb1 100644
--- a/test/xml/bugtests/page-number.fo
+++ b/test/xml/bugtests/page-number.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/rule.fo b/test/xml/bugtests/rule.fo
index 4e4dcf7ed..f3b23fdb8 100644
--- a/test/xml/bugtests/rule.fo
+++ b/test/xml/bugtests/rule.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/simple-link.fo b/test/xml/bugtests/simple-link.fo
index 2e3d7ce5b..f18adaba8 100644
--- a/test/xml/bugtests/simple-link.fo
+++ b/test/xml/bugtests/simple-link.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/space-treatment.fo b/test/xml/bugtests/space-treatment.fo
index c29e18734..0df02dd34 100644
--- a/test/xml/bugtests/space-treatment.fo
+++ b/test/xml/bugtests/space-treatment.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1in"
                     margin-right="0.75in">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/space.fo b/test/xml/bugtests/space.fo
index 12ac01113..ad572503a 100644
--- a/test/xml/bugtests/space.fo
+++ b/test/xml/bugtests/space.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/text-align.fo b/test/xml/bugtests/text-align.fo
index d5505ca0f..a0a001880 100644
--- a/test/xml/bugtests/text-align.fo
+++ b/test/xml/bugtests/text-align.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/text-decoration.fo b/test/xml/bugtests/text-decoration.fo
index 4f4b57d60..cefb2f56c 100644
--- a/test/xml/bugtests/text-decoration.fo
+++ b/test/xml/bugtests/text-decoration.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/text-indent.fo b/test/xml/bugtests/text-indent.fo
index 98889e444..745eec8e9 100644
--- a/test/xml/bugtests/text-indent.fo
+++ b/test/xml/bugtests/text-indent.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/word-spacing.fo b/test/xml/bugtests/word-spacing.fo
index d02bceeea..b318775bb 100644
--- a/test/xml/bugtests/word-spacing.fo
+++ b/test/xml/bugtests/word-spacing.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
   </fo:layout-master-set>
diff --git a/test/xml/bugtests/wrap.fo b/test/xml/bugtests/wrap.fo
index 79a421925..8f89fd06d 100644
--- a/test/xml/bugtests/wrap.fo
+++ b/test/xml/bugtests/wrap.fo
@@ -8,8 +8,8 @@
                     margin-bottom="1cm"
                     margin-left="1.5cm"
                     margin-right="1.5cm">
-        <fo:region-before extent="2.5cm"/>
         <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+        <fo:region-before extent="2.5cm"/>
         <fo:region-after extent="2.5cm"/>
       </fo:simple-page-master>
       <fo:simple-page-master master-name="no-overflow"