Restore section/simplesect

diff --git a/docbook/relaxng/docbook/src/hier.rnc b/docbook/relaxng/docbook/src/hier.rnc
index a19545ef615823d9971503b5a9afcbfd796a4d93..89a0fa35b9845115344b5545f0368714d73ad6db 100644 (file)
--- a/docbook/relaxng/docbook/src/hier.rnc
+++ b/docbook/relaxng/docbook/src/hier.rnc
@@ -60,12 +60,12 @@ db.label.attribute = attribute label { text }
 
 # ======================================================================
 
-db.toplevel.sections = (db.section+, db.simplesect*) | db.simplesect+
+db.toplevel.sections = db.section+ | db.simplesect+
 
 db.toplevel.blocks.or.sections =
   (db.all.blocks+, db.toplevel.sections?) | db.toplevel.sections
 
-db.recursive.sections = (db.section+, db.simplesect*) | db.simplesect+
+db.recursive.sections = db.section+ | db.simplesect+
 
 db.recursive.blocks.or.sections =
   (db.all.blocks+, db.recursive.sections?) | db.recursive.sections
@@ -443,7 +443,7 @@ div {
 
 # ======================================================================
 
-db.article.components = (db.section+, db.simplesect*) | db.simplesect+
+db.article.components = db.toplevel.sections
 
 # ======================================================================
 

diff --git a/docbook/relaxng/docbook/src/refentry.rnc b/docbook/relaxng/docbook/src/refentry.rnc
index 34652b413fa38b2a4dff8baac52314ae32c53c15..fd5ba1a7638998d2fdd3bcfc36107dace5bc05ff 100644 (file)
--- a/docbook/relaxng/docbook/src/refentry.rnc
+++ b/docbook/relaxng/docbook/src/refentry.rnc
@@ -22,8 +22,6 @@ db.divisions |= db.reference
 
 db.part.components |= db.refentry | db.reference
 
-db.article.components |= db.refentry+
-
 db.toplevel.sections |= db.refentry+
 
 db.recursive.sections |= db.refentry+

diff --git a/docbook/relaxng/docbook/src/refsect1.rnc b/docbook/relaxng/docbook/src/refsect1.rnc
index dc4b009e58e22d2bdcebd3c8e7ec8c0f04ef8717..d52017eaa0ea112dbcdb977f1143015444f4eba5 100644 (file)
--- a/docbook/relaxng/docbook/src/refsect1.rnc
+++ b/docbook/relaxng/docbook/src/refsect1.rnc
@@ -16,12 +16,16 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.refsect1 | db.refsect2 | db.refsect3
+
 db.toplevel.refsection |= db.refsect1+
 
 db.secondlevel.refsection |= db.refsect2+
 
 # ======================================================================
 
+db.refsect1.sections = db.refsect2+
+
 [
    db:refname [ "refsect1" ]
    db:refpurpose [ "A major subsection of a reference entry" ]
@@ -45,13 +49,15 @@ div {
       element refsect1 {
          db.refsect1.attlist,
          db.refsect1.info,
-         ((db.all.blocks+, db.refsect2*)
-          | db.refsect2+)
+         ((db.all.blocks+, db.refsect1.sections?)
+          | db.refsect1.sections)
       }
 }
 
 # ======================================================================
 
+db.refsect2.sections = db.refsect3+
+
 [
    db:refname [ "refsect2" ]
    db:refpurpose [ "A subsection of a " db:tag [ "refsect1" ] ]
@@ -75,8 +81,8 @@ div {
       element refsect2 {
          db.refsect2.attlist,
          db.refsect2.info,
-         ((db.all.blocks+, db.refsect3*)
-          | db.refsect3+)
+         ((db.all.blocks+, db.refsect2.sections?)
+          | db.refsect2.sections)
       }
 }
 

diff --git a/docbook/relaxng/docbook/src/sect1.rnc b/docbook/relaxng/docbook/src/sect1.rnc
index aa8a54ea62927bfa31bcbd5db316bb19cd1e02ff..8d8670c5130fb2d7c8a6f3568e88f12367f2ac06 100644 (file)
--- a/docbook/relaxng/docbook/src/sect1.rnc
+++ b/docbook/relaxng/docbook/src/sect1.rnc
@@ -16,13 +16,13 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
-db.toplevel.sections |= (db.sect1+, db.simplesect*) | db.simplesect+
+start |= db.sect1 | db.sect2 | db.sect3 | db.sect4 | db.sect5
 
-db.article.components |= (db.sect1+, db.simplesect*) | db.simplesect+
+db.toplevel.sections |= db.sect1+
 
 # ======================================================================
 
-db.sect1.sections = (db.sect2+, db.simplesect*) | db.simplesect+
+db.sect1.sections = db.sect2+ | db.simplesect+
 
 [
    db:refname [ "sect1" ]
@@ -55,7 +55,7 @@ div {
 
 # ======================================================================
 
-db.sect2.sections = (db.sect3+, db.simplesect*) | db.simplesect+
+db.sect2.sections = db.sect3+ | db.simplesect+
 
 [
    db:refname [ "sect2" ]
@@ -88,7 +88,7 @@ div {
 
 # ======================================================================
 
-db.sect3.sections = (db.sect4+, db.simplesect*) | db.simplesect+
+db.sect3.sections = db.sect4+ | db.simplesect+
 
 [
    db:refname [ "sect3" ]
@@ -121,7 +121,7 @@ div {
 
 # ======================================================================
 
-db.sect4.sections = (db.sect5+, db.simplesect*) | db.simplesect+
+db.sect4.sections = db.sect5+ | db.simplesect+
 
 [
    db:refname [ "sect4" ]

diff --git a/docbook/relaxng/docbook/src/xinclude.rnc b/docbook/relaxng/docbook/src/xinclude.rnc
index b1cec1b68c3cc8820383b2feaf5e21049c8d4b9e..16d62133c726c3e9bc73f5ebeb09fd1052b6c679 100644 (file)
--- a/docbook/relaxng/docbook/src/xinclude.rnc
+++ b/docbook/relaxng/docbook/src/xinclude.rnc
@@ -20,19 +20,13 @@ db.divisions |= db.xi.include
 db.components |= db.xi.include
 
 db.toplevel.sections |=
-   ((db.section|db.xi.include)+, (db.simplesect|db.xi.include)*)
- | (db.simplesect|db.xi.include)+
+   (db.section|db.xi.include)+ | (db.simplesect|db.xi.include)+
 
 db.recursive.sections |=
-   ((db.section|db.xi.include)+, (db.simplesect|db.xi.include)*)
- | (db.simplesect|db.xi.include)+
+   (db.section|db.xi.include)+ | (db.simplesect|db.xi.include)+
 
 db.part.components |= db.xi.include
 
-db.article.components |=
-   ((db.section|db.xi.include)+, (db.simplesect|db.xi.include)*)
- | (db.simplesect|db.xi.include)+
-
 db.all.blocks |= db.xi.include
 db.all.inlines |= db.xi.include
 
@@ -62,7 +56,7 @@ ctrl:conditional [
   ]
 
   rng:define [
-    name = "db.article.components"
+    name = "db.toplevel.refsection"
     combine = "choice"
     rng:oneOrMore [
       rng:choice [
@@ -73,7 +67,7 @@ ctrl:conditional [
   ]
 
   rng:define [
-    name = "db.toplevel.refsection"
+    name = "db.secondlevel.refsection"
     combine = "choice"
     rng:oneOrMore [
       rng:choice [
@@ -82,72 +76,66 @@ ctrl:conditional [
       ]
     ]
   ]
+]
+
+ctrl:conditional [
+  pattern="db.refsect1"
 
   rng:define [
-    name = "db.secondlevel.refsection"
+    name = "db.toplevel.sections"
     combine = "choice"
     rng:oneOrMore [
       rng:choice [
-        rng:ref [ name = "db.refentry" ]
+        rng:ref [ name = "db.refsect1" ]
         rng:ref [ name = "db.xi.include" ]
       ]
     ]
   ]
-]
 
-ctrl:conditional [
-  pattern="db.sect1"
+  rng:define [
+    name = "db.recursive.sections"
+    combine = "choice"
+    rng:oneOrMore [
+      rng:choice [
+        rng:ref [ name = "db.refsect1" ]
+        rng:ref [ name = "db.xi.include" ]
+      ]
+    ]
+  ]
 
   rng:define [
-    name = "db.toplevel.sections"
+    name = "db.toplevel.refsection"
     combine = "choice"
-    rng:choice [
-       rng:group [
-          rng:oneOrMore [
-             rng:choice [
-                rng:ref [ name = "db.sect1" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-          rng:zeroOrMore [
-             rng:choice [
-                rng:ref [ name = "db.simplesect" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-       ]
-       rng:oneOrMore [
-          rng:choice [
-             rng:ref [ name = "db.simplesect" ]
-             rng:ref [ name = "db.xi.include" ]
-          ]
-       ]
+    rng:oneOrMore [
+      rng:choice [
+        rng:ref [ name = "db.refsect1" ]
+        rng:ref [ name = "db.xi.include" ]
+      ]
     ]
   ]
 
   rng:define [
-    name = "db.article.components"
+    name = "db.secondlevel.refsection"
     combine = "choice"
-    rng:choice [
-       rng:group [
-          rng:oneOrMore [
-             rng:choice [
-                rng:ref [ name = "db.sect1" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-          rng:zeroOrMore [
-             rng:choice [
-                rng:ref [ name = "db.simplesect" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-       ]
-       rng:oneOrMore [
-          rng:choice [
-             rng:ref [ name = "db.simplesect" ]
-             rng:ref [ name = "db.xi.include" ]
-          ]
+    rng:oneOrMore [
+      rng:choice [
+        rng:ref [ name = "db.refsect2" ]
+        rng:ref [ name = "db.xi.include" ]
+      ]
+    ]
+  ]
+]
+
+ctrl:conditional [
+  pattern="db.sect1"
+
+  rng:define [
+    name = "db.toplevel.sections"
+    combine = "choice"
+    rng:oneOrMore [
+       rng:choice [
+          rng:ref [ name = "db.sect1" ]
+          rng:ref [ name = "db.xi.include" ]
        ]
     ]
   ]
@@ -155,26 +143,10 @@ ctrl:conditional [
   rng:define [
     name = "db.sect1.sections"
     combine = "choice"
-    rng:choice [
-       rng:group [
-          rng:oneOrMore [
-             rng:choice [
-                rng:ref [ name = "db.sect2" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-          rng:zeroOrMore [
-             rng:choice [
-                rng:ref [ name = "db.simplesect" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-       ]
-       rng:oneOrMore [
-          rng:choice [
-             rng:ref [ name = "db.simplesect" ]
-             rng:ref [ name = "db.xi.include" ]
-          ]
+    rng:oneOrMore [
+       rng:choice [
+          rng:ref [ name = "db.sect2" ]
+          rng:ref [ name = "db.xi.include" ]
        ]
     ]
   ]
@@ -182,26 +154,10 @@ ctrl:conditional [
   rng:define [
     name = "db.sect2.sections"
     combine = "choice"
-    rng:choice [
-       rng:group [
-          rng:oneOrMore [
-             rng:choice [
-                rng:ref [ name = "db.sect3" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-          rng:zeroOrMore [
-             rng:choice [
-                rng:ref [ name = "db.simplesect" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-       ]
-       rng:oneOrMore [
-          rng:choice [
-             rng:ref [ name = "db.simplesect" ]
-             rng:ref [ name = "db.xi.include" ]
-          ]
+    rng:oneOrMore [
+       rng:choice [
+          rng:ref [ name = "db.sect3" ]
+          rng:ref [ name = "db.xi.include" ]
        ]
     ]
   ]
@@ -209,26 +165,10 @@ ctrl:conditional [
   rng:define [
     name = "db.sect3.sections"
     combine = "choice"
-    rng:choice [
-       rng:group [
-          rng:oneOrMore [
-             rng:choice [
-                rng:ref [ name = "db.sect4" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-          rng:zeroOrMore [
-             rng:choice [
-                rng:ref [ name = "db.simplesect" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-       ]
-       rng:oneOrMore [
-          rng:choice [
-             rng:ref [ name = "db.simplesect" ]
-             rng:ref [ name = "db.xi.include" ]
-          ]
+    rng:oneOrMore [
+       rng:choice [
+          rng:ref [ name = "db.sect4" ]
+          rng:ref [ name = "db.xi.include" ]
        ]
     ]
   ]
@@ -236,26 +176,10 @@ ctrl:conditional [
   rng:define [
     name = "db.sect4.sections"
     combine = "choice"
-    rng:choice [
-       rng:group [
-          rng:oneOrMore [
-             rng:choice [
-                rng:ref [ name = "db.sect5" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-          rng:zeroOrMore [
-             rng:choice [
-                rng:ref [ name = "db.simplesect" ]
-                rng:ref [ name = "db.xi.include" ]
-             ]
-          ]
-       ]
-       rng:oneOrMore [
-          rng:choice [
-             rng:ref [ name = "db.simplesect" ]
-             rng:ref [ name = "db.xi.include" ]
-          ]
+    rng:oneOrMore [
+       rng:choice [
+          rng:ref [ name = "db.sect5" ]
+          rng:ref [ name = "db.xi.include" ]
        ]
     ]
   ]