From 7dc43d3684045d5e83c2440a75040f22de4efcf4 Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Thu, 31 Dec 2009 01:16:44 +0000
Subject: Updated docbook writer to use new templates.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1728 788f1e2b-df1e-0410-8736-df70ead52e1b
---
 tests/tables.docbook |    1 -
 tests/writer.docbook | 2534 +++++++++++++++++++++++++-------------------------
 2 files changed, 1267 insertions(+), 1268 deletions(-)

(limited to 'tests')

diff --git a/tests/tables.docbook b/tests/tables.docbook
index 6f5eac970..002aacd66 100644
--- a/tests/tables.docbook
+++ b/tests/tables.docbook
@@ -284,4 +284,3 @@
     </td>
   </tr>
 </informaltable>
-
diff --git a/tests/writer.docbook b/tests/writer.docbook
index 75c1febf1..46d02f765 100644
--- a/tests/writer.docbook
+++ b/tests/writer.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-
 <article>
   <articleinfo>
     <title>Pandoc Test Suite</title>
@@ -15,932 +14,932 @@
     </author>
     <date>July 17, 2006</date>
   </articleinfo>
-  <para>
-    This is a set of tests for pandoc. Most of them are adapted from
-    John Gruber's markdown test suite.
-  </para>
-  <section id="headers">
-    <title>Headers</title>
-    <section id="level-2-with-an-embedded-link">
-      <title>Level 2 with an
-             <ulink url="/url">embedded link</ulink></title>
-      <section id="level-3-with-emphasis">
-        <title>Level 3 with <emphasis>emphasis</emphasis></title>
-        <section id="level-4">
-          <title>Level 4</title>
-          <section id="level-5">
-            <title>Level 5</title>
-            <para>
-            </para>
-          </section>
+<para>
+  This is a set of tests for pandoc. Most of them are adapted from
+  John Gruber's markdown test suite.
+</para>
+<section id="headers">
+  <title>Headers</title>
+  <section id="level-2-with-an-embedded-link">
+    <title>Level 2 with an
+           <ulink url="/url">embedded link</ulink></title>
+    <section id="level-3-with-emphasis">
+      <title>Level 3 with <emphasis>emphasis</emphasis></title>
+      <section id="level-4">
+        <title>Level 4</title>
+        <section id="level-5">
+          <title>Level 5</title>
+          <para>
+          </para>
         </section>
       </section>
     </section>
   </section>
-  <section id="level-1">
-    <title>Level 1</title>
-    <section id="level-2-with-emphasis">
-      <title>Level 2 with <emphasis>emphasis</emphasis></title>
-      <section id="level-3">
-        <title>Level 3</title>
-        <para>
-          with no blank line
-        </para>
-      </section>
-    </section>
-    <section id="level-2">
-      <title>Level 2</title>
+</section>
+<section id="level-1">
+  <title>Level 1</title>
+  <section id="level-2-with-emphasis">
+    <title>Level 2 with <emphasis>emphasis</emphasis></title>
+    <section id="level-3">
+      <title>Level 3</title>
       <para>
         with no blank line
       </para>
     </section>
   </section>
-  <section id="paragraphs">
-    <title>Paragraphs</title>
+  <section id="level-2">
+    <title>Level 2</title>
     <para>
-      Here's a regular paragraph.
+      with no blank line
     </para>
+  </section>
+</section>
+<section id="paragraphs">
+  <title>Paragraphs</title>
+  <para>
+    Here's a regular paragraph.
+  </para>
+  <para>
+    In Markdown 1.0.0 and earlier. Version 8. This line turns into a
+    list item. Because a hard-wrapped line in the middle of a paragraph
+    looked like a list item.
+  </para>
+  <para>
+    Here's one with a bullet. * criminey.
+  </para>
+  <para>
+    There should be a hard line
+    break<literallayout></literallayout>here.
+  </para>
+</section>
+<section id="block-quotes">
+  <title>Block Quotes</title>
+  <para>
+    E-mail style:
+  </para>
+  <blockquote>
     <para>
-      In Markdown 1.0.0 and earlier. Version 8. This line turns into a
-      list item. Because a hard-wrapped line in the middle of a paragraph
-      looked like a list item.
+      This is a block quote. It is pretty short.
     </para>
+  </blockquote>
+  <blockquote>
     <para>
-      Here's one with a bullet. * criminey.
+      Code in a block quote:
     </para>
+    <screen>
+sub status {
+    print &quot;working&quot;;
+}
+</screen>
     <para>
-      There should be a hard line
-      break<literallayout></literallayout>here.
+      A list:
     </para>
-  </section>
-  <section id="block-quotes">
-    <title>Block Quotes</title>
+    <orderedlist numeration="arabic">
+      <listitem>
+        <para>
+          item one
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          item two
+        </para>
+      </listitem>
+    </orderedlist>
     <para>
-      E-mail style:
+      Nested block quotes:
     </para>
     <blockquote>
       <para>
-        This is a block quote. It is pretty short.
+        nested
       </para>
     </blockquote>
     <blockquote>
       <para>
-        Code in a block quote:
+        nested
       </para>
-      <screen>
+    </blockquote>
+  </blockquote>
+  <para>
+    This should not be a block quote: 2 &gt; 1.
+  </para>
+  <para>
+    And a following paragraph.
+  </para>
+</section>
+<section id="code-blocks">
+  <title>Code Blocks</title>
+  <para>
+    Code:
+  </para>
+  <screen>
+---- (should be four hyphens)
+
 sub status {
     print &quot;working&quot;;
 }
+
+this code block is indented by one tab
 </screen>
-      <para>
-        A list:
-      </para>
-      <orderedlist numeration="arabic">
-        <listitem>
-          <para>
-            item one
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            item two
-          </para>
-        </listitem>
-      </orderedlist>
-      <para>
-        Nested block quotes:
-      </para>
-      <blockquote>
+  <para>
+    And:
+  </para>
+  <screen>
+    this code block is indented by two tabs
+
+These should not be escaped:  \$ \\ \&gt; \[ \{
+</screen>
+</section>
+<section id="lists">
+  <title>Lists</title>
+  <section id="unordered">
+    <title>Unordered</title>
+    <para>
+      Asterisks tight:
+    </para>
+    <itemizedlist>
+      <listitem>
         <para>
-          nested
+          asterisk 1
         </para>
-      </blockquote>
-      <blockquote>
+      </listitem>
+      <listitem>
         <para>
-          nested
+          asterisk 2
         </para>
-      </blockquote>
-    </blockquote>
+      </listitem>
+      <listitem>
+        <para>
+          asterisk 3
+        </para>
+      </listitem>
+    </itemizedlist>
+    <para>
+      Asterisks loose:
+    </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          asterisk 1
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          asterisk 2
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          asterisk 3
+        </para>
+      </listitem>
+    </itemizedlist>
+    <para>
+      Pluses tight:
+    </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          Plus 1
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Plus 2
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Plus 3
+        </para>
+      </listitem>
+    </itemizedlist>
+    <para>
+      Pluses loose:
+    </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          Plus 1
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Plus 2
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Plus 3
+        </para>
+      </listitem>
+    </itemizedlist>
     <para>
-      This should not be a block quote: 2 &gt; 1.
+      Minuses tight:
     </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          Minus 1
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Minus 2
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Minus 3
+        </para>
+      </listitem>
+    </itemizedlist>
     <para>
-      And a following paragraph.
+      Minuses loose:
     </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          Minus 1
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Minus 2
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Minus 3
+        </para>
+      </listitem>
+    </itemizedlist>
   </section>
-  <section id="code-blocks">
-    <title>Code Blocks</title>
+  <section id="ordered">
+    <title>Ordered</title>
     <para>
-      Code:
+      Tight:
     </para>
-    <screen>
----- (should be four hyphens)
-
-sub status {
-    print &quot;working&quot;;
-}
-
-this code block is indented by one tab
-</screen>
+    <orderedlist numeration="arabic">
+      <listitem>
+        <para>
+          First
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Second
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Third
+        </para>
+      </listitem>
+    </orderedlist>
     <para>
-      And:
+      and:
     </para>
-    <screen>
-    this code block is indented by two tabs
-
-These should not be escaped:  \$ \\ \&gt; \[ \{
-</screen>
+    <orderedlist numeration="arabic">
+      <listitem>
+        <para>
+          One
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Two
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Three
+        </para>
+      </listitem>
+    </orderedlist>
+    <para>
+      Loose using tabs:
+    </para>
+    <orderedlist numeration="arabic">
+      <listitem>
+        <para>
+          First
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Second
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Third
+        </para>
+      </listitem>
+    </orderedlist>
+    <para>
+      and using spaces:
+    </para>
+    <orderedlist numeration="arabic">
+      <listitem>
+        <para>
+          One
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Two
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Three
+        </para>
+      </listitem>
+    </orderedlist>
+    <para>
+      Multiple paragraphs:
+    </para>
+    <orderedlist numeration="arabic">
+      <listitem>
+        <para>
+          Item 1, graf one.
+        </para>
+        <para>
+          Item 1. graf two. The quick brown fox jumped over the lazy dog's
+          back.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Item 2.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Item 3.
+        </para>
+      </listitem>
+    </orderedlist>
   </section>
-  <section id="lists">
-    <title>Lists</title>
-    <section id="unordered">
-      <title>Unordered</title>
-      <para>
-        Asterisks tight:
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            asterisk 1
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            asterisk 2
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            asterisk 3
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>
-        Asterisks loose:
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            asterisk 1
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            asterisk 2
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            asterisk 3
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>
-        Pluses tight:
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            Plus 1
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Plus 2
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Plus 3
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>
-        Pluses loose:
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            Plus 1
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Plus 2
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Plus 3
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>
-        Minuses tight:
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            Minus 1
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Minus 2
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Minus 3
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>
-        Minuses loose:
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            Minus 1
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Minus 2
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Minus 3
-          </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-    <section id="ordered">
-      <title>Ordered</title>
-      <para>
-        Tight:
-      </para>
-      <orderedlist numeration="arabic">
-        <listitem>
-          <para>
-            First
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Second
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Third
-          </para>
-        </listitem>
-      </orderedlist>
-      <para>
-        and:
-      </para>
-      <orderedlist numeration="arabic">
-        <listitem>
-          <para>
-            One
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Two
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Three
-          </para>
-        </listitem>
-      </orderedlist>
-      <para>
-        Loose using tabs:
-      </para>
-      <orderedlist numeration="arabic">
-        <listitem>
-          <para>
-            First
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Second
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Third
-          </para>
-        </listitem>
-      </orderedlist>
-      <para>
-        and using spaces:
-      </para>
-      <orderedlist numeration="arabic">
-        <listitem>
-          <para>
-            One
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Two
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Three
-          </para>
-        </listitem>
-      </orderedlist>
-      <para>
-        Multiple paragraphs:
-      </para>
-      <orderedlist numeration="arabic">
-        <listitem>
-          <para>
-            Item 1, graf one.
-          </para>
-          <para>
-            Item 1. graf two. The quick brown fox jumped over the lazy dog's
-            back.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Item 2.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Item 3.
-          </para>
-        </listitem>
-      </orderedlist>
-    </section>
-    <section id="nested">
-      <title>Nested</title>
-      <itemizedlist>
-        <listitem>
-          <para>
-            Tab
-          </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                Tab
-              </para>
-              <itemizedlist>
-                <listitem>
-                  <para>
-                    Tab
-                  </para>
-                </listitem>
-              </itemizedlist>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
-      <para>
-        Here's another:
-      </para>
-      <orderedlist numeration="arabic">
-        <listitem>
-          <para>
-            First
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Second:
-          </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                Fee
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Fie
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Foe
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-        <listitem>
-          <para>
-            Third
-          </para>
-        </listitem>
-      </orderedlist>
-      <para>
-        Same thing but with paragraphs:
-      </para>
-      <orderedlist numeration="arabic">
-        <listitem>
-          <para>
-            First
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Second:
-          </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                Fee
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Fie
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Foe
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-        <listitem>
-          <para>
-            Third
-          </para>
-        </listitem>
-      </orderedlist>
-    </section>
-    <section id="tabs-and-spaces">
-      <title>Tabs and spaces</title>
-      <itemizedlist>
-        <listitem>
-          <para>
-            this is a list item indented with tabs
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            this is a list item indented with spaces
-          </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                this is an example list item indented with tabs
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                this is an example list item indented with spaces
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
-    </section>
-    <section id="fancy-list-markers">
-      <title>Fancy list markers</title>
-      <orderedlist numeration="arabic">
-        <listitem override="2">
-          <para>
-            begins with 2
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            and now 3
-          </para>
-          <para>
-            with a continuation
-          </para>
-          <orderedlist numeration="lowerroman">
-            <listitem override="4">
-              <para>
-                sublist with roman numerals, starting with 4
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                more items
-              </para>
-              <orderedlist numeration="upperalpha">
-                <listitem>
-                  <para>
-                    a subsublist
-                  </para>
-                </listitem>
-                <listitem>
-                  <para>
-                    a subsublist
-                  </para>
-                </listitem>
-              </orderedlist>
-            </listitem>
-          </orderedlist>
-        </listitem>
-      </orderedlist>
-      <para>
-        Nesting:
-      </para>
-      <orderedlist numeration="upperalpha">
-        <listitem>
-          <para>
-            Upper Alpha
-          </para>
-          <orderedlist numeration="upperroman">
-            <listitem>
-              <para>
-                Upper Roman.
-              </para>
-              <orderedlist numeration="arabic">
-                <listitem override="6">
-                  <para>
-                    Decimal start with 6
-                  </para>
-                  <orderedlist numeration="loweralpha">
-                    <listitem override="3">
-                      <para>
-                        Lower alpha with paren
-                      </para>
-                    </listitem>
-                  </orderedlist>
-                </listitem>
-              </orderedlist>
-            </listitem>
-          </orderedlist>
-        </listitem>
-      </orderedlist>
-      <para>
-        Autonumbering:
-      </para>
-      <orderedlist>
-        <listitem>
-          <para>
-            Autonumber.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            More.
-          </para>
-          <orderedlist>
-            <listitem>
-              <para>
-                Nested.
-              </para>
-            </listitem>
-          </orderedlist>
-        </listitem>
-      </orderedlist>
-      <para>
-        Should not be a list item:
-      </para>
-      <para>
-        M.A.&#160;2007
-      </para>
-      <para>
-        B. Williams
-      </para>
-    </section>
-  </section>
-  <section id="definition-lists">
-    <title>Definition Lists</title>
+  <section id="nested">
+    <title>Nested</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          Tab
+        </para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              Tab
+            </para>
+            <itemizedlist>
+              <listitem>
+                <para>
+                  Tab
+                </para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
     <para>
-      Tight using spaces:
+      Here's another:
     </para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          apple
-        </term>
-        <listitem>
-          <para>
-            red fruit
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          orange
-        </term>
-        <listitem>
-          <para>
-            orange fruit
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          banana
-        </term>
-        <listitem>
-          <para>
-            yellow fruit
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <orderedlist numeration="arabic">
+      <listitem>
+        <para>
+          First
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Second:
+        </para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              Fee
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Fie
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Foe
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>
+          Third
+        </para>
+      </listitem>
+    </orderedlist>
     <para>
-      Tight using tabs:
+      Same thing but with paragraphs:
     </para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          apple
-        </term>
-        <listitem>
-          <para>
-            red fruit
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          orange
-        </term>
-        <listitem>
-          <para>
-            orange fruit
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          banana
-        </term>
-        <listitem>
-          <para>
-            yellow fruit
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <orderedlist numeration="arabic">
+      <listitem>
+        <para>
+          First
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Second:
+        </para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              Fee
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Fie
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Foe
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>
+          Third
+        </para>
+      </listitem>
+    </orderedlist>
+  </section>
+  <section id="tabs-and-spaces">
+    <title>Tabs and spaces</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          this is a list item indented with tabs
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          this is a list item indented with spaces
+        </para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              this is an example list item indented with tabs
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              this is an example list item indented with spaces
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section id="fancy-list-markers">
+    <title>Fancy list markers</title>
+    <orderedlist numeration="arabic">
+      <listitem override="2">
+        <para>
+          begins with 2
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          and now 3
+        </para>
+        <para>
+          with a continuation
+        </para>
+        <orderedlist numeration="lowerroman">
+          <listitem override="4">
+            <para>
+              sublist with roman numerals, starting with 4
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              more items
+            </para>
+            <orderedlist numeration="upperalpha">
+              <listitem>
+                <para>
+                  a subsublist
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  a subsublist
+                </para>
+              </listitem>
+            </orderedlist>
+          </listitem>
+        </orderedlist>
+      </listitem>
+    </orderedlist>
     <para>
-      Loose:
+      Nesting:
     </para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          apple
-        </term>
-        <listitem>
-          <para>
-            red fruit
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          orange
-        </term>
-        <listitem>
-          <para>
-            orange fruit
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          banana
-        </term>
-        <listitem>
-          <para>
-            yellow fruit
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <orderedlist numeration="upperalpha">
+      <listitem>
+        <para>
+          Upper Alpha
+        </para>
+        <orderedlist numeration="upperroman">
+          <listitem>
+            <para>
+              Upper Roman.
+            </para>
+            <orderedlist numeration="arabic">
+              <listitem override="6">
+                <para>
+                  Decimal start with 6
+                </para>
+                <orderedlist numeration="loweralpha">
+                  <listitem override="3">
+                    <para>
+                      Lower alpha with paren
+                    </para>
+                  </listitem>
+                </orderedlist>
+              </listitem>
+            </orderedlist>
+          </listitem>
+        </orderedlist>
+      </listitem>
+    </orderedlist>
     <para>
-      Multiple blocks with italics:
+      Autonumbering:
     </para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <emphasis>apple</emphasis>
-        </term>
-        <listitem>
-          <para>
-            red fruit
-          </para>
-          <para>
-            contains seeds, crisp, pleasant to taste
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <emphasis>orange</emphasis>
-        </term>
-        <listitem>
-          <para>
-            orange fruit
-          </para>
-          <screen>
-{ orange code block }
-</screen>
-          <blockquote>
+    <orderedlist>
+      <listitem>
+        <para>
+          Autonumber.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          More.
+        </para>
+        <orderedlist>
+          <listitem>
             <para>
-              orange block quote
+              Nested.
             </para>
-          </blockquote>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+          </listitem>
+        </orderedlist>
+      </listitem>
+    </orderedlist>
     <para>
-      Multiple definitions, tight:
+      Should not be a list item:
     </para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          apple
-        </term>
-        <listitem>
-          <para>
-            red fruit
-          </para>
-          <para>
-            computer
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          orange
-        </term>
-        <listitem>
-          <para>
-            orange fruit
-          </para>
-          <para>
-            bank
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
     <para>
-      Multiple definitions, loose:
+      M.A.&#160;2007
     </para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          apple
-        </term>
-        <listitem>
-          <para>
-            red fruit
-          </para>
-          <para>
-            computer
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          orange
-        </term>
-        <listitem>
-          <para>
-            orange fruit
-          </para>
-          <para>
-            bank
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
     <para>
-      Blank line after term, indented marker, alternate markers:
+      B. Williams
     </para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          apple
-        </term>
-        <listitem>
-          <para>
-            red fruit
-          </para>
-          <para>
-            computer
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          orange
-        </term>
-        <listitem>
+  </section>
+</section>
+<section id="definition-lists">
+  <title>Definition Lists</title>
+  <para>
+    Tight using spaces:
+  </para>
+  <variablelist>
+    <varlistentry>
+      <term>
+        apple
+      </term>
+      <listitem>
+        <para>
+          red fruit
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        orange
+      </term>
+      <listitem>
+        <para>
+          orange fruit
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        banana
+      </term>
+      <listitem>
+        <para>
+          yellow fruit
+        </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <para>
+    Tight using tabs:
+  </para>
+  <variablelist>
+    <varlistentry>
+      <term>
+        apple
+      </term>
+      <listitem>
+        <para>
+          red fruit
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        orange
+      </term>
+      <listitem>
+        <para>
+          orange fruit
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        banana
+      </term>
+      <listitem>
+        <para>
+          yellow fruit
+        </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <para>
+    Loose:
+  </para>
+  <variablelist>
+    <varlistentry>
+      <term>
+        apple
+      </term>
+      <listitem>
+        <para>
+          red fruit
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        orange
+      </term>
+      <listitem>
+        <para>
+          orange fruit
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        banana
+      </term>
+      <listitem>
+        <para>
+          yellow fruit
+        </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <para>
+    Multiple blocks with italics:
+  </para>
+  <variablelist>
+    <varlistentry>
+      <term>
+        <emphasis>apple</emphasis>
+      </term>
+      <listitem>
+        <para>
+          red fruit
+        </para>
+        <para>
+          contains seeds, crisp, pleasant to taste
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <emphasis>orange</emphasis>
+      </term>
+      <listitem>
+        <para>
+          orange fruit
+        </para>
+        <screen>
+{ orange code block }
+</screen>
+        <blockquote>
           <para>
-            orange fruit
+            orange block quote
           </para>
-          <orderedlist numeration="arabic">
-            <listitem>
-              <para>
-                sublist
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                sublist
-              </para>
-            </listitem>
-          </orderedlist>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </section>
-  <section id="html-blocks">
-    <title>HTML Blocks</title>
-    <para>
-      Simple block on one line:
-    </para>
-    <div>
-    foo
-    </div>
+        </blockquote>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <para>
+    Multiple definitions, tight:
+  </para>
+  <variablelist>
+    <varlistentry>
+      <term>
+        apple
+      </term>
+      <listitem>
+        <para>
+          red fruit
+        </para>
+        <para>
+          computer
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        orange
+      </term>
+      <listitem>
+        <para>
+          orange fruit
+        </para>
+        <para>
+          bank
+        </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <para>
+    Multiple definitions, loose:
+  </para>
+  <variablelist>
+    <varlistentry>
+      <term>
+        apple
+      </term>
+      <listitem>
+        <para>
+          red fruit
+        </para>
+        <para>
+          computer
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        orange
+      </term>
+      <listitem>
+        <para>
+          orange fruit
+        </para>
+        <para>
+          bank
+        </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <para>
+    Blank line after term, indented marker, alternate markers:
+  </para>
+  <variablelist>
+    <varlistentry>
+      <term>
+        apple
+      </term>
+      <listitem>
+        <para>
+          red fruit
+        </para>
+        <para>
+          computer
+        </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        orange
+      </term>
+      <listitem>
+        <para>
+          orange fruit
+        </para>
+        <orderedlist numeration="arabic">
+          <listitem>
+            <para>
+              sublist
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              sublist
+            </para>
+          </listitem>
+        </orderedlist>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
+<section id="html-blocks">
+  <title>HTML Blocks</title>
+  <para>
+    Simple block on one line:
+  </para>
+  <div>
+  foo
+  </div>
 
-    <para>
-      And nested without indentation:
-    </para>
-    <div>
+  <para>
+    And nested without indentation:
+  </para>
+  <div>
 <div>
 <div>
-    foo
-    </div>
+  foo
+  </div>
 </div>
 <div>
-    bar
-    </div>
+  bar
+  </div>
 </div>
 
-    <para>
-      Interpreted markdown in a table:
-    </para>
-    <table>
+  <para>
+    Interpreted markdown in a table:
+  </para>
+  <table>
 <tr>
 <td>
-    This is <emphasis>emphasized</emphasis>
-    </td>
+  This is <emphasis>emphasized</emphasis>
+  </td>
 <td>
-    And this is <emphasis role="strong">strong</emphasis>
-    </td>
+  And this is <emphasis role="strong">strong</emphasis>
+  </td>
 </tr>
 </table>
 
 <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script>
 
-    <para>
-      Here's a simple block:
-    </para>
-    <div>
+  <para>
+    Here's a simple block:
+  </para>
+  <div>
     
-    foo
-    </div>
+  foo
+  </div>
 
-    <para>
-      This should be a code block, though:
-    </para>
-    <screen>
+  <para>
+    This should be a code block, though:
+  </para>
+  <screen>
 &lt;div&gt;
     foo
 &lt;/div&gt;
 </screen>
-    <para>
-      As should this:
-    </para>
-    <screen>
+  <para>
+    As should this:
+  </para>
+  <screen>
 &lt;div&gt;foo&lt;/div&gt;
 </screen>
-    <para>
-      Now, nested:
-    </para>
-    <div>
+  <para>
+    Now, nested:
+  </para>
+  <div>
     <div>
         <div>
             
-    foo
-    </div>
+  foo
+  </div>
     </div>
 </div>
 
-    <para>
-      This should just be an HTML comment:
-    </para>
-    <!-- Comment -->
+  <para>
+    This should just be an HTML comment:
+  </para>
+  <!-- Comment -->
 
-    <para>
-      Multiline:
-    </para>
-    <!--
+  <para>
+    Multiline:
+  </para>
+  <!--
 Blah
 Blah
 -->
@@ -949,522 +948,523 @@ Blah
     This is another comment.
 -->
 
-    <para>
-      Code block:
-    </para>
-    <screen>
+  <para>
+    Code block:
+  </para>
+  <screen>
 &lt;!-- Comment --&gt;
 </screen>
-    <para>
-      Just plain comment, with trailing spaces on the line:
-    </para>
-    <!-- foo -->   
+  <para>
+    Just plain comment, with trailing spaces on the line:
+  </para>
+  <!-- foo -->   
 
-    <para>
-      Code:
-    </para>
-    <screen>
+  <para>
+    Code:
+  </para>
+  <screen>
 &lt;hr /&gt;
 </screen>
+  <para>
+    Hr's:
+  </para>
+  <hr>
+
+<hr />
+
+<hr />
+
+<hr>   
+
+<hr />  
+
+<hr /> 
+
+<hr class="foo" id="bar" />
+
+<hr class="foo" id="bar" />
+
+<hr class="foo" id="bar">
+
+</section>
+<section id="inline-markup">
+  <title>Inline Markup</title>
+  <para>
+    This is <emphasis>emphasized</emphasis>, and so
+    <emphasis>is this</emphasis>.
+  </para>
+  <para>
+    This is <emphasis role="strong">strong</emphasis>, and so
+    <emphasis role="strong">is this</emphasis>.
+  </para>
+  <para>
+    An <emphasis><ulink url="/url">emphasized link</ulink></emphasis>.
+  </para>
+  <para>
+    <emphasis role="strong"><emphasis>This is strong and em.</emphasis></emphasis>
+  </para>
+  <para>
+    So is <emphasis role="strong"><emphasis>this</emphasis></emphasis>
+    word.
+  </para>
+  <para>
+    <emphasis role="strong"><emphasis>This is strong and em.</emphasis></emphasis>
+  </para>
+  <para>
+    So is <emphasis role="strong"><emphasis>this</emphasis></emphasis>
+    word.
+  </para>
+  <para>
+    This is code: <literal>&gt;</literal>, <literal>$</literal>,
+    <literal>\</literal>, <literal>\$</literal>,
+    <literal>&lt;html&gt;</literal>.
+  </para>
+  <para>
+    <emphasis role="strikethrough">This is <emphasis>strikeout</emphasis>.</emphasis>
+  </para>
+  <para>
+    Superscripts: a<superscript>bc</superscript>d
+    a<superscript><emphasis>hello</emphasis></superscript>
+    a<superscript>hello&#160;there</superscript>.
+  </para>
+  <para>
+    Subscripts: H<subscript>2</subscript>O,
+    H<subscript>23</subscript>O,
+    H<subscript>many&#160;of&#160;them</subscript>O.
+  </para>
+  <para>
+    These should not be superscripts or subscripts, because of the
+    unescaped spaces: a^b c^d, a~b c~d.
+  </para>
+</section>
+<section id="smart-quotes-ellipses-dashes">
+  <title>Smart quotes, ellipses, dashes</title>
+  <para>
+    <quote>Hello,</quote> said the spider.
+    <quote><quote>Shelob</quote> is my name.</quote>
+  </para>
+  <para>
+    <quote>A</quote>, <quote>B</quote>, and <quote>C</quote> are
+    letters.
+  </para>
+  <para>
+    <quote>Oak,</quote> <quote>elm,</quote> and <quote>beech</quote>
+    are names of trees. So is <quote>pine.</quote>
+  </para>
+  <para>
+    <quote>He said, <quote>I want to go.</quote></quote> Were you alive
+    in the 70's?
+  </para>
+  <para>
+    Here is some quoted <quote><literal>code</literal></quote> and a
+    <quote><ulink url="http://example.com/?foo=1&amp;bar=2">quoted link</ulink></quote>.
+  </para>
+  <para>
+    Some dashes: one&#8212;two &#8212; three&#8212;four &#8212; five.
+  </para>
+  <para>
+    Dashes between numbers: 5&#8211;7, 255&#8211;66, 1987&#8211;1999.
+  </para>
+  <para>
+    Ellipses&#8230;and&#8230;and&#8230;.
+  </para>
+</section>
+<section id="latex">
+  <title>LaTeX</title>
+  <itemizedlist>
+    <listitem>
+      <para>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        2+2=4
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <emphasis>x</emphasis> ∈ <emphasis>y</emphasis>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        α ∧ ω
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        223
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <emphasis>p</emphasis>-Tree
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Here's some display math:
+        \frac{<emphasis>d</emphasis>}{<emphasis>dx</emphasis>}<emphasis>f</emphasis>(<emphasis>x</emphasis>)=\lim<subscript><emphasis>h</emphasis> → 0</subscript>\frac{<emphasis>f</emphasis>(<emphasis>x</emphasis>+<emphasis>h</emphasis>)-<emphasis>f</emphasis>(<emphasis>x</emphasis>)}{<emphasis>h</emphasis>}
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Here's one that has a line break in it:
+        α+ω × <emphasis>x</emphasis><superscript>2</superscript>.
+      </para>
+    </listitem>
+  </itemizedlist>
+  <para>
+    These shouldn't be math:
+  </para>
+  <itemizedlist>
+    <listitem>
+      <para>
+        To get the famous equation, write <literal>$e = mc^2$</literal>.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        $22,000 is a <emphasis>lot</emphasis> of money. So is $34,000. (It
+        worked if <quote>lot</quote> is emphasized.)
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Shoes ($20) and socks ($5).
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Escaped <literal>$</literal>: $73
+        <emphasis>this should be emphasized</emphasis> 23$.
+      </para>
+    </listitem>
+  </itemizedlist>
+  <para>
+    Here's a LaTeX table:
+  </para>
+  <para>
+  </para>
+</section>
+<section id="special-characters">
+  <title>Special Characters</title>
+  <para>
+    Here is some unicode:
+  </para>
+  <itemizedlist>
+    <listitem>
+      <para>
+        I hat: Î
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        o umlaut: ö
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        section: §
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        set membership: ∈
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        copyright: ©
+      </para>
+    </listitem>
+  </itemizedlist>
+  <para>
+    AT&amp;T has an ampersand in their name.
+  </para>
+  <para>
+    AT&amp;T is another way to write it.
+  </para>
+  <para>
+    This &amp; that.
+  </para>
+  <para>
+    4 &lt; 5.
+  </para>
+  <para>
+    6 &gt; 5.
+  </para>
+  <para>
+    Backslash: \
+  </para>
+  <para>
+    Backtick: `
+  </para>
+  <para>
+    Asterisk: *
+  </para>
+  <para>
+    Underscore: _
+  </para>
+  <para>
+    Left brace: {
+  </para>
+  <para>
+    Right brace: }
+  </para>
+  <para>
+    Left bracket: [
+  </para>
+  <para>
+    Right bracket: ]
+  </para>
+  <para>
+    Left paren: (
+  </para>
+  <para>
+    Right paren: )
+  </para>
+  <para>
+    Greater-than: &gt;
+  </para>
+  <para>
+    Hash: #
+  </para>
+  <para>
+    Period: .
+  </para>
+  <para>
+    Bang: !
+  </para>
+  <para>
+    Plus: +
+  </para>
+  <para>
+    Minus: -
+  </para>
+</section>
+<section id="links">
+  <title>Links</title>
+  <section id="explicit">
+    <title>Explicit</title>
     <para>
-      Hr's:
+      Just a <ulink url="/url/">URL</ulink>.
     </para>
-    <hr>
-
-<hr />
-
-<hr />
-
-<hr>   
-
-<hr />  
-
-<hr /> 
-
-<hr class="foo" id="bar" />
-
-<hr class="foo" id="bar" />
-
-<hr class="foo" id="bar">
-
-  </section>
-  <section id="inline-markup">
-    <title>Inline Markup</title>
     <para>
-      This is <emphasis>emphasized</emphasis>, and so
-      <emphasis>is this</emphasis>.
+      <ulink url="/url/">URL and title</ulink>.
     </para>
     <para>
-      This is <emphasis role="strong">strong</emphasis>, and so
-      <emphasis role="strong">is this</emphasis>.
+      <ulink url="/url/">URL and title</ulink>.
     </para>
     <para>
-      An <emphasis><ulink url="/url">emphasized link</ulink></emphasis>.
+      <ulink url="/url/">URL and title</ulink>.
     </para>
     <para>
-      <emphasis role="strong"><emphasis>This is strong and em.</emphasis></emphasis>
+      <ulink url="/url/">URL and title</ulink>
     </para>
     <para>
-      So is <emphasis role="strong"><emphasis>this</emphasis></emphasis>
-      word.
+      <ulink url="/url/">URL and title</ulink>
     </para>
     <para>
-      <emphasis role="strong"><emphasis>This is strong and em.</emphasis></emphasis>
+      <ulink url="/url/with_underscore">with_underscore</ulink>
     </para>
     <para>
-      So is <emphasis role="strong"><emphasis>this</emphasis></emphasis>
-      word.
+      Email link (<email>nobody@nowhere.net</email>)
     </para>
     <para>
-      This is code: <literal>&gt;</literal>, <literal>$</literal>,
-      <literal>\</literal>, <literal>\$</literal>,
-      <literal>&lt;html&gt;</literal>.
+      <ulink url="">Empty</ulink>.
     </para>
+  </section>
+  <section id="reference">
+    <title>Reference</title>
     <para>
-      <emphasis role="strikethrough">This is <emphasis>strikeout</emphasis>.</emphasis>
+      Foo <ulink url="/url/">bar</ulink>.
     </para>
     <para>
-      Superscripts: a<superscript>bc</superscript>d
-      a<superscript><emphasis>hello</emphasis></superscript>
-      a<superscript>hello&#160;there</superscript>.
+      Foo <ulink url="/url/">bar</ulink>.
     </para>
     <para>
-      Subscripts: H<subscript>2</subscript>O,
-      H<subscript>23</subscript>O,
-      H<subscript>many&#160;of&#160;them</subscript>O.
+      Foo <ulink url="/url/">bar</ulink>.
     </para>
     <para>
-      These should not be superscripts or subscripts, because of the
-      unescaped spaces: a^b c^d, a~b c~d.
+      With <ulink url="/url/">embedded [brackets]</ulink>.
     </para>
-  </section>
-  <section id="smart-quotes-ellipses-dashes">
-    <title>Smart quotes, ellipses, dashes</title>
     <para>
-      <quote>Hello,</quote> said the spider.
-      <quote><quote>Shelob</quote> is my name.</quote>
+      <ulink url="/url/">b</ulink> by itself should be a link.
     </para>
     <para>
-      <quote>A</quote>, <quote>B</quote>, and <quote>C</quote> are
-      letters.
+      Indented <ulink url="/url">once</ulink>.
     </para>
     <para>
-      <quote>Oak,</quote> <quote>elm,</quote> and <quote>beech</quote>
-      are names of trees. So is <quote>pine.</quote>
+      Indented <ulink url="/url">twice</ulink>.
     </para>
     <para>
-      <quote>He said, <quote>I want to go.</quote></quote> Were you alive
-      in the 70's?
+      Indented <ulink url="/url">thrice</ulink>.
     </para>
     <para>
-      Here is some quoted <quote><literal>code</literal></quote> and a
-      <quote><ulink url="http://example.com/?foo=1&amp;bar=2">quoted link</ulink></quote>.
+      This should [not][] be a link.
     </para>
+    <screen>
+[not]: /url
+</screen>
     <para>
-      Some dashes: one&#8212;two &#8212; three&#8212;four &#8212; five.
+      Foo <ulink url="/url/">bar</ulink>.
     </para>
     <para>
-      Dashes between numbers: 5&#8211;7, 255&#8211;66, 1987&#8211;1999.
+      Foo <ulink url="/url/">biz</ulink>.
     </para>
+  </section>
+  <section id="with-ampersands">
+    <title>With ampersands</title>
     <para>
-      Ellipses&#8230;and&#8230;and&#8230;.
+      Here's a
+      <ulink url="http://example.com/?foo=1&amp;bar=2">link with an ampersand in the URL</ulink>.
     </para>
-  </section>
-  <section id="latex">
-    <title>LaTeX</title>
-    <itemizedlist>
-      <listitem>
-        <para>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          2+2=4
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <emphasis>x</emphasis> ∈ <emphasis>y</emphasis>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          α ∧ ω
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          223
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <emphasis>p</emphasis>-Tree
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Here's some display math:
-          \frac{<emphasis>d</emphasis>}{<emphasis>dx</emphasis>}<emphasis>f</emphasis>(<emphasis>x</emphasis>)=\lim<subscript><emphasis>h</emphasis> → 0</subscript>\frac{<emphasis>f</emphasis>(<emphasis>x</emphasis>+<emphasis>h</emphasis>)-<emphasis>f</emphasis>(<emphasis>x</emphasis>)}{<emphasis>h</emphasis>}
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Here's one that has a line break in it:
-          α+ω × <emphasis>x</emphasis><superscript>2</superscript>.
-        </para>
-      </listitem>
-    </itemizedlist>
     <para>
-      These shouldn't be math:
+      Here's a link with an amersand in the link text:
+      <ulink url="http://att.com/">AT&amp;T</ulink>.
     </para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          To get the famous equation, write <literal>$e = mc^2$</literal>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          $22,000 is a <emphasis>lot</emphasis> of money. So is $34,000. (It
-          worked if <quote>lot</quote> is emphasized.)
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Shoes ($20) and socks ($5).
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Escaped <literal>$</literal>: $73
-          <emphasis>this should be emphasized</emphasis> 23$.
-        </para>
-      </listitem>
-    </itemizedlist>
     <para>
-      Here's a LaTeX table:
+      Here's an <ulink url="/script?foo=1&amp;bar=2">inline link</ulink>.
     </para>
     <para>
+      Here's an
+      <ulink url="/script?foo=1&amp;bar=2">inline link in pointy braces</ulink>.
     </para>
   </section>
-  <section id="special-characters">
-    <title>Special Characters</title>
+  <section id="autolinks">
+    <title>Autolinks</title>
     <para>
-      Here is some unicode:
+      With an ampersand:
+      <ulink url="http://example.com/?foo=1&amp;bar=2"><literal>http://example.com/?foo=1&amp;bar=2</literal></ulink>
     </para>
     <itemizedlist>
       <listitem>
         <para>
-          I hat: Î
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          o umlaut: ö
+          In a list?
         </para>
       </listitem>
       <listitem>
         <para>
-          section: §
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          set membership: ∈
+          <ulink url="http://example.com/"><literal>http://example.com/</literal></ulink>
         </para>
       </listitem>
       <listitem>
         <para>
-          copyright: ©
+          It should.
         </para>
       </listitem>
     </itemizedlist>
     <para>
-      AT&amp;T has an ampersand in their name.
-    </para>
-    <para>
-      AT&amp;T is another way to write it.
-    </para>
-    <para>
-      This &amp; that.
-    </para>
-    <para>
-      4 &lt; 5.
-    </para>
-    <para>
-      6 &gt; 5.
-    </para>
-    <para>
-      Backslash: \
-    </para>
-    <para>
-      Backtick: `
-    </para>
-    <para>
-      Asterisk: *
-    </para>
-    <para>
-      Underscore: _
-    </para>
-    <para>
-      Left brace: {
-    </para>
-    <para>
-      Right brace: }
-    </para>
-    <para>
-      Left bracket: [
-    </para>
-    <para>
-      Right bracket: ]
-    </para>
-    <para>
-      Left paren: (
-    </para>
-    <para>
-      Right paren: )
-    </para>
-    <para>
-      Greater-than: &gt;
-    </para>
-    <para>
-      Hash: #
-    </para>
-    <para>
-      Period: .
-    </para>
-    <para>
-      Bang: !
-    </para>
-    <para>
-      Plus: +
-    </para>
-    <para>
-      Minus: -
+      An e-mail address: <email>nobody@nowhere.net</email>
     </para>
-  </section>
-  <section id="links">
-    <title>Links</title>
-    <section id="explicit">
-      <title>Explicit</title>
-      <para>
-        Just a <ulink url="/url/">URL</ulink>.
-      </para>
-      <para>
-        <ulink url="/url/">URL and title</ulink>.
-      </para>
-      <para>
-        <ulink url="/url/">URL and title</ulink>.
-      </para>
-      <para>
-        <ulink url="/url/">URL and title</ulink>.
-      </para>
-      <para>
-        <ulink url="/url/">URL and title</ulink>
-      </para>
-      <para>
-        <ulink url="/url/">URL and title</ulink>
-      </para>
-      <para>
-        <ulink url="/url/with_underscore">with_underscore</ulink>
-      </para>
-      <para>
-        Email link (<email>nobody@nowhere.net</email>)
-      </para>
-      <para>
-        <ulink url="">Empty</ulink>.
-      </para>
-    </section>
-    <section id="reference">
-      <title>Reference</title>
-      <para>
-        Foo <ulink url="/url/">bar</ulink>.
-      </para>
-      <para>
-        Foo <ulink url="/url/">bar</ulink>.
-      </para>
-      <para>
-        Foo <ulink url="/url/">bar</ulink>.
-      </para>
-      <para>
-        With <ulink url="/url/">embedded [brackets]</ulink>.
-      </para>
-      <para>
-        <ulink url="/url/">b</ulink> by itself should be a link.
-      </para>
-      <para>
-        Indented <ulink url="/url">once</ulink>.
-      </para>
-      <para>
-        Indented <ulink url="/url">twice</ulink>.
-      </para>
-      <para>
-        Indented <ulink url="/url">thrice</ulink>.
-      </para>
-      <para>
-        This should [not][] be a link.
-      </para>
-      <screen>
-[not]: /url
-</screen>
-      <para>
-        Foo <ulink url="/url/">bar</ulink>.
-      </para>
-      <para>
-        Foo <ulink url="/url/">biz</ulink>.
-      </para>
-    </section>
-    <section id="with-ampersands">
-      <title>With ampersands</title>
-      <para>
-        Here's a
-        <ulink url="http://example.com/?foo=1&amp;bar=2">link with an ampersand in the URL</ulink>.
-      </para>
-      <para>
-        Here's a link with an amersand in the link text:
-        <ulink url="http://att.com/">AT&amp;T</ulink>.
-      </para>
-      <para>
-        Here's an <ulink url="/script?foo=1&amp;bar=2">inline link</ulink>.
-      </para>
-      <para>
-        Here's an
-        <ulink url="/script?foo=1&amp;bar=2">inline link in pointy braces</ulink>.
-      </para>
-    </section>
-    <section id="autolinks">
-      <title>Autolinks</title>
-      <para>
-        With an ampersand:
-        <ulink url="http://example.com/?foo=1&amp;bar=2"><literal>http://example.com/?foo=1&amp;bar=2</literal></ulink>
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            In a list?
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <ulink url="http://example.com/"><literal>http://example.com/</literal></ulink>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            It should.
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>
-        An e-mail address: <email>nobody@nowhere.net</email>
-      </para>
-      <blockquote>
-        <para>
-          Blockquoted:
-          <ulink url="http://example.com/"><literal>http://example.com/</literal></ulink>
-        </para>
-      </blockquote>
+    <blockquote>
       <para>
-        Auto-links should not occur here:
-        <literal>&lt;http://example.com/&gt;</literal>
+        Blockquoted:
+        <ulink url="http://example.com/"><literal>http://example.com/</literal></ulink>
       </para>
-      <screen>
-or here: &lt;http://example.com/&gt;
-</screen>
-    </section>
-  </section>
-  <section id="images">
-    <title>Images</title>
-    <para>
-      From <quote>Voyage dans la Lune</quote> by Georges Melies (1902):
-    </para>
-    <para>
-      <inlinemediaobject>
-        <imageobject>
-          <objectinfo>
-            <title>
-              Voyage dans la Lune
-            </title>
-          </objectinfo>
-          <imagedata fileref="lalune.jpg" />
-        </imageobject>
-      </inlinemediaobject>
-    </para>
+    </blockquote>
     <para>
-      Here is a movie
-      <inlinemediaobject>
-        <imageobject>
-          <imagedata fileref="movie.jpg" />
-        </imageobject>
-      </inlinemediaobject>
-      icon.
+      Auto-links should not occur here:
+      <literal>&lt;http://example.com/&gt;</literal>
     </para>
+    <screen>
+or here: &lt;http://example.com/&gt;
+</screen>
   </section>
-  <section id="footnotes">
-    <title>Footnotes</title>
-    <para>
-      Here is a footnote
-      reference,<footnote>
-                  <para>
-                    Here is the footnote. It can go anywhere after the footnote
-                    reference. It need not be placed at the end of the document.
-                  </para>
-                </footnote>
-      and
-      another.<footnote>
-                <para>
-                  Here's the long note. This one contains multiple blocks.
-                </para>
+</section>
+<section id="images">
+  <title>Images</title>
+  <para>
+    From <quote>Voyage dans la Lune</quote> by Georges Melies (1902):
+  </para>
+  <para>
+    <inlinemediaobject>
+      <imageobject>
+        <objectinfo>
+          <title>
+            Voyage dans la Lune
+          </title>
+        </objectinfo>
+        <imagedata fileref="lalune.jpg" />
+      </imageobject>
+    </inlinemediaobject>
+  </para>
+  <para>
+    Here is a movie
+    <inlinemediaobject>
+      <imageobject>
+        <imagedata fileref="movie.jpg" />
+      </imageobject>
+    </inlinemediaobject>
+    icon.
+  </para>
+</section>
+<section id="footnotes">
+  <title>Footnotes</title>
+  <para>
+    Here is a footnote
+    reference,<footnote>
                 <para>
-                  Subsequent blocks are indented to show that they belong to the
-                  footnote (as with list items).
+                  Here is the footnote. It can go anywhere after the footnote
+                  reference. It need not be placed at the end of the document.
                 </para>
-                <screen>
+              </footnote>
+    and
+    another.<footnote>
+              <para>
+                Here's the long note. This one contains multiple blocks.
+              </para>
+              <para>
+                Subsequent blocks are indented to show that they belong to the
+                footnote (as with list items).
+              </para>
+              <screen>
   { &lt;code&gt; }
 </screen>
+              <para>
+                If you want, you can indent every line, but you can also be lazy
+                and just indent the first line of each block.
+              </para>
+            </footnote>
+    This should <emphasis>not</emphasis> be a footnote reference,
+    because it contains a space.[^my note] Here is an inline
+    note.<footnote>
+           <para>
+             This is <emphasis>easier</emphasis> to type. Inline notes may
+             contain <ulink url="http://google.com">links</ulink> and
+             <literal>]</literal> verbatim characters, as well as [bracketed
+             text].
+           </para>
+         </footnote>
+  </para>
+  <blockquote>
+    <para>
+      Notes can go in
+      quotes.<footnote>
+               <para>
+                 In quote.
+               </para>
+             </footnote>
+    </para>
+  </blockquote>
+  <orderedlist numeration="arabic">
+    <listitem>
+      <para>
+        And in list
+        items.<footnote>
                 <para>
-                  If you want, you can indent every line, but you can also be lazy
-                  and just indent the first line of each block.
+                  In list.
                 </para>
               </footnote>
-      This should <emphasis>not</emphasis> be a footnote reference,
-      because it contains a space.[^my note] Here is an inline
-      note.<footnote>
-             <para>
-               This is <emphasis>easier</emphasis> to type. Inline notes may
-               contain <ulink url="http://google.com">links</ulink> and
-               <literal>]</literal> verbatim characters, as well as [bracketed
-               text].
-             </para>
-           </footnote>
-    </para>
-    <blockquote>
-      <para>
-        Notes can go in
-        quotes.<footnote>
-                 <para>
-                   In quote.
-                 </para>
-               </footnote>
       </para>
-    </blockquote>
-    <orderedlist numeration="arabic">
-      <listitem>
-        <para>
-          And in list
-          items.<footnote>
-                  <para>
-                    In list.
-                  </para>
-                </footnote>
-        </para>
-      </listitem>
-    </orderedlist>
-    <para>
-      This paragraph should not be part of the note, as it is not
-      indented.
-    </para>
-  </section>
+    </listitem>
+  </orderedlist>
+  <para>
+    This paragraph should not be part of the note, as it is not
+    indented.
+  </para>
+</section>
 </article>
 
+
-- 
cgit v1.2.3