From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 28 Mar 2009 20:16:00 +0000 (+0000)
Subject: RFE #1899655: allow all elements with an info to be in the start pattern
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcc2f1f365f6894bda4eab075d567edbfe640efd;p=docbook-dsssl

RFE #1899655: allow all elements with an info to be in the start pattern
---

diff --git a/docbook/relaxng/docbook/src/admonitions.rnc b/docbook/relaxng/docbook/src/admonitions.rnc
index e9f55b308..ad91bd072 100644
--- a/docbook/relaxng/docbook/src/admonitions.rnc
+++ b/docbook/relaxng/docbook/src/admonitions.rnc
@@ -33,6 +33,8 @@ namespace rng  = "http://relaxng.org/ns/structure/1.0"
 namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 
+start |= db.admonition.blocks 
+
 db.nopara.blocks |= db.admonition.blocks
 
 # ======================================================================
diff --git a/docbook/relaxng/docbook/src/annotations.rnc b/docbook/relaxng/docbook/src/annotations.rnc
index 04264e276..cdda96c34 100644
--- a/docbook/relaxng/docbook/src/annotations.rnc
+++ b/docbook/relaxng/docbook/src/annotations.rnc
@@ -33,6 +33,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.annotation
+
 db.ubiq.inlines |= db.annotation
 db.all.blocks |= db.annotation
 db.info.elements |= db.annotation
diff --git a/docbook/relaxng/docbook/src/bibliography.rnc b/docbook/relaxng/docbook/src/bibliography.rnc
index fa066ed66..6a31eb702 100644
--- a/docbook/relaxng/docbook/src/bibliography.rnc
+++ b/docbook/relaxng/docbook/src/bibliography.rnc
@@ -33,6 +33,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.bibliodiv | db.bibliolist
+
 db.navigation.components |= db.bibliography
 
 db.list.blocks |= db.bibliolist
diff --git a/docbook/relaxng/docbook/src/callouts.rnc b/docbook/relaxng/docbook/src/callouts.rnc
index 880e31cc0..d7290371b 100644
--- a/docbook/relaxng/docbook/src/callouts.rnc
+++ b/docbook/relaxng/docbook/src/callouts.rnc
@@ -33,6 +33,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.calloutlist | db.programlistingco | db.screenco | db.imageobjectco
+
 db.publishing.inlines |= db.coref
 db.list.blocks |= db.calloutlist
 db.verbatim.blocks |= db.programlistingco | db.screenco
diff --git a/docbook/relaxng/docbook/src/ebnf.rnc b/docbook/relaxng/docbook/src/ebnf.rnc
index 6f7de8d3a..9e3c633ae 100644
--- a/docbook/relaxng/docbook/src/ebnf.rnc
+++ b/docbook/relaxng/docbook/src/ebnf.rnc
@@ -33,6 +33,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.productionset | db.constraintdef
+
 db.technical.inlines |= db.nonterminal
 db.technical.blocks |= db.productionset | db.constraintdef
 
diff --git a/docbook/relaxng/docbook/src/glossary.rnc b/docbook/relaxng/docbook/src/glossary.rnc
index da9ecaebc..2e90a8aaa 100644
--- a/docbook/relaxng/docbook/src/glossary.rnc
+++ b/docbook/relaxng/docbook/src/glossary.rnc
@@ -32,6 +32,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.glossary | db.glossdiv | db.glosslist
+
 db.publishing.inlines |= db.glossary.inlines
 db.list.blocks |= db.glosslist
 db.navigation.components |= db.glossary
diff --git a/docbook/relaxng/docbook/src/hier.rnc b/docbook/relaxng/docbook/src/hier.rnc
index 62e10c5e9..684434575 100644
--- a/docbook/relaxng/docbook/src/hier.rnc
+++ b/docbook/relaxng/docbook/src/hier.rnc
@@ -33,6 +33,8 @@ namespace db = "http://docbook.org/ns/docbook"
 namespace dbx = "http://sourceforge.net/projects/docbook/defguide/schema/extra-markup"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.partintro | db.simplesect
+
 db.status.attribute =
    [
       db:refpurpose [
diff --git a/docbook/relaxng/docbook/src/index.rnc b/docbook/relaxng/docbook/src/index.rnc
index 693ef93fb..63d2bc9a8 100644
--- a/docbook/relaxng/docbook/src/index.rnc
+++ b/docbook/relaxng/docbook/src/index.rnc
@@ -32,7 +32,7 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
-start |= db.setindex
+start |= db.setindex | db.index | db.indexdiv
 
 db.ubiq.inlines |= db.indexterm
 db.indexing.inlines |= db.indexterm
diff --git a/docbook/relaxng/docbook/src/math.rnc b/docbook/relaxng/docbook/src/math.rnc
index 79e8c0bc9..e79dd1fec 100644
--- a/docbook/relaxng/docbook/src/math.rnc
+++ b/docbook/relaxng/docbook/src/math.rnc
@@ -33,6 +33,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.equation | db.informalequation
+
 db.formal.blocks |= db.equation
 db.informal.blocks |= db.informalequation
 
diff --git a/docbook/relaxng/docbook/src/msgset.rnc b/docbook/relaxng/docbook/src/msgset.rnc
index 440bf9e88..7a3dd81d8 100644
--- a/docbook/relaxng/docbook/src/msgset.rnc
+++ b/docbook/relaxng/docbook/src/msgset.rnc
@@ -33,6 +33,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.msg | db.msgexplan | db.msgmain | db.msgrel | db.msgset | db.msgsub
+
 db.technical.blocks |= db.msgset
 
 # ======================================================================
diff --git a/docbook/relaxng/docbook/src/os.rnc b/docbook/relaxng/docbook/src/os.rnc
index 1d6e7e51c..f3a879d4d 100644
--- a/docbook/relaxng/docbook/src/os.rnc
+++ b/docbook/relaxng/docbook/src/os.rnc
@@ -34,6 +34,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
+start |= db.cmdsynopsis
+
 db.domain.inlines |= db.os.inlines
 
 db.synopsis.blocks |= db.cmdsynopsis
diff --git a/docbook/relaxng/docbook/src/pool.rnc b/docbook/relaxng/docbook/src/pool.rnc
index 3f4754976..a74e82249 100644
--- a/docbook/relaxng/docbook/src/pool.rnc
+++ b/docbook/relaxng/docbook/src/pool.rnc
@@ -39,6 +39,35 @@ default namespace = "http://docbook.org/ns/docbook"
 
 # ======================================================================
 
+# The start tokens are somewhat arbitrary. To resolve RFE #1899655, the
+# TC concluded that anything with an info element was a reasonable start
+# element. That's mostly what has been done, with a few extra elements
+# where the patterns seemed to warrant it. If you need more, just ask.
+
+start |= db.abstract
+ | db.mediaobject.content
+ | db.audiodata 
+ | db.imagedata
+ | db.textdata
+ | db.videodata
+ | db.caption
+ | db.publishing.blocks
+ | db.formal.blocks
+ | db.informal.blocks
+ | db.formalpara
+ | db.inlinemediaobject
+ | db.list.blocks
+ | db.legalnotice
+ | db.verbatim.blocks
+ | db.graphic.blocks
+ | db.personblurb
+ | db.revhistory
+ | db.simpara
+ | db.step
+ | db.stepalternatives
+
+# ======================================================================
+
 [
    db:refname [ "*:*" ]
    db:refpurpose [ "Any element from almost any namespace" ]
diff --git a/docbook/relaxng/docbook/src/programming.rnc b/docbook/relaxng/docbook/src/programming.rnc
index 1ae7f5657..793f128be 100644
--- a/docbook/relaxng/docbook/src/programming.rnc
+++ b/docbook/relaxng/docbook/src/programming.rnc
@@ -34,6 +34,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
+start |= db.synopsis.blocks | db.funcsynopsisinfo | db.classsynopsisinfo
+
 db.domain.inlines |= db.programming.inlines
 
 db.nopara.blocks |= db.synopsis.blocks
diff --git a/docbook/relaxng/docbook/src/qandaset.rnc b/docbook/relaxng/docbook/src/qandaset.rnc
index 089a449f9..f4d1351dd 100644
--- a/docbook/relaxng/docbook/src/qandaset.rnc
+++ b/docbook/relaxng/docbook/src/qandaset.rnc
@@ -33,6 +33,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.qandadiv | db.qandaentry | db.qandaset
+
 db.list.blocks |= db.qandaset
 
 # ======================================================================
diff --git a/docbook/relaxng/docbook/src/refentry.rnc b/docbook/relaxng/docbook/src/refentry.rnc
index f3549c0ff..13dc954c3 100644
--- a/docbook/relaxng/docbook/src/refentry.rnc
+++ b/docbook/relaxng/docbook/src/refentry.rnc
@@ -33,7 +33,7 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
-start |= db.refentry | db.refsection
+start |= db.refentry | db.refsection | db.refsynopsisdiv
 
 db.divisions |= db.reference
 
diff --git a/docbook/relaxng/docbook/src/tasks.rnc b/docbook/relaxng/docbook/src/tasks.rnc
index 3cd3d413f..633604edc 100644
--- a/docbook/relaxng/docbook/src/tasks.rnc
+++ b/docbook/relaxng/docbook/src/tasks.rnc
@@ -32,6 +32,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.task | db.taskprerequisites | db.taskrelated | db.tasksummary
+
 db.technical.blocks |= db.task
 
 db.task.info = db._info.title.req
diff --git a/docbook/relaxng/docbook/src/toc.rnc b/docbook/relaxng/docbook/src/toc.rnc
index ef8866fbc..6cf596d3f 100644
--- a/docbook/relaxng/docbook/src/toc.rnc
+++ b/docbook/relaxng/docbook/src/toc.rnc
@@ -32,6 +32,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
+start |= db.toc | db.tocdiv
+
 db.navigation.components |= db.toc
 db.toc.components |= db.toc