[mallard] Changing ulist and olist to list, more...

I've decided to re-merge ordered and unordered lists into a single
list element, as it was before.  But this time, other types of lists
have their own elements.  Ordered and unodered lists have the same
content model anyway.  Besides the basic list element, we now have
the steps, terms, and tree elements.

35 files changed, 154 insertions, 127 deletions

diff --git a/doc/mallard/C/mal_block.xml b/doc/mallard/C/mal_block.xml
index 927e098..29c5df4 100644
--- a/doc/mallard/C/mal_block.xml
+++ b/doc/mallard/C/mal_block.xml
@@ -107,24 +107,26 @@ mal_block_formal = (
 <!-- BEGIN lists -->
 <section id="lists">
   <info>
-    <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_list"/>
+    <link type="topic" xref="mal_block_steps"/>
+    <link type="topic" xref="mal_block_terms"/>
     <link type="topic" xref="mal_block_tree"/>
   </info>
   <title>List Elements</title>
   <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> |
+  <link xref="mal_block_list">mal_block_list</link> |
+  <link xref="mal_block_steps">mal_block_steps</link> |
+  <link xref="mal_block_terms">mal_block_terms</link> |
   <link xref="mal_block_tree">mal_block_tree</link>
 )</code></synopsis>
 
   <p>Mallard provides list elements for most common needs, including the common
   defintion, ordered, and unordered lists.  Mallard also provides simple trees,
   which are useful for representing heirarchies such as class inheritance or
-  directory layouts.</p>
+  directory layouts.  Each of the list elements uses the <code>item</code>
+  element, though the content model for <code>item</code> varies.  See the
+  list element pages for details.</p>
 </section>
 <!-- END lists -->
 
diff --git a/doc/mallard/C/mal_block_cite.xml b/doc/mallard/C/mal_block_cite.xml
index 98cf664..fb598e3 100644
--- a/doc/mallard/C/mal_block_cite.xml
+++ b/doc/mallard/C/mal_block_cite.xml
@@ -49,7 +49,7 @@ element.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <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>
@@ -61,7 +61,7 @@ element.</p>
     <item><p>The <code>href</code> attribute provides a URL to identify the
     entity being cited.  It will frequently be a <sys>mailto:</sys> URL with
     a person's email address.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_code.xml b/doc/mallard/C/mal_block_code.xml
index 8625613..b73b8a2 100644
--- a/doc/mallard/C/mal_block_code.xml
+++ b/doc/mallard/C/mal_block_code.xml
@@ -46,7 +46,7 @@ by the user.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>code</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.  Whitespace
     is interpreted literally.</p></item>
@@ -74,7 +74,7 @@ by the user.</p>
     <code xref="mal_block_listing">listing</code> element to provide a title
     and description for the code block.  This is frequently used to provide
     the name of the file whose contents are being shown.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_comment.xml b/doc/mallard/C/mal_block_comment.xml
index d921935..9d1503c 100644
--- a/doc/mallard/C/mal_block_comment.xml
+++ b/doc/mallard/C/mal_block_comment.xml
@@ -51,7 +51,7 @@ to provide a <code>date</code> attribute.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>comment</code> element contains an optional
     <link xref="mal_block_title">title</link> element, a
     <link xref="mal_block_cite">cite</link> element, and  any
@@ -69,7 +69,7 @@ to provide a <code>date</code> attribute.</p>
     <item><p>The <code>comment</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_desc.xml b/doc/mallard/C/mal_block_desc.xml
index 577b987..376a83b 100644
--- a/doc/mallard/C/mal_block_desc.xml
+++ b/doc/mallard/C/mal_block_desc.xml
@@ -43,7 +43,7 @@ for the formal element.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>desc</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -62,7 +62,7 @@ for the formal element.</p>
 
     <item><p>The <code>desc</code> element can also be used in an informational
     context.  See <link xref="mal_info_desc"/> for more information.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_example.xml b/doc/mallard/C/mal_block_example.xml
index e911329..7c87b77 100644
--- a/doc/mallard/C/mal_block_example.xml
+++ b/doc/mallard/C/mal_block_example.xml
@@ -40,7 +40,7 @@ paragraphs together.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>example</code> element can contain any
     <link xref="mal_block">general block content</link>.</p></item>
 
@@ -56,7 +56,7 @@ paragraphs together.</p>
     <item><p>The <code>example</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_figure.xml b/doc/mallard/C/mal_block_figure.xml
index 45cb6ff..ab37ec2 100644
--- a/doc/mallard/C/mal_block_figure.xml
+++ b/doc/mallard/C/mal_block_figure.xml
@@ -44,7 +44,7 @@ To provide a title for the contents of a file, such as a
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>figure</code> element contains an optional
     <link xref="mal_block_title">title</link> element, an optional
     <link xref="mal_block_desc">desc</link> element, and  any
@@ -62,7 +62,7 @@ To provide a title for the contents of a file, such as a
     <item><p>The <code>figure</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_ulist.xml b/doc/mallard/C/mal_block_list.xml
index 1da0ff1..75f8643 100644
--- a/doc/mallard/C/mal_block_ulist.xml
+++ b/doc/mallard/C/mal_block_list.xml
@@ -1,6 +1,6 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard"
       type="topic"
-      id="mal_block_ulist">
+      id="mal_block_list">
 
 <info>
   <version number="0.1" date="2007-02-21" status="stub"/>
@@ -17,10 +17,11 @@
   <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
 </info>
 
-<title>Bulleted Lists</title>
+<title>Basic Lists</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_block_ulist = element ulist {
+mal_block_list = element list {
+  attribute type { xsl:NMTOKEN } ?,
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
 
@@ -35,33 +36,48 @@ mal_block_ulist = element ulist {
 }
 </code></synopsis>
 
-<comment>
-<cite date="2009-05-20">shaunm</cite>
-<p>add intro text</p>
-</comment>
+<p>Use the <code>list</code> element to create a basic bulleted or numbered
+list.  By default, lists are unordered, and list items are marked with a
+bullet or other glyph.  You can select various numbering systems using the
+<code>type</code> attribute.  If you need a numbered list to enumerate steps
+the reader should perform, use the <code xref="mal_block_steps">steps</code>
+element.</p>
+
 
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
-    <item><p>The <code>ulist</code> element can contain an optional
+  <list>
+    <item><p>The <code>list</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
+    <item><p>The <code>list</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>type</code> attribute allows you to select the list type,
+    which affects the markers used for each list item.  Allowed values are those
+    from the <link href="http://www.w3.org/TR/css3-lists/">CSS
+    <code>list-style-type</code> property</link>.  Additionally, the value of
+    <code>"numeric"</code> can be used to select a numeric list type appropriate
+    for the page's language.</p></item>
+
+    <item><p>If no <code>type</code> attribute is present, it is assumed to be a
+    <link href="http://www.w3.org/TR/css3-lists/#glyphs">glyph type</link> such
+    as <code>"disc"</code> or <code>"circle"</code>.  That is, list default to
+    bulleted lists.</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
+    <item><p>The <code>list</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
@@ -84,6 +100,14 @@ mal_block_ulist = element ulist {
 <!-- BEGIN comparison -->
 <section id="comparison">
   <title>Comparison to Other Formats</title>
+
+  <p>The <code>list</code> element combines the functionality of the
+  <code href="http://www.docbook.org/tdg/en/html/itemizedlist.html">itemizedlist</code>
+  and <code href="http://www.docbook.org/tdg/en/html/orderedlist.html">orderedlist</code>
+  elements in DocBook.  DocBook allows leading block-level content in its list
+  elements.  This is not allowed in Mallard, though an optional <code>title</code>
+  element is allowed.  DocBook allows you to override the bullet or numbering
+  type on each list item.  Mallard does not allow this.</p>
 </section>
 <!-- END comparison -->
 
diff --git a/doc/mallard/C/mal_block_listing.xml b/doc/mallard/C/mal_block_listing.xml
index 5b02f9e..a8e0c8b 100644
--- a/doc/mallard/C/mal_block_listing.xml
+++ b/doc/mallard/C/mal_block_listing.xml
@@ -46,7 +46,7 @@ element.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>listing</code> element contains an optional
     <link xref="mal_block_title">title</link> element, an optional
     <link xref="mal_block_desc">desc</link> element, and  any
@@ -64,7 +64,7 @@ element.</p>
     <item><p>The <code>listing</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_media.xml b/doc/mallard/C/mal_block_media.xml
index 32ba950..3150963 100644
--- a/doc/mallard/C/mal_block_media.xml
+++ b/doc/mallard/C/mal_block_media.xml
@@ -47,7 +47,7 @@ for details on how fallback elements are handled.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>media</code> element can contain any
     <link xref="mal_block">general block content</link>.  The content is only
     used as a fallback or alternative.</p></item>
@@ -70,7 +70,7 @@ for details on how fallback elements are handled.</p>
 
     <item><p>The <code>media</code> element may also be used in an inline context.
     See <link xref="mal_inline_media"/> for more information.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_note.xml b/doc/mallard/C/mal_block_note.xml
index 65e9cbb..fdd1e88 100644
--- a/doc/mallard/C/mal_block_note.xml
+++ b/doc/mallard/C/mal_block_note.xml
@@ -42,7 +42,7 @@ of your document.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>note</code> element contains an optional
     <link xref="mal_block_title">title</link> element and  any
     <link xref="mal_block">general block content</link>.</p></item>
@@ -85,7 +85,7 @@ of your document.</p>
     <item><p>The <code>note</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_p.xml b/doc/mallard/C/mal_block_p.xml
index 609ad78..742f29b 100644
--- a/doc/mallard/C/mal_block_p.xml
+++ b/doc/mallard/C/mal_block_p.xml
@@ -30,7 +30,7 @@ outout.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>p</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -46,7 +46,7 @@ outout.</p>
     <item><p>The <code>p</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_quote.xml b/doc/mallard/C/mal_block_quote.xml
index c21cd24..e09b9ec 100644
--- a/doc/mallard/C/mal_block_quote.xml
+++ b/doc/mallard/C/mal_block_quote.xml
@@ -41,7 +41,7 @@ and have it automatically formatted by display tools.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>quote</code> element contains an optional
     <link xref="mal_block_title">title</link> element, a mandatory
     <link xref="mal_block_cite">cite</link> element, and any
@@ -70,7 +70,7 @@ and have it automatically formatted by display tools.</p>
     <item><p>The <code>quote</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_screen.xml b/doc/mallard/C/mal_block_screen.xml
index a2ed8c2..dba0fc2 100644
--- a/doc/mallard/C/mal_block_screen.xml
+++ b/doc/mallard/C/mal_block_screen.xml
@@ -51,7 +51,7 @@ by the user.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>screen</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.  Whitespace
     is interpreted literally.</p></item>
@@ -85,7 +85,7 @@ by the user.</p>
     <item><p>The <code>screen</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes on block elements.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_olist.xml b/doc/mallard/C/mal_block_steps.xml
index c53ef8d..1e18daa 100644
--- a/doc/mallard/C/mal_block_olist.xml
+++ b/doc/mallard/C/mal_block_steps.xml
@@ -1,6 +1,6 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard"
       type="topic"
-      id="mal_block_olist">
+      id="mal_block_steps">
 
 <info>
   <version number="0.1" date="2007-02-21" status="stub"/>
@@ -17,10 +17,10 @@
   <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
 </info>
 
-<title>Numbered Lists</title>
+<title>Procedures</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_block_olist = element olist {
+mal_block_steps = element steps {
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
 
@@ -43,7 +43,7 @@ mal_block_olist = element olist {
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <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
@@ -61,7 +61,7 @@ mal_block_olist = element olist {
     <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>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_synopsis.xml b/doc/mallard/C/mal_block_synopsis.xml
index e50dd24..f3ee435 100644
--- a/doc/mallard/C/mal_block_synopsis.xml
+++ b/doc/mallard/C/mal_block_synopsis.xml
@@ -49,7 +49,7 @@ control element.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>synopsis</code> element contains an optional
     <link xref="mal_block_title">title</link> element, an optional
     <link xref="mal_block_desc">desc</link> element, and  any
@@ -67,7 +67,7 @@ control element.</p>
     <item><p>The <code>synopsis</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_dlist.xml b/doc/mallard/C/mal_block_terms.xml
index f003cee..11dca03 100644
--- a/doc/mallard/C/mal_block_dlist.xml
+++ b/doc/mallard/C/mal_block_terms.xml
@@ -1,6 +1,6 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard"
       type="topic"
-      id="mal_block_dlist">
+      id="mal_block_terms">
 
 <info>
   <version number="0.1" date="2007-02-21" status="stub"/>
@@ -20,7 +20,7 @@
 <title>Definition Lists</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_block_dlist = element dlist {
+mal_block_terms = element terms {
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
 
@@ -44,7 +44,7 @@ mal_block_dlist = element dlist {
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <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
@@ -63,7 +63,7 @@ mal_block_dlist = element dlist {
     <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>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_app.xml b/doc/mallard/C/mal_inline_app.xml
index b2715bf..e5ef63f 100644
--- a/doc/mallard/C/mal_inline_app.xml
+++ b/doc/mallard/C/mal_inline_app.xml
@@ -43,7 +43,7 @@ use <code xref="mal_inline_cmd">cmd</code> for this purpose instead.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>app</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -63,7 +63,7 @@ use <code xref="mal_inline_cmd">cmd</code> for this purpose instead.</p>
     <item><p>The <code>app</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_cmd.xml b/doc/mallard/C/mal_inline_cmd.xml
index 103f75e..bf76b9c 100644
--- a/doc/mallard/C/mal_inline_cmd.xml
+++ b/doc/mallard/C/mal_inline_cmd.xml
@@ -55,7 +55,7 @@ by the user.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>cmd</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -89,7 +89,7 @@ by the user.</p>
     <item><p>The <code>cmd</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_code.xml b/doc/mallard/C/mal_inline_code.xml
index ede7387..b9985f2 100644
--- a/doc/mallard/C/mal_inline_code.xml
+++ b/doc/mallard/C/mal_inline_code.xml
@@ -53,7 +53,7 @@ by the user.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>code</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -79,7 +79,7 @@ by the user.</p>
 
     <item><p>The <code>code</code> element may also be used in a block context.
     See <link xref="mal_block_code"/> for more information.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_em.xml b/doc/mallard/C/mal_inline_em.xml
index 5cde8cb..ec81c60 100644
--- a/doc/mallard/C/mal_inline_em.xml
+++ b/doc/mallard/C/mal_inline_em.xml
@@ -42,7 +42,7 @@ display tools.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>em</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -62,7 +62,7 @@ display tools.</p>
     <item><p>The <code>em</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_file.xml b/doc/mallard/C/mal_inline_file.xml
index a21f577..21c26a0 100644
--- a/doc/mallard/C/mal_inline_file.xml
+++ b/doc/mallard/C/mal_inline_file.xml
@@ -41,7 +41,7 @@ filenames, such as search paths and file extensions.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>file</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -61,7 +61,7 @@ filenames, such as search paths and file extensions.</p>
     <item><p>The <code>file</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_gui.xml b/doc/mallard/C/mal_inline_gui.xml
index 16f133d..5fa03bd 100644
--- a/doc/mallard/C/mal_inline_gui.xml
+++ b/doc/mallard/C/mal_inline_gui.xml
@@ -43,7 +43,7 @@ control is being marked up.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>gui</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -103,7 +103,7 @@ control is being marked up.</p>
     <item><p>The <code>gui</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_guiseq.xml b/doc/mallard/C/mal_inline_guiseq.xml
index f319e97..767a5b8 100644
--- a/doc/mallard/C/mal_inline_guiseq.xml
+++ b/doc/mallard/C/mal_inline_guiseq.xml
@@ -41,7 +41,7 @@ items.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>guiseq</code> element can contain a mixture of text and
     <code xref="mal_inline_gui">gui</code> elements.</p></item>
 
@@ -58,7 +58,7 @@ items.</p>
     <item><p>The <code>guiseq</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_input.xml b/doc/mallard/C/mal_inline_input.xml
index 1bc5b2a..e98bce0 100644
--- a/doc/mallard/C/mal_inline_input.xml
+++ b/doc/mallard/C/mal_inline_input.xml
@@ -42,7 +42,7 @@ or into a text field in a graphical application.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>input</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -67,7 +67,7 @@ or into a text field in a graphical application.</p>
     <code xref="mal_inline_output">output</code> element, may be used to mark up
     the contents of a <code xref="mal_block_screen">screen</code> element,
     allowing processing tools to treat them differently.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_key.xml b/doc/mallard/C/mal_inline_key.xml
index 2512583..71da95b 100644
--- a/doc/mallard/C/mal_inline_key.xml
+++ b/doc/mallard/C/mal_inline_key.xml
@@ -54,7 +54,7 @@ these instead.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>key</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -78,7 +78,7 @@ these instead.</p>
     <item><p>The <code>key</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_keyseq.xml b/doc/mallard/C/mal_inline_keyseq.xml
index 049fbbc..9a0010e 100644
--- a/doc/mallard/C/mal_inline_keyseq.xml
+++ b/doc/mallard/C/mal_inline_keyseq.xml
@@ -45,7 +45,7 @@ key press.  You can use text without markup to indicate a class of keys, such as
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>keyseq</code> element can contain a mixture of text,
     <code xref="mal_inline_key">key</code> elements, and other
     <code>keyseq</code> elements.</p></item>
@@ -68,7 +68,7 @@ key press.  You can use text without markup to indicate a class of keys, such as
     <item><p>The <code>keyseq</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_link.xml b/doc/mallard/C/mal_inline_link.xml
index 29bff77..c2d0d34 100644
--- a/doc/mallard/C/mal_inline_link.xml
+++ b/doc/mallard/C/mal_inline_link.xml
@@ -48,7 +48,7 @@ the same document.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>link</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -78,7 +78,7 @@ the same document.</p>
     <item><p>The <code>link</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
@@ -147,11 +147,11 @@ recommendation</link>.
   displayed as normal.  Otherwise, automatic link text is generated
   as follows:</p>
 
-  <ulist>
+  <list>
     <item><p>If the <code>link</code> element has an <code>xref</code>
     attribute that points to a page or section in the same document:</p>
 
-    <ulist>
+    <list>
       <item><p>If the <code>link</code> element has a <code>role</code>
       attribute, and that page or section has an
       <link xref="mal_info_title">informational title</link> with the
@@ -168,7 +168,7 @@ recommendation</link>.
 
       <item><p>Otherwise, the contents of the primary title of that page
       page or section are used.</p></item>
-    </ulist>
+    </list>
     </item>
 
     <item><p>Otherwise, if the <code>link</code> element has an <code>xref</code>
@@ -176,7 +176,7 @@ recommendation</link>.
     tool knows how to generate link contents, that content is used.</p></item>
 
     <item><p>Otherwise, the link target is used as text content.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END processing -->
 
diff --git a/doc/mallard/C/mal_inline_media.xml b/doc/mallard/C/mal_inline_media.xml
index 3fd1d2a..4f4aa1f 100644
--- a/doc/mallard/C/mal_inline_media.xml
+++ b/doc/mallard/C/mal_inline_media.xml
@@ -48,7 +48,7 @@ for details on how fallback elements are handled.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>media</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -74,7 +74,7 @@ for details on how fallback elements are handled.</p>
 
     <item><p>The <code>media</code> element may also be used in a block context.
     See <link xref="mal_block_media"/> for more information.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_output.xml b/doc/mallard/C/mal_inline_output.xml
index d1eb8fc..8de2973 100644
--- a/doc/mallard/C/mal_inline_output.xml
+++ b/doc/mallard/C/mal_inline_output.xml
@@ -49,7 +49,7 @@ differently.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>output</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -88,7 +88,7 @@ differently.</p>
     <code xref="mal_inline_input">input</code> element, may be used to mark up
     the contents of a <code xref="mal_block_screen">screen</code> element,
     allowing processing tools to treat them differently.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_span.xml b/doc/mallard/C/mal_inline_span.xml
index 0bae089..61825c0 100644
--- a/doc/mallard/C/mal_inline_span.xml
+++ b/doc/mallard/C/mal_inline_span.xml
@@ -44,7 +44,7 @@ using attributes from external namespaces.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>span</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -64,7 +64,7 @@ using attributes from external namespaces.</p>
     <item><p>The <code>span</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_sys.xml b/doc/mallard/C/mal_inline_sys.xml
index a1be855..f56bc60 100644
--- a/doc/mallard/C/mal_inline_sys.xml
+++ b/doc/mallard/C/mal_inline_sys.xml
@@ -42,7 +42,7 @@ isn't covered by other elements such as <code xref="mal_inline_file">file</code>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>sys</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -62,7 +62,7 @@ isn't covered by other elements such as <code xref="mal_inline_file">file</code>
     <item><p>The <code>sys</code> element can have attributes from external
     namespaces.  See <link xref="mal_external"/> for more information
     on external-namespace attributes.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_var.xml b/doc/mallard/C/mal_inline_var.xml
index 1ddbf91..966c389 100644
--- a/doc/mallard/C/mal_inline_var.xml
+++ b/doc/mallard/C/mal_inline_var.xml
@@ -45,7 +45,7 @@ an indicated argument.</p>
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>var</code> element can contain a mixture of text and
     any <link xref="mal_inline">general inline elements</link>.</p></item>
 
@@ -68,7 +68,7 @@ an indicated argument.</p>
 
     <item><p>See <link xref="mal_inline_cmd"/> and <link xref="mal_inline_code"/>
     for examples using <code>var</code>.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_page.xml b/doc/mallard/C/mal_page.xml
index 3d53bf7..f6b4c16 100644
--- a/doc/mallard/C/mal_page.xml
+++ b/doc/mallard/C/mal_page.xml
@@ -39,11 +39,11 @@ mal_page_topic = element page {
 <!-- BEGIN notes -->
 <section id="notes">
   <title>Notes</title>
-  <ulist>
+  <list>
     <item><p>The <code>type</code> attribute takes the values <code>"guide"</code> and
     <code>"topic"</code>.  <link xref="#guide">Guide pages</link> and <link xref="#topic">topic
     pages</link> are discussed below.</p></item>
-  </ulist>
+  </list>
 </section>
 <!-- END notes -->
 
diff --git a/xslt/mallard/html/mal2html-list.xsl b/xslt/mallard/html/mal2html-list.xsl
index e964e19..051248d 100644
--- a/xslt/mallard/html/mal2html-list.xsl
+++ b/xslt/mallard/html/mal2html-list.xsl
@@ -36,20 +36,15 @@ REMARK: Describe this template
 -->
 <xsl:template name="mal2html.list.css">
 <xsl:text>
-ul.ulist {
-  margin: 0; padding: 0;
-}
-ul.ulist li {
-  margin-left: 1.44em;
-}
+ul.list { margin: 0; padding: 0; }
+li.item-list { margin-left: 1.44em; }
+
 ul.tree {
   margin: 0; padding: 0;
   list-style-type: none;
 }
-ul.tree li {
-  margin: 0; padding: 0;
-}
-.item-tree { margin: 0; padding: 0; }
+li.item-tree { margin: 0; padding: 0; }
+div.item-tree { margin: 0; padding: 0; }
 ul.tree ul.tree {
   margin-left: 1.44em;
 }
@@ -63,41 +58,45 @@ div.tree-lines ul.tree ul.tree ul.tree {
 </xsl:template>
 
 
-<!-- == Bullet Lists == -->
-
-<xsl:template mode="mal2html.block.mode" match="mal:ulist">
+<!-- = list = -->
+<xsl:template mode="mal2html.block.mode" match="mal:list">
+  <xsl:param name="first_child" select="not(preceding-sibling::*)"/>
   <div>
     <xsl:attribute name="class">
-      <xsl:text>ulist</xsl:text>
-      <xsl:if test="not(preceding-sibling::*)">
+      <xsl:text>list</xsl:text>
+      <xsl:if test="$first_child">
         <xsl:text> first-child</xsl:text>
       </xsl:if>
     </xsl:attribute>
-    <ul class="ulist">
-      <xsl:apply-templates mode="mal2html.list.bullet.mode"/>
+    <ul class="list">
+      <xsl:apply-templates mode="mal2html.list.list.mode" select="mal:item"/>
     </ul>
   </div>
 </xsl:template>
 
-<xsl:template mode="mal2html.list.bullet.mode" match="mal:item">
+<!-- = list/item = -->
+<xsl:template mode="mal2html.list.list.mode" match="mal:item">
   <li>
-    <xsl:if test="not(preceding-sibling::mal:item)">
-      <xsl:attribute name="class">
-        <xsl:text>first-child</xsl:text>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:apply-templates mode="mal2html.block.mode"/>
+    <xsl:attribute name="class">
+      <xsl:text>item-list</xsl:text>
+      <xsl:if test="not(preceding-sibling::mal:item)">
+        <xsl:text> first-child</xsl:text>
+      </xsl:if>
+    </xsl:attribute>
+    <xsl:for-each
+        select="mal:*[
+                ($mal2html.editor_mode or not(self::mal:comment)
+                or processing-instruction('mal2html.show_comment'))]">
+      <xsl:apply-templates mode="mal2html.block.mode" select=".">
+        <xsl:with-param name="first_child" select="position() = 1"/>
+      </xsl:apply-templates>
+    </xsl:for-each>
   </li>
 </xsl:template>
 
-
-<!-- == Numbered Lists == -->
-
-<!-- == Definition Lists == -->
-
-<!-- == Tree Lists == -->
-
+<!-- = tree = -->
 <xsl:template mode="mal2html.block.mode" match="mal:tree">
+  <xsl:param name="first_child" select="not(preceding-sibling::*)"/>
   <xsl:variable name="lines" select="contains(concat(' ', @style, ' '), ' lines ')"/>
   <div>
     <xsl:attribute name="class">
@@ -105,22 +104,24 @@ div.tree-lines ul.tree ul.tree ul.tree {
       <xsl:if test="$lines">
         <xsl:text> tree-lines</xsl:text>
       </xsl:if>
-      <xsl:if test="not(preceding-sibling::*)">
+      <!-- FIXME -->
+      <xsl:if test="$first_child">
         <xsl:text> first-child</xsl:text>
       </xsl:if>
     </xsl:attribute>
     <ul class="tree">
-      <xsl:apply-templates mode="mal2html.list.tree.mode">
+      <xsl:apply-templates mode="mal2html.list.tree.mode" select="mal:item">
         <xsl:with-param name="lines" select="$lines"/>
       </xsl:apply-templates>
     </ul>
   </div>
 </xsl:template>
 
+<!-- = tree/item = -->
 <xsl:template mode="mal2html.list.tree.mode" match="mal:item">
   <xsl:param name="lines" select="false()"/>
-  <li class="item item-tree">
-    <div class="item item-tree">
+  <li class="item-tree">
+    <div class="item-tree">
       <xsl:if test="$lines and not(parent::mal:list)">
         <xsl:choose>
           <xsl:when test="following-sibling::mal:item">