- Added db-section.rng

* rng/db-section.rng:
- Added db-section.rng

* rng/db-title.rng:
- Annotation changes

3 files changed, 203 insertions, 93 deletions

diff --git a/sandbox/mallard/ChangeLog b/sandbox/mallard/ChangeLog
index 34b60d0..5f01474 100644
--- a/sandbox/mallard/ChangeLog
+++ b/sandbox/mallard/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-18  Shaun McCance  <shaunm@gnome.org>
+
+	* rng/db-section.rng:
+	- Added db-section.rng
+
+	* rng/db-title.rng:
+	- Annotation changes
+
 2004-03-15  Shaun McCance  <shaunm@gnome.org>
 
 	* rng/db-admon.rng:
diff --git a/sandbox/mallard/rng/db-section.rng b/sandbox/mallard/rng/db-section.rng
new file mode 100644
index 0000000..1f1265c
--- /dev/null
+++ b/sandbox/mallard/rng/db-section.rng
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
+	 xmlns:ref="http://www.gnome.org/~shaunm/mallard/reference">
+
+<ref:title>Command Synopses</ref:title>
+
+
+<!-- === Dependancies === -->
+
+<div>
+  <ref:title>Dependancicies</ref:title>
+
+  <!-- == db-title.rng == -->
+  <include href="db-title.rng">
+    <define name="db-title.stub.attr-common">
+      <ref name="db-section.stub.attr-common"/>
+    </define>
+    <define name="db-title.stub.inline">
+      <ref name="db-section.stub.inline"/>
+    </define>
+  </include>
+</div>
+
+
+<!-- === Stub Content Models === -->
+
+<div>
+  <ref:title>Stub Content Models</ref:title>
+
+  <!-- == db-section.stub.attr-common == -->
+  <define name="db-section.stub.attr-common">
+    <ref:refname>db-section.stub.attr-common</ref:refname>
+    <ref:refpurpose>
+      A stub model for common attributes
+    </ref:refpurpose>
+    <notAllowed/>
+  </define>
+
+  <!-- == db-section.stub.block == -->
+  <define name="db-section.stub.block">
+    <ref:refname>db-section.stub.block</ref:refname>
+    <ref:refpurpose>
+      A stub model for block-level content
+    </ref:refpurpose>
+    <notAllowed/>
+  </define>
+
+  <!-- == db-section.stub.inline == -->
+  <define name="db-section.stub.inline">
+    <ref:refname>db-section.stub.inline</ref:refname>
+    <ref:refpurpose>
+      A stub model for inline content
+    </ref:refpurpose>
+    <notAllowed/>
+  </define>
+</div>
+
+
+<!-- === Element Definitions === -->
+
+<div>
+  <ref:title>Element Definitions</ref:title>
+
+  <!-- == section == -->
+  <define name="db-section.element.section">
+    <element name="section">
+      <ref:refname>section</ref:refname>
+      <ref:refpurpose>
+	A section of a document
+      </ref:refpurpose>
+
+      <ref name="db-section.stub.attr-common"/>
+      <ref name="db-section.stub.info"/>
+      <ref name="db-title.model.subtitle"/>
+      <choice>
+	<group>
+	  <ref name="db-section.stub.block"/>
+	  <zeroOrMore>
+	    <ref name="db-section.element.section"/>
+	  </zeroOrMore>
+	</group>
+	<group>
+	  <oneOrMore>
+	    <ref name="db-section.element.section"/>
+	  </oneOrMore>
+	</group>
+      </choice>
+    </element>
+  </define>
+</div>
+
+</grammar>
diff --git a/sandbox/mallard/rng/db-title.rng b/sandbox/mallard/rng/db-title.rng
index 91acecf..5a45c54 100644
--- a/sandbox/mallard/rng/db-title.rng
+++ b/sandbox/mallard/rng/db-title.rng
@@ -1,109 +1,118 @@
 <?xml version='1.0' encoding='utf-8'?>
+
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
 	 xmlns:ref="http://www.gnome.org/~shaunm/mallard/reference">
 
-  <ref:title>Titles</ref:title>
-
-  <!-- Stub Content Models -->
-
-  <div ref:role="stub">
-    <ref:title>Stub Content Models</ref:title>
-
-    <define name="db-title.stub.attr-common">
-      <ref:refname>db-title.stub.attr-common</ref:refname>
+<ref:title>Titles</ref:title>
+
+
+<!-- === Stub Content Models === -->
+
+<div>
+  <ref:title>Stub Content Models</ref:title>
+
+  <!-- == db-title.stub.attr-common == -->
+  <define name="db-title.stub.attr-common">
+    <ref:refname>db-title.stub.attr-common</ref:refname>
+    <ref:refpurpose>
+      A stub model for common attributes
+    </ref:refpurpose>
+    <notAllowed/>
+  </define>
+
+  <!-- == db-title.stub.inline == -->
+  <define name="db-title.stub.inline">
+    <ref:refname>db-title.stub.inline</ref:refname>
+    <ref:refpurpose>
+      A stub model for inline content
+    </ref:refpurpose>
+    <notAllowed/>
+  </define>
+</div>
+
+
+<!-- === Content Model Implementations === -->
+
+<div>
+  <ref:title>Content Model Implementations</ref:title>
+
+  <!-- == db-title.model.title == -->
+  <define name="db-title.model.title">
+    <ref:refname>db-title.model.title</ref:refname>
+    <ref:refpurpose>
+      A model allowing <ref:xmltag>title</ref:xmltag> and
+      <ref:xmltag>titleabbrev</ref:xmltag>
+    </ref:refpurpose>
+
+    <ref name="db-title.element.title"/>
+    <optional>
+      <ref name="db-title.element.titleabbrev"/>
+    </optional>
+  </define>
+
+  <!-- == db-title.model.subtitle == -->
+  <define name="db-title.model.subtitle">
+    <ref:refname>db-title.model.subtitle</ref:refname>
+    <ref:refpurpose>
+      A model allowing <ref:xmltag>title</ref:xmltag>,
+      <ref:xmltag>titleabbrev</ref:xmltag>, and
+      <ref:xmltag>subtitle</ref:xmltag>
+    </ref:refpurpose>
+
+    <ref name="db-title.element.title"/>
+    <optional>
+      <ref name="db-title.element.titleabbrev"/>
+    </optional>
+    <optional>
+      <ref name="db-title.element.subtitle"/>
+    </optional>
+  </define>
+</div>
+
+
+<!-- === Element Definitions === -->
+
+<div>
+  <ref:title>Element Definitions</ref:title>
+
+  <!-- == db-title.element.subtitle == -->
+  <define name="db-title.element.subtitle">
+    <element name="subtitle">
+      <ref:refname>subtitle</ref:refname>
       <ref:refpurpose>
-	A stub model for common attributes.
+	The subtitle of a document or section
       </ref:refpurpose>
-      <notAllowed/>
-    </define>
 
-    <define name="db-title.stub.inline">
-      <ref:refname>db-title.stub.inline</ref:refname>
-      <ref:refpurpose>
-	A stub model for inline content.
-      </ref:refpurpose>
-      <notAllowed/>
-    </define>
-  </div>
-
-  <!-- Content Model Implementations -->
+      <ref name="db-title.stub.attr-common"/>
+      <ref name="db-title.stub.inline"/>
+    </element>
+  </define>
 
-  <div ref:role="model">
-    <ref:title>Content Model Implementations</ref:title>
-
-    <define name="db-title.model.title">
-      <ref:refname>db-title.model.title</ref:refname>
+  <!-- == db-title.element.title == -->
+  <define name="db-title.element.title">
+    <element name="title">
+      <ref:refname>title</ref:refname>
       <ref:refpurpose>
-	A model allowing <ref:xmltag>title</ref:xmltag> and
-	<ref:xmltag>titleabbrev</ref:xmltag>, which can be used
-	to implement the stub title model for many modules.
+	The title of a document or section
       </ref:refpurpose>
 
-      <ref name="db-title.element.title"/>
-      <optional>
-	<ref name="db-title.element.titleabbrev"/>
-      </optional>
-    </define>
+      <ref name="db-title.stub.attr-common"/>
+      <ref name="db-title.stub.inline"/>
+    </element>
+  </define>
 
-    <define name="db-title.model.subtitle">
-      <ref:refname>db-title.model.subtitle</ref:refname>
+  <!-- == db-title.element.titleabbrev == -->
+  <define name="db-title.element.titleabbrev">
+    <element name="titleabbrev">
+      <ref:refname>titleabbrev</ref:refname>
       <ref:refpurpose>
-	A model allowing <ref:xmltag>title</ref:xmltag>,
-	<ref:xmltag>titleabbrev</ref:xmltag>, and
-	<ref:xmltag>subtitle</ref:xmltag>, which can be used
-	to implement the stub title model for many modules.
+	An abbreviated form of the title
       </ref:refpurpose>
 
-      <ref name="db-title.element.title"/>
-      <optional>
-	<ref name="db-title.element.titleabbrev"/>
-      </optional>
-      <optional>
-	<ref name="db-title.element.subtitle"/>
-      </optional>
-    </define>
-  </div>
-
-  <!-- Element Definitions -->
-
-  <div ref:role="element">
-    <ref:title>Element Definitions</ref:title>
-
-    <define name="db-title.element.subtitle">
-      <element name="subtitle">
-	<ref:refname>subtitle</ref:refname>
-	<ref:refpurpose>
-	  The subtitle of a document or section.
-	</ref:refpurpose>
-
-	<ref name="db-title.stub.attr-common"/>
-	<ref name="db-title.stub.inline"/>
-      </element>
-    </define>
-
-    <define name="db-title.element.title">
-      <element name="title">
-	<ref:refname>title</ref:refname>
-	<ref:refpurpose>
-	  The title of a document or section.
-	</ref:refpurpose>
-
-	<ref name="db-title.stub.attr-common"/>
-	<ref name="db-title.stub.inline"/>
-      </element>
-    </define>
-
-    <define name="db-title.element.titleabbrev">
-      <element name="titleabbrev">
-	<ref:refname>titleabbrev</ref:refname>
-	<ref:refpurpose>
-	  The abbreviation of a title.
-	</ref:refpurpose>
-
-	<ref name="db-title.stub.attr-common"/>
-	<ref name="db-title.stub.inline"/>
-      </element>
-    </define>
-
-  </div>
+      <ref name="db-title.stub.attr-common"/>
+      <ref name="db-title.stub.inline"/>
+    </element>
+  </define>
+</div>
+
 </grammar>