GNOME.org
 

[gnome-doc-utils/mallard] [mallard] Restructuring of block elements spec

commit 4b6650888efbaccc4fb7724baf8737c3fac8131b
Author: Shaun McCance <shaunm gnome org>
Date:   Wed May 6 11:05:54 2009 -0500

    [mallard] Restructuring of block elements spec
---
 doc/mallard/C/mal_block.xml                        |  110 +++++++++++++++-----
 doc/mallard/C/mal_block_cite.xml                   |    2 -
 doc/mallard/C/mal_block_code.xml                   |    1 -
 doc/mallard/C/mal_block_comment.xml                |    1 -
 doc/mallard/C/mal_block_desc.xml                   |    2 -
 ...mal_list_definition.xml => mal_block_dlist.xml} |   14 ++-
 doc/mallard/C/mal_block_example.xml                |    1 -
 doc/mallard/C/mal_block_figure.xml                 |    1 -
 doc/mallard/C/mal_block_listing.xml                |    1 -
 doc/mallard/C/mal_block_media.xml                  |    1 -
 doc/mallard/C/mal_block_note.xml                   |    1 -
 .../{mal_list_numbered.xml => mal_block_olist.xml} |   14 ++-
 doc/mallard/C/mal_block_p.xml                      |    1 -
 doc/mallard/C/mal_block_quote.xml                  |    1 -
 doc/mallard/C/mal_block_screen.xml                 |    1 -
 doc/mallard/C/mal_block_synopsis.xml               |    2 -
 .../C/{mal_list_bullet.xml => mal_block_ulist.xml} |   14 ++-
 doc/mallard/C/mal_list.xml                         |   29 -----
 doc/mallard/C/mal_subtitle.xml                     |    1 -
 doc/mallard/C/mal_table.xml                        |    1 -
 doc/mallard/C/mal_title.xml                        |    1 -
 21 files changed, 122 insertions(+), 78 deletions(-)

diff --git a/doc/mallard/C/mal_block.xml b/doc/mallard/C/mal_block.xml
index 1221ef8..e86f47a 100644
--- a/doc/mallard/C/mal_block.xml
+++ b/doc/mallard/C/mal_block.xml
@@ -21,17 +21,9 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_block = (
-  <link xref="mal_block_code">mal_block_code</link> |
-  <link xref="mal_block_comment">mal_block_comment</link> |
-  <link xref="mal_block_example">mal_block_example</link> |
-  <link xref="mal_block_figure">mal_block_figure</link> |
-  <link xref="mal_block_listing">mal_block_listing</link> |
-  <link xref="mal_block_media">mal_block_media</link> |
-  <link xref="mal_block_note">mal_block_note</link> |
-  <link xref="mal_block_p">mal_block_p</link> |
-  <link xref="mal_block_screen">mal_block_screen</link> |
-  <link xref="mal_block_synopsis">mal_block_synopsis</link> |
-  <link xref="mal_list">mal_list</link> |
+  <link xref="#basic">mal_block_basic</link> |
+  <link xref="#formal">mal_block_formal</link> |
+  <link xref="#lists">mal_block_list</link> |
   <link xref="mal_table">mal_table</link>
 )
 </code></synopsis>
@@ -42,28 +34,98 @@ mal_block = (
 </comment>
 
 
-<!-- BEGIN elements -->
-<section id="elements" style="2column">
+<!-- BEGIN basic -->
+<section id="basic" style="2column">
   <info>
-    <title type="link">Block Elements</title>
+    <title type="link">Basic Block Elements</title>
+    <link type="topic" xref="mal_block_code"/>
+    <link type="topic" xref="mal_block_example"/>
+    <link type="topic" xref="mal_block_media"/>
+    <link type="topic" xref="mal_block_p"/>
+    <link type="topic" xref="mal_block_screen"/>
   </info>
-  <title>Elements</title>
+  <title>Basic Elements</title>
+  <synopsis><code mime="application/relax-ng-compact-syntax">
+mal_block_basic = (
+  <link xref="mal_block_code">mal_block_code</link> |
+  <link xref="mal_block_example">mal_block_example</link> |
+  <link xref="mal_block_media">mal_block_media</link> |
+  <link xref="mal_block_p">mal_block_p</link> |
+  <link xref="mal_block_screen">mal_block_screen</link>
+)</code></synopsis>
 </section>
-<!-- END elements -->
+<!-- END basic -->
 
-<!-- BEGIN simple -->
-<section id="simple">
-  <title>Simple Block Elements</title>
 
+<!-- BEGIN formal -->
+<section id="formal" style="2column">
+  <title>Formal Elements</title>
+  <info>
+    <title type="link">Formal Block Elements</title>
+    <link type="topic" xref="mal_block_comment"/>
+    <link type="topic" xref="mal_block_figure"/>
+    <link type="topic" xref="mal_block_listing"/>
+    <link type="topic" xref="mal_block_note"/>
+    <link type="topic" xref="mal_block_quote"/>
+    <link type="topic" xref="mal_block_synopsis"/>
+  </info>
+  <synopsis><code mime="application/relax-ng-compact-syntax">
+mal_block_formal = (
+  <link xref="mal_block_comment">mal_block_comment</link> |
+  <link xref="mal_block_figure">mal_block_figure</link> |
+  <link xref="mal_block_listing">mal_block_listing</link> |
+  <link xref="mal_block_note">mal_block_note</link> |
+  <link xref="mal_block_quote">mal_block_quote</link> |
+  <link xref="mal_block_synopsis">mal_block_synopsis</link>
+)</code></synopsis>
 </section>
-<!-- END simple -->
+<!-- END formal -->
+
 
+<!-- BEGIN lists -->
+<section id="lists">
+  <title>List Elements</title>
+  <info>
+    <link type="topic" xref="mal_block_dlist"/>
+    <link type="topic" xref="mal_block_olist"/>
+    <link type="topic" xref="mal_block_ulist"/>
+  </info>
+  <synopsis><code mime="application/relax-ng-compact-syntax">
+mal_block_list = (
+  <link xref="mal_block_dlist">mal_block_dlist</link> |
+  <link xref="mal_block_olist">mal_block_olist</link> |
+  <link xref="mal_block_ulist">mal_block_ulist</link>
+)</code></synopsis>
+</section>
+<!-- END lists -->
 
-<!-- BEGIN containers -->
-<section id="containers">
-  <title>Block Container Elements</title>
 
+<!-- BEGIN tables -->
+<section id="tables">
+  <info>
+    <title type="link">Block Elements</title>
+    <link type="topic" xref="mal_table"/>
+  </info>
+  <title>Tables</title>
+  <comment>
+    <cite date="2009-05-06"><name>Shaun McCance</name></cite>
+    <p>Add a blurb that just links to mal_table</p>
+  </comment>
+</section>
+<!-- END tables -->
+
+
+<!-- BEGIN other -->
+<section id="other">
+  <title>Other Elements</title>
+  <info>
+    <title type="link">Other Block Elements</title>
+    <link type="topic" xref="mal_title"/>
+    <link type="topic" xref="mal_subtitle"/>
+    <link type="topic" xref="mal_block_desc"/>
+    <link type="topic" xref="mal_block_cite"/>
+  </info>
 </section>
-<!-- END containers -->
+<!-- END other -->
 
 </page>
diff --git a/doc/mallard/C/mal_block_cite.xml b/doc/mallard/C/mal_block_cite.xml
index 4ba1c01..2042e38 100644
--- a/doc/mallard/C/mal_block_cite.xml
+++ b/doc/mallard/C/mal_block_cite.xml
@@ -3,8 +3,6 @@
       id="mal_block_cite">
 
 <info>
-  <link type="guide" xref="mal_block#elements"/>
-
   <credit type="author">
     <name>Shaun McCance</name>
     <email>shaunm gnome org</email>
diff --git a/doc/mallard/C/mal_block_code.xml b/doc/mallard/C/mal_block_code.xml
index 99e0817..9ac8b0f 100644
--- a/doc/mallard/C/mal_block_code.xml
+++ b/doc/mallard/C/mal_block_code.xml
@@ -3,7 +3,6 @@
       id="mal_block_code">
 
 <info>
-  <link type="guide" xref="mal_block#elements"/>
   <link type="seealso" xref="mal_inline_code"/>
 
   <version number="0.1" date="2009-04-19" status="review"/>
diff --git a/doc/mallard/C/mal_block_comment.xml b/doc/mallard/C/mal_block_comment.xml
index a5f7699..14c362e 100644
--- a/doc/mallard/C/mal_block_comment.xml
+++ b/doc/mallard/C/mal_block_comment.xml
@@ -3,7 +3,6 @@
       id="mal_block_comment">
 
 <info>
-  <link type="guide" xref="mal_block#containers"/>
   <link type="seealso" xref="mal_block_cite"/>
 
   <credit type="author">
diff --git a/doc/mallard/C/mal_block_desc.xml b/doc/mallard/C/mal_block_desc.xml
index c825a50..dca52d9 100644
--- a/doc/mallard/C/mal_block_desc.xml
+++ b/doc/mallard/C/mal_block_desc.xml
@@ -3,8 +3,6 @@
       id="mal_block_desc">
 
 <info>
-  <link type="guide" xref="mal_block#elements"/>
-
   <version number="0.1" date="2009-04-19" status="incomplete"/>
 
   <credit type="author">
diff --git a/doc/mallard/C/mal_list_definition.xml b/doc/mallard/C/mal_block_dlist.xml
similarity index 64%
rename from doc/mallard/C/mal_list_definition.xml
rename to doc/mallard/C/mal_block_dlist.xml
index 8fb3b08..c7a44c1 100644
--- a/doc/mallard/C/mal_list_definition.xml
+++ b/doc/mallard/C/mal_block_dlist.xml
@@ -1,10 +1,20 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
       type="topic"
-      id="mal_list_definition">
+      id="mal_block_dlist">
 
 <info>
-  <link type="guide" xref="mal_list"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
+
+  <credit type="author">
+    <name>Shaun McCance</name>
+    <email>shaunm gnome org</email>
+  </credit>
+  <copyright>
+    <year>2008-2009</year>
+    <name>Shaun McCance</name>
+  </copyright>
+
+  <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"; />
 </info>
 
 <title>Definition Lists</title>
diff --git a/doc/mallard/C/mal_block_example.xml b/doc/mallard/C/mal_block_example.xml
index 5842f0a..6333fd6 100644
--- a/doc/mallard/C/mal_block_example.xml
+++ b/doc/mallard/C/mal_block_example.xml
@@ -3,7 +3,6 @@
       id="mal_block_example">
 
 <info>
-  <link type="guide" xref="mal_block#containers"/>
   <version number="0.1" date="2008-12-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_block_figure.xml b/doc/mallard/C/mal_block_figure.xml
index b61aca7..e981f9e 100644
--- a/doc/mallard/C/mal_block_figure.xml
+++ b/doc/mallard/C/mal_block_figure.xml
@@ -3,7 +3,6 @@
       id="mal_block_figure">
 
 <info>
-  <link type="guide" xref="mal_block#elements"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_block_listing.xml b/doc/mallard/C/mal_block_listing.xml
index 9ada0c7..3f665b1 100644
--- a/doc/mallard/C/mal_block_listing.xml
+++ b/doc/mallard/C/mal_block_listing.xml
@@ -3,7 +3,6 @@
       id="mal_block_listing">
 
 <info>
-  <link type="guide" xref="mal_block#elements"/>
   <version number="0.1" date="2009-05-02" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_block_media.xml b/doc/mallard/C/mal_block_media.xml
index c5fb407..2ca7498 100644
--- a/doc/mallard/C/mal_block_media.xml
+++ b/doc/mallard/C/mal_block_media.xml
@@ -3,7 +3,6 @@
       id="mal_block_media">
 
 <info>
-  <link type="guide" xref="mal_block#elements"/>
   <link type="seealso" xref="mal_inline_media"/>
 
   <version number="0.1" date="2009-05-03" status="review"/>
diff --git a/doc/mallard/C/mal_block_note.xml b/doc/mallard/C/mal_block_note.xml
index efd3d44..da77628 100644
--- a/doc/mallard/C/mal_block_note.xml
+++ b/doc/mallard/C/mal_block_note.xml
@@ -3,7 +3,6 @@
       id="mal_block_note">
 
 <info>
-  <link type="guide" xref="mal_block#containers"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_list_numbered.xml b/doc/mallard/C/mal_block_olist.xml
similarity index 64%
rename from doc/mallard/C/mal_list_numbered.xml
rename to doc/mallard/C/mal_block_olist.xml
index 52566b6..ac84f32 100644
--- a/doc/mallard/C/mal_list_numbered.xml
+++ b/doc/mallard/C/mal_block_olist.xml
@@ -1,10 +1,20 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
       type="topic"
-      id="mal_list_numbered">
+      id="mal_block_olist">
 
 <info>
-  <link type="guide" xref="mal_list"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
+
+  <credit type="author">
+    <name>Shaun McCance</name>
+    <email>shaunm gnome org</email>
+  </credit>
+  <copyright>
+    <year>2008-2009</year>
+    <name>Shaun McCance</name>
+  </copyright>
+
+  <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"; />
 </info>
 
 <title>Numbered Lists</title>
diff --git a/doc/mallard/C/mal_block_p.xml b/doc/mallard/C/mal_block_p.xml
index 35b3f4e..31d5d69 100644
--- a/doc/mallard/C/mal_block_p.xml
+++ b/doc/mallard/C/mal_block_p.xml
@@ -3,7 +3,6 @@
       id="mal_block_p">
 
 <info>
-  <link type="guide" xref="mal_block#simple"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_block_quote.xml b/doc/mallard/C/mal_block_quote.xml
index d3ddc2c..8020c00 100644
--- a/doc/mallard/C/mal_block_quote.xml
+++ b/doc/mallard/C/mal_block_quote.xml
@@ -2,7 +2,6 @@
       type="topic" id="mal_block_quote">
 
 <info>
-  <link type="guide" xref="mal_block#elements"/>
   <link type="seealso" xref="mal_inline_quote"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
diff --git a/doc/mallard/C/mal_block_screen.xml b/doc/mallard/C/mal_block_screen.xml
index 5fe65f1..d8c70fa 100644
--- a/doc/mallard/C/mal_block_screen.xml
+++ b/doc/mallard/C/mal_block_screen.xml
@@ -3,7 +3,6 @@
       id="mal_block_screen">
 
 <info>
-  <link type="guide" xref="mal_block#elements"/>
   <link type="seealso" xref="mal_block_code"/>
 
   <version number="0.1" date="2009-04-16" status="review"/>
diff --git a/doc/mallard/C/mal_block_synopsis.xml b/doc/mallard/C/mal_block_synopsis.xml
index 9e176eb..a9ae0dc 100644
--- a/doc/mallard/C/mal_block_synopsis.xml
+++ b/doc/mallard/C/mal_block_synopsis.xml
@@ -3,8 +3,6 @@
       id="mal_block_synopsis">
 
 <info>
-  <link type="guide" xref="mal_block#elements"/>
-
   <version number="0.1" date="2007-02-21" status="incomplete"/>
 
   <credit type="author">
diff --git a/doc/mallard/C/mal_list_bullet.xml b/doc/mallard/C/mal_block_ulist.xml
similarity index 63%
rename from doc/mallard/C/mal_list_bullet.xml
rename to doc/mallard/C/mal_block_ulist.xml
index b263e51..56b478e 100644
--- a/doc/mallard/C/mal_list_bullet.xml
+++ b/doc/mallard/C/mal_block_ulist.xml
@@ -1,10 +1,20 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
       type="topic"
-      id="mal_list_bullet">
+      id="mal_block_ulist">
 
 <info>
-  <link type="guide" xref="mal_list"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
+
+  <credit type="author">
+    <name>Shaun McCance</name>
+    <email>shaunm gnome org</email>
+  </credit>
+  <copyright>
+    <year>2008-2009</year>
+    <name>Shaun McCance</name>
+  </copyright>
+
+  <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"; />
 </info>
 
 <title>Bullet Lists</title>
diff --git a/doc/mallard/C/mal_list.xml b/doc/mallard/C/mal_list.xml
deleted file mode 100644
index 2191254..0000000
--- a/doc/mallard/C/mal_list.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<page xmlns="http://www.gnome.org/~shaunm/mallard";
-      type="guide"
-      id="mal_list">
-<info>
-  <link type="guide" xref="mal_block#containers"/>
-  <version number="0.1" date="2007-02-21" status="stub"/>
-</info>
-
-<title>Lists</title>
-
-<synopsis><code mime="application/relax-ng-compact-syntax">
-mal_list = (
-  <link xref="mal_list_bullet">mal_list_bullet</link>     |
-  <link xref="mal_list_numbered">mal_list_numbered</link>   |
-  <link xref="mal_list_definition">mal_list_definition</link> |
-  <link xref="mal_list_tree">mal_list_tree</link>       )
-</code></synopsis>
-
-<comment>
-  <cite date="2007-01-30"><name>Shaun McCance</name></cite>
-  <p>Add explanation, examples, processing expectations</p>
-</comment>
-
-<comment>
-  <cite date="2007-02-09"><name>Shaun McCance</name></cite>
-  <p>Unmarked lists and segmented lists</p>
-</comment>
-
-</page>
diff --git a/doc/mallard/C/mal_subtitle.xml b/doc/mallard/C/mal_subtitle.xml
index 6376ab3..12cef6e 100644
--- a/doc/mallard/C/mal_subtitle.xml
+++ b/doc/mallard/C/mal_subtitle.xml
@@ -3,7 +3,6 @@
       id="mal_subtitle">
 
 <info>
-  <link type="guide" xref="mal_block#simple"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_table.xml b/doc/mallard/C/mal_table.xml
index 0c106e5..0aa1a7c 100644
--- a/doc/mallard/C/mal_table.xml
+++ b/doc/mallard/C/mal_table.xml
@@ -3,7 +3,6 @@
       id="mal_table">
 
 <info>
-  <link type="guide" xref="mal_block#containers"/>
 </info>
 
 <title>Tables</title>
diff --git a/doc/mallard/C/mal_title.xml b/doc/mallard/C/mal_title.xml
index a5369a7..b11e797 100644
--- a/doc/mallard/C/mal_title.xml
+++ b/doc/mallard/C/mal_title.xml
@@ -3,7 +3,6 @@
       id="mal_title">
 
 <info>
-  <link type="guide" xref="mal_block#simple"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]