Allow simplesect to occur after section elements

diff --git a/docbook/relaxng/docbook/src/hier.rnc b/docbook/relaxng/docbook/src/hier.rnc
index 1696cf0f79e3ff1c4d1a096e380929fc1db08881..3edf9b1baa980d208079aad279d98b399d7dbbae 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.toplevel.sections = (db.section+, db.simplesect*) | db.simplesect+
 
 db.toplevel.blocks.or.sections =
   (db.all.blocks+, db.toplevel.sections?) | db.toplevel.sections
 
-db.recursive.sections = db.section+ | db.simplesect+
+db.recursive.sections = (db.section+, db.simplesect*) | db.simplesect+
 
 db.recursive.blocks.or.sections =
   (db.all.blocks+, db.recursive.sections?) | db.recursive.sections

diff --git a/docbook/relaxng/docbook/src/sect1.rnc b/docbook/relaxng/docbook/src/sect1.rnc
index f86d6e18b13cf3f6c3ad12eed7e1aa8663dee379..c4ff04aabd7bb9b9a911e287f346890174ba48ae 100644 (file)
--- a/docbook/relaxng/docbook/src/sect1.rnc
+++ b/docbook/relaxng/docbook/src/sect1.rnc
@@ -22,7 +22,7 @@ db.toplevel.sections |= db.sect1+
 
 # ======================================================================
 
-db.sect1.sections = db.sect2+ | db.simplesect+
+db.sect1.sections = (db.sect2+, db.simplesect*) | db.simplesect+
 
 [
    db:refname [ "sect1" ]
@@ -55,7 +55,7 @@ div {
 
 # ======================================================================
 
-db.sect2.sections = db.sect3+ | db.simplesect+
+db.sect2.sections = (db.sect3+, db.simplesect*) | db.simplesect+
 
 [
    db:refname [ "sect2" ]
@@ -88,7 +88,7 @@ div {
 
 # ======================================================================
 
-db.sect3.sections = db.sect4+ | db.simplesect+
+db.sect3.sections = (db.sect4+, db.simplesect*) | db.simplesect+
 
 [
    db:refname [ "sect3" ]
@@ -121,7 +121,7 @@ div {
 
 # ======================================================================
 
-db.sect4.sections = db.sect5+ | db.simplesect+
+db.sect4.sections = (db.sect5+, db.simplesect*) | db.simplesect+
 
 [
    db:refname [ "sect4" ]