From: Norman Walsh Date: Wed, 26 May 2004 17:57:06 +0000 (+0000) Subject: Changed version name X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e28817e63f6d38f78f45f92aef2edd620b26c630;p=docbook-dsssl Changed version name --- diff --git a/docbook/relaxng/src/bibliography.rnc b/docbook/relaxng/src/bibliography.rnc index f65ec3f84..6d06984f7 100644 --- a/docbook/relaxng/src/bibliography.rnc +++ b/docbook/relaxng/src/bibliography.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/callouts.rnc b/docbook/relaxng/src/callouts.rnc index ffcf4146b..cd8ad0311 100644 --- a/docbook/relaxng/src/callouts.rnc +++ b/docbook/relaxng/src/callouts.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/calstbl.rnc b/docbook/relaxng/src/calstbl.rnc index c417721f0..6ccc7c2cf 100644 --- a/docbook/relaxng/src/calstbl.rnc +++ b/docbook/relaxng/src/calstbl.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/docbook-dtd.rnc b/docbook/relaxng/src/docbook-dtd.rnc index dc9a0ccd8..5d38b3bb5 100644 --- a/docbook/relaxng/src/docbook-dtd.rnc +++ b/docbook/relaxng/src/docbook-dtd.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/ebnf.rnc b/docbook/relaxng/src/ebnf.rnc index 98a904f49..8cd4ebb1f 100644 --- a/docbook/relaxng/src/ebnf.rnc +++ b/docbook/relaxng/src/ebnf.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/glossary.rnc b/docbook/relaxng/src/glossary.rnc index e3232115e..51770a038 100644 --- a/docbook/relaxng/src/glossary.rnc +++ b/docbook/relaxng/src/glossary.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/hier.rnc b/docbook/relaxng/src/hier.rnc index a89d95f17..c889f0c4b 100644 --- a/docbook/relaxng/src/hier.rnc +++ b/docbook/relaxng/src/hier.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. @@ -21,12 +21,22 @@ db.label.attribute = attribute label { text } # ====================================================================== -db.optional.sections = db.section* | db.simplesect* +db.toplevel.optional.sections = db.section* | db.simplesect* -db.required.sections = db.section+ | db.simplesect+ +db.toplevel.required.sections = db.section+ | db.simplesect+ -db.blocks.or.sections = - (db.all.blocks+, db.optional.sections) | db.required.sections +db.toplevel.blocks.or.sections = + (db.all.blocks+, db.toplevel.optional.sections) | db.toplevel.required.sections + +db.recursive.optional.sections = db.section* | db.simplesect* + +db.recursive.required.sections = db.section+ | db.simplesect+ + +db.recursive.blocks.or.sections = + (db.all.blocks+, db.recursive.optional.sections) | db.recursive.required.sections + +db.optional.refentry = notAllowed +db.required.refentry = notAllowed # ====================================================================== @@ -43,7 +53,7 @@ db.components = db.navigation.components = notAllowed db.component.contentmodel = - db.navigation.components*, db.blocks.or.sections, db.navigation.components* + db.navigation.components*, db.toplevel.blocks.or.sections, db.navigation.components* # ====================================================================== @@ -314,7 +324,7 @@ div { element partintro { db.partintro.attlist, db.partintro.info, - db.blocks.or.sections + db.toplevel.blocks.or.sections } } @@ -343,7 +353,7 @@ div { element section { db.section.attlist, db.section.info, - db.blocks.or.sections + db.recursive.blocks.or.sections } } diff --git a/docbook/relaxng/src/htmlform.rnc b/docbook/relaxng/src/htmlform.rnc index 9489df706..dc439d640 100644 --- a/docbook/relaxng/src/htmlform.rnc +++ b/docbook/relaxng/src/htmlform.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/htmltbl.rnc b/docbook/relaxng/src/htmltbl.rnc index ca815292d..8e1c001ac 100644 --- a/docbook/relaxng/src/htmltbl.rnc +++ b/docbook/relaxng/src/htmltbl.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/index.rnc b/docbook/relaxng/src/index.rnc index 8c2f2ba42..c00abd43e 100644 --- a/docbook/relaxng/src/index.rnc +++ b/docbook/relaxng/src/index.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/mathml.rnc b/docbook/relaxng/src/mathml.rnc index 07a1876f7..8776b4dc4 100644 --- a/docbook/relaxng/src/mathml.rnc +++ b/docbook/relaxng/src/mathml.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/msgset.rnc b/docbook/relaxng/src/msgset.rnc index f13819cc1..2614fb028 100644 --- a/docbook/relaxng/src/msgset.rnc +++ b/docbook/relaxng/src/msgset.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/pool.rnc b/docbook/relaxng/src/pool.rnc index e5e468f17..e30bc6866 100644 --- a/docbook/relaxng/src/pool.rnc +++ b/docbook/relaxng/src/pool.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/qandaset.rnc b/docbook/relaxng/src/qandaset.rnc index bdc8db465..b26807433 100644 --- a/docbook/relaxng/src/qandaset.rnc +++ b/docbook/relaxng/src/qandaset.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/refentry.rnc b/docbook/relaxng/src/refentry.rnc index 77a9aae4c..cd10eea3b 100644 --- a/docbook/relaxng/src/refentry.rnc +++ b/docbook/relaxng/src/refentry.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. @@ -25,6 +25,18 @@ db.part.components |= db.refentry | db.reference db.article.optional.components |= db.refentry* db.article.required.components |= db.refentry+ +db.toplevel.optional.sections |= db.refentry* +db.toplevel.required.sections |= db.refentry+ + +db.recursive.optional.sections |= db.refentry* +db.recursive.required.sections |= db.refentry+ + +db.optional.refentry |= db.refentry* +db.required.refentry |= db.refentry+ + +db.refsect1 = notAllowed +db.refsect2 = notAllowed + # ====================================================================== [ @@ -55,15 +67,6 @@ div { # ====================================================================== -db.optional.refsections = db.refsection* | db.simplesect* - -db.required.refsections = db.refsection+ | db.simplesect* - -db.blocks.or.refsections = - (db.all.blocks+, db.optional.refsections) | db.required.refsections - -# ====================================================================== - [ db:refname [ "refentry" ] db:refpurpose [ "" ] @@ -89,7 +92,7 @@ div { db.refmeta?, db.refnamediv+, db.refsynopsisdiv?, - db.refsection+ + (db.refsection+|db.refsect1+) } } @@ -276,7 +279,8 @@ div { element refsynopsisdiv { db.refsynopsisdiv.attlist, db.refsynopsisdiv.info, - db.blocks.or.refsections + ((db.all.blocks+, (db.refsection* | db.refsect2*)) + | (db.refsection+ | db.refsect2+)) } } @@ -303,6 +307,7 @@ div { element refsection { db.refsection.attlist, db.refsection.info, - db.blocks.or.refsections + ((db.all.blocks+, db.refsection*) + | db.refsection+) } } diff --git a/docbook/relaxng/src/sdocbook.rnc b/docbook/relaxng/src/sdocbook.rnc index 946cad5fd..a9b0314e1 100644 --- a/docbook/relaxng/src/sdocbook.rnc +++ b/docbook/relaxng/src/sdocbook.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a reinterpretation of "Simplified DocBook" in the NG framework. # diff --git a/docbook/relaxng/src/slides-ng.rnc b/docbook/relaxng/src/slides-ng.rnc index d6fb67353..be9b8dec6 100644 --- a/docbook/relaxng/src/slides-ng.rnc +++ b/docbook/relaxng/src/slides-ng.rnc @@ -1,4 +1,4 @@ -# This file is part of Slides NG +# This file is part of Slides NG: The "Cachaça" Release. # This schema is a reinterpretation of "Slides" in the NG framework. # diff --git a/docbook/relaxng/src/svg.rnc b/docbook/relaxng/src/svg.rnc index 4c67ef906..eb95fc294 100644 --- a/docbook/relaxng/src/svg.rnc +++ b/docbook/relaxng/src/svg.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/tasks.rnc b/docbook/relaxng/src/tasks.rnc index a492513ea..89f673b8d 100644 --- a/docbook/relaxng/src/tasks.rnc +++ b/docbook/relaxng/src/tasks.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/toc.rnc b/docbook/relaxng/src/toc.rnc index ee3cc1f1a..d7eb0f155 100644 --- a/docbook/relaxng/src/toc.rnc +++ b/docbook/relaxng/src/toc.rnc @@ -1,4 +1,4 @@ -# This file is part of DocBook NG: The "Bourbon" Release. +# This file is part of DocBook NG: The "Cachaça" Release. # This schema is a "work-in-progress". It validates a DocBook-like grammar that # may, in some incarnation, form the basis for DocBook V.next. Or it may not. diff --git a/docbook/relaxng/src/website-ng.rnc b/docbook/relaxng/src/website-ng.rnc index e071a7b6a..4cf410cb7 100644 --- a/docbook/relaxng/src/website-ng.rnc +++ b/docbook/relaxng/src/website-ng.rnc @@ -1,4 +1,4 @@ -# This file is part of Website NG +# This file is part of Website NG: The "Cachaça" Release. # This schema is a reinterpretation of "Website" in the NG framework. # diff --git a/docbook/relaxng/src/ws-rddl.rnc b/docbook/relaxng/src/ws-rddl.rnc index e722b55ef..cb753dcfe 100644 --- a/docbook/relaxng/src/ws-rddl.rnc +++ b/docbook/relaxng/src/ws-rddl.rnc @@ -1,4 +1,4 @@ -# This file is part of Website NG +# This file is part of Website NG: The "Cachaça" Release. # This schema is a reinterpretation of "Website" in the NG framework. # diff --git a/docbook/relaxng/tools/augment.xsl b/docbook/relaxng/tools/augment.xsl index c51a96a33..4722a6bb3 100644 --- a/docbook/relaxng/tools/augment.xsl +++ b/docbook/relaxng/tools/augment.xsl @@ -47,7 +47,7 @@ - DocBook NG: The "Bourbon" Release + DocBook NG: The "Cachaça" Release See http://docbook.org/docbook-ng/ diff --git a/docbook/relaxng/tools/html.xsl b/docbook/relaxng/tools/html.xsl index aed990948..7d4116c5c 100644 --- a/docbook/relaxng/tools/html.xsl +++ b/docbook/relaxng/tools/html.xsl @@ -15,7 +15,7 @@ - +