From 99b97d1a8c6d129cc8f4ae2ada193e73fe247a39 Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Thu, 21 Jul 2005 20:45:22 +0000 Subject: [PATCH] Allow simplesect to occur after section elements --- docbook/relaxng/docbook/src/hier.rnc | 4 ++-- docbook/relaxng/docbook/src/sect1.rnc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docbook/relaxng/docbook/src/hier.rnc b/docbook/relaxng/docbook/src/hier.rnc index 1696cf0f7..3edf9b1ba 100644 --- 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 f86d6e18b..c4ff04aab 100644 --- 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" ] -- 2.40.0