[gnome-doc-utils/mallard] [mallard] Consolidating info elements to use mal_info as guide

[Shaun McCance <shaunm src gnome org>]

commit cad073043dd9e084b1bf40db86a51f256b16c446
Author: Shaun McCance <shaunm gnome org>
Date:   Thu May 28 15:04:48 2009 -0500

    [mallard] Consolidating info elements to use mal_info as guide
---
 doc/mallard/C/mal_info.xml           |   22 +++++++++++-----
 doc/mallard/C/mal_info_copyright.xml |    2 +-
 doc/mallard/C/mal_info_credit.xml    |    3 +-
 doc/mallard/C/mal_info_desc.xml      |    4 ++-
 doc/mallard/C/mal_info_license.xml   |    3 +-
 doc/mallard/C/mal_info_link.xml      |    3 +-
 doc/mallard/C/mal_info_title.xml     |   47 ++++++++++++++++++++++++++++++++++
 doc/mallard/C/mal_info_version.xml   |    3 +-
 doc/mallard/C/spec_info.xml          |   27 -------------------
 9 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/doc/mallard/C/mal_info.xml b/doc/mallard/C/mal_info.xml
index 5164186..45f731f 100644
--- a/doc/mallard/C/mal_info.xml
+++ b/doc/mallard/C/mal_info.xml
@@ -1,8 +1,10 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
-      type="topic"
+      type="guide"
       id="mal_info">
 
 <info>
+  <link type="guide" xref="spec"/>
+
   <version number="0.1" date="2008-02-21" status="stub"/>
 </info>
 
@@ -10,16 +12,15 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_info = element info {
-  element title {
-    attribute type { text },
-    attribute role { text } ?,
-    <link xref="mal_inline">mal_inline</link>
-  } *
+  attribute * - (mal:* | local:*) { text } *,
+
+  element * - (mal:* | local:*) { mal_inline } *
 &amp; <link xref="mal_info_desc">mal_info_desc</link> ?
-&amp; <link xref="mal_info_link">mal_info_link</link> *
 &amp; <link xref="mal_info_credit">mal_info_credit</link> *
 &amp; <link xref="mal_info_copyright">mal_info_copyright</link> *
 &amp; <link xref="mal_info_license">mal_info_license</link> *
+&amp; <link xref="mal_info_link">mal_info_link</link> *
+&amp; <link xref="mal_info_title">mal_info_title</link> *
 &amp; <link xref="mal_info_version">mal_info_version</link> *
 }
 </code></synopsis>
@@ -41,4 +42,11 @@ link (guide/page/seealso)
 ? desc
 ? keyword
 -->
+
+<!-- BEGIN elements -->
+<section id="elements">
+  <title>Informational Elements</title>
+</section>
+<!-- END elements -->
+
 </page>
diff --git a/doc/mallard/C/mal_info_copyright.xml b/doc/mallard/C/mal_info_copyright.xml
index 03c1a7f..1dfaded 100644
--- a/doc/mallard/C/mal_info_copyright.xml
+++ b/doc/mallard/C/mal_info_copyright.xml
@@ -3,7 +3,7 @@
       id="mal_info_copyright">
 
 <info>
-  <link type="guide" xref="spec_info"/>
+  <link type="guide" xref="mal_info#elements"/>
 
   <credit type="author">
     <name>Shaun McCance</name>
diff --git a/doc/mallard/C/mal_info_credit.xml b/doc/mallard/C/mal_info_credit.xml
index bf90873..23a609d 100644
--- a/doc/mallard/C/mal_info_credit.xml
+++ b/doc/mallard/C/mal_info_credit.xml
@@ -3,7 +3,8 @@
       id="mal_info_credit">
 
 <info>
-  <link type="guide" xref="spec_info"/>
+  <link type="guide" xref="mal_info#elements"/>
+
   <version number="0.1" date="2007-02-22" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_info_desc.xml b/doc/mallard/C/mal_info_desc.xml
index 5eea233..84e39aa 100644
--- a/doc/mallard/C/mal_info_desc.xml
+++ b/doc/mallard/C/mal_info_desc.xml
@@ -3,9 +3,11 @@
       id="mal_info_desc">
 
 <info>
+  <link type="guide" xref="mal_info#elements"/>
+
   <version number="0.1" date="2007-02-23" status="stub"/>
+
   <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"; />
-  <link type="guide" xref="spec_info"/>
 </info>
 
 <title>FIXME</title>
diff --git a/doc/mallard/C/mal_info_license.xml b/doc/mallard/C/mal_info_license.xml
index aa7bef8..70ec589 100644
--- a/doc/mallard/C/mal_info_license.xml
+++ b/doc/mallard/C/mal_info_license.xml
@@ -3,7 +3,8 @@
       id="mal_info_license">
 
 <info>
-  <link type="guide" xref="spec_info"/>
+  <link type="guide" xref="mal_info#elements"/>
+
   <version number="0.1" date="2007-02-22" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_info_link.xml b/doc/mallard/C/mal_info_link.xml
index f06d376..f324811 100644
--- a/doc/mallard/C/mal_info_link.xml
+++ b/doc/mallard/C/mal_info_link.xml
@@ -3,7 +3,8 @@
       id="mal_info_link">
 
 <info>
-  <link type="guide" xref="mal_info"/>
+  <link type="guide" xref="mal_info#elements"/>
+
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_info_title.xml b/doc/mallard/C/mal_info_title.xml
new file mode 100644
index 0000000..f8b7cf3
--- /dev/null
+++ b/doc/mallard/C/mal_info_title.xml
@@ -0,0 +1,47 @@
+<page xmlns="http://www.gnome.org/~shaunm/mallard";
+      type="topic"
+      id="mal_info_title">
+
+<info>
+  <link type="guide" xref="mal_info#elements"/>
+
+  <version number="0.1" date="2009-05-28" status="stub"/>
+</info>
+
+<title>Tiltes</title>
+
+<synopsis><code mime="application/relax-ng-compact-syntax">
+mal_info_title = element title {
+  attribute type { xsd:NMTOKEN },
+  attribute role { xsd:NMTOKEN } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>
+}
+</code></synopsis>
+
+<!-- BEGIN notes -->
+<section id="notes">
+  <title>Notes</title>
+</section>
+<!-- END notes -->
+
+<!-- BEGIN primary -->
+<section id="primary">
+  <title>Primary Titles</title>
+</section>
+<!-- END primary -->
+
+<!-- BEGIN link -->
+<section id="link">
+  <title>Link Titles</title>
+</section>
+<!-- END link -->
+
+<!-- BEGIN sort -->
+<section id="sort">
+  <title>Sort Titles</title>
+</section>
+<!-- END sort -->
+
+</page>
diff --git a/doc/mallard/C/mal_info_version.xml b/doc/mallard/C/mal_info_version.xml
index bc2c497..691e6d4 100644
--- a/doc/mallard/C/mal_info_version.xml
+++ b/doc/mallard/C/mal_info_version.xml
@@ -3,7 +3,8 @@
       id="mal_info_version">
 
 <info>
-  <link type="guide" xref="spec_info"/>
+  <link type="guide" xref="mal_info#elements"/>
+
   <version number="0.1" date="2007-02-22" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/spec_info.xml b/doc/mallard/C/spec_info.xml
deleted file mode 100644
index 3904aad..0000000
--- a/doc/mallard/C/spec_info.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<page xmlns="http://www.gnome.org/~shaunm/mallard";
-      type="guide"
-      id="spec_info">
-
-<info>
-  <link type="guide" xref="spec" weight="-1"/>
-
-  <credit type="author">
-    <name>Shaun McCance</name>
-    <email>shaunm gnome org</email>
-  </credit>
-  <copyright>
-    <year>2008</year>
-    <name>Shaun McCance</name>
-  </copyright>
-
-  <version number="0.1" date="2007-02-22" status="stub"/>
-</info>
-
-<title>Information Elements</title>
-
-<comment>
-  <cite date="2008-02-22"><name>Shaun McCance</name></cite>
-  <p>Add</p>
-</comment>
-
-</page>