Update patterns to reflect changes in DocBook section patterns (as of Mezcal)

diff --git a/docbook/relaxng/simple/src/sdocbook.rnc b/docbook/relaxng/simple/src/sdocbook.rnc
index 826a799ed664d02ab806675b7795a80ef7332fc1..0478a5b10695f1ee3797cac8af440520e47a5775 100644 (file)
--- a/docbook/relaxng/simple/src/sdocbook.rnc
+++ b/docbook/relaxng/simple/src/sdocbook.rnc
@@ -17,14 +17,11 @@ default namespace = "http://docbook.org/ns/docbook"
 start = db.article
 
 include "../../docbook/src/hier.rnc" {
-   db.toplevel.optional.sections = db.section*
-   db.toplevel.required.sections = db.section+
+   db.toplevel.sections = db.section+
 
-   db.recursive.optional.sections = db.section*
-   db.recursive.required.sections = db.section+
+   db.recursive.sections = db.section+
 
-   db.article.optional.components = db.section*
-   db.article.required.components = db.section+
+   db.article.components = db.section+
 
    db.ackno = notAllowed
 
@@ -32,9 +29,8 @@ include "../../docbook/src/hier.rnc" {
       element article {
          db.article.attlist,
          db.article.info,
-         ((db.all.blocks+,
-            db.article.optional.components)
-          | db.article.required.components),
+         ((db.all.blocks+, db.article.components?)
+          | db.article.components),
          (db.appendix | db.navigation.components | db.ackno)*
       }
 }