[mallard] Fixing content models for list types

5 files changed, 191 insertions, 20 deletions

diff --git a/doc/mallard/C/mal_block.xml b/doc/mallard/C/mal_block.xml
index ab23075..927e098 100644
--- a/doc/mallard/C/mal_block.xml
+++ b/doc/mallard/C/mal_block.xml
@@ -110,6 +110,7 @@ mal_block_formal = (
     <link type="topic" xref="mal_block_dlist"/>
     <link type="topic" xref="mal_block_olist"/>
     <link type="topic" xref="mal_block_ulist"/>
+    <link type="topic" xref="mal_block_tree"/>
   </info>
   <title>List Elements</title>
   <synopsis><code mime="application/relax-ng-compact-syntax">
diff --git a/doc/mallard/C/mal_block_dlist.xml b/doc/mallard/C/mal_block_dlist.xml
index 59f13f5..f003cee 100644
--- a/doc/mallard/C/mal_block_dlist.xml
+++ b/doc/mallard/C/mal_block_dlist.xml
@@ -20,15 +20,73 @@
 <title>Definition Lists</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_list_definition = element list {
-  attribute type { "definition" },
-  attribute style { text } ?,
+mal_block_dlist = element dlist {
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_block_title">mal_block_title</link> ?,
+
   element item {
+    attribute style { xsd:NMTOKENS } ?,
+    attribute * - (mal:* | local:*) { text } *,
+
     <link xref="mal_block_title">mal_block_title</link> +,
-    <link xref="mal_block">mal_block</link> +,
-    <link xref="mal_list">mal_list</link> ?
+    <link xref="mal_block">mal_block</link> +
   } +
 }
 </code></synopsis>
 
+<comment>
+<cite date="2009-05-20">shaunm</cite>
+<p>add intro text</p>
+</comment>
+
+<!-- BEGIN notes -->
+<section id="notes">
+  <title>Notes</title>
+  <ulist>
+    <item><p>The <code>dlist</code> element can contain an optional
+    <code xref="mal_block_title">title</code> element followed by one or more
+    <code>item</code> elements.  Each child <code>item</code> element contains
+    one or more <code xref="mal_block_title">title</code> elements followed by
+    any <link xref="mal_inline">general inline elements</link>.</p></item>
+
+    <item><p>The <code>dlist</code> element can occur in any
+    general block context, including inside
+    <link xref="mal_page">pages</link>, <link xref="mal_section">sections</link>,
+    and certain <link xref="mal_block">block elements</link>.</p></item>
+
+    <item><p>The <code>style</code> attribute takes a space-separated list of
+    style hints.  Processing tools should adjust their behavior according to
+    those style hints they understand.</p></item>
+
+    <item><p>The <code>dlist</code> element can have attributes from external
+    namespaces.  See <link xref="mal_external"/> for more information
+    on external-namespace attributes.</p></item>
+  </ulist>
+</section>
+<!-- END notes -->
+
+
+<!-- BEGIN examples -->
+<section id="examples">
+  <title>Examples</title>
+</section>
+<!-- END examples -->
+
+
+<!-- BEGIN processing -->
+<section id="processing">
+  <title>Processing Expectations</title>
+
+</section>
+<!-- END processing -->
+
+
+<!-- BEGIN comparison -->
+<section id="comparison">
+  <title>Comparison to Other Formats</title>
+</section>
+<!-- END comparison -->
+
 </page>
diff --git a/doc/mallard/C/mal_block_olist.xml b/doc/mallard/C/mal_block_olist.xml
index 9c2dc62..c53ef8d 100644
--- a/doc/mallard/C/mal_block_olist.xml
+++ b/doc/mallard/C/mal_block_olist.xml
@@ -20,15 +20,71 @@
 <title>Numbered Lists</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_list_numbered = element list {
-  attribute type { "numbered" },
-  attribute style { text } ?,
+mal_block_olist = element olist {
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
   <link xref="mal_block_title">mal_block_title</link> ?,
+
   element item {
-    <link xref="mal_block">mal_block</link> +,
-    <link xref="mal_list">mal_list</link> ?
-  } +,
+    attribute style { xsd:NMTOKENS } ?,
+    attribute * - (mal:* | local:*) { text } *,
+
+    <link xref="mal_block">mal_block</link> +
+  } +
 }
 </code></synopsis>
 
+<comment>
+<cite date="2009-05-20">shaunm</cite>
+<p>add intro text</p>
+</comment>
+
+<!-- BEGIN notes -->
+<section id="notes">
+  <title>Notes</title>
+  <ulist>
+    <item><p>The <code>olist</code> element can contain an optional
+    <code xref="mal_block_title">title</code> element followed by one or more
+    <code>item</code> elements.  Each child <code>item</code> element contains
+    any <link xref="mal_inline">general inline elements</link>.</p></item>
+
+    <item><p>The <code>olist</code> element can occur in any
+    general block context, including inside
+    <link xref="mal_page">pages</link>, <link xref="mal_section">sections</link>,
+    and certain <link xref="mal_block">block elements</link>.</p></item>
+
+    <item><p>The <code>style</code> attribute takes a space-separated list of
+    style hints.  Processing tools should adjust their behavior according to
+    those style hints they understand.</p></item>
+
+    <item><p>The <code>olist</code> element can have attributes from external
+    namespaces.  See <link xref="mal_external"/> for more information
+    on external-namespace attributes.</p></item>
+  </ulist>
+</section>
+<!-- END notes -->
+
+
+<!-- BEGIN examples -->
+<section id="examples">
+  <title>Examples</title>
+</section>
+<!-- END examples -->
+
+
+<!-- BEGIN processing -->
+<section id="processing">
+  <title>Processing Expectations</title>
+
+</section>
+<!-- END processing -->
+
+
+<!-- BEGIN comparison -->
+<section id="comparison">
+  <title>Comparison to Other Formats</title>
+</section>
+<!-- END comparison -->
+
 </page>
diff --git a/doc/mallard/C/mal_block_tree.xml b/doc/mallard/C/mal_block_tree.xml
index a12774a..cacbdc1 100644
--- a/doc/mallard/C/mal_block_tree.xml
+++ b/doc/mallard/C/mal_block_tree.xml
@@ -1,23 +1,27 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard"
       type="topic"
-      id="mal_list_tree">
+      id="mal_block_tree">
 
 <info>
-  <link type="guide" xref="mal_block#lists"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
 <title>Tree Lists</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_list_tree = element list {
-  attribute type { "tree" },
-  attribute style { text } ?,
-  mal_item_tree +
+mal_block_tree = element tree {
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_block_title">mal_block_title</link> ?,
+  mal_tree_item +
 }
-mal_item_tree = element item {
+mal_tree_item = element item {
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
   <link xref="mal_inline">mal_inline</link>,
-  mal_item_tree *
+  mal_tree_item *
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_block_ulist.xml b/doc/mallard/C/mal_block_ulist.xml
index 4f0a8e2..1da0ff1 100644
--- a/doc/mallard/C/mal_block_ulist.xml
+++ b/doc/mallard/C/mal_block_ulist.xml
@@ -17,7 +17,7 @@
   <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
 </info>
 
-<title>Bullet Lists</title>
+<title>Bulleted Lists</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_block_ulist = element ulist {
@@ -35,4 +35,56 @@ mal_block_ulist = element ulist {
 }
 </code></synopsis>
 
+<comment>
+<cite date="2009-05-20">shaunm</cite>
+<p>add intro text</p>
+</comment>
+
+<!-- BEGIN notes -->
+<section id="notes">
+  <title>Notes</title>
+  <ulist>
+    <item><p>The <code>ulist</code> element can contain an optional
+    <code xref="mal_block_title">title</code> element followed by one or more
+    <code>item</code> elements.  Each child <code>item</code> element contains
+    any <link xref="mal_inline">general inline elements</link>.</p></item>
+
+    <item><p>The <code>ulist</code> element can occur in any
+    general block context, including inside
+    <link xref="mal_page">pages</link>, <link xref="mal_section">sections</link>,
+    and certain <link xref="mal_block">block elements</link>.</p></item>
+
+    <item><p>The <code>style</code> attribute takes a space-separated list of
+    style hints.  Processing tools should adjust their behavior according to
+    those style hints they understand.</p></item>
+
+    <item><p>The <code>ulist</code> element can have attributes from external
+    namespaces.  See <link xref="mal_external"/> for more information
+    on external-namespace attributes.</p></item>
+  </ulist>
+</section>
+<!-- END notes -->
+
+
+<!-- BEGIN examples -->
+<section id="examples">
+  <title>Examples</title>
+</section>
+<!-- END examples -->
+
+
+<!-- BEGIN processing -->
+<section id="processing">
+  <title>Processing Expectations</title>
+
+</section>
+<!-- END processing -->
+
+
+<!-- BEGIN comparison -->
+<section id="comparison">
+  <title>Comparison to Other Formats</title>
+</section>
+<!-- END comparison -->
+
 </page>