[mallard] Changing list.bullet to ulist

32 files changed, 88 insertions, 84 deletions

diff --git a/doc/mallard/C/mal_block_cite.xml b/doc/mallard/C/mal_block_cite.xml
index 528897a..98cf664 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_code.xml b/doc/mallard/C/mal_block_code.xml
index 32b0b33..8625613 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_comment.xml b/doc/mallard/C/mal_block_comment.xml
index 5654173..d921935 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_desc.xml b/doc/mallard/C/mal_block_desc.xml
index 789e206..577b987 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_example.xml b/doc/mallard/C/mal_block_example.xml
index 983ac4b..e911329 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_figure.xml b/doc/mallard/C/mal_block_figure.xml
index 24b937f..45cb6ff 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_listing.xml b/doc/mallard/C/mal_block_listing.xml
index ed3baa7..5b02f9e 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_media.xml b/doc/mallard/C/mal_block_media.xml
index fd7ce1a..32ba950 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_note.xml b/doc/mallard/C/mal_block_note.xml
index 242b4f6..65e9cbb 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_p.xml b/doc/mallard/C/mal_block_p.xml
index 4898c53..609ad78 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_quote.xml b/doc/mallard/C/mal_block_quote.xml
index dd0cf00..c21cd24 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_screen.xml b/doc/mallard/C/mal_block_screen.xml
index 5e44426..a2ed8c2 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_synopsis.xml b/doc/mallard/C/mal_block_synopsis.xml
index 3541412..e50dd24 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_block_ulist.xml b/doc/mallard/C/mal_block_ulist.xml
index f575995..4f0a8e2 100644
--- a/doc/mallard/C/mal_block_ulist.xml
+++ b/doc/mallard/C/mal_block_ulist.xml
@@ -20,13 +20,17 @@
 <title>Bullet Lists</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_list_bullet = element list {
-  attribute type { "bullet" } ?,
-  attribute style { text } ?,
+mal_block_ulist = element ulist {
+  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>
diff --git a/doc/mallard/C/mal_inline_app.xml b/doc/mallard/C/mal_inline_app.xml
index 73d87da..b2715bf 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_cmd.xml b/doc/mallard/C/mal_inline_cmd.xml
index e310b2b..103f75e 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_code.xml b/doc/mallard/C/mal_inline_code.xml
index cae5c64..ede7387 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_em.xml b/doc/mallard/C/mal_inline_em.xml
index 9e8ef08..5cde8cb 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_file.xml b/doc/mallard/C/mal_inline_file.xml
index 67811b7..a21f577 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_gui.xml b/doc/mallard/C/mal_inline_gui.xml
index 3e7c9e1..16f133d 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_guiseq.xml b/doc/mallard/C/mal_inline_guiseq.xml
index 8348df1..f319e97 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_input.xml b/doc/mallard/C/mal_inline_input.xml
index c9bb464..1bc5b2a 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_key.xml b/doc/mallard/C/mal_inline_key.xml
index 35c66fb..2512583 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_keyseq.xml b/doc/mallard/C/mal_inline_keyseq.xml
index da63f2c..049fbbc 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_link.xml b/doc/mallard/C/mal_inline_link.xml
index 9d47cba..29bff77 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
@@ -147,11 +147,11 @@ recommendation</link>.
   displayed as normal.  Otherwise, automatic link text is generated
   as follows:</p>
 
-  <list type="bullet">
+  <ulist>
     <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>
 
-    <list type="bullet">
+    <ulist>
       <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>
-    </list>
+    </ulist>
     </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>
-  </list>
+  </ulist>
 </section>
 <!-- END processing -->
 
diff --git a/doc/mallard/C/mal_inline_media.xml b/doc/mallard/C/mal_inline_media.xml
index 07b391b..3fd1d2a 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_output.xml b/doc/mallard/C/mal_inline_output.xml
index 149956d..d1eb8fc 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_span.xml b/doc/mallard/C/mal_inline_span.xml
index 5749c6b..0bae089 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_sys.xml b/doc/mallard/C/mal_inline_sys.xml
index af9b279..a1be855 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_inline_var.xml b/doc/mallard/C/mal_inline_var.xml
index d662719..1ddbf91 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/doc/mallard/C/mal_page.xml b/doc/mallard/C/mal_page.xml
index 012892e..3d53bf7 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>
-  <list type="bullet">
+  <ulist>
     <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>
-  </list>
+  </ulist>
 </section>
 <!-- END notes -->
 
diff --git a/xslt/mallard/html/mal2html-list.xsl b/xslt/mallard/html/mal2html-list.xsl
index d6ff1e9..e964e19 100644
--- a/xslt/mallard/html/mal2html-list.xsl
+++ b/xslt/mallard/html/mal2html-list.xsl
@@ -36,27 +36,27 @@ REMARK: Describe this template
 -->
 <xsl:template name="mal2html.list.css">
 <xsl:text>
-ul.list-bullet {
+ul.ulist {
   margin: 0; padding: 0;
 }
-ul.list-bullet li {
+ul.ulist li {
   margin-left: 1.44em;
 }
-ul.list-tree {
+ul.tree {
   margin: 0; padding: 0;
   list-style-type: none;
 }
-ul.list-tree li {
+ul.tree li {
   margin: 0; padding: 0;
 }
 .item-tree { margin: 0; padding: 0; }
-ul.list-tree ul.list-tree {
+ul.tree ul.tree {
   margin-left: 1.44em;
 }
-div.list-tree-lines ul.list-tree ul.list-tree {
+div.tree-lines ul.tree ul.tree {
   margin-left: 0.2em;
 }
-div.list-tree-lines ul.list-tree ul.list-tree ul.list-tree {
+div.tree-lines ul.tree ul.tree ul.tree {
   margin-left: 1.44em;
 }
 </xsl:text>
@@ -65,15 +65,15 @@ div.list-tree-lines ul.list-tree ul.list-tree ul.list-tree {
 
 <!-- == Bullet Lists == -->
 
-<xsl:template mode="mal2html.block.mode" match="mal:list[@type='bullet']">
+<xsl:template mode="mal2html.block.mode" match="mal:ulist">
   <div>
     <xsl:attribute name="class">
-      <xsl:text>list list-bullet</xsl:text>
+      <xsl:text>ulist</xsl:text>
       <xsl:if test="not(preceding-sibling::*)">
         <xsl:text> first-child</xsl:text>
       </xsl:if>
     </xsl:attribute>
-    <ul class="list list-bullet">
+    <ul class="ulist">
       <xsl:apply-templates mode="mal2html.list.bullet.mode"/>
     </ul>
   </div>
@@ -97,19 +97,19 @@ div.list-tree-lines ul.list-tree ul.list-tree ul.list-tree {
 
 <!-- == Tree Lists == -->
 
-<xsl:template mode="mal2html.block.mode" match="mal:list[@type='tree']">
+<xsl:template mode="mal2html.block.mode" match="mal:tree">
   <xsl:variable name="lines" select="contains(concat(' ', @style, ' '), ' lines ')"/>
   <div>
     <xsl:attribute name="class">
-      <xsl:text>list list-tree</xsl:text>
+      <xsl:text>tree</xsl:text>
       <xsl:if test="$lines">
-        <xsl:text> list-tree-lines</xsl:text>
+        <xsl:text> tree-lines</xsl:text>
       </xsl:if>
       <xsl:if test="not(preceding-sibling::*)">
         <xsl:text> first-child</xsl:text>
       </xsl:if>
     </xsl:attribute>
-    <ul class="list list-tree">
+    <ul class="tree">
       <xsl:apply-templates mode="mal2html.list.tree.mode">
         <xsl:with-param name="lines" select="$lines"/>
       </xsl:apply-templates>
@@ -135,7 +135,7 @@ div.list-tree-lines ul.list-tree ul.list-tree ul.list-tree {
                            select="*[not(self::mal:item)]"/>
     </div>
     <xsl:if test="mal:item">
-      <ul class="list list-tree">
+      <ul class="tree">
         <xsl:apply-templates mode="mal2html.list.tree.mode" select="mal:item">
           <xsl:with-param name="lines" select="$lines"/>
         </xsl:apply-templates>