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 e9f55b308b526d23136c3bf0b1e05a2914ff0b02..ad91bd0721fdf6f2ce0a8dc59250723e4d256a55 100644 (file)
--- 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 04264e276b0d8be295333e34dd84e4cc4771ca4b..cdda96c34ada2d9ee4037d005ecd9f8e85db1b3c 100644 (file)
--- 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 fa066ed6683c17c40a0a64362fb7b372b7ad4bf1..6a31eb70237a69dee4210ca9eebe7d87bae2a681 100644 (file)
--- 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 880e31cc0719b13306688a8e4ae554b8f2373de7..d7290371bf7a4272bda0f33b0b21e0fd446af8dd 100644 (file)
--- 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 6f7de8d3ad263703646682350c58b5549d16cd2e..9e3c633ae1601bd8bf560b1cd1aa71ee4152814b 100644 (file)
--- 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 da9ecaebc157ce1212ce3f4e1188c97e504ffdf1..2e90a8aaa3f190b6c98be737bce7de8f5f5edf66 100644 (file)
--- 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 62e10c5e9e6db37be591e8f3dde6bdffc005b17b..6844345754e14ae4ac29ed5f3f835a71e01b55ea 100644 (file)
--- 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 693ef93fb0cc8871620e489f986953b52153fddf..63d2bc9a89ae8bc6d7dfba85288d725c6bff3212 100644 (file)
--- 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 79e8c0bc901dff09e4e728fdd1be66a9f617d1b8..e79dd1feca5ebaa4892e859e3365c6e45bf7015d 100644 (file)
--- 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 440bf9e886130ff7de97f1974a858ea2c18835db..7a3dd81d846ee33e477cae3fbd873ffd08fae063 100644 (file)
--- 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 1d6e7e51cd513c034fe08070a0d8ca451cac09f3..f3a879d4d16dc8df8ed4e860cb245000fd65d87a 100644 (file)
--- 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 3f475497643a1396f55967c274303205015f3dc5..a74e82249bedb6695d872a2b96080a421fa29622 100644 (file)
--- 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 1ae7f565780c1cb2f91f9addeac4804177fb06fa..793f128be33a046c1d460f03a4f911e444fe649d 100644 (file)
--- 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 089a449f9e630a777fec2a51ce0126df3c226f9d..f4d1351dda5d3d64061a08224f1ce3170c702604 100644 (file)
--- 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 f3549c0ff0ece165144711f38620f2af958989c0..13dc954c38386488e3aa67121862d8ae1e4a1936 100644 (file)
--- 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 3cd3d413f2592414b622a10fb028c7621c6117ac..633604edc720fcf10e87ba7aaf853a9c3c4d617a 100644 (file)
--- 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 ef8866fbcd572ab8272c10c4f0a33344e4f10009..6cf596d3fefb5c256d01c406b11182fecbf35791 100644 (file)
--- 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