Changed version name

diff --git a/docbook/relaxng/src/bibliography.rnc b/docbook/relaxng/src/bibliography.rnc
index f65ec3f8461bca02a5cc4475cbd77170e6ecbcad..6d06984f70c80bfaf394efe42e395a44d254b6d9 100644 (file)
--- 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 ffcf4146b32768c848684bb3237e3354cce9c98b..cd8ad0311778523d4f0262f811977c01a026c9b8 100644 (file)
--- 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 c417721f09f1a429c744d2a80918cb608a92420b..6ccc7c2cf7092973fc155830078f2c03c6aca4a4 100644 (file)
--- 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 dc9a0ccd8e3354b852c62fe561e8a003df0a7c17..5d38b3bb5ebcf56da93ae42af25e19f67579c723 100644 (file)
--- 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 98a904f4990d6cb4a43cd79ac70330a5e28ed6c8..8cd4ebb1f4ef8146267be4050d2d89144d82614b 100644 (file)
--- 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 e3232115e4b794cb9468cea538219f504f6109fa..51770a038ac4fae52e856913bc47f16c4287e78f 100644 (file)
--- 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 a89d95f174852309ebd251cbc133c943319eefd6..c889f0c4bf9ccd596ead86be9849f9135bcbb291 100644 (file)
--- 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 9489df7068e5ab75600d70dcd38c7de005a2d676..dc439d640205dca380135d0f3eb2db0fd7a18a7b 100644 (file)
--- 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 ca815292d5cf1584521f35ff4e0724a0fd46d778..8e1c001ac471c3dd984b6616094c503424da1b5f 100644 (file)
--- 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 8c2f2ba42ba3ae5ed00a8427e21e86baff35c255..c00abd43e74db53f6010488df6e2931b638dbcd1 100644 (file)
--- 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 07a1876f7d981872ed338f60811e6d6d7a721c3a..8776b4dc425bbeb66316b4dc47391cfc0a528553 100644 (file)
--- 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 f13819cc189a195ff95abbe2d7ec8bf6f7af7347..2614fb02866b397ff3d764f1cbe1deb6d41da389 100644 (file)
--- 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 e5e468f1789009d7547d084ed64f748c1aadd7a0..e30bc686677bf6eb1690db0b5d360e04c56d2cd9 100644 (file)
--- 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 bdc8db465fd9d7c12c7742329cced04e6f7fc736..b268074335617d10f23cfd9bcb50da283c67c832 100644 (file)
--- 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 77a9aae4c7986a4e04d0193d06ff600ce0b8b881..cd10eea3bc7c29988f935e17c750aa1b528b0b17 100644 (file)
--- 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 946cad5fdac7f5a75720e8648ee3effe2cba72fb..a9b0314e1dbcf3f98805c8fc99dbdae69a8ecb91 100644 (file)
--- 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 d6fb67353615474f61a6fa718be4d35bf4eeee0a..be9b8dec6ba95e6c0d7295ac964749befd97e3d6 100644 (file)
--- 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 4c67ef906c55ec170119c21f0a447fcc66a9a6d7..eb95fc294cebdc2fd2f8ee93d43d186ca4d6cc5b 100644 (file)
--- 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 a492513eaaab5b67873c8bcb63b538843d7e21b3..89f673b8dac678daf07a23133bf04a48bd309bb6 100644 (file)
--- 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 ee3cc1f1a870116248ca2cbb008c653743513bf7..d7eb0f155df19ed39a8dc9d55682d004b8be3503 100644 (file)
--- 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 e071a7b6a6521b61e2ac48256a71f4ce3ae4aa08..4cf410cb782ba84e50d6dc7840af623ff8cbb1c2 100644 (file)
--- 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 e722b55ef8801a4c70f809290554d01184c65f84..cb753dcfef1a36e5be0004bff64de409a272fc8a 100644 (file)
--- 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 c51a96a338a11506823d5223549669ea44056478..4722a6bb33ba458eaaee23f595a4722eea2cace6 100644 (file)
--- a/docbook/relaxng/tools/augment.xsl
+++ b/docbook/relaxng/tools/augment.xsl
@@ -47,7 +47,7 @@
 
       <xsl:text>&#10;</xsl:text>
       <xsl:text>&#10;</xsl:text>
-      <xsl:comment> DocBook NG: The "Bourbon" Release </xsl:comment>
+      <xsl:comment> DocBook NG: The "Cachaça" Release </xsl:comment>
       <xsl:text>&#10;</xsl:text>
       <xsl:comment> See http://docbook.org/docbook-ng/ </xsl:comment>
       <xsl:text>&#10;</xsl:text>

diff --git a/docbook/relaxng/tools/html.xsl b/docbook/relaxng/tools/html.xsl
index aed990948dc8335fc734d0ddfec53d331e65af84..7d4116c5cc787a460395f2379d0de4384b0a9b71 100644 (file)
--- a/docbook/relaxng/tools/html.xsl
+++ b/docbook/relaxng/tools/html.xsl
@@ -15,7 +15,7 @@
   <xsl:param name="title" select="'anonymous'"/>
   <xsl:param name="base.dir" select="'html/'"/>
   <xsl:param name="stylesheet" select="'html.css'"/>
-  <xsl:param name="ng-release" select="'Bourbon'"/>
+  <xsl:param name="ng-release" select="'Cachaça'"/>
 
   <xsl:output method="html"/>