Clean up tests

author: Shaun McCance <shaunm@redhat.com> 2020-12-30 21:27:54 -0500
committer: Shaun McCance <shaunm@redhat.com> 2020-12-30 21:28:10 -0500
commit: 5df5b3aacf4728a993fe5e23f54af0abe563efcc (patch)
tree: 8498a3223e0e21d5ce8542fd902b42fc5c08222e
parent: 878542983f5ab904ae3c35c39b8e8a11bb70c661 (diff)
download: yelp-xsl-5df5b3aacf4728a993fe5e23f54af0abe563efcc.tar.gz
349 files changed, 2167 insertions, 19694 deletions
diff --git a/.gitignore b/.gitignore
index f962399d..9a427968 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,23 @@
 *~
-.xml2po.mo
 ChangeLog
 INSTALL
 Makefile
-!/test/**/Makefile
-/test/colors/*.html
-/test/lipsum/html/
-/test/syntax/*.html
-/test/syntax/highlight.pack.js
 Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.log
-config.status
-config.sub
-configure
-install-sh
-missing
-yelp-xsl.pc
-
-/doc/yelp-xsl/ducks/*.duck
-/xslt/theme/test-theme.html
+/aclocal.m4
+/autom4te.cache/
+/config.guess
+/config.log
+/config.rpath
+/config.status
+/config.sub
+/configure
+/doc/yelp-xsl/ducks/
+/install-sh
+/m4/
+/missing
+/test/colors/output/
+/test/docbook/output/
+/test/mallard/output/
+/test/syntax/output/
 /xslt/common/domains/yelp-xsl.xml
-/test/testdocs/html
+/yelp-xsl.pc
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 8b137891..00000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/colors/Makefile b/test/colors/Makefile
deleted file mode 100644
index e07230cc..00000000
--- a/test/colors/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: testcolors.html
-
-testcolors.html: testcolors.xsl ../../xslt/common/color.xsl
-	xsltproc -o testcolors.html testcolors.xsl testcolors.xsl
-
diff --git a/test/colors/README b/test/colors/README
new file mode 100644
index 00000000..e620c461
--- /dev/null
+++ b/test/colors/README
@@ -0,0 +1,11 @@
+This test shows the colors provided by colors.xsl, including those
+that can be automatically computed. It shows all foreground colors
+on all background color, along with the WCAG contrast ratio to
+ensure accessibility for various visual impairments.
+
+To try things out, just make changes directly to the files in your
+checkout of yelp-xsl. You don't have to build or install your copy
+of yelp-xsl. Just build this preview document. To build this preview
+document, just run:
+
+  ./build.sh
diff --git a/test/colors/build.sh b/test/colors/build.sh
new file mode 100755
index 00000000..96665230
--- /dev/null
+++ b/test/colors/build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ ! -d output ]; then mkdir output; fi
+rm -f output/*.*
+xsltproc -o output/testcolors.html testcolors.xsl testcolors.xsl
diff --git a/test/docbook/README b/test/docbook/README
new file mode 100644
index 00000000..40de7930
--- /dev/null
+++ b/test/docbook/README
@@ -0,0 +1,10 @@
+This document is intended to test out different features and style
+changes for DocBook documents. If you need to test things not in
+this document, feel free to add stuff to this document.
+
+To try things out, just make changes directly to the files in your
+checkout of yelp-xsl. You don't have to build or install your copy
+of yelp-xsl. Just build this preview document. To build this preview
+document, just run:
+
+  ./build.sh
diff --git a/test/docbook/build.sh b/test/docbook/build.sh
new file mode 100755
index 00000000..29cb8119
--- /dev/null
+++ b/test/docbook/build.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -d output ]; then mkdir output; fi
+rm -f output/*.*
+xsltproc --nonet --xinclude -o output/ \
+         --param db.chunk.chunk_top 1 \
+         ../../xslt/docbook/html/db2html.xsl \
+         source/index.docbook
diff --git a/test/docbook/source/bibliography.xml b/test/docbook/source/bibliography.xml
new file mode 100644
index 00000000..9cac4b01
--- /dev/null
+++ b/test/docbook/source/bibliography.xml
@@ -0,0 +1,77 @@
+<bibliography id="bibliography">
+  <bibliodiv id="bibliodiv">
+    <title>A Bibliography Division</title>
+
+    <bibliolist>
+    <title>A <sgmltag>bibliolist</sgmltag></title>
+
+    <biblioentry>
+      <abbrev>AhoSethiUllman96</abbrev>
+      <authorgroup>
+        <author><firstname>Alfred V.</firstname><surname>Aho</surname></author>
+        <author><firstname>Ravi</firstname><surname>Sethi</surname></author>
+        <author><firstname>Jeffrey D.</firstname><surname>Ullman</surname></author>
+      </authorgroup>
+      <copyright><year>1996</year>
+      <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
+      <editor><firstname>James T.</firstname><surname>DeWolf</surname></editor>
+      <isbn>0-201-10088-6</isbn>
+      <publisher>
+        <publishername>Addison-Wesley Publishing Company</publishername>
+      </publisher>
+      <title>Compilers, Principles, Techniques, and Tools</title>
+    </biblioentry>
+
+    <biblioentry xreflabel="Kites75">
+      <authorgroup>
+        <author><firstname>Andrea</firstname><surname>Bahadur</surname></author>
+        <author><firstname>Mark</firstname><surname>Shwarek</surname></author>
+      </authorgroup>
+      <copyright><year>1974</year><year>1975</year>
+      <holder>Product Development International Holding N. V.</holder>
+      </copyright>
+      <isbn>0-88459-021-6</isbn>
+      <publisher>
+        <publishername>Plenary Publications International, Inc.</publishername>
+      </publisher>
+      <title>Kites</title>
+      <subtitle>Ancient Craft to Modern Sport</subtitle>
+      <pagenums>988-999</pagenums>
+    </biblioentry>
+
+    </bibliolist>
+
+    <biblioentry id="Walsh97">
+      <abbrev>Walsh97</abbrev>
+      <biblioset relation='journal'>
+        <title>XML: Principles, Tools, and Techniques</title>
+        <publisher>
+          <publishername>O'Reilly &amp; Associates, Inc.</publishername>
+        </publisher>
+        <issn>1085-2301</issn>
+        <editor><firstname>Dan</firstname><surname>Connolly</surname></editor>
+      </biblioset>
+      <biblioset relation='article'>
+        <title>A Guide to XML</title>
+        <author><surname>Walsh</surname><firstname>Norman</firstname></author>
+        <copyright><year>1997</year><holder>ArborText, Inc.</holder></copyright>
+        <pagenums>97-108</pagenums>
+      </biblioset>
+    </biblioentry>
+
+    <bibliomixed>
+      <abbrev>Walsh96</abbrev>
+      <bibliomset relation='article'>
+        <surname>Walsh</surname>, <firstname>Norman</firstname>.
+        <title role='article'>Introduction to Cascading Style Sheets</title>.
+      </bibliomset>
+      <bibliomset relation='journal'>
+        <title>The World Wide Web Journal</title> 
+        <volumenum>2</volumenum><issuenum>1</issuenum>.
+        <publishername>O'Reilly &amp; Associates, Inc.</publishername> and
+        <corpname>The World Wide Web Consortium</corpname>.
+        <pubdate>Winter, 1996</pubdate></bibliomset>.
+    </bibliomixed>
+
+  </bibliodiv>
+</bibliography>
diff --git a/test/docbook/source/blocks.xml b/test/docbook/source/blocks.xml
new file mode 100644
index 00000000..2fdf2401
--- /dev/null
+++ b/test/docbook/source/blocks.xml
@@ -0,0 +1,486 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         id="blocks">
+<title>Some Block Elements</title>
+<titleabbrev>Some Blocks</titleabbrev>
+
+<para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+porttitor condimentum nulla.</para>
+
+<section id="admon">
+  <title>Admonitions</title>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <caution>
+    <title>Beware the Title!</title>
+    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+    porttitor condimentum nulla.</para>
+  </caution>
+
+  <important>
+    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+    porttitor condimentum nulla.</para>
+  </important>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <note>
+    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+    porttitor condimentum nulla.</para>
+  </note>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <note role="bug">
+    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+    porttitor condimentum nulla.</para>
+  </note>
+
+  <tip>
+    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+    porttitor condimentum nulla.</para>
+  </tip>
+
+  <warning>
+    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+    porttitor condimentum nulla.</para>
+  </warning>
+
+</section> <!-- admon -->
+
+<section id="formal-block">
+  <title>Formal Blocks</title>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <example>
+    <title>An Example</title>
+    <programlisting><![CDATA[
+$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+    if ! test -d $(dir $@); then mkdir $(dir $@); fi
+    case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";;esac; \
+    if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \
+    (cd $(dir $@) && \
+      $(_xml2po) -e -p \
+          "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
+              "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+                  cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+]]></programlisting>
+  </example>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <figure>
+    <title>A Figure</title>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="http://www.gnome.org/projects/orca/images/orca2-sm.jpg"/>
+      </imageobject>
+      <caption><para>The mascot for the <ulink
+      url="http://www.gnome.org/projects/orca/index.html">Orca screen
+      reader</ulink></para></caption>
+    </mediaobject>
+  </figure>
+  <informalfigure>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="http://www.gnome.org/projects/orca/images/orca2-sm.jpg"/>
+      </imageobject>
+      <caption><para>The mascot for the <ulink
+      url="http://www.gnome.org/projects/orca/index.html">Orca screen
+      reader</ulink></para></caption>
+    </mediaobject>
+  </informalfigure>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+</section> <!-- formal-block -->
+
+  <section id="programlisting">
+  <title>Program Listings</title>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <programlisting><![CDATA[
+function runline (line, ix, jx, pre, aft, char, name, id, fmt) {
+  ix = match(line, /[\*\$\@\%\!\#]\{[^\}]*\}/)
+  if (ix > 0) {
+    jx = ix + index(substr(line, ix), "}");
+    pre = substr(line, 1, ix - 1);
+    aft = substr(line, jx);
+    char = substr(line, ix, 1);
+    name = substr(line, ix + 2, jx - ix - 3);
+    id = name;
+    while (sub(/[\.-]/, "_", id));
+    if (char == "!")
+      fmt = "<filename><link linkend='S__%s'>%s</link></filename>";
+    else if (char == "*")
+      fmt = "<function><link linkend='T__%s'>%s</link></function>";
+    else if (char == "%")
+      fmt = "<function><link linkend='M__%s'>%s</link></function>";
+    else if (char == "@") 
+      fmt = "<parameter><link linkend='P__%s'>%s</link></parameter>";
+    else if (char == "$") 
+      fmt = "<parameter>"name"</parameter>";
+    else if (char == "#")
+      fmt = "<literal>"name"</literal>";
+    else
+      fmt = name;
+    return sprintf("%s%s%s",
+		   runline(pre),
+		   sprintf(fmt, id, name),
+		   runline(aft) );
+  } else {
+    return line;
+  }
+}
+]]></programlisting>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <programlisting linenumbering="numbered"><![CDATA[
+function runline (line, ix, jx, pre, aft, char, name, id, fmt) {
+  ix = match(line, /[\*\$\@\%\!\#]\{[^\}]*\}/)
+  if (ix > 0) {
+    jx = ix + index(substr(line, ix), "}");
+    pre = substr(line, 1, ix - 1);
+    aft = substr(line, jx);
+    char = substr(line, ix, 1);
+    name = substr(line, ix + 2, jx - ix - 3);
+    id = name;
+    while (sub(/[\.-]/, "_", id));
+    if (char == "!")
+      fmt = "<filename><link linkend='S__%s'>%s</link></filename>";
+    else if (char == "*")
+      fmt = "<function><link linkend='T__%s'>%s</link></function>";
+    else if (char == "%")
+      fmt = "<function><link linkend='M__%s'>%s</link></function>";
+    else if (char == "@") 
+      fmt = "<parameter><link linkend='P__%s'>%s</link></parameter>";
+    else if (char == "$") 
+      fmt = "<parameter>"name"</parameter>";
+    else if (char == "#")
+      fmt = "<literal>"name"</literal>";
+    else
+      fmt = name;
+    return sprintf("%s%s%s",
+		   runline(pre),
+		   sprintf(fmt, id, name),
+		   runline(aft) );
+  } else {
+    return line;
+  }
+}
+]]></programlisting>
+
+<programlisting linenumbering="numbered" continuation="continues">
+BEGIN { print "&lt;section&gt;"; }
+</programlisting>
+
+<programlisting linenumbering="numbered" continuation="continues">
+<![CDATA[/<\!--\!\!/ {
+  inthis = "title";
+  this = "header";
+  next;
+}
+]]></programlisting>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+<programlisting linenumbering="numbered" startinglinenumber="701">
+# The starting line number is 701.
+# So this is line number 72.
+</programlisting>
+
+
+  </section> <!-- programlisting -->
+
+  <section id="screen">
+  <title>Screens</title>
+
+  <para>This <sgmltag>screen</sgmltag> element has <sgmltag>prompt</sgmltag>,
+  <sgmltag>userinput</sgmltag>, and <sgmltag>computeroutput</sgmltag> elements.</para>
+
+  <screen><prompt>[shaunm@verso testbook] </prompt><userinput>make</userinput>
+<computeroutput><![CDATA[if [ ! -d html ]; then mkdir html; fi
+rm -f html/*.*
+xsltproc --timing --nonet --xinclude -o html/ \
+        --param db.chunk.chunk_top 1 \
+        --stringparam theme.icon.admon.path "../../../data/icons/" \
+        --stringparam theme.icon.nav.previous "../../../data/icons/nav-previous.png" \
+        --stringparam theme.icon.nav.next "../../../data/icons/nav-next.png" \
+        ../../xslt/docbook/html/db2html.xsl \
+        testbook.xml
+Parsing stylesheet ../../xslt/docbook/html/db2html.xsl took 0 ms
+Parsing document testbook.xml took 51 ms
+XInclude processing testbook.xml took 0 ms
+Running stylesheet and saving result took 144 ms
+]]></computeroutput></screen>
+
+  <screen linenumbering="numbered"><prompt>[shaunm@verso testbook] </prompt><userinput>make</userinput>
+<computeroutput><![CDATA[if [ ! -d html ]; then mkdir html; fi
+rm -f html/*.*
+xsltproc --timing --nonet --xinclude -o html/ \
+        --param db.chunk.chunk_top 1 \
+        --stringparam theme.icon.admon.path "../../../data/icons/" \
+        --stringparam theme.icon.nav.previous "../../../data/icons/nav-previous.png" \
+        --stringparam theme.icon.nav.next "../../../data/icons/nav-next.png" \
+        ../../xslt/docbook/html/db2html.xsl \
+        testbook.xml
+Parsing stylesheet ../../xslt/docbook/html/db2html.xsl took 0 ms
+Parsing document testbook.xml took 51 ms
+XInclude processing testbook.xml took 0 ms
+Running stylesheet and saving result took 144 ms
+]]></computeroutput></screen>
+
+  </section> <!-- screen -->
+
+<section id="cmdsynopsis">
+  <title>Commands</title>
+  <cmdsynopsis>
+    <command>cd</command>
+    <arg choice="req"><replaceable>directory</replaceable></arg>
+  </cmdsynopsis>
+  <cmdsynopsis>
+    <command>cal</command>
+    <arg>-j</arg>
+    <arg>-y</arg>
+    <arg>month <arg>year</arg></arg>
+  </cmdsynopsis>
+  <cmdsynopsis>
+    <command>chgrp</command>
+    <arg>-R <group>
+      <arg>-H</arg>
+      <arg>-L</arg>
+      <arg>-P</arg>
+    </group></arg>
+    <arg>-f</arg>
+    <arg choice='plain'><replaceable>group</replaceable></arg>
+    <arg rep='repeat' choice='plain'><replaceable>file</replaceable></arg>
+  </cmdsynopsis>
+  <para>Here we use an <sgmltag>sbr</sgmltag> element:</para>
+  <cmdsynopsis>
+    <command>ls</command>
+    <group><arg>--all</arg><arg>--almost-all</arg></group>
+    <sbr/>
+    <arg>--ignore-backups</arg>
+    <sbr/>
+    <arg>--directory</arg>
+    <sbr/>
+    <arg>--human-readable</arg>
+    <sbr/>
+    <arg>--ignore=<replaceable>PATTERN</replaceable></arg>
+    <sbr/>
+    <arg>-l</arg>
+    <sbr/>
+    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
+  </cmdsynopsis>
+  <para>And here we put <sgmltag>sbr</sgmltag> elements inside
+  <sgmltag>arg</sgmltag> and <sgmltag>group</sgmltag> elements:</para>
+  <cmdsynopsis>
+    <command>ls</command>
+    <group><arg>--all</arg><sbr/><arg>--almost-all</arg></group>
+    <arg>--ignore=<sbr/><group><replaceable>PATTERN</replaceable><sbr/><replaceable>PATTERN</replaceable><sbr/><replaceable>PATTERN</replaceable></group></arg>
+    <sbr/>
+    <arg>--ignore=<group><replaceable>PATTERN</replaceable><sbr/><replaceable>PATTERN</replaceable><sbr/><replaceable>PATTERN</replaceable></group></arg>
+    <sbr/>
+    <group><arg choice="req">fe=<sbr/>fi</arg><arg>fo</arg><sbr/><arg>fum</arg></group>
+    <sbr/>
+    <arg>-l</arg>
+    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
+  </cmdsynopsis>
+
+  <para>Also, <sgmltag>sbr</sgmltag> tags with fragments:</para>
+  <cmdsynopsis>
+    <command>foo</command>
+    <group><synopfragmentref linkend="synopfrag1"/><arg>foo</arg><sbr/><arg>bar</arg></group>
+    <arg><synopfragmentref linkend="synopfrag2"/>foo=<sbr/>bar</arg>
+    <synopfragment id="synopfrag1">
+      <group><arg>foo</arg><sbr/><arg>bar</arg></group>
+      <arg>foo=<sbr/>bar</arg>
+    </synopfragment>
+    <synopfragment id="synopfrag2">
+      <group><arg>foo</arg><sbr/><arg>bar</arg></group>
+      <arg>foo=<sbr/>bar</arg>
+    </synopfragment>
+  </cmdsynopsis>
+
+  <para>Here we put two <sgmltag>cmdsynopsis</sgmltag> elements inside
+  a single <sgmltag>synopsis</sgmltag> element:</para>
+  <synopsis><cmdsynopsis>
+    <command>grep</command>
+    <arg><replaceable>options</replaceable></arg>
+    <arg choice="plain"><replaceable>PATTERN</replaceable></arg>
+    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
+    </cmdsynopsis><cmdsynopsis>
+    <command>grep</command>
+    <arg><replaceable>options</replaceable></arg>
+    <group>
+      <arg>-e <replaceable>PATTERN</replaceable></arg>
+      <arg>-f <replaceable>FILE</replaceable></arg>
+    </group>
+    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
+  </cmdsynopsis></synopsis>
+  <para>Here we just put both commands in a single <sgmltag>cmdsynopsis</sgmltag>
+  element:</para>
+  <cmdsynopsis>
+    <command>grep</command>
+    <arg><replaceable>options</replaceable></arg>
+    <arg choice="plain"><replaceable>PATTERN</replaceable></arg>
+    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
+    <command>grep</command>
+    <arg><replaceable>options</replaceable></arg>
+    <group>
+      <arg>-e <replaceable>PATTERN</replaceable></arg>
+      <arg>-f <replaceable>FILE</replaceable></arg>
+    </group>
+    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
+  </cmdsynopsis>
+</section>
+
+<section id="misc-block">
+  <title>Miscellaneous</title>
+
+  <epigraph>
+    <attribution>Henry Spencer</attribution>
+    <para>Those who do not understand Unix are condemned to reinvent it,
+    poorly.</para>
+  </epigraph>
+
+  <para>The above was brought to you courtesy of the <sgmltag>epigraph</sgmltag>
+  element.  Now here is an <sgmltag>address</sgmltag> element:</para>
+
+  <address>Free Software Foundation
+51 Franklin Street, Fifth Floor
+Boston, MA 02110-1301
+USA</address>
+
+  <para>Here is a <sgmltag>blockquote</sgmltag> element:</para>
+
+  <blockquote>
+    <attribution>Richard Stallman, from the <ulink
+    url="http://www.gnu.org/gnu/manifesto.html">GNU Manifeto</ulink></attribution>
+    <para>I consider that the golden rule requires that if I like a program
+    I must share it with other people who like it. Software sellers want to
+    divide the users and conquer them, making each user agree not to share
+    with others. I refuse to break solidarity with other users in this way.
+    I cannot in good conscience sign a nondisclosure agreement or a software
+    license agreement. For years I worked within the Artificial Intelligence
+    Lab to resist such tendencies and other inhospitalities, but eventually
+    they had gone too far: I could not remain in an institution where such
+    things are done for me against my will.</para>
+  </blockquote>
+
+  <formalpara>
+    <title>Formal Paragraph</title>
+    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+    porttitor condimentum nulla.</para>
+  </formalpara>
+
+  <para>Next we have a <sgmltag>literallayout</sgmltag> element:</para>
+
+  <literallayout>This is a line.
+This is another line.
+  This line is indented.</literallayout>
+
+  <para>And here is a <sgmltag>synopsis</sgmltag> element:</para>
+  <synopsis><![CDATA[#include <gtk/gtk.h>
+
+                    GtkButton;
+GtkWidget*          gtk_button_new                      (void);
+GtkWidget*          gtk_button_new_with_label           (const gchar *label);
+GtkWidget*          gtk_button_new_with_mnemonic        (const gchar *label);
+GtkWidget*          gtk_button_new_from_stock           (const gchar *stock_id);
+]]></synopsis>
+  <synopsis linenumbering="numbered"><![CDATA[#include <gtk/gtk.h>
+void                gtk_button_pressed                  (GtkButton *button);
+void                gtk_button_released                 (GtkButton *button);
+void                gtk_button_clicked                  (GtkButton *button);
+void                gtk_button_enter                    (GtkButton *button);
+void                gtk_button_leave                    (GtkButton *button);
+]]></synopsis>
+
+<!-- FIXME:
+glossary stuff
+-->
+
+</section> <!-- misc-block -->
+
+</chapter>
diff --git a/test/docbook/source/cals-tables.xml b/test/docbook/source/cals-tables.xml
new file mode 100644
index 00000000..c94b9ae0
--- /dev/null
+++ b/test/docbook/source/cals-tables.xml
@@ -0,0 +1,322 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         id="cals-tables">
+<title>CALS Tables</title>
+
+<informaltable>
+<tgroup cols="2">
+  <tbody>
+    <row><entry>fe</entry><entry>fi</entry></row>
+    <row><entry>fo</entry><entry>fum</entry></row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+porttitor condimentum nulla.</para>
+
+<section id="cals-tables-span">
+<title>Spanning</title>
+
+<para>Here's some column spanning:</para>
+<informaltable frame="none">
+<tgroup cols="4" rowsep="1" colsep="1">
+  <colspec colname="one"/>
+  <colspec colname="two"/>
+  <colspec colname="three"/>
+  <colspec colname="four"/>
+  <spanspec spanname="two-four" namest="two" nameend="four"/>
+  <tbody>
+    <row>
+      <entry>one</entry>
+      <entry>two</entry>
+      <entry>three</entry>
+      <entry>four</entry>
+    </row>
+    <row>
+      <entry namest="one" nameend="two">one-two</entry>
+      <entry>three</entry>
+      <entry>four</entry>
+    </row>
+    <row>
+      <entry namest="two" nameend="three">two-three</entry>
+      <entry>four</entry>
+    </row>
+    <row>
+      <entry>one</entry>
+      <entry spanname="two-four">two-four</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>Here's some row spanning:</para>
+<informaltable frame="none">
+<tgroup cols="4" rowsep="1" colsep="1">
+  <tbody>
+    <row>
+      <entry morerows="1">one</entry>
+      <entry morerows="2">two</entry>
+      <entry>three</entry>
+      <entry>four</entry>
+    </row>
+    <row>
+      <entry>three</entry>
+      <entry morerows="1">four</entry>
+    </row>
+    <row>
+      <entry>one</entry>
+      <entry morerows="1">three</entry>
+    </row>
+    <row>
+      <entry>one</entry>
+      <entry>two</entry>
+      <entry>four</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>Here we test implicit entries:</para>
+<informaltable frame="none">
+<tgroup cols="4" rowsep="1" colsep="1">
+  <colspec colname="one"/>
+  <colspec colname="two"/>
+  <colspec colname="three"/>
+  <colspec colname="four"/>
+  <tbody>
+    <row>
+      <entry>one</entry>
+      <entry>two</entry>
+      <entry morerows="2">three</entry>
+      <entry>four</entry>
+    </row>
+    <row>
+      <entry colname="two">two</entry>
+      <entry>four</entry>
+    </row>
+    <row>
+      <entry colname="four">four</entry>
+    </row>
+    <row>
+      <entry colname="three">three</entry>
+      <entry>four</entry>
+    </row>
+    <row>
+      <entry colname="four">four</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>And here's some craziness to mix it all together:</para>
+<informaltable frame="none">
+<tgroup cols="5" rowsep="1" colsep="1">
+  <colspec colname="one"/>
+  <colspec colname="two"/>
+  <colspec colname="three"/>
+  <colspec colname="four"/>
+  <colspec colname="five"/>
+  <tbody>
+    <row>
+      <entry morerows="1">one</entry>
+      <entry>two</entry>
+      <entry>three</entry>
+      <entry morerows="3">four</entry>
+      <entry>five</entry>
+    </row>
+    <row>
+      <entry colname="three">three</entry>
+      <entry morerows="1">five</entry>
+    </row>
+    <row>
+      <entry>one</entry>
+      <entry namest="two" nameend="three">two-three</entry>
+    </row>
+    <row>
+      <entry>one</entry>
+      <entry namest="two" nameend="three" morerows="1">two-three</entry>
+      <entry>five</entry>
+    </row>
+    <row>
+      <entry>one</entry>
+      <entry>four</entry>
+      <entry>five</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+</section> <!-- cals-tables-span -->
+
+<section id="cals-tables-sep">
+<title>Separators</title>
+
+<!-- FIXME: more -->
+<para>Here we just set <sgmltag>colsep</sgmltag> on some
+<sgmltag>entry</sgmltag> elements:</para>
+<informaltable frame="none">
+<tgroup cols="3">
+  <tbody>
+    <row>
+      <entry colsep="1">SEP</entry>
+      <entry>no</entry>
+      <entry>no</entry>
+    </row>
+    <row>
+      <entry>no</entry>
+      <entry colsep="1">SEP</entry>
+      <entry>no</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>Here we turn column separators on and off with
+<sgmltag>colspec</sgmltag> elements:</para>
+<informaltable frame="none">
+<tgroup cols="3" colsep="1">
+  <colspec colname="one" colsep="0"/>
+  <colspec colname="two" colsep="1"/>
+  <colspec colname="three" colsep="0"/>
+  <colspec/>
+  <tbody>
+    <row>
+      <entry>no</entry>
+      <entry colname="two">SEP</entry>
+      <entry>no</entry>
+    </row>
+    <row>
+      <entry namest="one" nameend="two">SEP</entry>
+      <entry>no</entry>
+    </row>
+    <row>
+      <entry namest="two" nameend="three">no</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+</section> <!-- cals-tables-sep -->
+
+<section id="cals-tables-frames">
+<title>Frames</title>
+
+<para>This table has a top frame:</para>
+<informaltable frame="top">
+<tgroup cols="2">
+  <tbody>
+    <row>
+      <entry>fe</entry>
+      <entry>fi</entry>
+    </row>
+    <row>
+      <entry>fo</entry>
+      <entry>fum</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>This table has a bottom frame:</para>
+<informaltable frame="bottom">
+<tgroup cols="2">
+  <tbody>
+    <row>
+      <entry>fe</entry>
+      <entry>fi</entry>
+    </row>
+    <row>
+      <entry>fo</entry>
+      <entry>fum</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>This table has top and bottom frames:</para>
+<informaltable frame="topbot">
+<tgroup cols="2">
+  <tbody>
+    <row>
+      <entry>fe</entry>
+      <entry>fi</entry>
+    </row>
+    <row>
+      <entry>fo</entry>
+      <entry>fum</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>This table has side frames:</para>
+<informaltable frame="sides">
+<tgroup cols="2">
+  <tbody>
+    <row>
+      <entry>fe</entry>
+      <entry>fi</entry>
+    </row>
+    <row>
+      <entry>fo</entry>
+      <entry>fum</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>This table has no frames:</para>
+<informaltable frame="none">
+<tgroup cols="2">
+  <tbody>
+    <row>
+      <entry>fe</entry>
+      <entry>fi</entry>
+    </row>
+    <row>
+      <entry>fo</entry>
+      <entry>fum</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+<para>We default to framing all sides when not specified:</para>
+<informaltable>
+<tgroup cols="2">
+  <tbody>
+    <row>
+      <entry>fe</entry>
+      <entry>fi</entry>
+    </row>
+    <row>
+      <entry>fo</entry>
+      <entry>fum</entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+
+</section> <!-- cals-tables-frames -->
+
+<section id="cals-tables-misc">
+<title>Miscellaneous</title>
+
+<table pgwide="1">
+<title>Using <sgmltag>pgwide</sgmltag></title>
+<tgroup cols="3">
+  <tbody>
+    <row><entry>fe</entry><entry>fi</entry><entry>fo</entry></row>
+    <row><entry>fum</entry><entry>fe</entry><entry>fi</entry></row>
+    <row><entry>fo</entry><entry>fum</entry><entry>fe</entry></row>
+    <row><entry>fi</entry><entry>fo</entry><entry>fum</entry></row>
+  </tbody>
+</tgroup>
+</table>
+
+</section> <!-- cals-tables-misc -->
+</chapter> <!-- cals-tables -->
diff --git a/test/docbook/source/classsynopsis.xml b/test/docbook/source/classsynopsis.xml
new file mode 100644
index 00000000..23f6f177
--- /dev/null
+++ b/test/docbook/source/classsynopsis.xml
@@ -0,0 +1,214 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         id="classsynopsis">
+<title>Class Synopses</title>
+
+<section id="classsynopsis-cpp">
+<title>C++</title>
+
+<para>Here is a <sgmltag>classsynopsis</sgmltag>:</para>
+<classsynopsis language="cpp">
+  <ooclass><classname>Button</classname></ooclass>
+  <ooclass><modifier>public</modifier><classname>Bin</classname></ooclass>
+  <constructorsynopsis>
+    <modifier>public</modifier>
+    <methodname>Button</methodname>
+    <void/>
+  </constructorsynopsis>
+  <constructorsynopsis>
+    <modifier>public</modifier>
+    <modifier>explicit</modifier>
+    <methodparam>
+      <modifier>const</modifier>
+      <type>Glib::ustring&amp;</type>
+      <parameter>label</parameter>
+    </methodparam>
+    <methodparam>
+      <type>bool</type>
+      <parameter>mnemonic</parameter>
+      <initializer>false</initializer>
+    </methodparam>
+  </constructorsynopsis>
+  <destructorsynopsis>
+    <modifier>public</modifier>
+    <modifier>virtual</modifier>
+    <void/>
+  </destructorsynopsis>
+  <fieldsynopsis>
+    <modifier>private</modifier>
+    <modifier>friend</modifier>
+    <type>class</type>
+    <varname>Button_Class</varname>
+  </fieldsynopsis>
+  <fieldsynopsis>
+    <modifier>private</modifier>
+    <modifier>static</modifier>
+    <type>CppClassType</type>
+    <varname>button_class_</varname>
+  </fieldsynopsis>
+  <methodsynopsis>
+    <modifier>protected</modifier>
+    <modifier>virtual</modifier>
+    <void/>
+    <methodname>on_pressed</methodname>
+    <void/>
+  </methodsynopsis>
+  <methodsynopsis>
+    <modifier>protected</modifier>
+    <modifier>virtual</modifier>
+    <void/>
+    <methodname>on_released</methodname>
+    <void/>
+  </methodsynopsis>
+  <methodsynopsis>
+    <modifier>protected</modifier>
+    <modifier>virtual</modifier>
+    <void/>
+    <methodname>on_clicked</methodname>
+    <void/>
+  </methodsynopsis>
+  <methodsynopsis>
+    <modifier>protected</modifier>
+    <modifier>virtual</modifier>
+    <void/>
+    <methodname>on_enter</methodname>
+    <void/>
+  </methodsynopsis>
+  <methodsynopsis>
+    <modifier>protected</modifier>
+    <modifier>virtual</modifier>
+    <void/>
+    <methodname>on_leave</methodname>
+    <void/>
+  </methodsynopsis>
+  <methodsynopsis>
+    <modifier>protected</modifier>
+    <modifier>virtual</modifier>
+    <void/>
+    <methodname>on_activate</methodname>
+    <void/>
+  </methodsynopsis>
+  <methodsynopsis>
+    <modifier>public</modifier>
+    <type>GType</type>
+    <methodname>get_type</methodname>
+    <void/>
+    <modifier>G_GNUC_CONST</modifier>
+  </methodsynopsis>
+  <methodsynopsis>
+    <modifier>public</modifier>
+    <type>GType</type>
+    <methodname>get_base_type</methodname>
+    <void/>
+    <modifier>G_GNUC_CONST</modifier>
+  </methodsynopsis>
+  <fieldsynopsis>
+    <modifier>public</modifier>
+    <modifier>static</modifier>
+    <type>bool</type>
+    <varname>fake</varname>
+    <initializer>true</initializer>
+  </fieldsynopsis>
+</classsynopsis>
+
+<para>Here is a standalone <sgmltag>methodsynopsis</sgmltag>:</para>
+<methodsynopsis language="cpp">
+<modifier>public</modifier>
+<void/>
+<methodname>frobnicate</methodname>
+<methodparam><type>Foo</type><parameter>foo</parameter></methodparam>
+<methodparam><modifier>const</modifier><type>bool</type><parameter>frob</parameter><initializer>true</initializer></methodparam>
+<modifier>FROB</modifier>
+</methodsynopsis>
+
+</section> <!-- classsynopsis-cpp -->
+
+<section id="classsynopsis-csharp">
+<title>C#</title>
+</section> <!-- classsynopsis-csharp -->
+
+<section id="classsynopsis-java">
+<title>Java</title>
+</section> <!-- classsynopsis-java -->
+
+<section id="classsynopsis-python">
+<title>Python</title>
+
+<para>Here is a <sgmltag>classsynopsis</sgmltag>:</para>
+<classsynopsis language="python">
+<ooclass><classname>gtk.Button</classname></ooclass>
+<ooclass><classname>gtk.Bin</classname></ooclass>
+<constructorsynopsis>
+  <methodparam>
+    <parameter>label</parameter>
+    <initializer>None</initializer>
+  </methodparam>
+  <methodparam>
+    <parameter>stock</parameter>
+    <initializer>None</initializer>
+  </methodparam>
+  <methodparam>
+    <parameter>use_underline</parameter>
+    <initializer>True</initializer>
+  </methodparam>
+</constructorsynopsis>
+<destructorsynopsis><void/></destructorsynopsis>
+<methodsynopsis><methodname>pressed</methodname><void/></methodsynopsis>
+<methodsynopsis><methodname>released</methodname><void/></methodsynopsis>
+<methodsynopsis><methodname>clicked</methodname><void/></methodsynopsis>
+<methodsynopsis><methodname>enter</methodname><void/></methodsynopsis>
+<methodsynopsis><methodname>leave</methodname><void/></methodsynopsis>
+<methodsynopsis>
+  <methodname>set_relief</methodname>
+  <methodparam><parameter>newstyle</parameter></methodparam>
+</methodsynopsis>
+<methodsynopsis><methodname>get_relief</methodname><void/></methodsynopsis>
+<fieldsynopsis><varname>fake</varname><initializer>True</initializer></fieldsynopsis>
+</classsynopsis>
+
+<para>Here we use <sgmltag>modifier</sgmltag> for Python decorators:</para>
+<classsynopsis language="python">
+<ooclass><classname>Decorated</classname></ooclass>
+<ooclass><classname>Base1</classname></ooclass>
+<ooclass><classname>Base2</classname></ooclass>
+<ooclass><classname>Base3</classname></ooclass>
+<constructorsynopsis>
+  <modifier>@constructor</modifier>
+  <methodname>create</methodname>
+  <methodparam><parameter>input</parameter></methodparam>
+</constructorsynopsis>
+<destructorsynopsis>
+  <modifier>@destructor</modifier>
+  <methodname>destroy</methodname>
+  <void/>
+</destructorsynopsis>
+<fieldsynopsis>
+  <modifier>@private</modifier>
+  <varname>parts</varname>
+  <initializer>None</initializer>
+</fieldsynopsis>
+<methodsynopsis>
+  <modifier>@classmethod</modifier>
+  <methodname>find_all</methodname>
+  <void/>
+</methodsynopsis>
+</classsynopsis>
+
+<para>Here we use annotations from
+<ulink url="http://www.python.org/dev/peps/pep-3107/">PEP 3107</ulink>:</para>
+<methodsynopsis language="python">
+  <type>Frobnicated</type>
+  <methodname>frobnicate</methodname>
+  <methodparam>
+    <type>Frobnicatable</type>
+    <parameter>frob</parameter>
+  </methodparam>
+  <methodparam>
+    <type>bool</type>
+    <parameter>thorough</parameter>
+    <initializer>False</initializer>
+  </methodparam>
+</methodsynopsis>
+
+</section> <!-- classsynopsis-python -->
+
+</chapter>
diff --git a/test/docbook/source/funcsynopsis.xml b/test/docbook/source/funcsynopsis.xml
new file mode 100644
index 00000000..98f1a0d7
--- /dev/null
+++ b/test/docbook/source/funcsynopsis.xml
@@ -0,0 +1,131 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         id="funcsynopsis">
+<title>Function Synopses</title>
+
+<section id="funcsynopsis-ansi">
+<title>ANSI Formatting</title>
+
+<para>Here's an example with two <sgmltag>modifier</sgmltag> elements:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style ANSI?>
+<funcsynopsisinfo>// This is a funcsynopsisinfo</funcsynopsisinfo>
+<funcprototype>
+  <modifier>static</modifier>
+  <modifier>SILLY</modifier>
+  <funcdef><type>Foo *</type> <function>foo_list_get_nth</function></funcdef>
+  <paramdef><type>FooList *</type><parameter>list</parameter></paramdef>
+  <paramdef>int <parameter>n</parameter></paramdef>
+</funcprototype>
+</funcsynopsis>
+
+<para>This example uses <sgmltag>void</sgmltag>:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style ANSI?>
+<funcprototype>
+  <modifier>static</modifier>
+  <funcdef>void <function>foo_noop</function></funcdef>
+  <void/>
+</funcprototype>
+</funcsynopsis>
+
+<para>This example uses <sgmltag>varargs</sgmltag>:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style ANSI?>
+<funcprototype>
+  <modifier>static</modifier>
+  <funcdef>void <function>foo_process_args</function></funcdef>
+  <paramdef><type>Foo *</type><parameter>foo</parameter></paramdef>
+  <varargs/>
+</funcprototype>
+</funcsynopsis>
+
+<para>This example places a <sgmltag>modifier</sgmltag> after the
+<sgmltag>func</sgmltag>, for some strange reason:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style ANSI?>
+<funcprototype>
+  <funcdef>void <function>foo_process_args</function></funcdef>
+  <paramdef><type>Foo *</type><parameter>foo</parameter></paramdef>
+  <varargs/>
+  <modifier>AFTER</modifier>
+</funcprototype>
+</funcsynopsis>
+
+<para>This example uses <sgmltag>funcparams</sgmltag>:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style ANSI?>
+<funcprototype>
+  <funcdef>void <function>foo_list_foreach</function></funcdef>
+  <paramdef><type>FooList *</type><parameter>list</parameter></paramdef>
+  <paramdef>int (*<parameter>func</parameter>) <funcparams>Foo *, void *</funcparams></paramdef>
+  <paramdef>void *<parameter>user_data</parameter></paramdef>
+</funcprototype>
+
+</funcsynopsis>
+
+</section> <!-- funcsynopsis-ansi -->
+
+<section id="funcsynopsis-kr">
+<title>K&amp;R Formatting</title>
+
+<para>Here's an example with two <sgmltag>modifier</sgmltag> elements:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style KR?>
+<funcsynopsisinfo>// This is a funcsynopsisinfo</funcsynopsisinfo>
+<funcprototype>
+  <modifier>static</modifier>
+  <modifier>SILLY</modifier>
+  <funcdef><type>Foo *</type> <function>foo_list_get_nth</function></funcdef>
+  <paramdef><type>FooList *</type><parameter>list</parameter></paramdef>
+  <paramdef>int <parameter>n</parameter></paramdef>
+</funcprototype>
+</funcsynopsis>
+
+<para>This example uses <sgmltag>void</sgmltag>:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style KR?>
+<funcprototype>
+  <modifier>static</modifier>
+  <funcdef>void <function>foo_noop</function></funcdef>
+  <void/>
+</funcprototype>
+</funcsynopsis>
+
+<para>This example uses <sgmltag>varargs</sgmltag>:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style KR?>
+<funcprototype>
+  <modifier>static</modifier>
+  <funcdef>void <function>foo_process_args</function></funcdef>
+  <paramdef><type>Foo *</type><parameter>foo</parameter></paramdef>
+  <varargs/>
+</funcprototype>
+</funcsynopsis>
+
+<para>This example places a <sgmltag>modifier</sgmltag> after the
+<sgmltag>func</sgmltag>, for some strange reason:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style KR?>
+<funcprototype>
+  <funcdef>void <function>foo_process_args</function></funcdef>
+  <paramdef><type>Foo *</type><parameter>foo</parameter></paramdef>
+  <varargs/>
+  <modifier>AFTER</modifier>
+</funcprototype>
+</funcsynopsis>
+
+<para>This example uses <sgmltag>funcparams</sgmltag>:</para>
+<funcsynopsis>
+<?db2html.funcsynopsis.style KR?>
+<funcprototype>
+  <funcdef>void <function>foo_list_foreach</function></funcdef>
+  <paramdef><type>FooList *</type><parameter>list</parameter></paramdef>
+  <paramdef>int (*<parameter>func</parameter>) <funcparams>Foo *, void *</funcparams></paramdef>
+  <paramdef>void *<parameter>user_data</parameter></paramdef>
+</funcprototype>
+
+</funcsynopsis>
+
+</section> <!-- funcsynopsis-kr -->
+
+</chapter>
diff --git a/test/docbook/source/glossary.xml b/test/docbook/source/glossary.xml
new file mode 100644
index 00000000..6c237dfa
--- /dev/null
+++ b/test/docbook/source/glossary.xml
@@ -0,0 +1,42 @@
+<glossary id="glossary">
+  <glossdiv id="glossary-div">
+    <title>A Glossary Division</title>
+    <glosslist>
+      <title>A Glossary List</title>
+      <glossentry>
+        <glossterm>applet</glossterm>
+        <glossdef>
+          <para>An applet is a small, interactive application that resides within
+          a panel, for example the <application>CD Player</application>. Each
+          applet has a simple user interface that you can operate with the mouse
+          or keyboard.</para>
+        </glossdef>
+      </glossentry>
+      <glossentry id="gloss-button">
+        <glossterm>button</glossterm>
+        <glossdef>
+          <para>The thing you press.</para>
+        </glossdef>
+      </glossentry>
+      <glossentry>
+        <glossterm>desktop</glossterm>
+        <glossdef>
+          <para>The part of the GNOME Desktop where there are no interface
+          graphical items, such as panels and windows.</para>
+        </glossdef>
+      </glossentry>
+    </glosslist>
+    <glossentry id="gloss-background">
+      <glossterm>desktop background</glossterm>
+      <abbrev>background</abbrev>
+      <glossdef>
+        <para>The image or color that is applied to your desktop.</para>
+        <glossseealso otherterm="gloss-background"/>
+      </glossdef>
+    </glossentry>
+    <glossentry>
+      <glossterm>desktop</glossterm>
+      <glosssee otherterm="gloss-background"/>
+    </glossentry>
+  </glossdiv> <!-- glossary-div -->
+</glossary>
diff --git a/test/docbook/source/idx.xml b/test/docbook/source/idx.xml
new file mode 100644
index 00000000..8efdcf03
--- /dev/null
+++ b/test/docbook/source/idx.xml
@@ -0,0 +1,26 @@
+<index id="idx">
+  <title>Manual Index</title>
+  <para>This index is constructed manually using <sgmltag>indexentry</sgmltag>
+  elements.</para>
+  <indexentry>
+    <primaryie><classname>GtkAboutDialog</classname></primaryie>
+    <seealsoie><classname>GtkDialog</classname></seealsoie>
+    <seealsoie><classname>GtkWindow</classname></seealsoie>
+  </indexentry>
+  <indexentry>
+    <primaryie><classname>GtkDialog</classname></primaryie>
+    <seealsoie><classname>GtkWindow</classname></seealsoie>
+  </indexentry>
+  <indexentry>
+    <primaryie><classname>GtkWindow</classname></primaryie>
+  </indexentry>
+  <indexentry>
+    <primaryie>windows</primaryie>
+    <seeie><classname>GtkWindow</classname></seeie>
+    <secondaryie>about dialogs</secondaryie>
+    <seeie><classname>GtkAboutDialog</classname></seeie>
+    <seealsoie><classname>GtkDialog</classname></seealsoie>
+    <secondaryie>dialogs</secondaryie>
+    <seeie><classname>GtkDialog</classname></seeie>
+  </indexentry>
+</index>
diff --git a/test/docbook/source/index.docbook b/test/docbook/source/index.docbook
new file mode 100644
index 00000000..e57610ed
--- /dev/null
+++ b/test/docbook/source/index.docbook
@@ -0,0 +1,62 @@
+<?xml version="1.0"?><!-- -*- indent-tabs-mode: nil -*- -->
+<book xmlns="http://docbook.org/ns/docbook"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      id="index"> 
+  <title>Test Book</title> 
+  <bookinfo>
+    <abstract role="description">
+      <para>This is a description of the document.</para>
+    </abstract>
+    <copyright>
+      <year>2007</year>
+      <holder>Shaun McCance</holder>
+    </copyright>
+    <publisher role="maintainer">
+      <publishername>GNOME Documentation Project</publishername>
+    </publisher>
+    <author>
+      <firstname>Shaun</firstname>
+      <surname>McCance</surname>
+      <affiliation>
+        <orgname>GNOME Documentation Project</orgname>
+      </affiliation>
+      <email>shaunm@gnome.org</email>
+    </author>
+    <revhistory>
+      <revision>
+        <revnumber>0.1</revnumber>
+        <date>1887-02-03</date>
+        <revdescription>
+          <para role="author">Shaun McCance</para>
+          <para role="publisher">GNOME Documentation Project</para>
+        </revdescription>
+      </revision>
+      <revision>
+        <revnumber>0.2</revnumber>
+        <date>1902-03-08</date>
+        <revdescription>
+          <para role="author">Shaun McCance</para>
+          <para role="publisher">GNOME Documentation Project</para>
+        </revdescription>
+      </revision>
+    </revhistory>
+
+    <legalnotice>
+      <title>Feedback</title>
+      <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+      Integer lacinia.</para>
+    </legalnotice>
+  </bookinfo>
+
+<xi:include href="inline.xml"/>
+<xi:include href="blocks.xml"/>
+<xi:include href="lists.xml"/>
+<xi:include href="cals-tables.xml"/>
+<xi:include href="funcsynopsis.xml"/>
+<xi:include href="classsynopsis.xml"/>
+<xi:include href="glossary.xml"/>
+<xi:include href="bibliography.xml"/>
+<xi:include href="reference.xml"/>
+<xi:include href="idx.xml"/>
+
+</book>
diff --git a/test/docbook/source/inline.xml b/test/docbook/source/inline.xml
new file mode 100644
index 00000000..34f39b12
--- /dev/null
+++ b/test/docbook/source/inline.xml
@@ -0,0 +1,431 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         id="inline">
+<title>Inline Elements</title>
+<variablelist>
+  <varlistentry>
+    <term><sgmltag>abbrev</sgmltag></term>
+    <listitem><para>The word <wordasword>concatenate</wordasword> is frequently abbreviated
+    as either <abbrev>concat</abbrev> or simply <abbrev>cat</abbrev>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>accel</sgmltag></term>
+    <listitem><para>To see the authors of an application, select
+    <guimenuitem><accel>A</accel>bout</guimenuitem> from the
+    <guimenuitem><accel>H</accel>elp</guimenuitem> menu.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>acronym</sgmltag></term>
+    <listitem><para><acronym>GNOME</acronym> stands for <acronym>GNU</acronym>
+    Network Object Model Environment.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>action</sgmltag></term>
+    <listitem><para>Logging out will cause the session manager to perform
+    <action>session saving</action>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>application</sgmltag></term>
+    <listitem><para><application>Yelp</application> is the default help
+    viewer in GNOME.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>citetitle</sgmltag></term>
+    <listitem><para>Please read <citetitle pubwork="article">A Pretty Good Article</citetitle>
+    and <citetitle pubwork="book">The Bestest Book Ever</citetitle>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>citation</sgmltag></term>
+    <listitem><para>Consult <citation>Walsh97</citation> for more information.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>classname</sgmltag></term>
+    <listitem><para>The <classname>YelpDocument</classname> class provides on-demand
+    page transformations in <application>Yelp</application>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>code</sgmltag></term>
+    <listitem><para>Call <code>frobnicate(file)</code> to frobnicate the file.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>command</sgmltag></term>
+    <listitem><para>To start <application>Yelp</application>, enter <command>yelp</command>
+    at the command line.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>computeroutput</sgmltag></term>
+    <listitem><para>Runnin <command>scrollkeeper-get-content-list C</command> should output
+    something like <computeroutput>/tmp/scrollkeeper-shaunm/contents.1</computeroutput>.
+    Sometimes it also prints errors like <computeroutput role="stderr">I/O warning :
+    failed to load external entity
+    "/var/lib/scrollkeeper/en_US.UTF-8/scrollkeeper_cl.xml"</computeroutput>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>constant</sgmltag></term>
+    <listitem><para>The maximum legal length for a path name is 
+    <constant class='limit'>PATH_MAX</constant>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>corpauthor</sgmltag></term>
+    <term><sgmltag>corpcredit</sgmltag></term>
+    <listitem><para>Some of the GNOME Documentation was written by
+    <corpauthor>Sun Microsystems</corpauthor>.  Some technical editing was also done
+    by <corpcredit>Sun Microsystems</corpcredit>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>database</sgmltag></term>
+    <listitem><para>The <database>Pulse</database> database tracks everything
+    you need to know about your project.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>email</sgmltag></term>
+    <listitem><para>To contact the GNOME Documentation Team, send an email to
+    <email>gnome-doc-list@gnome.org</email>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>emphasis</sgmltag></term>
+    <listitem><para>This is <emphasis>italic</emphasis>, and this is
+    <emphasis role="bold">bold</emphasis>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>envar</sgmltag></term>
+    <listitem><para>The <envar>YELP_DEBUG</envar> environment variable can be used to
+    control the debugging output in <application>Yelp</application>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>errorcode</sgmltag></term>
+    <term><sgmltag>errorname</sgmltag></term>
+    <term><sgmltag>errortext</sgmltag></term>
+    <term><sgmltag>errortype</sgmltag></term>
+    <listitem><para>On most DOS-derived systems, functions signal a
+    <errortext>File Not Found</errortext> error by returning <errorcode>2</errorcode>
+    (<errorname>ENOENT</errorname>).  This is usually a <errortype>recoverable</errortype>
+    (non-fatal) error.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>exceptionname</sgmltag></term>
+    <listitem><para>If the world is ending, this function will throw the exception
+    <exceptionname>ArmageddonException</exceptionname>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>filename</sgmltag></term>
+    <listitem><para>This text was written in the file
+    <filename>testbook.xml</filename>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>firstterm</sgmltag></term>
+    <listitem><para>This document has example <firstterm>tables</firstterm>, and in
+    particular <firstterm linkend="cals-tables">CALS tables</firstterm>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>foreignphrase</sgmltag></term>
+    <listitem><para>Free software is sometimes called <foreignphrase>libre</foreignphrase>
+    software.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>function</sgmltag></term>
+    <listitem><para>The function <function>g_strdup</function> duplicates a string.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>glossterm</sgmltag></term>
+    <listitem><para>There's no glossary entry for <glossterm>frobnicate</glossterm>.  This
+    links implicitly to the definition of <glossterm>button</glossterm>, but we have to use
+    an explicit link for <glossterm linkend="gloss-button">buttons</glossterm>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>guibutton</sgmltag></term>
+    <term><sgmltag>guiicon</sgmltag></term>
+    <term><sgmltag>guilabel</sgmltag></term>
+    <term><sgmltag>guimenu</sgmltag></term>
+    <term><sgmltag>guimenuitem</sgmltag></term>
+    <term><sgmltag>guisubmenu</sgmltag></term>
+    <listitem><para>You can select what fonts to use under the <guilabel>Fonts</guilabel>
+    heading in the dialog.  To close the dialog, click the <guibutton>Close</guibutton> button.
+    To open a file, select <guimenuitem>Open</guimenuitem> from the <guimenu>File</guimenu>
+    menu or click the <guiicon><inlinegraphic
+    fileref="file:///usr/share/icons/gnome/22x22/status/stock_open.png"/></guiicon> icon
+    on the toolbar.  To open a recent file, select a file from the <guisubmenu>Open Recent</guisubmenu>
+    submenu of the <guimenu>File</guimenu> menu.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>hardware</sgmltag></term>
+    <listitem><para>Unfortunately, your <hardware>hard drive</hardware> cannot be
+    fixed by simply blowing into it like an old game cartridge.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>inlineequation</sgmltag></term>
+    <term><sgmltag>mathphrase</sgmltag></term>
+    <listitem><para>Fermat's last theorem says that <inlineequation>
+    <alt>x^n + y^n ≠ z^n ∀ n > 2</alt>
+    <mathphrase>x<superscript>n</superscript> + y<superscript>n</superscript> ≠ z<superscript>n</superscript> ∀ n ≠ 2</mathphrase></inlineequation>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>interface</sgmltag></term>
+    <listitem><para>In old-school DocBook, we'd use the <sgmltag>interface</sgmltag>
+    tag for the <interface>Close</interface> button.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>interfacename</sgmltag></term>
+    <listitem><para>This class implements <interfacename>GtkCellLayout</interfacename>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>keycap</sgmltag></term>
+    <term><sgmltag>keycode</sgmltag></term>
+    <term><sgmltag>keysym</sgmltag></term>
+    <listitem><para>The <keycap>F1</keycap> key on an IBM PC keyboard generates the
+    scan code <keycode>0x3B</keycode> when pressed.  This value is defined as
+    <keysym>KEY_F1</keysym>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>keycombo</sgmltag></term>
+    <listitem><para>To copy the selection to the clipboard, press
+    <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>lineannotation</sgmltag></term>
+    <listitem><para>Do not run this command if you value your data:</para>
+    <screen>find . -type f -exec shred -fuz {} \;        <lineannotation>shred all files at any depth</lineannotation></screen></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>literal</sgmltag></term>
+    <listitem><para>Set <envar>YELP_DEBUG</envar> to <literal>function-calls</literal> to
+    see all the major function calls inside <application>Yelp</application>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>markup</sgmltag></term>
+    <listitem><para>To italicize text on Wikipedia, type <markup>''text''</markup>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>medialabel</sgmltag></term>
+    <listitem><para>To being installing <application>Frobnicator</application>, insert
+    the disc labelled <medialabel>Frobnicator Install</medialabel>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>menuchoice</sgmltag></term>
+    <listitem><para>You can open a new window by selecting <menuchoice>
+    <shortcut><keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo></shortcut>
+    <guimenu>File</guimenu><guimenuitem>New Window</guimenuitem></menuchoice>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>methodname</sgmltag></term>
+    <listitem><para>The <methodname>set_label()</methodname> method sets the text of the
+    button to <parameter><replaceable>label</replaceable></parameter>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>mousebutton</sgmltag></term>
+    <listitem><para>Click with the <mousebutton>middle</mousebutton> mouse button to
+    paste the contents of the PRIMARY selection.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>option</sgmltag></term>
+    <listitem><para>The <option>-rf</option> option to the <command>ls</command>
+    command has been known to cause mental anguish.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>optional</sgmltag></term>
+    <listitem>
+      <synopsis><command>yelp <optional><option>-p</option></optional></command></synopsis>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>ooclass</sgmltag></term>
+    <term><sgmltag>ooexception</sgmltag></term>
+    <term><sgmltag>oointerface</sgmltag></term>
+    <listitem><para>The <ooclass><classname>Mallard</classname></ooclass> class
+    implements the <oointerface><interfacename>Quacks</interfacename></oointerface>
+    interface.  The <methodname>quack</methodname> method may throw the
+    <ooexception><exceptionname>Muted</exceptionname></ooexception>
+    exception.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>parameter</sgmltag></term>
+    <listitem><para>The <parameter>db2html.funcsynopsis.style</parameter> allows you
+    to set the style of function synopses to either <literal>'KR'</literal> or
+    <literal>'ANSI'</literal>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>personname</sgmltag></term>
+    <listitem><para>My name is
+    <personname><firstname>Shaun</firstname><surname>McCance</surname></personname>,
+    or <personname><firstname>Shaun</firstname><othername>William</othername>
+    <surname>McCance</surname></personname>.  You may also call me <personname>
+    <honorific>Mr</honorific><surname>Mojo</surname></personname>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>productname</sgmltag></term>
+    <listitem><para><productname class="trade">Frobnicator</productname> is the
+    only solution for frobnicating your files.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>prompt</sgmltag></term>
+    <listitem><para>The prototypical prompt is <prompt>$</prompt>, but most people
+    use something like <prompt>[<replaceable>user</replaceable>@<replaceable>host</replaceable> <replaceable>dir</replaceable>]</prompt>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>property</sgmltag></term>
+    <listitem><para>The <property>font_name</property> property can be used to set
+    the font on a widget in your <filename>.gtrc-2.0</filename> file.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>quote</sgmltag></term>
+    <listitem><para>He said, <quote>The Mallard said <quote>Quack</quote>.</quote></para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>replaceable</sgmltag></term>
+    <listitem><para>To view a DocBook file, simply run
+    <command>yelp <replaceable>file</replaceable></command>, where
+    <parameter><replaceable>file</replaceable></parameter>
+    is the name of the file.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>returnvalue</sgmltag></term>
+    <listitem><para>The template <function>i18n.locale</function> returns
+    <returnvalue>C</returnvalue> if no language has been defined in the
+    document.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>sgmltag</sgmltag></term>
+    <listitem><itemizedlist>
+      <listitem><para><sgmltag class="attribute">attribute</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="attvalue">attvalue</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="element">element</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="emptytag">emptytag</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="endtag">endtag</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="genentity">genentity</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="localname">localname</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="namespace">namespace</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="numcharref">numcharref</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="paramentity">paramentity</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="pi">pi</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="prefix">prefix</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="sgmlcomment">sgmlcomment</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="starttag">starttag</sgmltag></para></listitem>
+      <listitem><para><sgmltag class="xmlpi">xmlpi</sgmltag></para></listitem>
+    </itemizedlist></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>shortcut</sgmltag></term>
+    <listitem><para>You can open a new window by selecting <menuchoice>
+    <shortcut><keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo></shortcut>
+    <guimenu>File</guimenu><guimenuitem>New Window</guimenuitem></menuchoice>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>structfield</sgmltag></term>
+    <term><sgmltag>structname</sgmltag></term>
+    <listitem><para>The <structfield>reqs_pending</structfield> field is a list
+    of all the <structname>Request</structname> instances that are currently open
+    for this <structname>YelpDocument</structname>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>subscript</sgmltag></term>
+    <term><sgmltag>superscript</sgmltag></term>
+    <listitem><para>Here is a <sgmltag>subscript</sgmltag><subscript>sub<subscript>scr<subscript>ipt</subscript></subscript></subscript>.
+    Here is a <sgmltag>superscript</sgmltag><superscript>super<superscript>scr<superscript>ipt</superscript></superscript></superscript>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>symbol</sgmltag></term>
+    <listitem><para>No more than <symbol>MAX_DUCKS</symbol> ducks may exist
+    at any single time.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>systemitem</sgmltag></term>
+    <listitem><para>The GNOME web site is hosted on
+    <systemitem>window.gnome.org</systemitem>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>token</sgmltag></term>
+    <listitem><para>The character ∀ is parsed into <token>FORALL</token>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>trademark</sgmltag></term>
+    <listitem><para>Here are some trademarks: <trademark class="copyright">copyright</trademark>
+    <trademark class="registered">registered</trademark>
+    <trademark class="service">service</trademark>
+    <trademark class="trade">trade</trademark>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>type</sgmltag></term>
+    <listitem><para>Strings are stored as <type>gchar*</type> references.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>uri</sgmltag></term>
+    <listitem><para>Grab the latest Mallard stuff at
+    <uri>svn+ssh://svn.gnome.org/svn/gnome-doc-utils/trunk/sandbox/mallard/</uri>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>userinput</sgmltag></term>
+    <listitem><para>Type <userinput>foo</userinput> at the prompt.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>varname</sgmltag></term>
+    <listitem><para>In Perl, <varname>@ARGV</varname> contains the command line
+    parameters used when the script was run.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><sgmltag>wordasword</sgmltag></term>
+    <listitem><para>A <wordasword>term</wordasword> in Algebra has a very different
+    meaning than a <sgmltag>term</sgmltag> in DocBook.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+</chapter>
diff --git a/test/docbook/source/lists.xml b/test/docbook/source/lists.xml
new file mode 100644
index 00000000..dc6fa571
--- /dev/null
+++ b/test/docbook/source/lists.xml
@@ -0,0 +1,223 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         id="lists">
+<title>List Elements</title>
+
+<section id="itemizedlist">
+  <title>Itemized Lists</title>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <itemizedlist>
+    <title>An Itemized List</title>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    <listitem>
+      <para>Vivamus fermentum orci. Nullam posuere sem ut lectus. Donec viverra
+      tristique neque. Proin ultricies bibendum enim amet.</para>
+      <para>Phasellus mattis rhoncus nibh. Nulla nec pede varius ligula posuere
+      iaculis. Sed hendrerit nunc ac nunc. Suspendisse id.</para>
+    </listitem>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+  </itemizedlist>
+
+  <itemizedlist mark="box">
+    <title>Another Itemized List</title>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+  </itemizedlist>
+
+</section> <!-- itemizedlist -->
+
+<section id="orderedlist">
+  <title>Ordered Lists</title>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <orderedlist>
+    <title>An Ordered List</title>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    <listitem>
+      <para>Vivamus fermentum orci. Nullam posuere sem ut lectus. Donec viverra
+      tristique neque. Proin ultricies bibendum enim amet.</para>
+      <para>Phasellus mattis rhoncus nibh. Nulla nec pede varius ligula posuere
+      iaculis. Sed hendrerit nunc ac nunc. Suspendisse id.</para>
+    </listitem>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+  </orderedlist>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <orderedlist continuation="continues">
+    <title>A Continuation</title>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+  </orderedlist>
+
+  <orderedlist>
+    <title>Some Nested Lists</title>
+    <listitem>
+      <para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para>
+      <orderedlist numeration="lowerroman">
+        <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+        consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+        <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+        consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+      </orderedlist>
+    </listitem>
+    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    <listitem>
+      <para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para>
+      <orderedlist numeration="loweralpha">
+        <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+        consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+        <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+        consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+      </orderedlist>
+    </listitem>
+  </orderedlist>
+
+</section> <!-- orderedlist -->
+
+<section id="simplelist">
+  <title>Simple Lists</title>
+
+  <para>Here is an inline list:
+  <simplelist type="inline">
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+  </simplelist>.</para>
+
+  <para>Here are some horizontal lists:</para>
+
+  <simplelist type="horiz" columns="1">
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+  </simplelist>
+  <simplelist type="horiz" columns="2">
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+  </simplelist>
+  <simplelist type="horiz" columns="3">
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+  </simplelist>
+  <simplelist type="horiz" columns="3">
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+  </simplelist>
+
+  <para>Here are some vertical lists:</para>
+
+  <simplelist type="vert" columns="1">
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+  </simplelist>
+  <simplelist type="vert" columns="2">
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+  </simplelist>
+  <simplelist type="vert" columns="3">
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+    <member>Fe</member>
+    <member>Fi</member>
+    <member>Fo</member>
+    <member>Fum</member>
+  </simplelist>
+
+</section> <!-- simplelist -->
+
+<section id="variablelist">
+  <title>Variable Lists</title>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+  <variablelist>
+    <title>A Variable List</title>
+    <varlistentry>
+      <term>Fe</term>
+      <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>Fi</term>
+      <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>Fo</term>
+      <term>Fum</term>
+      <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
+      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
+    </varlistentry>
+  </variablelist>
+
+  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
+  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
+  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
+  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
+  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
+  porttitor condimentum nulla.</para>
+
+</section> <!-- variablelist -->
+
+<!-- FIXME:
+segmentedlist
+procedure
+-->
+
+</chapter>
diff --git a/test/docbook/source/reference.xml b/test/docbook/source/reference.xml
new file mode 100644
index 00000000..2a7dc234
--- /dev/null
+++ b/test/docbook/source/reference.xml
@@ -0,0 +1,36 @@
+<reference id="reference">
+<title>Reference</title>
+<partintro>
+<para>This is a collection of reference entries</para>
+</partintro>
+
+<refentry id="ls">
+<refmeta>
+<refentrytitle>ls</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>ls</refname>
+<refpurpose>list contents of a directory</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="ls-synops">
+<cmdsynopsis>
+<command>/usr/bin/ls</command>
+<arg choice="opt">
+  <option>aAbcCdfFgilLmnopqrRstux1</option>
+</arg>
+<arg choice="opt" rep="repeat">file</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1 id="ls-desc"><title>Description</title>
+<para>
+For each file that is a directory, <command>ls</command> lists the contents of
+the directory; for each file that is an ordinary file, <command>ls</command>
+repeats its name and any other information requested.
+</para>
+</refsect1>
+</refentry>
+</reference>
diff --git a/test/lipsum/README b/test/lipsum/README
deleted file mode 100755
index e79538c7..00000000
--- a/test/lipsum/README
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# This document is intended to test out different style changes on
-# Mallard documents. If you need to test things not in this document,
-# feel free to add stuff to this document. You can use lipsum.com
-# to generate text.
-#
-# To try things out, just make changes directly to the files in your
-# checkout of yelp-xsl. You don't have to build or install your copy
-# of yelp-xsl. Just build this preview document. To build this preview
-# document, just run this README. You do need yelp-tools installed
-# for the yelp-build command. It's in your distro's packages, and you
-# might have it installed already anyway.
-#
-# ./README
-
-yelp-build cache *.page
-if [ ! -d html ]; then mkdir html; fi
-cp ../../js/highlight.pack.js html/
-for page in *.page; do
-    xsltproc \
-        --stringparam mal.cache.file index.cache \
-        -o html/ \
-        ../../xslt/mallard/html/mal2html.xsl \
-        $page;
-done
-rm index.cache
diff --git a/test/mallard/README b/test/mallard/README
new file mode 100644
index 00000000..6b0bcbee
--- /dev/null
+++ b/test/mallard/README
@@ -0,0 +1,13 @@
+This document is intended to test out different features and style
+changes for Mallard documents. If you need to test things not in
+this document, feel free to add stuff to this document.
+
+To try things out, just make changes directly to the files in your
+checkout of yelp-xsl. You don't have to build or install your copy
+of yelp-xsl. Just build this preview document. To build this preview
+document, just run:
+
+  ./build.sh
+
+You do need yelp-tools installed for the yelp-build command. It's in
+your distro's packages, and you might have it installed already anyway.
diff --git a/test/mallard/build.sh b/test/mallard/build.sh
new file mode 100755
index 00000000..e7b9d41f
--- /dev/null
+++ b/test/mallard/build.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+yelp-build cache source/*.page
+if [ ! -d output ]; then mkdir output; fi
+rm -f output/*.*
+cp ../../js/highlight.pack.js output/
+for page in source/*.page; do
+    xsltproc \
+        --stringparam mal.cache.file ../index.cache \
+        -o output/ \
+        ../../xslt/mallard/html/mal2html.xsl \
+        $page;
+done
+rm index.cache
diff --git a/test/lipsum/index.page b/test/mallard/source/index.page
index 887faf39..887faf39 100644
--- a/test/lipsum/index.page
+++ b/test/mallard/source/index.page
diff --git a/test/lipsum/note1.page b/test/mallard/source/note1.page
index 4aed9b47..4aed9b47 100644
--- a/test/lipsum/note1.page
+++ b/test/mallard/source/note1.page
diff --git a/test/lipsum/task1.page b/test/mallard/source/task1.page
index 684bb07a..684bb07a 100644
--- a/test/lipsum/task1.page
+++ b/test/mallard/source/task1.page
diff --git a/test/syntax/Makefile b/test/syntax/Makefile
deleted file mode 100644
index 975a897d..00000000
--- a/test/syntax/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-highlight.pack.js:
-	cp ../../js/highlight.pack.js .
-
-mallard: highlight.pack.js
-	xsltproc --xinclude ../../xslt/mallard/html/mal2html.xsl mallard.page
-
-docbook: highlight.pack.js
-	xsltproc --xinclude --param db.chunk.max_depth 0 ../../xslt/docbook/html/db2html.xsl docbook.docbook
-
-dita: highlight.pack.js
-	xsltproc --xinclude ../../xslt/dita/html/dita2html.xsl dita.dita
diff --git a/test/syntax/README b/test/syntax/README
new file mode 100644
index 00000000..9a8d86ca
--- /dev/null
+++ b/test/syntax/README
@@ -0,0 +1,9 @@
+This test shows the syntax highlighting for different languages in
+different formats. yelp-xsl uses highlight.js for syntax highlighting.
+
+To try things out, just make changes directly to the files in your
+checkout of yelp-xsl. You don't have to build or install your copy
+of yelp-xsl. Just build this preview document. To build this preview
+document, just run:
+
+  ./build.sh
diff --git a/test/syntax/build.sh b/test/syntax/build.sh
new file mode 100755
index 00000000..b5fee4b3
--- /dev/null
+++ b/test/syntax/build.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+if [ ! -d output ]; then mkdir output; fi
+
+# Mallard
+if [ ! -d output/mallard ]; then mkdir output/mallard; fi
+rm -f output/mallard/*.*
+cp ../../js/highlight.pack.js output/mallard/
+xsltproc -o output/mallard/ --xinclude \
+	../../xslt/mallard/html/mal2html.xsl \
+	source/mallard.page
+
+# DocBook
+if [ ! -d output/docbook ]; then mkdir output/docbook; fi
+rm -f output/docbook/*.*
+cp ../../js/highlight.pack.js output/docbook/
+xsltproc -o output/docbook/ --xinclude \
+	--param db.chunk.max_depth 0 \
+	../../xslt/docbook/html/db2html.xsl \
+	source/docbook.docbook
+
+# DITA
+if [ ! -d output/dita ]; then mkdir output/dita; fi
+rm -f output/dita/*.*
+cp ../../js/highlight.pack.js output/dita/
+xsltproc -o output/dita/ --xinclude \
+	../../xslt/dita/html/dita2html.xsl \
+	source/dita.dita
diff --git a/test/syntax/code/actionscript b/test/syntax/source/code/actionscript
index 9c35adf9..9c35adf9 100644
--- a/test/syntax/code/actionscript
+++ b/test/syntax/source/code/actionscript
diff --git a/test/syntax/code/apache b/test/syntax/source/code/apache
index 3bf2af4f..3bf2af4f 100644
--- a/test/syntax/code/apache
+++ b/test/syntax/source/code/apache
diff --git a/test/syntax/code/asciidoc b/test/syntax/source/code/asciidoc
index bfeb895e..bfeb895e 100644
--- a/test/syntax/code/asciidoc
+++ b/test/syntax/source/code/asciidoc
diff --git a/test/syntax/code/awk b/test/syntax/source/code/awk
index 239869c0..239869c0 100644
--- a/test/syntax/code/awk
+++ b/test/syntax/source/code/awk
diff --git a/test/syntax/code/bash b/test/syntax/source/code/bash
index b2654812..b2654812 100644
--- a/test/syntax/code/bash
+++ b/test/syntax/source/code/bash
diff --git a/test/syntax/code/clojure b/test/syntax/source/code/clojure
index ebce2352..ebce2352 100644
--- a/test/syntax/code/clojure
+++ b/test/syntax/source/code/clojure
diff --git a/test/syntax/code/cmake b/test/syntax/source/code/cmake
index 2bbea38c..2bbea38c 100644
--- a/test/syntax/code/cmake
+++ b/test/syntax/source/code/cmake
diff --git a/test/syntax/code/cpp b/test/syntax/source/code/cpp
index 37497ac5..37497ac5 100644
--- a/test/syntax/code/cpp
+++ b/test/syntax/source/code/cpp
diff --git a/test/syntax/code/cs b/test/syntax/source/code/cs
index f58190a1..f58190a1 100644
--- a/test/syntax/code/cs
+++ b/test/syntax/source/code/cs
diff --git a/test/syntax/code/css b/test/syntax/source/code/css
index e7a102b0..e7a102b0 100644
--- a/test/syntax/code/css
+++ b/test/syntax/source/code/css
diff --git a/test/syntax/code/d b/test/syntax/source/code/d
index 92cc8d84..92cc8d84 100644
--- a/test/syntax/code/d
+++ b/test/syntax/source/code/d
diff --git a/test/syntax/code/diff b/test/syntax/source/code/diff
index 4f4c04fe..4f4c04fe 100644
--- a/test/syntax/code/diff
+++ b/test/syntax/source/code/diff
diff --git a/test/syntax/code/django b/test/syntax/source/code/django
index 150037f5..150037f5 100644
--- a/test/syntax/code/django
+++ b/test/syntax/source/code/django
diff --git a/test/syntax/code/dockerfile b/test/syntax/source/code/dockerfile
index e796dc7e..e796dc7e 100644
--- a/test/syntax/code/dockerfile
+++ b/test/syntax/source/code/dockerfile
diff --git a/test/syntax/code/dos b/test/syntax/source/code/dos
index 246ca3d9..246ca3d9 100644
--- a/test/syntax/code/dos
+++ b/test/syntax/source/code/dos
diff --git a/test/syntax/code/ducktype b/test/syntax/source/code/ducktype
index 234f80fd..234f80fd 100644
--- a/test/syntax/code/ducktype
+++ b/test/syntax/source/code/ducktype
diff --git a/test/syntax/code/erb b/test/syntax/source/code/erb
index f7ea6203..f7ea6203 100644
--- a/test/syntax/code/erb
+++ b/test/syntax/source/code/erb
diff --git a/test/syntax/code/fsharp b/test/syntax/source/code/fsharp
index b7a00317..b7a00317 100644
--- a/test/syntax/code/fsharp
+++ b/test/syntax/source/code/fsharp
diff --git a/test/syntax/code/go b/test/syntax/source/code/go
index aa8663a9..aa8663a9 100644
--- a/test/syntax/code/go
+++ b/test/syntax/source/code/go
diff --git a/test/syntax/code/haml b/test/syntax/source/code/haml
index fb4bab32..fb4bab32 100644
--- a/test/syntax/code/haml
+++ b/test/syntax/source/code/haml
diff --git a/test/syntax/code/haskell b/test/syntax/source/code/haskell
index acb83786..acb83786 100644
--- a/test/syntax/code/haskell
+++ b/test/syntax/source/code/haskell
diff --git a/test/syntax/code/http b/test/syntax/source/code/http
index 34631a1d..34631a1d 100644
--- a/test/syntax/code/http
+++ b/test/syntax/source/code/http
diff --git a/test/syntax/code/ini b/test/syntax/source/code/ini
index 03a5c297..03a5c297 100644
--- a/test/syntax/code/ini
+++ b/test/syntax/source/code/ini
diff --git a/test/syntax/code/java b/test/syntax/source/code/java
index 7683240c..7683240c 100644
--- a/test/syntax/code/java
+++ b/test/syntax/source/code/java
diff --git a/test/syntax/code/javascript b/test/syntax/source/code/javascript
index 5a6bc04e..5a6bc04e 100644
--- a/test/syntax/code/javascript
+++ b/test/syntax/source/code/javascript
diff --git a/test/syntax/code/json b/test/syntax/source/code/json
index 9710b228..9710b228 100644
--- a/test/syntax/code/json
+++ b/test/syntax/source/code/json
diff --git a/test/syntax/code/lisp b/test/syntax/source/code/lisp
index 2b622087..2b622087 100644
--- a/test/syntax/code/lisp
+++ b/test/syntax/source/code/lisp
diff --git a/test/syntax/code/lua b/test/syntax/source/code/lua
index 58174ee6..58174ee6 100644
--- a/test/syntax/code/lua
+++ b/test/syntax/source/code/lua
diff --git a/test/syntax/code/makefile b/test/syntax/source/code/makefile
index cd1ec79d..cd1ec79d 100644
--- a/test/syntax/code/makefile
+++ b/test/syntax/source/code/makefile
diff --git a/test/syntax/code/markdown b/test/syntax/source/code/markdown
index e7f66da9..e7f66da9 100644
--- a/test/syntax/code/markdown
+++ b/test/syntax/source/code/markdown
diff --git a/test/syntax/code/matlab b/test/syntax/source/code/matlab
index 81fa7175..81fa7175 100644
--- a/test/syntax/code/matlab
+++ b/test/syntax/source/code/matlab
diff --git a/test/syntax/code/nginx b/test/syntax/source/code/nginx
index adf4b7e9..adf4b7e9 100644
--- a/test/syntax/code/nginx
+++ b/test/syntax/source/code/nginx
diff --git a/test/syntax/code/objectivec b/test/syntax/source/code/objectivec
index 177f2ff3..177f2ff3 100644
--- a/test/syntax/code/objectivec
+++ b/test/syntax/source/code/objectivec
diff --git a/test/syntax/code/perl b/test/syntax/source/code/perl
index 3b08442d..3b08442d 100644
--- a/test/syntax/code/perl
+++ b/test/syntax/source/code/perl
diff --git a/test/syntax/code/php b/test/syntax/source/code/php
index ec43315f..ec43315f 100644
--- a/test/syntax/code/php
+++ b/test/syntax/source/code/php
diff --git a/test/syntax/code/python b/test/syntax/source/code/python
index 1216323c..1216323c 100644
--- a/test/syntax/code/python
+++ b/test/syntax/source/code/python
diff --git a/test/syntax/code/r b/test/syntax/source/code/r
index 2f277478..2f277478 100644
--- a/test/syntax/code/r
+++ b/test/syntax/source/code/r
diff --git a/test/syntax/code/ruby b/test/syntax/source/code/ruby
index 1fb23784..1fb23784 100644
--- a/test/syntax/code/ruby
+++ b/test/syntax/source/code/ruby
diff --git a/test/syntax/code/rust b/test/syntax/source/code/rust
index 6d0fd4d4..6d0fd4d4 100644
--- a/test/syntax/code/rust
+++ b/test/syntax/source/code/rust
diff --git a/test/syntax/code/scala b/test/syntax/source/code/scala
index d0de6175..d0de6175 100644
--- a/test/syntax/code/scala
+++ b/test/syntax/source/code/scala
diff --git a/test/syntax/code/scheme b/test/syntax/source/code/scheme
index b62a98cb..b62a98cb 100644
--- a/test/syntax/code/scheme
+++ b/test/syntax/source/code/scheme
diff --git a/test/syntax/code/shell b/test/syntax/source/code/shell
index 4a48fe2b..4a48fe2b 100644
--- a/test/syntax/code/shell
+++ b/test/syntax/source/code/shell
diff --git a/test/syntax/code/smalltalk b/test/syntax/source/code/smalltalk
index 7c960a72..7c960a72 100644
--- a/test/syntax/code/smalltalk
+++ b/test/syntax/source/code/smalltalk
diff --git a/test/syntax/code/sql b/test/syntax/source/code/sql
index 377e6b39..377e6b39 100644
--- a/test/syntax/code/sql
+++ b/test/syntax/source/code/sql
diff --git a/test/syntax/code/tcl b/test/syntax/source/code/tcl
index c05db107..c05db107 100644
--- a/test/syntax/code/tcl
+++ b/test/syntax/source/code/tcl
diff --git a/test/syntax/code/tex b/test/syntax/source/code/tex
index 10b25557..10b25557 100644
--- a/test/syntax/code/tex
+++ b/test/syntax/source/code/tex
diff --git a/test/syntax/code/vala b/test/syntax/source/code/vala
index aed04682..aed04682 100644
--- a/test/syntax/code/vala
+++ b/test/syntax/source/code/vala
diff --git a/test/syntax/code/xml b/test/syntax/source/code/xml
index 7f002c4b..7f002c4b 100644
--- a/test/syntax/code/xml
+++ b/test/syntax/source/code/xml
diff --git a/test/syntax/code/xquery b/test/syntax/source/code/xquery
index 9ac5efdf..9ac5efdf 100644
--- a/test/syntax/code/xquery
+++ b/test/syntax/source/code/xquery
diff --git a/test/syntax/code/yaml b/test/syntax/source/code/yaml
index 49c4939e..49c4939e 100644
--- a/test/syntax/code/yaml
+++ b/test/syntax/source/code/yaml
diff --git a/test/syntax/dita.dita b/test/syntax/source/dita.dita
index c6c032fd..c6c032fd 100644
--- a/test/syntax/dita.dita
+++ b/test/syntax/source/dita.dita
diff --git a/test/syntax/docbook.docbook b/test/syntax/source/docbook.docbook
index 06dd96ae..06dd96ae 100644
--- a/test/syntax/docbook.docbook
+++ b/test/syntax/source/docbook.docbook
diff --git a/test/syntax/mallard.page b/test/syntax/source/mallard.page
index 8ba7f925..8ba7f925 100644
--- a/test/syntax/mallard.page
+++ b/test/syntax/source/mallard.page
diff --git a/test/testbook/Makefile b/test/testbook/Makefile
deleted file mode 100644
index b12b0a7b..00000000
--- a/test/testbook/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-.ALL: html xhtml norm
-.PHONY: html xhtml norm
-
-html:
-	if [ ! -d html ]; then mkdir html; fi
-	rm -f html/*.*
-	xsltproc --timing --nonet --xinclude -o html/ \
-	--param db.chunk.chunk_top 1 \
-	--stringparam theme.icon.admon.path "../../../data/icons/hicolor/48x48/" \
-	../../xslt/docbook/html/db2html.xsl \
-	testbook.xml
-xhtml:
-	if [ ! -d xhtml ]; then mkdir xhtml; fi
-	rm -f xhtml/*.*
-	xsltproc --timing --nonet --xinclude -o xhtml/ \
-	--param db.chunk.chunk_top 1 \
-	--stringparam theme.icon.admon.path "../../../data/icons/hicolor/48x48/" \
-	../../xslt/docbook/html/db2xhtml.xsl \
-	testbook.xml
-
-norm:
-	if [ ! -d html ]; then mkdir norm; fi
-	rm -f norm/*.*
-	xsltproc --timing --nonet --xinclude -o norm/index.html \
-	/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl \
-	testbook.xml
diff --git a/test/testbook/testbook.xml b/test/testbook/testbook.xml
deleted file mode 100644
index e3636d55..00000000
--- a/test/testbook/testbook.xml
+++ /dev/null
@@ -1,2043 +0,0 @@
-<?xml version="1.0"?><!-- -*- indent-tabs-mode: nil -*- -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<book id="index"> 
-  <title>Test Book</title> 
-  <bookinfo>
-    <abstract role="description">
-      <para>This is a description of the document.</para>
-    </abstract>
-    <copyright>
-      <year>2007</year>
-      <holder>Shaun McCance</holder>
-    </copyright>
-    <publisher role="maintainer">
-      <publishername>GNOME Documentation Project</publishername>
-    </publisher>
-    <author>
-      <firstname>Shaun</firstname>
-      <surname>McCance</surname>
-      <affiliation>
-        <orgname>GNOME Documentation Project</orgname>
-      </affiliation>
-      <email>shaunm@gnome.org</email>
-    </author>
-    <revhistory>
-      <revision>
-        <revnumber>0.1</revnumber>
-        <date>1887-02-03</date>
-        <revdescription>
-          <para role="author">Shaun McCance</para>
-          <para role="publisher">GNOME Documentation Project</para>
-        </revdescription>
-      </revision>
-      <revision>
-        <revnumber>0.2</revnumber>
-        <date>1902-03-08</date>
-        <revdescription>
-          <para role="author">Shaun McCance</para>
-          <para role="publisher">GNOME Documentation Project</para>
-        </revdescription>
-      </revision>
-    </revhistory>
-
-    <legalnotice>
-      <title>Feedback</title>
-      <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-      Integer lacinia.</para>
-    </legalnotice>
-  </bookinfo>
-
-<chapter id="inline">
-<title>Inline Elements</title>
-<variablelist>
-  <varlistentry>
-    <term><sgmltag>abbrev</sgmltag></term>
-    <listitem><para>The word <wordasword>concatenate</wordasword> is frequently abbreviated
-    as either <abbrev>concat</abbrev> or simply <abbrev>cat</abbrev>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>accel</sgmltag></term>
-    <listitem><para>To see the authors of an application, select
-    <guimenuitem><accel>A</accel>bout</guimenuitem> from the
-    <guimenuitem><accel>H</accel>elp</guimenuitem> menu.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>acronym</sgmltag></term>
-    <listitem><para><acronym>GNOME</acronym> stands for <acronym>GNU</acronym>
-    Network Object Model Environment.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>action</sgmltag></term>
-    <listitem><para>Logging out will cause the session manager to perform
-    <action>session saving</action>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>application</sgmltag></term>
-    <listitem><para><application>Yelp</application> is the default help
-    viewer in GNOME.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>citetitle</sgmltag></term>
-    <listitem><para>Please read <citetitle pubwork="article">A Pretty Good Article</citetitle>
-    and <citetitle pubwork="book">The Bestest Book Ever</citetitle>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>citation</sgmltag></term>
-    <listitem><para>Consult <citation>Walsh97</citation> for more information.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>classname</sgmltag></term>
-    <listitem><para>The <classname>YelpDocument</classname> class provides on-demand
-    page transformations in <application>Yelp</application>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>code</sgmltag></term>
-    <listitem><para>Call <code>frobnicate(file)</code> to frobnicate the file.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>command</sgmltag></term>
-    <listitem><para>To start <application>Yelp</application>, enter <command>yelp</command>
-    at the command line.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>computeroutput</sgmltag></term>
-    <listitem><para>Runnin <command>scrollkeeper-get-content-list C</command> should output
-    something like <computeroutput>/tmp/scrollkeeper-shaunm/contents.1</computeroutput>.
-    Sometimes it also prints errors like <computeroutput role="stderr">I/O warning :
-    failed to load external entity
-    "/var/lib/scrollkeeper/en_US.UTF-8/scrollkeeper_cl.xml"</computeroutput>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>constant</sgmltag></term>
-    <listitem><para>The maximum legal length for a path name is 
-    <constant class='limit'>PATH_MAX</constant>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>corpauthor</sgmltag></term>
-    <term><sgmltag>corpcredit</sgmltag></term>
-    <listitem><para>Some of the GNOME Documentation was written by
-    <corpauthor>Sun Microsystems</corpauthor>.  Some technical editing was also done
-    by <corpcredit>Sun Microsystems</corpcredit>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>database</sgmltag></term>
-    <listitem><para>The <database>Pulse</database> database tracks everything
-    you need to know about your project.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>email</sgmltag></term>
-    <listitem><para>To contact the GNOME Documentation Team, send an email to
-    <email>gnome-doc-list@gnome.org</email>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>emphasis</sgmltag></term>
-    <listitem><para>This is <emphasis>italic</emphasis>, and this is
-    <emphasis role="bold">bold</emphasis>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>envar</sgmltag></term>
-    <listitem><para>The <envar>YELP_DEBUG</envar> environment variable can be used to
-    control the debugging output in <application>Yelp</application>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>errorcode</sgmltag></term>
-    <term><sgmltag>errorname</sgmltag></term>
-    <term><sgmltag>errortext</sgmltag></term>
-    <term><sgmltag>errortype</sgmltag></term>
-    <listitem><para>On most DOS-derived systems, functions signal a
-    <errortext>File Not Found</errortext> error by returning <errorcode>2</errorcode>
-    (<errorname>ENOENT</errorname>).  This is usually a <errortype>recoverable</errortype>
-    (non-fatal) error.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>exceptionname</sgmltag></term>
-    <listitem><para>If the world is ending, this function will throw the exception
-    <exceptionname>ArmageddonException</exceptionname>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>filename</sgmltag></term>
-    <listitem><para>This text was written in the file
-    <filename>testbook.xml</filename>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>firstterm</sgmltag></term>
-    <listitem><para>This document has example <firstterm>tables</firstterm>, and in
-    particular <firstterm linkend="cals-tables">CALS tables</firstterm>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>foreignphrase</sgmltag></term>
-    <listitem><para>Free software is sometimes called <foreignphrase>libre</foreignphrase>
-    software.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>function</sgmltag></term>
-    <listitem><para>The function <function>g_strdup</function> duplicates a string.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>glossterm</sgmltag></term>
-    <listitem><para>There's no glossary entry for <glossterm>frobnicate</glossterm>.  This
-    links implicitly to the definition of <glossterm>button</glossterm>, but we have to use
-    an explicit link for <glossterm linkend="gloss-button">buttons</glossterm>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>guibutton</sgmltag></term>
-    <term><sgmltag>guiicon</sgmltag></term>
-    <term><sgmltag>guilabel</sgmltag></term>
-    <term><sgmltag>guimenu</sgmltag></term>
-    <term><sgmltag>guimenuitem</sgmltag></term>
-    <term><sgmltag>guisubmenu</sgmltag></term>
-    <listitem><para>You can select what fonts to use under the <guilabel>Fonts</guilabel>
-    heading in the dialog.  To close the dialog, click the <guibutton>Close</guibutton> button.
-    To open a file, select <guimenuitem>Open</guimenuitem> from the <guimenu>File</guimenu>
-    menu or click the <guiicon><inlinegraphic
-    fileref="file:///usr/share/icons/gnome/22x22/status/stock_open.png"/></guiicon> icon
-    on the toolbar.  To open a recent file, select a file from the <guisubmenu>Open Recent</guisubmenu>
-    submenu of the <guimenu>File</guimenu> menu.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>hardware</sgmltag></term>
-    <listitem><para>Unfortunately, your <hardware>hard drive</hardware> cannot be
-    fixed by simply blowing into it like an old game cartridge.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>inlineequation</sgmltag></term>
-    <term><sgmltag>mathphrase</sgmltag></term>
-    <listitem><para>Fermat's last theorem says that <inlineequation>
-    <alt>x^n + y^n &ne; z^n ∀ n &gt; 2</alt>
-    <mathphrase>x<superscript>n</superscript> + y<superscript>n</superscript> ≠ z<superscript>n</superscript> ∀ n ≠ 2</mathphrase></inlineequation>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>interface</sgmltag></term>
-    <listitem><para>In old-school DocBook, we'd use the <sgmltag>interface</sgmltag>
-    tag for the <interface>Close</interface> button.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>interfacename</sgmltag></term>
-    <listitem><para>This class implements <interfacename>GtkCellLayout</interfacename>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>keycap</sgmltag></term>
-    <term><sgmltag>keycode</sgmltag></term>
-    <term><sgmltag>keysym</sgmltag></term>
-    <listitem><para>The <keycap>F1</keycap> key on an IBM PC keyboard generates the
-    scan code <keycode>0x3B</keycode> when pressed.  This value is defined as
-    <keysym>KEY_F1</keysym>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>keycombo</sgmltag></term>
-    <listitem><para>To copy the selection to the clipboard, press
-    <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>lineannotation</sgmltag></term>
-    <listitem><para>Do not run this command if you value your data:</para>
-    <screen>find . -type f -exec shred -fuz {} \;        <lineannotation>shred all files at any depth</lineannotation></screen></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>literal</sgmltag></term>
-    <listitem><para>Set <envar>YELP_DEBUG</envar> to <literal>function-calls</literal> to
-    see all the major function calls inside <application>Yelp</application>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>markup</sgmltag></term>
-    <listitem><para>To italicize text on Wikipedia, type <markup>''text''</markup>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>medialabel</sgmltag></term>
-    <listitem><para>To being installing <application>Frobnicator</application>, insert
-    the disc labelled <medialabel>Frobnicator Install</medialabel>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>menuchoice</sgmltag></term>
-    <listitem><para>You can open a new window by selecting <menuchoice>
-    <shortcut><keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo></shortcut>
-    <guimenu>File</guimenu><guimenuitem>New Window</guimenuitem></menuchoice>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>methodname</sgmltag></term>
-    <listitem><para>The <methodname>set_label()</methodname> method sets the text of the
-    button to <parameter><replaceable>label</replaceable></parameter>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>mousebutton</sgmltag></term>
-    <listitem><para>Click with the <mousebutton>middle</mousebutton> mouse button to
-    paste the contents of the PRIMARY selection.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>option</sgmltag></term>
-    <listitem><para>The <option>-rf</option> option to the <command>ls</command>
-    command has been known to cause mental anguish.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>optional</sgmltag></term>
-    <listitem>
-      <synopsis><command>yelp <optional><option>-p</option></optional></command></synopsis>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>ooclass</sgmltag></term>
-    <term><sgmltag>ooexception</sgmltag></term>
-    <term><sgmltag>oointerface</sgmltag></term>
-    <listitem><para>The <ooclass><classname>Mallard</classname></ooclass> class
-    implements the <oointerface><interfacename>Quacks</interfacename></oointerface>
-    interface.  The <methodname>quack</methodname> method may throw the
-    <ooexception><exceptionname>Muted</exceptionname></ooexception>
-    exception.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>parameter</sgmltag></term>
-    <listitem><para>The <parameter>db2html.funcsynopsis.style</parameter> allows you
-    to set the style of function synopses to either <literal>'KR'</literal> or
-    <literal>'ANSI'</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>personname</sgmltag></term>
-    <listitem><para>My name is
-    <personname><firstname>Shaun</firstname><surname>McCance</surname></personname>,
-    or <personname><firstname>Shaun</firstname><othername>William</othername>
-    <surname>McCance</surname></personname>.  You may also call me <personname>
-    <honorific>Mr</honorific><surname>Mojo</surname></personname>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>productname</sgmltag></term>
-    <listitem><para><productname class="trade">Frobnicator</productname> is the
-    only solution for frobnicating your files.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>prompt</sgmltag></term>
-    <listitem><para>The prototypical prompt is <prompt>$</prompt>, but most people
-    use something like <prompt>[<replaceable>user</replaceable>@<replaceable>host</replaceable> <replaceable>dir</replaceable>]</prompt>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>property</sgmltag></term>
-    <listitem><para>The <property>font_name</property> property can be used to set
-    the font on a widget in your <filename>.gtrc-2.0</filename> file.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>quote</sgmltag></term>
-    <listitem><para>He said, <quote>The Mallard said <quote>Quack</quote>.</quote></para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>replaceable</sgmltag></term>
-    <listitem><para>To view a DocBook file, simply run
-    <command>yelp <replaceable>file</replaceable></command>, where
-    <parameter><replaceable>file</replaceable></parameter>
-    is the name of the file.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>returnvalue</sgmltag></term>
-    <listitem><para>The template <function>i18n.locale</function> returns
-    <returnvalue>C</returnvalue> if no language has been defined in the
-    document.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>sgmltag</sgmltag></term>
-    <listitem><itemizedlist>
-      <listitem><para><sgmltag class="attribute">attribute</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="attvalue">attvalue</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="element">element</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="emptytag">emptytag</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="endtag">endtag</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="genentity">genentity</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="localname">localname</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="namespace">namespace</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="numcharref">numcharref</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="paramentity">paramentity</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="pi">pi</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="prefix">prefix</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="sgmlcomment">sgmlcomment</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="starttag">starttag</sgmltag></para></listitem>
-      <listitem><para><sgmltag class="xmlpi">xmlpi</sgmltag></para></listitem>
-    </itemizedlist></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>shortcut</sgmltag></term>
-    <listitem><para>You can open a new window by selecting <menuchoice>
-    <shortcut><keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo></shortcut>
-    <guimenu>File</guimenu><guimenuitem>New Window</guimenuitem></menuchoice>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>structfield</sgmltag></term>
-    <term><sgmltag>structname</sgmltag></term>
-    <listitem><para>The <structfield>reqs_pending</structfield> field is a list
-    of all the <structname>Request</structname> instances that are currently open
-    for this <structname>YelpDocument</structname>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>subscript</sgmltag></term>
-    <term><sgmltag>superscript</sgmltag></term>
-    <listitem><para>Here is a <sgmltag>subscript</sgmltag><subscript>sub<subscript>scr<subscript>ipt</subscript></subscript></subscript>.
-    Here is a <sgmltag>superscript</sgmltag><superscript>super<superscript>scr<superscript>ipt</superscript></superscript></superscript>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>symbol</sgmltag></term>
-    <listitem><para>No more than <symbol>MAX_DUCKS</symbol> ducks may exist
-    at any single time.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>systemitem</sgmltag></term>
-    <listitem><para>The GNOME web site is hosted on
-    <systemitem>window.gnome.org</systemitem>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>token</sgmltag></term>
-    <listitem><para>The character ∀ is parsed into <token>FORALL</token>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>trademark</sgmltag></term>
-    <listitem><para>Here are some trademarks: <trademark class="copyright">copyright</trademark>
-    <trademark class="registered">registered</trademark>
-    <trademark class="service">service</trademark>
-    <trademark class="trade">trade</trademark>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>type</sgmltag></term>
-    <listitem><para>Strings are stored as <type>gchar*</type> references.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>uri</sgmltag></term>
-    <listitem><para>Grab the latest Mallard stuff at
-    <uri>svn+ssh://svn.gnome.org/svn/gnome-doc-utils/trunk/sandbox/mallard/</uri>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>userinput</sgmltag></term>
-    <listitem><para>Type <userinput>foo</userinput> at the prompt.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>varname</sgmltag></term>
-    <listitem><para>In Perl, <varname>@ARGV</varname> contains the command line
-    parameters used when the script was run.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><sgmltag>wordasword</sgmltag></term>
-    <listitem><para>A <wordasword>term</wordasword> in Algebra has a very different
-    meaning than a <sgmltag>term</sgmltag> in DocBook.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-</chapter> <!-- inline -->
-
-<chapter id="some-blocks">
-<title>Some Block Elements</title>
-<titleabbrev>Some Blocks</titleabbrev>
-
-<para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-porttitor condimentum nulla.</para>
-
-<section id="admon">
-  <title>Admonitions</title>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <caution>
-    <title>Beware the Title!</title>
-    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-    porttitor condimentum nulla.</para>
-  </caution>
-
-  <important>
-    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-    porttitor condimentum nulla.</para>
-  </important>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <note>
-    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-    porttitor condimentum nulla.</para>
-  </note>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <note role="bug">
-    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-    porttitor condimentum nulla.</para>
-  </note>
-
-  <tip>
-    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-    porttitor condimentum nulla.</para>
-  </tip>
-
-  <warning>
-    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-    porttitor condimentum nulla.</para>
-  </warning>
-
-</section> <!-- admon -->
-
-<section id="formal-block">
-  <title>Formal Blocks</title>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <example>
-    <title>An Example</title>
-    <programlisting><![CDATA[
-$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
-    if ! test -d $(dir $@); then mkdir $(dir $@); fi
-    case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";;esac; \
-    if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \
-    (cd $(dir $@) && \
-      $(_xml2po) -e -p \
-          "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
-              "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
-                  cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
-]]></programlisting>
-  </example>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <figure>
-    <title>A Figure</title>
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="http://www.gnome.org/projects/orca/images/orca2-sm.jpg"/>
-      </imageobject>
-      <caption><para>The mascot for the <ulink
-      url="http://www.gnome.org/projects/orca/index.html">Orca screen
-      reader</ulink></para></caption>
-    </mediaobject>
-  </figure>
-  <informalfigure>
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="http://www.gnome.org/projects/orca/images/orca2-sm.jpg"/>
-      </imageobject>
-      <caption><para>The mascot for the <ulink
-      url="http://www.gnome.org/projects/orca/index.html">Orca screen
-      reader</ulink></para></caption>
-    </mediaobject>
-  </informalfigure>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-</section> <!-- formal-block -->
-
-  <section id="programlisting">
-  <title>Program Listings</title>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <programlisting><![CDATA[
-function runline (line, ix, jx, pre, aft, char, name, id, fmt) {
-  ix = match(line, /[\*\$\@\%\!\#]\{[^\}]*\}/)
-  if (ix > 0) {
-    jx = ix + index(substr(line, ix), "}");
-    pre = substr(line, 1, ix - 1);
-    aft = substr(line, jx);
-    char = substr(line, ix, 1);
-    name = substr(line, ix + 2, jx - ix - 3);
-    id = name;
-    while (sub(/[\.-]/, "_", id));
-    if (char == "!")
-      fmt = "<filename><link linkend='S__%s'>%s</link></filename>";
-    else if (char == "*")
-      fmt = "<function><link linkend='T__%s'>%s</link></function>";
-    else if (char == "%")
-      fmt = "<function><link linkend='M__%s'>%s</link></function>";
-    else if (char == "@") 
-      fmt = "<parameter><link linkend='P__%s'>%s</link></parameter>";
-    else if (char == "$") 
-      fmt = "<parameter>"name"</parameter>";
-    else if (char == "#")
-      fmt = "<literal>"name"</literal>";
-    else
-      fmt = name;
-    return sprintf("%s%s%s",
-		   runline(pre),
-		   sprintf(fmt, id, name),
-		   runline(aft) );
-  } else {
-    return line;
-  }
-}
-]]></programlisting>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <programlisting linenumbering="numbered"><![CDATA[
-function runline (line, ix, jx, pre, aft, char, name, id, fmt) {
-  ix = match(line, /[\*\$\@\%\!\#]\{[^\}]*\}/)
-  if (ix > 0) {
-    jx = ix + index(substr(line, ix), "}");
-    pre = substr(line, 1, ix - 1);
-    aft = substr(line, jx);
-    char = substr(line, ix, 1);
-    name = substr(line, ix + 2, jx - ix - 3);
-    id = name;
-    while (sub(/[\.-]/, "_", id));
-    if (char == "!")
-      fmt = "<filename><link linkend='S__%s'>%s</link></filename>";
-    else if (char == "*")
-      fmt = "<function><link linkend='T__%s'>%s</link></function>";
-    else if (char == "%")
-      fmt = "<function><link linkend='M__%s'>%s</link></function>";
-    else if (char == "@") 
-      fmt = "<parameter><link linkend='P__%s'>%s</link></parameter>";
-    else if (char == "$") 
-      fmt = "<parameter>"name"</parameter>";
-    else if (char == "#")
-      fmt = "<literal>"name"</literal>";
-    else
-      fmt = name;
-    return sprintf("%s%s%s",
-		   runline(pre),
-		   sprintf(fmt, id, name),
-		   runline(aft) );
-  } else {
-    return line;
-  }
-}
-]]></programlisting>
-
-<programlisting linenumbering="numbered" continuation="continues">
-BEGIN { print "&lt;section&gt;"; }
-</programlisting>
-
-<programlisting linenumbering="numbered" continuation="continues">
-<![CDATA[/<\!--\!\!/ {
-  inthis = "title";
-  this = "header";
-  next;
-}
-]]></programlisting>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-<programlisting linenumbering="numbered" startinglinenumber="701">
-# The starting line number is 701.
-# So this is line number 72.
-</programlisting>
-
-
-  </section> <!-- programlisting -->
-
-  <section id="screen">
-  <title>Screens</title>
-
-  <para>This <sgmltag>screen</sgmltag> element has <sgmltag>prompt</sgmltag>,
-  <sgmltag>userinput</sgmltag>, and <sgmltag>computeroutput</sgmltag> elements.</para>
-
-  <screen><prompt>[shaunm@verso testbook] </prompt><userinput>make</userinput>
-<computeroutput><![CDATA[if [ ! -d html ]; then mkdir html; fi
-rm -f html/*.*
-xsltproc --timing --nonet --xinclude -o html/ \
-        --param db.chunk.chunk_top 1 \
-        --stringparam theme.icon.admon.path "../../../data/icons/" \
-        --stringparam theme.icon.nav.previous "../../../data/icons/nav-previous.png" \
-        --stringparam theme.icon.nav.next "../../../data/icons/nav-next.png" \
-        ../../xslt/docbook/html/db2html.xsl \
-        testbook.xml
-Parsing stylesheet ../../xslt/docbook/html/db2html.xsl took 0 ms
-Parsing document testbook.xml took 51 ms
-XInclude processing testbook.xml took 0 ms
-Running stylesheet and saving result took 144 ms
-]]></computeroutput></screen>
-
-  <screen linenumbering="numbered"><prompt>[shaunm@verso testbook] </prompt><userinput>make</userinput>
-<computeroutput><![CDATA[if [ ! -d html ]; then mkdir html; fi
-rm -f html/*.*
-xsltproc --timing --nonet --xinclude -o html/ \
-        --param db.chunk.chunk_top 1 \
-        --stringparam theme.icon.admon.path "../../../data/icons/" \
-        --stringparam theme.icon.nav.previous "../../../data/icons/nav-previous.png" \
-        --stringparam theme.icon.nav.next "../../../data/icons/nav-next.png" \
-        ../../xslt/docbook/html/db2html.xsl \
-        testbook.xml
-Parsing stylesheet ../../xslt/docbook/html/db2html.xsl took 0 ms
-Parsing document testbook.xml took 51 ms
-XInclude processing testbook.xml took 0 ms
-Running stylesheet and saving result took 144 ms
-]]></computeroutput></screen>
-
-  </section> <!-- screen -->
-
-<section id="cmdsynopsis">
-  <title>Commands</title>
-  <cmdsynopsis>
-    <command>cd</command>
-    <arg choice="req"><replaceable>directory</replaceable></arg>
-  </cmdsynopsis>
-  <cmdsynopsis>
-    <command>cal</command>
-    <arg>-j</arg>
-    <arg>-y</arg>
-    <arg>month <arg>year</arg></arg>
-  </cmdsynopsis>
-  <cmdsynopsis>
-    <command>chgrp</command>
-    <arg>-R <group>
-      <arg>-H</arg>
-      <arg>-L</arg>
-      <arg>-P</arg>
-    </group></arg>
-    <arg>-f</arg>
-    <arg choice='plain'><replaceable>group</replaceable></arg>
-    <arg rep='repeat' choice='plain'><replaceable>file</replaceable></arg>
-  </cmdsynopsis>
-  <para>Here we use an <sgmltag>sbr</sgmltag> element:</para>
-  <cmdsynopsis>
-    <command>ls</command>
-    <group><arg>--all</arg><arg>--almost-all</arg></group>
-    <sbr/>
-    <arg>--ignore-backups</arg>
-    <sbr/>
-    <arg>--directory</arg>
-    <sbr/>
-    <arg>--human-readable</arg>
-    <sbr/>
-    <arg>--ignore=<replaceable>PATTERN</replaceable></arg>
-    <sbr/>
-    <arg>-l</arg>
-    <sbr/>
-    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
-  </cmdsynopsis>
-  <para>And here we put <sgmltag>sbr</sgmltag> elements inside
-  <sgmltag>arg</sgmltag> and <sgmltag>group</sgmltag> elements:</para>
-  <cmdsynopsis>
-    <command>ls</command>
-    <group><arg>--all</arg><sbr/><arg>--almost-all</arg></group>
-    <arg>--ignore=<sbr/><group><replaceable>PATTERN</replaceable><sbr/><replaceable>PATTERN</replaceable><sbr/><replaceable>PATTERN</replaceable></group></arg>
-    <sbr/>
-    <arg>--ignore=<group><replaceable>PATTERN</replaceable><sbr/><replaceable>PATTERN</replaceable><sbr/><replaceable>PATTERN</replaceable></group></arg>
-    <sbr/>
-    <group><arg choice="req">fe=<sbr/>fi</arg><arg>fo</arg><sbr/><arg>fum</arg></group>
-    <sbr/>
-    <arg>-l</arg>
-    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
-  </cmdsynopsis>
-
-  <para>Also, <sgmltag>sbr</sgmltag> tags with fragments:</para>
-  <cmdsynopsis>
-    <command>foo</command>
-    <group><synopfragmentref linkend="synopfrag1"/><arg>foo</arg><sbr/><arg>bar</arg></group>
-    <arg><synopfragmentref linkend="synopfrag2"/>foo=<sbr/>bar</arg>
-    <synopfragment id="synopfrag1">
-      <group><arg>foo</arg><sbr/><arg>bar</arg></group>
-      <arg>foo=<sbr/>bar</arg>
-    </synopfragment>
-    <synopfragment id="synopfrag2">
-      <group><arg>foo</arg><sbr/><arg>bar</arg></group>
-      <arg>foo=<sbr/>bar</arg>
-    </synopfragment>
-  </cmdsynopsis>
-
-  <para>Here we put two <sgmltag>cmdsynopsis</sgmltag> elements inside
-  a single <sgmltag>synopsis</sgmltag> element:</para>
-  <synopsis><cmdsynopsis>
-    <command>grep</command>
-    <arg><replaceable>options</replaceable></arg>
-    <arg choice="plain"><replaceable>PATTERN</replaceable></arg>
-    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
-    </cmdsynopsis><cmdsynopsis>
-    <command>grep</command>
-    <arg><replaceable>options</replaceable></arg>
-    <group>
-      <arg>-e <replaceable>PATTERN</replaceable></arg>
-      <arg>-f <replaceable>FILE</replaceable></arg>
-    </group>
-    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
-  </cmdsynopsis></synopsis>
-  <para>Here we just put both commands in a single <sgmltag>cmdsynopsis</sgmltag>
-  element:</para>
-  <cmdsynopsis>
-    <command>grep</command>
-    <arg><replaceable>options</replaceable></arg>
-    <arg choice="plain"><replaceable>PATTERN</replaceable></arg>
-    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
-    <command>grep</command>
-    <arg><replaceable>options</replaceable></arg>
-    <group>
-      <arg>-e <replaceable>PATTERN</replaceable></arg>
-      <arg>-f <replaceable>FILE</replaceable></arg>
-    </group>
-    <arg rep="repeat"><replaceable>FILE</replaceable></arg>
-  </cmdsynopsis>
-</section>
-
-<section id="misc-block">
-  <title>Miscellaneous</title>
-
-  <epigraph>
-    <attribution>Henry Spencer</attribution>
-    <para>Those who do not understand Unix are condemned to reinvent it,
-    poorly.</para>
-  </epigraph>
-
-  <para>The above was brought to you courtesy of the <sgmltag>epigraph</sgmltag>
-  element.  Now here is an <sgmltag>address</sgmltag> element:</para>
-
-  <address>Free Software Foundation
-51 Franklin Street, Fifth Floor
-Boston, MA 02110-1301
-USA</address>
-
-  <para>Here is a <sgmltag>blockquote</sgmltag> element:</para>
-
-  <blockquote>
-    <attribution>Richard Stallman, from the <ulink
-    url="http://www.gnu.org/gnu/manifesto.html">GNU Manifeto</ulink></attribution>
-    <para>I consider that the golden rule requires that if I like a program
-    I must share it with other people who like it. Software sellers want to
-    divide the users and conquer them, making each user agree not to share
-    with others. I refuse to break solidarity with other users in this way.
-    I cannot in good conscience sign a nondisclosure agreement or a software
-    license agreement. For years I worked within the Artificial Intelligence
-    Lab to resist such tendencies and other inhospitalities, but eventually
-    they had gone too far: I could not remain in an institution where such
-    things are done for me against my will.</para>
-  </blockquote>
-
-  <formalpara>
-    <title>Formal Paragraph</title>
-    <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-    faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-    Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-    consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-    Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-    porttitor condimentum nulla.</para>
-  </formalpara>
-
-  <para>Next we have a <sgmltag>literallayout</sgmltag> element:</para>
-
-  <literallayout>This is a line.
-This is another line.
-  This line is indented.</literallayout>
-
-  <para>And here is a <sgmltag>synopsis</sgmltag> element:</para>
-  <synopsis><![CDATA[#include <gtk/gtk.h>
-
-                    GtkButton;
-GtkWidget*          gtk_button_new                      (void);
-GtkWidget*          gtk_button_new_with_label           (const gchar *label);
-GtkWidget*          gtk_button_new_with_mnemonic        (const gchar *label);
-GtkWidget*          gtk_button_new_from_stock           (const gchar *stock_id);
-]]></synopsis>
-  <synopsis linenumbering="numbered"><![CDATA[#include <gtk/gtk.h>
-void                gtk_button_pressed                  (GtkButton *button);
-void                gtk_button_released                 (GtkButton *button);
-void                gtk_button_clicked                  (GtkButton *button);
-void                gtk_button_enter                    (GtkButton *button);
-void                gtk_button_leave                    (GtkButton *button);
-]]></synopsis>
-
-<!-- FIXME:
-glossary stuff
--->
-
-</section> <!-- misc-block -->
-
-</chapter> <!-- some-blocks -->
-
-<chapter id="lists">
-<title>List Elements</title>
-
-<section id="itemizedlist">
-  <title>Itemized Lists</title>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <itemizedlist>
-    <title>An Itemized List</title>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    <listitem>
-      <para>Vivamus fermentum orci. Nullam posuere sem ut lectus. Donec viverra
-      tristique neque. Proin ultricies bibendum enim amet.</para>
-      <para>Phasellus mattis rhoncus nibh. Nulla nec pede varius ligula posuere
-      iaculis. Sed hendrerit nunc ac nunc. Suspendisse id.</para>
-    </listitem>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-  </itemizedlist>
-
-  <itemizedlist mark="box">
-    <title>Another Itemized List</title>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-  </itemizedlist>
-
-</section> <!-- itemizedlist -->
-
-<section id="orderedlist">
-  <title>Ordered Lists</title>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <orderedlist>
-    <title>An Ordered List</title>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    <listitem>
-      <para>Vivamus fermentum orci. Nullam posuere sem ut lectus. Donec viverra
-      tristique neque. Proin ultricies bibendum enim amet.</para>
-      <para>Phasellus mattis rhoncus nibh. Nulla nec pede varius ligula posuere
-      iaculis. Sed hendrerit nunc ac nunc. Suspendisse id.</para>
-    </listitem>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-  </orderedlist>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <orderedlist continuation="continues">
-    <title>A Continuation</title>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-  </orderedlist>
-
-  <orderedlist>
-    <title>Some Nested Lists</title>
-    <listitem>
-      <para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para>
-      <orderedlist numeration="lowerroman">
-        <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-        consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-        <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-        consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-      </orderedlist>
-    </listitem>
-    <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-    consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    <listitem>
-      <para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para>
-      <orderedlist numeration="loweralpha">
-        <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-        consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-        <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-        consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-      </orderedlist>
-    </listitem>
-  </orderedlist>
-
-</section> <!-- orderedlist -->
-
-<section id="simplelist">
-  <title>Simple Lists</title>
-
-  <para>Here is an inline list:
-  <simplelist type="inline">
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-  </simplelist>.</para>
-
-  <para>Here are some horizontal lists:</para>
-
-  <simplelist type="horiz" columns="1">
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-  </simplelist>
-  <simplelist type="horiz" columns="2">
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-  </simplelist>
-  <simplelist type="horiz" columns="3">
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-  </simplelist>
-  <simplelist type="horiz" columns="3">
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-  </simplelist>
-
-  <para>Here are some vertical lists:</para>
-
-  <simplelist type="vert" columns="1">
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-  </simplelist>
-  <simplelist type="vert" columns="2">
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-  </simplelist>
-  <simplelist type="vert" columns="3">
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-    <member>Fe</member>
-    <member>Fi</member>
-    <member>Fo</member>
-    <member>Fum</member>
-  </simplelist>
-
-</section> <!-- simplelist -->
-
-<section id="variablelist">
-  <title>Variable Lists</title>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-  <variablelist>
-    <title>A Variable List</title>
-    <varlistentry>
-      <term>Fe</term>
-      <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>Fi</term>
-      <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>Fo</term>
-      <term>Fum</term>
-      <listitem><para>Aenean adipiscing adipiscing neque. Donec viverra, pede ac
-      consequat imperdiet, arcu risus mollis neque, vitae volutpat.</para></listitem>
-    </varlistentry>
-  </variablelist>
-
-  <para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-  faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-  Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-  consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-  Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-  porttitor condimentum nulla.</para>
-
-</section> <!-- variablelist -->
-
-<!-- FIXME:
-segmentedlist
-procedure
--->
-
-</chapter> <!-- lists -->
-
-<chapter id="cals-tables">
-<title>CALS Tables</title>
-
-<informaltable>
-<tgroup cols="2">
-  <tbody>
-    <row><entry>fe</entry><entry>fi</entry></row>
-    <row><entry>fo</entry><entry>fum</entry></row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed risus dui,
-faucibus at, blandit eu, congue in, sem. Suspendisse nec mi. Sed vel augue.
-Cras egestas. Vivamus nisi. Fusce neque. Aenean posuere, orci non lacinia
-consectetuer, neque libero semper metus, ut ullamcorper eros lorem at tellus.
-Ut ante tellus, iaculis at, tincidunt quis, ultrices at, ligula. Pellentesque
-porttitor condimentum nulla.</para>
-
-<section id="cals-tables-span">
-<title>Spanning</title>
-
-<para>Here's some column spanning:</para>
-<informaltable frame="none">
-<tgroup cols="4" rowsep="1" colsep="1">
-  <colspec colname="one"/>
-  <colspec colname="two"/>
-  <colspec colname="three"/>
-  <colspec colname="four"/>
-  <spanspec spanname="two-four" namest="two" nameend="four"/>
-  <tbody>
-    <row>
-      <entry>one</entry>
-      <entry>two</entry>
-      <entry>three</entry>
-      <entry>four</entry>
-    </row>
-    <row>
-      <entry namest="one" nameend="two">one-two</entry>
-      <entry>three</entry>
-      <entry>four</entry>
-    </row>
-    <row>
-      <entry namest="two" nameend="three">two-three</entry>
-      <entry>four</entry>
-    </row>
-    <row>
-      <entry>one</entry>
-      <entry spanname="two-four">two-four</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>Here's some row spanning:</para>
-<informaltable frame="none">
-<tgroup cols="4" rowsep="1" colsep="1">
-  <tbody>
-    <row>
-      <entry morerows="1">one</entry>
-      <entry morerows="2">two</entry>
-      <entry>three</entry>
-      <entry>four</entry>
-    </row>
-    <row>
-      <entry>three</entry>
-      <entry morerows="1">four</entry>
-    </row>
-    <row>
-      <entry>one</entry>
-      <entry morerows="1">three</entry>
-    </row>
-    <row>
-      <entry>one</entry>
-      <entry>two</entry>
-      <entry>four</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>Here we test implicit entries:</para>
-<informaltable frame="none">
-<tgroup cols="4" rowsep="1" colsep="1">
-  <colspec colname="one"/>
-  <colspec colname="two"/>
-  <colspec colname="three"/>
-  <colspec colname="four"/>
-  <tbody>
-    <row>
-      <entry>one</entry>
-      <entry>two</entry>
-      <entry morerows="2">three</entry>
-      <entry>four</entry>
-    </row>
-    <row>
-      <entry colname="two">two</entry>
-      <entry>four</entry>
-    </row>
-    <row>
-      <entry colname="four">four</entry>
-    </row>
-    <row>
-      <entry colname="three">three</entry>
-      <entry>four</entry>
-    </row>
-    <row>
-      <entry colname="four">four</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>And here's some craziness to mix it all together:</para>
-<informaltable frame="none">
-<tgroup cols="5" rowsep="1" colsep="1">
-  <colspec colname="one"/>
-  <colspec colname="two"/>
-  <colspec colname="three"/>
-  <colspec colname="four"/>
-  <colspec colname="five"/>
-  <tbody>
-    <row>
-      <entry morerows="1">one</entry>
-      <entry>two</entry>
-      <entry>three</entry>
-      <entry morerows="3">four</entry>
-      <entry>five</entry>
-    </row>
-    <row>
-      <entry colname="three">three</entry>
-      <entry morerows="1">five</entry>
-    </row>
-    <row>
-      <entry>one</entry>
-      <entry namest="two" nameend="three">two-three</entry>
-    </row>
-    <row>
-      <entry>one</entry>
-      <entry namest="two" nameend="three" morerows="1">two-three</entry>
-      <entry>five</entry>
-    </row>
-    <row>
-      <entry>one</entry>
-      <entry>four</entry>
-      <entry>five</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-</section> <!-- cals-tables-span -->
-
-<section id="cals-tables-sep">
-<title>Separators</title>
-
-<!-- FIXME: more -->
-<para>Here we just set <sgmltag>colsep</sgmltag> on some
-<sgmltag>entry</sgmltag> elements:</para>
-<informaltable frame="none">
-<tgroup cols="3">
-  <tbody>
-    <row>
-      <entry colsep="1">SEP</entry>
-      <entry>no</entry>
-      <entry>no</entry>
-    </row>
-    <row>
-      <entry>no</entry>
-      <entry colsep="1">SEP</entry>
-      <entry>no</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>Here we turn column separators on and off with
-<sgmltag>colspec</sgmltag> elements:</para>
-<informaltable frame="none">
-<tgroup cols="3" colsep="1">
-  <colspec colname="one" colsep="0"/>
-  <colspec colname="two" colsep="1"/>
-  <colspec colname="three" colsep="0"/>
-  <colspec/>
-  <tbody>
-    <row>
-      <entry>no</entry>
-      <entry colname="two">SEP</entry>
-      <entry>no</entry>
-    </row>
-    <row>
-      <entry namest="one" nameend="two">SEP</entry>
-      <entry>no</entry>
-    </row>
-    <row>
-      <entry namest="two" nameend="three">no</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-</section> <!-- cals-tables-sep -->
-
-<section id="cals-tables-frames">
-<title>Frames</title>
-
-<para>This table has a top frame:</para>
-<informaltable frame="top">
-<tgroup cols="2">
-  <tbody>
-    <row>
-      <entry>fe</entry>
-      <entry>fi</entry>
-    </row>
-    <row>
-      <entry>fo</entry>
-      <entry>fum</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>This table has a bottom frame:</para>
-<informaltable frame="bottom">
-<tgroup cols="2">
-  <tbody>
-    <row>
-      <entry>fe</entry>
-      <entry>fi</entry>
-    </row>
-    <row>
-      <entry>fo</entry>
-      <entry>fum</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>This table has top and bottom frames:</para>
-<informaltable frame="topbot">
-<tgroup cols="2">
-  <tbody>
-    <row>
-      <entry>fe</entry>
-      <entry>fi</entry>
-    </row>
-    <row>
-      <entry>fo</entry>
-      <entry>fum</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>This table has side frames:</para>
-<informaltable frame="sides">
-<tgroup cols="2">
-  <tbody>
-    <row>
-      <entry>fe</entry>
-      <entry>fi</entry>
-    </row>
-    <row>
-      <entry>fo</entry>
-      <entry>fum</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>This table has no frames:</para>
-<informaltable frame="none">
-<tgroup cols="2">
-  <tbody>
-    <row>
-      <entry>fe</entry>
-      <entry>fi</entry>
-    </row>
-    <row>
-      <entry>fo</entry>
-      <entry>fum</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-<para>We default to framing all sides when not specified:</para>
-<informaltable>
-<tgroup cols="2">
-  <tbody>
-    <row>
-      <entry>fe</entry>
-      <entry>fi</entry>
-    </row>
-    <row>
-      <entry>fo</entry>
-      <entry>fum</entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-
-</section> <!-- cals-tables-frames -->
-
-<section id="cals-tables-misc">
-<title>Miscellaneous</title>
-
-<table pgwide="1">
-<title>Using <sgmltag>pgwide</sgmltag></title>
-<tgroup cols="3">
-  <tbody>
-    <row><entry>fe</entry><entry>fi</entry><entry>fo</entry></row>
-    <row><entry>fum</entry><entry>fe</entry><entry>fi</entry></row>
-    <row><entry>fo</entry><entry>fum</entry><entry>fe</entry></row>
-    <row><entry>fi</entry><entry>fo</entry><entry>fum</entry></row>
-  </tbody>
-</tgroup>
-</table>
-
-</section> <!-- cals-tables-misc -->
-</chapter> <!-- cals-tables -->
-
-<chapter id="funcsynopsis">
-<title>Function Synopses</title>
-
-<section id="funcsynopsis-ansi">
-<title>ANSI Formatting</title>
-
-<para>Here's an example with two <sgmltag>modifier</sgmltag> elements:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style ANSI?>
-<funcsynopsisinfo>// This is a funcsynopsisinfo</funcsynopsisinfo>
-<funcprototype>
-  <modifier>static</modifier>
-  <modifier>SILLY</modifier>
-  <funcdef><type>Foo *</type> <function>foo_list_get_nth</function></funcdef>
-  <paramdef><type>FooList *</type><parameter>list</parameter></paramdef>
-  <paramdef>int <parameter>n</parameter></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-<para>This example uses <sgmltag>void</sgmltag>:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style ANSI?>
-<funcprototype>
-  <modifier>static</modifier>
-  <funcdef>void <function>foo_noop</function></funcdef>
-  <void/>
-</funcprototype>
-</funcsynopsis>
-
-<para>This example uses <sgmltag>varargs</sgmltag>:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style ANSI?>
-<funcprototype>
-  <modifier>static</modifier>
-  <funcdef>void <function>foo_process_args</function></funcdef>
-  <paramdef><type>Foo *</type><parameter>foo</parameter></paramdef>
-  <varargs/>
-</funcprototype>
-</funcsynopsis>
-
-<para>This example places a <sgmltag>modifier</sgmltag> after the
-<sgmltag>func</sgmltag>, for some strange reason:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style ANSI?>
-<funcprototype>
-  <funcdef>void <function>foo_process_args</function></funcdef>
-  <paramdef><type>Foo *</type><parameter>foo</parameter></paramdef>
-  <varargs/>
-  <modifier>AFTER</modifier>
-</funcprototype>
-</funcsynopsis>
-
-<para>This example uses <sgmltag>funcparams</sgmltag>:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style ANSI?>
-<funcprototype>
-  <funcdef>void <function>foo_list_foreach</function></funcdef>
-  <paramdef><type>FooList *</type><parameter>list</parameter></paramdef>
-  <paramdef>int (*<parameter>func</parameter>) <funcparams>Foo *, void *</funcparams></paramdef>
-  <paramdef>void *<parameter>user_data</parameter></paramdef>
-</funcprototype>
-
-</funcsynopsis>
-
-</section> <!-- funcsynopsis-ansi -->
-
-<section id="funcsynopsis-kr">
-<title>K&amp;R Formatting</title>
-
-<para>Here's an example with two <sgmltag>modifier</sgmltag> elements:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style KR?>
-<funcsynopsisinfo>// This is a funcsynopsisinfo</funcsynopsisinfo>
-<funcprototype>
-  <modifier>static</modifier>
-  <modifier>SILLY</modifier>
-  <funcdef><type>Foo *</type> <function>foo_list_get_nth</function></funcdef>
-  <paramdef><type>FooList *</type><parameter>list</parameter></paramdef>
-  <paramdef>int <parameter>n</parameter></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-<para>This example uses <sgmltag>void</sgmltag>:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style KR?>
-<funcprototype>
-  <modifier>static</modifier>
-  <funcdef>void <function>foo_noop</function></funcdef>
-  <void/>
-</funcprototype>
-</funcsynopsis>
-
-<para>This example uses <sgmltag>varargs</sgmltag>:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style KR?>
-<funcprototype>
-  <modifier>static</modifier>
-  <funcdef>void <function>foo_process_args</function></funcdef>
-  <paramdef><type>Foo *</type><parameter>foo</parameter></paramdef>
-  <varargs/>
-</funcprototype>
-</funcsynopsis>
-
-<para>This example places a <sgmltag>modifier</sgmltag> after the
-<sgmltag>func</sgmltag>, for some strange reason:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style KR?>
-<funcprototype>
-  <funcdef>void <function>foo_process_args</function></funcdef>
-  <paramdef><type>Foo *</type><parameter>foo</parameter></paramdef>
-  <varargs/>
-  <modifier>AFTER</modifier>
-</funcprototype>
-</funcsynopsis>
-
-<para>This example uses <sgmltag>funcparams</sgmltag>:</para>
-<funcsynopsis>
-<?db2html.funcsynopsis.style KR?>
-<funcprototype>
-  <funcdef>void <function>foo_list_foreach</function></funcdef>
-  <paramdef><type>FooList *</type><parameter>list</parameter></paramdef>
-  <paramdef>int (*<parameter>func</parameter>) <funcparams>Foo *, void *</funcparams></paramdef>
-  <paramdef>void *<parameter>user_data</parameter></paramdef>
-</funcprototype>
-
-</funcsynopsis>
-
-</section> <!-- funcsynopsis-kr -->
-
-</chapter> <!-- funcsynopsis -->
-
-<chapter id="classsynopsis">
-<title>Class Synopses</title>
-
-<section id="classsynopsis-cpp">
-<title>C++</title>
-
-<para>Here is a <sgmltag>classsynopsis</sgmltag>:</para>
-<classsynopsis language="cpp">
-  <ooclass><classname>Button</classname></ooclass>
-  <ooclass><modifier>public</modifier><classname>Bin</classname></ooclass>
-  <constructorsynopsis>
-    <modifier>public</modifier>
-    <methodname>Button</methodname>
-    <void/>
-  </constructorsynopsis>
-  <constructorsynopsis>
-    <modifier>public</modifier>
-    <modifier>explicit</modifier>
-    <methodparam>
-      <modifier>const</modifier>
-      <type>Glib::ustring&amp;</type>
-      <parameter>label</parameter>
-    </methodparam>
-    <methodparam>
-      <type>bool</type>
-      <parameter>mnemonic</parameter>
-      <initializer>false</initializer>
-    </methodparam>
-  </constructorsynopsis>
-  <destructorsynopsis>
-    <modifier>public</modifier>
-    <modifier>virtual</modifier>
-    <void/>
-  </destructorsynopsis>
-  <fieldsynopsis>
-    <modifier>private</modifier>
-    <modifier>friend</modifier>
-    <type>class</type>
-    <varname>Button_Class</varname>
-  </fieldsynopsis>
-  <fieldsynopsis>
-    <modifier>private</modifier>
-    <modifier>static</modifier>
-    <type>CppClassType</type>
-    <varname>button_class_</varname>
-  </fieldsynopsis>
-  <methodsynopsis>
-    <modifier>protected</modifier>
-    <modifier>virtual</modifier>
-    <void/>
-    <methodname>on_pressed</methodname>
-    <void/>
-  </methodsynopsis>
-  <methodsynopsis>
-    <modifier>protected</modifier>
-    <modifier>virtual</modifier>
-    <void/>
-    <methodname>on_released</methodname>
-    <void/>
-  </methodsynopsis>
-  <methodsynopsis>
-    <modifier>protected</modifier>
-    <modifier>virtual</modifier>
-    <void/>
-    <methodname>on_clicked</methodname>
-    <void/>
-  </methodsynopsis>
-  <methodsynopsis>
-    <modifier>protected</modifier>
-    <modifier>virtual</modifier>
-    <void/>
-    <methodname>on_enter</methodname>
-    <void/>
-  </methodsynopsis>
-  <methodsynopsis>
-    <modifier>protected</modifier>
-    <modifier>virtual</modifier>
-    <void/>
-    <methodname>on_leave</methodname>
-    <void/>
-  </methodsynopsis>
-  <methodsynopsis>
-    <modifier>protected</modifier>
-    <modifier>virtual</modifier>
-    <void/>
-    <methodname>on_activate</methodname>
-    <void/>
-  </methodsynopsis>
-  <methodsynopsis>
-    <modifier>public</modifier>
-    <type>GType</type>
-    <methodname>get_type</methodname>
-    <void/>
-    <modifier>G_GNUC_CONST</modifier>
-  </methodsynopsis>
-  <methodsynopsis>
-    <modifier>public</modifier>
-    <type>GType</type>
-    <methodname>get_base_type</methodname>
-    <void/>
-    <modifier>G_GNUC_CONST</modifier>
-  </methodsynopsis>
-  <fieldsynopsis>
-    <modifier>public</modifier>
-    <modifier>static</modifier>
-    <type>bool</type>
-    <varname>fake</varname>
-    <initializer>true</initializer>
-  </fieldsynopsis>
-</classsynopsis>
-
-<para>Here is a standalone <sgmltag>methodsynopsis</sgmltag>:</para>
-<methodsynopsis language="cpp">
-<modifier>public</modifier>
-<void/>
-<methodname>frobnicate</methodname>
-<methodparam><type>Foo</type><parameter>foo</parameter></methodparam>
-<methodparam><modifier>const</modifier><type>bool</type><parameter>frob</parameter><initializer>true</initializer></methodparam>
-<modifier>FROB</modifier>
-</methodsynopsis>
-
-</section> <!-- classsynopsis-cpp -->
-
-<section id="classsynopsis-csharp">
-<title>C#</title>
-</section> <!-- classsynopsis-csharp -->
-
-<section id="classsynopsis-java">
-<title>Java</title>
-</section> <!-- classsynopsis-java -->
-
-<section id="classsynopsis-python">
-<title>Python</title>
-
-<para>Here is a <sgmltag>classsynopsis</sgmltag>:</para>
-<classsynopsis language="python">
-<ooclass><classname>gtk.Button</classname></ooclass>
-<ooclass><classname>gtk.Bin</classname></ooclass>
-<constructorsynopsis>
-  <methodparam>
-    <parameter>label</parameter>
-    <initializer>None</initializer>
-  </methodparam>
-  <methodparam>
-    <parameter>stock</parameter>
-    <initializer>None</initializer>
-  </methodparam>
-  <methodparam>
-    <parameter>use_underline</parameter>
-    <initializer>True</initializer>
-  </methodparam>
-</constructorsynopsis>
-<destructorsynopsis><void/></destructorsynopsis>
-<methodsynopsis><methodname>pressed</methodname><void/></methodsynopsis>
-<methodsynopsis><methodname>released</methodname><void/></methodsynopsis>
-<methodsynopsis><methodname>clicked</methodname><void/></methodsynopsis>
-<methodsynopsis><methodname>enter</methodname><void/></methodsynopsis>
-<methodsynopsis><methodname>leave</methodname><void/></methodsynopsis>
-<methodsynopsis>
-  <methodname>set_relief</methodname>
-  <methodparam><parameter>newstyle</parameter></methodparam>
-</methodsynopsis>
-<methodsynopsis><methodname>get_relief</methodname><void/></methodsynopsis>
-<fieldsynopsis><varname>fake</varname><initializer>True</initializer></fieldsynopsis>
-</classsynopsis>
-
-<para>Here we use <sgmltag>modifier</sgmltag> for Python decorators:</para>
-<classsynopsis language="python">
-<ooclass><classname>Decorated</classname></ooclass>
-<ooclass><classname>Base1</classname></ooclass>
-<ooclass><classname>Base2</classname></ooclass>
-<ooclass><classname>Base3</classname></ooclass>
-<constructorsynopsis>
-  <modifier>@constructor</modifier>
-  <methodname>create</methodname>
-  <methodparam><parameter>input</parameter></methodparam>
-</constructorsynopsis>
-<destructorsynopsis>
-  <modifier>@destructor</modifier>
-  <methodname>destroy</methodname>
-  <void/>
-</destructorsynopsis>
-<fieldsynopsis>
-  <modifier>@private</modifier>
-  <varname>parts</varname>
-  <initializer>None</initializer>
-</fieldsynopsis>
-<methodsynopsis>
-  <modifier>@classmethod</modifier>
-  <methodname>find_all</methodname>
-  <void/>
-</methodsynopsis>
-</classsynopsis>
-
-<para>Here we use annotations from
-<ulink url="http://www.python.org/dev/peps/pep-3107/">PEP 3107</ulink>:</para>
-<methodsynopsis language="python">
-  <type>Frobnicated</type>
-  <methodname>frobnicate</methodname>
-  <methodparam>
-    <type>Frobnicatable</type>
-    <parameter>frob</parameter>
-  </methodparam>
-  <methodparam>
-    <type>bool</type>
-    <parameter>thorough</parameter>
-    <initializer>False</initializer>
-  </methodparam>
-</methodsynopsis>
-
-</section> <!-- classsynopsis-python -->
-
-</chapter> <!-- classsynopsis -->
-
-<glossary id="glossary">
-  <glossdiv id="glossary-div">
-    <title>A Glossary Division</title>
-    <glosslist>
-      <title>A Glossary List</title>
-      <glossentry>
-        <glossterm>applet</glossterm>
-        <glossdef>
-          <para>An applet is a small, interactive application that resides within
-          a panel, for example the <application>CD Player</application>. Each
-          applet has a simple user interface that you can operate with the mouse
-          or keyboard.</para>
-        </glossdef>
-      </glossentry>
-      <glossentry id="gloss-button">
-        <glossterm>button</glossterm>
-        <glossdef>
-          <para>The thing you press.</para>
-        </glossdef>
-      </glossentry>
-      <glossentry>
-        <glossterm>desktop</glossterm>
-        <glossdef>
-          <para>The part of the GNOME Desktop where there are no interface
-          graphical items, such as panels and windows.</para>
-        </glossdef>
-      </glossentry>
-    </glosslist>
-    <glossentry id="gloss-background">
-      <glossterm>desktop background</glossterm>
-      <abbrev>background</abbrev>
-      <glossdef>
-        <para>The image or color that is applied to your desktop.</para>
-        <glossseealso otherterm="gloss-background"/>
-      </glossdef>
-    </glossentry>
-    <glossentry>
-      <glossterm>desktop</glossterm>
-      <glosssee otherterm="gloss-background"/>
-    </glossentry>
-  </glossdiv> <!-- glossary-div -->
-</glossary>
-
-<bibliography id="bibliography">
-  <bibliodiv id="bibliodiv">
-    <title>A Bibliography Division</title>
-
-    <bibliolist>
-    <title>A <sgmltag>bibliolist</sgmltag></title>
-
-    <biblioentry>
-      <abbrev>AhoSethiUllman96</abbrev>
-      <authorgroup>
-        <author><firstname>Alfred V.</firstname><surname>Aho</surname></author>
-        <author><firstname>Ravi</firstname><surname>Sethi</surname></author>
-        <author><firstname>Jeffrey D.</firstname><surname>Ullman</surname></author>
-      </authorgroup>
-      <copyright><year>1996</year>
-      <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
-      <editor><firstname>James T.</firstname><surname>DeWolf</surname></editor>
-      <isbn>0-201-10088-6</isbn>
-      <publisher>
-        <publishername>Addison-Wesley Publishing Company</publishername>
-      </publisher>
-      <title>Compilers, Principles, Techniques, and Tools</title>
-    </biblioentry>
-
-    <biblioentry xreflabel="Kites75">
-      <authorgroup>
-        <author><firstname>Andrea</firstname><surname>Bahadur</surname></author>
-        <author><firstname>Mark</firstname><surname>Shwarek</surname></author>
-      </authorgroup>
-      <copyright><year>1974</year><year>1975</year>
-      <holder>Product Development International Holding N. V.</holder>
-      </copyright>
-      <isbn>0-88459-021-6</isbn>
-      <publisher>
-        <publishername>Plenary Publications International, Inc.</publishername>
-      </publisher>
-      <title>Kites</title>
-      <subtitle>Ancient Craft to Modern Sport</subtitle>
-      <pagenums>988-999</pagenums>
-    </biblioentry>
-
-    </bibliolist>
-
-    <biblioentry id="Walsh97">
-      <abbrev>Walsh97</abbrev>
-      <biblioset relation='journal'>
-        <title>XML: Principles, Tools, and Techniques</title>
-        <publisher>
-          <publishername>O'Reilly &amp; Associates, Inc.</publishername>
-        </publisher>
-        <issn>1085-2301</issn>
-        <editor><firstname>Dan</firstname><surname>Connolly</surname></editor>
-      </biblioset>
-      <biblioset relation='article'>
-        <title>A Guide to XML</title>
-        <author><surname>Walsh</surname><firstname>Norman</firstname></author>
-        <copyright><year>1997</year><holder>ArborText, Inc.</holder></copyright>
-        <pagenums>97-108</pagenums>
-      </biblioset>
-    </biblioentry>
-
-    <bibliomixed>
-      <abbrev>Walsh96</abbrev>
-      <bibliomset relation='article'>
-        <surname>Walsh</surname>, <firstname>Norman</firstname>.
-        <title role='article'>Introduction to Cascading Style Sheets</title>.
-      </bibliomset>
-      <bibliomset relation='journal'>
-        <title>The World Wide Web Journal</title> 
-        <volumenum>2</volumenum><issuenum>1</issuenum>.
-        <publishername>O'Reilly &amp; Associates, Inc.</publishername> and
-        <corpname>The World Wide Web Consortium</corpname>.
-        <pubdate>Winter, 1996</pubdate></bibliomset>.
-    </bibliomixed>
-
-  </bibliodiv>
-</bibliography>
-
-<reference id="reference">
-<title>Reference</title>
-<partintro>
-<para>This is a collection of reference entries</para>
-</partintro>
-
-<refentry id="ls">
-<refmeta>
-<refentrytitle>ls</refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>ls</refname>
-<refpurpose>list contents of a directory</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="ls-synops">
-<cmdsynopsis>
-<command>/usr/bin/ls</command>
-<arg choice="opt">
-  <option>aAbcCdfFgilLmnopqrRstux1</option>
-</arg>
-<arg choice="opt" rep="repeat">file</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1 id="ls-desc"><title>Description</title>
-<para>
-For each file that is a directory, <command>ls</command> lists the contents of
-the directory; for each file that is an ordinary file, <command>ls</command>
-repeats its name and any other information requested.
-</para>
-</refsect1>
-</refentry>
-</reference>
-
-<index id="idx">
-  <title>Manual Index</title>
-  <para>This index is constructed manually using <sgmltag>indexentry</sgmltag>
-  elements.</para>
-  <indexentry>
-    <primaryie><classname>GtkAboutDialog</classname></primaryie>
-    <seealsoie><classname>GtkDialog</classname></seealsoie>
-    <seealsoie><classname>GtkWindow</classname></seealsoie>
-  </indexentry>
-  <indexentry>
-    <primaryie><classname>GtkDialog</classname></primaryie>
-    <seealsoie><classname>GtkWindow</classname></seealsoie>
-  </indexentry>
-  <indexentry>
-    <primaryie><classname>GtkWindow</classname></primaryie>
-  </indexentry>
-  <indexentry>
-    <primaryie>windows</primaryie>
-    <seeie><classname>GtkWindow</classname></seeie>
-    <secondaryie>about dialogs</secondaryie>
-    <seeie><classname>GtkAboutDialog</classname></seeie>
-    <seealsoie><classname>GtkDialog</classname></seealsoie>
-    <secondaryie>dialogs</secondaryie>
-    <seeie><classname>GtkDialog</classname></seeie>
-  </indexentry>
-</index>
-
-</book>
diff --git a/test/testdoc1/AUTHORS b/test/testdoc1/AUTHORS
deleted file mode 100644
index e2850a29..00000000
--- a/test/testdoc1/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Shaun McCance <shaunm@gnome.org>
diff --git a/test/testdoc1/COPYING b/test/testdoc1/COPYING
deleted file mode 100644
index 2dd82611..00000000
--- a/test/testdoc1/COPYING
+++ /dev/null
@@ -1,504 +0,0 @@
-                 GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/test/testdoc1/COPYING-DOCS b/test/testdoc1/COPYING-DOCS
deleted file mode 100644
index b42936be..00000000
--- a/test/testdoc1/COPYING-DOCS
+++ /dev/null
@@ -1,355 +0,0 @@
-		GNU Free Documentation License
-		   Version 1.1, March 2000
-
- Copyright (C) 2000  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document "free" in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The "Document", below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as "you".
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section entitled "History", and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. In any section entitled "Acknowledgements" or "Dedications",
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section as "Endorsements"
-   or to conflict in title with any Invariant Section.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled "History"
-in the various original documents, forming one section entitled
-"History"; likewise combine any sections entitled "Acknowledgements",
-and any sections entitled "Dedications".  You must delete all sections
-entitled "Endorsements."
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an "aggregate", and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-
-If you have no Invariant Sections, write "with no Invariant Sections"
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write "no Front-Cover Texts" instead of
-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
diff --git a/test/testdoc1/ChangeLog b/test/testdoc1/ChangeLog
deleted file mode 100644
index e69de29b..00000000
--- a/test/testdoc1/ChangeLog
+++ /dev/null
diff --git a/test/testdoc1/INSTALL b/test/testdoc1/INSTALL
deleted file mode 100644
index b42a17ac..00000000
--- a/test/testdoc1/INSTALL
+++ /dev/null
@@ -1,182 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
diff --git a/test/testdoc1/Makefile.am b/test/testdoc1/Makefile.am
deleted file mode 100644
index 15e23180..00000000
--- a/test/testdoc1/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = help
-
-EXTRA_DIST =			\
-	gnome-doc-utils.make
diff --git a/test/testdoc1/NEWS b/test/testdoc1/NEWS
deleted file mode 100644
index e69de29b..00000000
--- a/test/testdoc1/NEWS
+++ /dev/null
diff --git a/test/testdoc1/NO-AUTO-GEN b/test/testdoc1/NO-AUTO-GEN
deleted file mode 100644
index e69de29b..00000000
--- a/test/testdoc1/NO-AUTO-GEN
+++ /dev/null
diff --git a/test/testdoc1/README b/test/testdoc1/README
deleted file mode 100644
index e69de29b..00000000
--- a/test/testdoc1/README
+++ /dev/null
diff --git a/test/testdoc1/autogen.sh b/test/testdoc1/autogen.sh
deleted file mode 100755
index 4b08d90a..00000000
--- a/test/testdoc1/autogen.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="testdoc1"
-
-(test -f $srcdir/configure.in \
-  && test -f $srcdir/README \
-  && test -d $srcdir/help) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/test/testdoc1/configure.in b/test/testdoc1/configure.in
deleted file mode 100644
index 51c373da..00000000
--- a/test/testdoc1/configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
-AC_INIT
-AM_INIT_AUTOMAKE(testdoc1, 0.1)
-
-GNOME_DOC_INIT
-
-AC_OUTPUT([
-Makefile
-help/Makefile
-help/testdoc1/Makefile
-])
diff --git a/test/testdoc1/help/Makefile.am b/test/testdoc1/help/Makefile.am
deleted file mode 100644
index b96adc9a..00000000
--- a/test/testdoc1/help/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = testdoc1
-
diff --git a/test/testdoc1/help/testdoc1/C/fdl-appendix.xml b/test/testdoc1/help/testdoc1/C/fdl-appendix.xml
deleted file mode 100644
index 707ea994..00000000
--- a/test/testdoc1/help/testdoc1/C/fdl-appendix.xml
+++ /dev/null
@@ -1,667 +0,0 @@
-<!--  
-     The GNU Free Documentation License 1.1 in DocBook
-     Markup by Eric Baudais <baudais@okstate.edu>
-     Maintained by the GNOME Documentation Project
-     http://developer.gnome.org/projects/gdp
-     Version: 1.0.1
-     Last Modified: Nov 16, 2000
--->
-
-<appendix id="fdl">
-  <appendixinfo>
-    <releaseinfo>
-      Version 1.1, March 2000
-    </releaseinfo>
-    <copyright>
-      <year>2000</year><holder>Free Software Foundation, Inc.</holder>
-    </copyright>
-    <legalnotice id="fdl-legalnotice">
-      <para>
-	<address>Free Software Foundation, Inc. <street>59 Temple Place, 
-        Suite 330</street>, <city>Boston</city>, <state>MA</state>  
-        <postcode>02111-1307</postcode>  <country>USA</country></address> 
-	Everyone is permitted to copy and distribute verbatim copies of this 
-        license document, but changing it is not allowed.
-      </para>
-    </legalnotice>
-  </appendixinfo>
-  <title>GNU Free Documentation License</title>
-
-  <sect1 id="fdl-preamble">
-    <title>0. PREAMBLE</title>
-    <para>
-      The purpose of this License is to make a manual, textbook, or
-      other written document <quote>free</quote> in the sense of
-      freedom: to assure everyone the effective freedom to copy and
-      redistribute it, with or without modifying it, either
-      commercially or noncommercially. Secondarily, this License
-      preserves for the author and publisher a way to get credit for
-      their work, while not being considered responsible for
-      modifications made by others.
-    </para>
-    
-    <para>
-      This License is a kind of <quote>copyleft</quote>, which means
-      that derivative works of the document must themselves be free in
-      the same sense. It complements the GNU General Public License,
-      which is a copyleft license designed for free software.
-    </para>
-    
-    <para>
-      We have designed this License in order to use it for manuals for
-      free software, because free software needs free documentation: a
-      free program should come with manuals providing the same
-      freedoms that the software does. But this License is not limited
-      to software manuals; it can be used for any textual work,
-      regardless of subject matter or whether it is published as a
-      printed book. We recommend this License principally for works
-      whose purpose is instruction or reference.
-    </para>
-  </sect1>
-  <sect1 id="fdl-section1">
-    <title>1. APPLICABILITY AND DEFINITIONS</title>
-    <para id="fdl-document">
-      This License applies to any manual or other work that contains a
-      notice placed by the copyright holder saying it can be
-      distributed under the terms of this License. The
-      <quote>Document</quote>, below, refers to any such manual or
-      work. Any member of the public is a licensee, and is addressed
-      as <quote>you</quote>.
-    </para>
-    
-    <para id="fdl-modified">
-      A <quote>Modified Version</quote> of the Document means any work
-      containing the Document or a portion of it, either copied
-      verbatim, or with modifications and/or translated into another
-      language.
-    </para>
-	
-    <para id="fdl-secondary">
-      A <quote>Secondary Section</quote> is a named appendix or a
-      front-matter section of the <link
-      linkend="fdl-document">Document</link> that deals exclusively
-      with the relationship of the publishers or authors of the
-      Document to the Document's overall subject (or to related
-      matters) and contains nothing that could fall directly within
-      that overall subject. (For example, if the Document is in part a
-      textbook of mathematics, a Secondary Section may not explain any
-      mathematics.)  The relationship could be a matter of historical
-      connection with the subject or with related matters, or of
-      legal, commercial, philosophical, ethical or political position
-      regarding them.
-    </para>
-
-    <para id="fdl-invariant">
-      The <quote>Invariant Sections</quote> are certain <link
-      linkend="fdl-secondary"> Secondary Sections</link> whose titles
-      are designated, as being those of Invariant Sections, in the
-      notice that says that the <link
-      linkend="fdl-document">Document</link> is released under this
-      License.
-    </para>
-    
-    <para id="fdl-cover-texts">
-      The <quote>Cover Texts</quote> are certain short passages of
-      text that are listed, as Front-Cover Texts or Back-Cover Texts,
-      in the notice that says that the <link
-      linkend="fdl-document">Document</link> is released under this
-      License.
-    </para>
-	
-    <para id="fdl-transparent">
-      A <quote>Transparent</quote> copy of the <link
-      linkend="fdl-document"> Document</link> means a machine-readable
-      copy, represented in a format whose specification is available
-      to the general public, whose contents can be viewed and edited
-      directly and straightforwardly with generic text editors or (for
-      images composed of pixels) generic paint programs or (for
-      drawings) some widely available drawing editor, and that is
-      suitable for input to text formatters or for automatic
-      translation to a variety of formats suitable for input to text
-      formatters. A copy made in an otherwise Transparent file format
-      whose markup has been designed to thwart or discourage
-      subsequent modification by readers is not Transparent.  A copy
-      that is not <quote>Transparent</quote> is called
-      <quote>Opaque</quote>.
-    </para>
-    
-    <para>
-      Examples of suitable formats for Transparent copies include
-      plain ASCII without markup, Texinfo input format, LaTeX input
-      format, SGML or XML using a publicly available DTD, and
-      standard-conforming simple HTML designed for human
-      modification. Opaque formats include PostScript, PDF,
-      proprietary formats that can be read and edited only by
-      proprietary word processors, SGML or XML for which the DTD
-      and/or processing tools are not generally available, and the
-      machine-generated HTML produced by some word processors for
-      output purposes only.
-    </para>
-    
-    <para id="fdl-title-page">
-      The <quote>Title Page</quote> means, for a printed book, the
-      title page itself, plus such following pages as are needed to
-      hold, legibly, the material this License requires to appear in
-      the title page. For works in formats which do not have any title
-      page as such, <quote>Title Page</quote> means the text near the
-      most prominent appearance of the work's title, preceding the
-      beginning of the body of the text.
-    </para>
-  </sect1>
-    
-  <sect1 id="fdl-section2">
-    <title>2. VERBATIM COPYING</title>
-    <para>
-      You may copy and distribute the <link
-      linkend="fdl-document">Document</link> in any medium, either
-      commercially or noncommercially, provided that this License, the
-      copyright notices, and the license notice saying this License
-      applies to the Document are reproduced in all copies, and that
-      you add no other conditions whatsoever to those of this
-      License. You may not use technical measures to obstruct or
-      control the reading or further copying of the copies you make or
-      distribute. However, you may accept compensation in exchange for
-      copies. If you distribute a large enough number of copies you
-      must also follow the conditions in <link
-      linkend="fdl-section3">section 3</link>.
-    </para>
-    
-    <para>
-      You may also lend copies, under the same conditions stated
-      above, and you may publicly display copies.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section3">
-    <title>3. COPYING IN QUANTITY</title>
-    <para>
-      If you publish printed copies of the <link
-      linkend="fdl-document">Document</link> numbering more than 100,
-      and the Document's license notice requires <link
-      linkend="fdl-cover-texts">Cover Texts</link>, you must enclose
-      the copies in covers that carry, clearly and legibly, all these
-      Cover Texts: Front-Cover Texts on the front cover, and
-      Back-Cover Texts on the back cover. Both covers must also
-      clearly and legibly identify you as the publisher of these
-      copies. The front cover must present the full title with all
-      words of the title equally prominent and visible. You may add
-      other material on the covers in addition. Copying with changes
-      limited to the covers, as long as they preserve the title of the
-      <link linkend="fdl-document">Document</link> and satisfy these
-      conditions, can be treated as verbatim copying in other
-      respects.
-    </para>
-    
-    <para>
-      If the required texts for either cover are too voluminous to fit
-      legibly, you should put the first ones listed (as many as fit
-      reasonably) on the actual cover, and continue the rest onto
-      adjacent pages.
-    </para>
-    
-    <para>
-      If you publish or distribute <link
-      linkend="fdl-transparent">Opaque</link> copies of the <link
-      linkend="fdl-document">Document</link> numbering more than 100,
-      you must either include a machine-readable <link
-      linkend="fdl-transparent">Transparent</link> copy along with
-      each Opaque copy, or state in or with each Opaque copy a
-      publicly-accessible computer-network location containing a
-      complete Transparent copy of the Document, free of added
-      material, which the general network-using public has access to
-      download anonymously at no charge using public-standard network
-      protocols. If you use the latter option, you must take
-      reasonably prudent steps, when you begin distribution of Opaque
-      copies in quantity, to ensure that this Transparent copy will
-      remain thus accessible at the stated location until at least one
-      year after the last time you distribute an Opaque copy (directly
-      or through your agents or retailers) of that edition to the
-      public.
-    </para>
-    
-    <para>
-      It is requested, but not required, that you contact the authors
-      of the <link linkend="fdl-document">Document</link> well before
-      redistributing any large number of copies, to give them a chance
-      to provide you with an updated version of the Document.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section4">
-    <title>4. MODIFICATIONS</title>
-    <para>
-      You may copy and distribute a <link
-      linkend="fdl-modified">Modified Version</link> of the <link
-      linkend="fdl-document">Document</link> under the conditions of
-      sections <link linkend="fdl-section2">2</link> and <link
-      linkend="fdl-section3">3</link> above, provided that you release
-      the Modified Version under precisely this License, with the
-      Modified Version filling the role of the Document, thus
-      licensing distribution and modification of the Modified Version
-      to whoever possesses a copy of it. In addition, you must do
-      these things in the Modified Version:
-    </para>
-    
-    <itemizedlist mark="opencircle">
-      <listitem>
-	<formalpara>
-	  <title>A</title>
-	  <para>
-	    Use in the <link linkend="fdl-title-page">Title
-	    Page</link> (and on the covers, if any) a title distinct
-	    from that of the <link
-	    linkend="fdl-document">Document</link>, and from those of
-	    previous versions (which should, if there were any, be
-	    listed in the History section of the Document). You may
-	    use the same title as a previous version if the original
-	    publisher of that version gives permission.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>B</title>
-	  <para>
-	    List on the <link linkend="fdl-title-page">Title
-	    Page</link>, as authors, one or more persons or entities
-	    responsible for authorship of the modifications in the
-	    <link linkend="fdl-modified">Modified Version</link>,
-	    together with at least five of the principal authors of
-	    the <link linkend="fdl-document">Document</link> (all of
-	    its principal authors, if it has less than five).
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>C</title>
-	  <para>
-	    State on the <link linkend="fdl-title-page">Title
-	    Page</link> the name of the publisher of the <link
-	    linkend="fdl-modified">Modified Version</link>, as the
-	    publisher.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>D</title>
-	  <para>
-	    Preserve all the copyright notices of the <link
-	    linkend="fdl-document">Document</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>E</title>
-	  <para>
-	    Add an appropriate copyright notice for your modifications
-	    adjacent to the other copyright notices.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>F</title>
-	  <para>
-	    Include, immediately after the copyright notices, a
-	    license notice giving the public permission to use the
-	    <link linkend="fdl-modified">Modified Version</link> under
-	    the terms of this License, in the form shown in the
-	    Addendum below.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>G</title>
-	  <para>
-	    Preserve in that license notice the full lists of <link
-	    linkend="fdl-invariant"> Invariant Sections</link> and
-	    required <link linkend="fdl-cover-texts">Cover
-	    Texts</link> given in the <link
-	    linkend="fdl-document">Document's</link> license notice.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>H</title>
-	  <para>
-	    Include an unaltered copy of this License.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>I</title>
-	  <para>
-	    Preserve the section entitled <quote>History</quote>, and
-	    its title, and add to it an item stating at least the
-	    title, year, new authors, and publisher of the <link
-	    linkend="fdl-modified">Modified Version </link>as given on
-	    the <link linkend="fdl-title-page">Title Page</link>.  If
-	    there is no section entitled <quote>History</quote> in the
-	    <link linkend="fdl-document">Document</link>, create one
-	    stating the title, year, authors, and publisher of the
-	    Document as given on its Title Page, then add an item
-	    describing the Modified Version as stated in the previous
-	    sentence.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>J</title>
-	  <para>
-	    Preserve the network location, if any, given in the <link
-	    linkend="fdl-document">Document</link> for public access
-	    to a <link linkend="fdl-transparent">Transparent</link>
-	    copy of the Document, and likewise the network locations
-	    given in the Document for previous versions it was based
-	    on. These may be placed in the <quote>History</quote>
-	    section.  You may omit a network location for a work that
-	    was published at least four years before the Document
-	    itself, or if the original publisher of the version it
-	    refers to gives permission.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>K</title>
-	  <para>
-	    In any section entitled <quote>Acknowledgements</quote> or
-	    <quote>Dedications</quote>, preserve the section's title,
-	    and preserve in the section all the substance and tone of
-	    each of the contributor acknowledgements and/or
-	    dedications given therein.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>L</title>
-	  <para>
-	    Preserve all the <link linkend="fdl-invariant">Invariant
-	    Sections</link> of the <link
-	    linkend="fdl-document">Document</link>, unaltered in their
-	    text and in their titles.  Section numbers or the
-	    equivalent are not considered part of the section titles.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>M</title>
-	  <para>
-	    Delete any section entitled
-	    <quote>Endorsements</quote>. Such a section may not be
-	    included in the <link linkend="fdl-modified">Modified
-	    Version</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>N</title>
-	  <para>
-	    Do not retitle any existing section as
-	    <quote>Endorsements</quote> or to conflict in title with
-	    any <link linkend="fdl-invariant">Invariant
-	    Section</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-    </itemizedlist>
-    
-    <para>
-      If the <link linkend="fdl-modified">Modified Version</link>
-      includes new front-matter sections or appendices that qualify as
-      <link linkend="fdl-secondary">Secondary Sections</link> and
-      contain no material copied from the Document, you may at your
-      option designate some or all of these sections as invariant. To
-      do this, add their titles to the list of <link
-      linkend="fdl-invariant">Invariant Sections</link> in the
-      Modified Version's license notice.  These titles must be
-      distinct from any other section titles.
-    </para>
-    
-    <para>
-      You may add a section entitled <quote>Endorsements</quote>,
-      provided it contains nothing but endorsements of your <link
-      linkend="fdl-modified">Modified Version</link> by various
-      parties--for example, statements of peer review or that the text
-      has been approved by an organization as the authoritative
-      definition of a standard.
-    </para>
-    
-    <para>
-      You may add a passage of up to five words as a <link
-      linkend="fdl-cover-texts">Front-Cover Text</link>, and a passage
-      of up to 25 words as a <link
-      linkend="fdl-cover-texts">Back-Cover Text</link>, to the end of
-      the list of <link linkend="fdl-cover-texts">Cover Texts</link>
-      in the <link linkend="fdl-modified">Modified Version</link>.
-      Only one passage of Front-Cover Text and one of Back-Cover Text
-      may be added by (or through arrangements made by) any one
-      entity. If the <link linkend="fdl-document">Document</link>
-      already includes a cover text for the same cover, previously
-      added by you or by arrangement made by the same entity you are
-      acting on behalf of, you may not add another; but you may
-      replace the old one, on explicit permission from the previous
-      publisher that added the old one.
-    </para>
-    
-    <para>
-      The author(s) and publisher(s) of the <link
-      linkend="fdl-document">Document</link> do not by this License
-      give permission to use their names for publicity for or to
-      assert or imply endorsement of any <link
-      linkend="fdl-modified">Modified Version </link>.
-    </para>
-  </sect1>
-    
-  <sect1 id="fdl-section5">
-    <title>5. COMBINING DOCUMENTS</title>
-    <para>
-      You may combine the <link linkend="fdl-document">Document</link>
-      with other documents released under this License, under the
-      terms defined in <link linkend="fdl-section4">section 4</link>
-      above for modified versions, provided that you include in the
-      combination all of the <link linkend="fdl-invariant">Invariant
-      Sections</link> of all of the original documents, unmodified,
-      and list them all as Invariant Sections of your combined work in
-      its license notice.
-    </para>
-    
-    <para>
-      The combined work need only contain one copy of this License,
-      and multiple identical <link linkend="fdl-invariant">Invariant
-      Sections</link> may be replaced with a single copy. If there are
-      multiple Invariant Sections with the same name but different
-      contents, make the title of each such section unique by adding
-      at the end of it, in parentheses, the name of the original
-      author or publisher of that section if known, or else a unique
-      number. Make the same adjustment to the section titles in the
-      list of Invariant Sections in the license notice of the combined
-      work.
-    </para>
-    
-    <para>
-      In the combination, you must combine any sections entitled
-      <quote>History</quote> in the various original documents,
-      forming one section entitled <quote>History</quote>; likewise
-      combine any sections entitled <quote>Acknowledgements</quote>,
-      and any sections entitled <quote>Dedications</quote>.  You must
-      delete all sections entitled <quote>Endorsements.</quote>
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section6">
-    <title>6. COLLECTIONS OF DOCUMENTS</title>
-    <para>
-      You may make a collection consisting of the <link
-      linkend="fdl-document">Document</link> and other documents
-      released under this License, and replace the individual copies
-      of this License in the various documents with a single copy that
-      is included in the collection, provided that you follow the
-      rules of this License for verbatim copying of each of the
-      documents in all other respects.
-    </para>
-    
-    <para>
-      You may extract a single document from such a collection, and
-      dispbibute it individually under this License, provided you
-      insert a copy of this License into the extracted document, and
-      follow this License in all other respects regarding verbatim
-      copying of that document.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section7">
-    <title>7. AGGREGATION WITH INDEPENDENT WORKS</title>
-    <para>
-      A compilation of the <link
-      linkend="fdl-document">Document</link> or its derivatives with
-      other separate and independent documents or works, in or on a
-      volume of a storage or distribution medium, does not as a whole
-      count as a <link linkend="fdl-modified">Modified Version</link>
-      of the Document, provided no compilation copyright is claimed
-      for the compilation.  Such a compilation is called an
-      <quote>aggregate</quote>, and this License does not apply to the
-      other self-contained works thus compiled with the Document , on
-      account of their being thus compiled, if they are not themselves
-      derivative works of the Document.  If the <link
-      linkend="fdl-cover-texts">Cover Text</link> requirement of <link
-      linkend="fdl-section3">section 3</link> is applicable to these
-      copies of the Document, then if the Document is less than one
-      quarter of the entire aggregate, the Document's Cover Texts may
-      be placed on covers that surround only the Document within the
-      aggregate. Otherwise they must appear on covers around the whole
-      aggregate.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section8">
-    <title>8. TRANSLATION</title>
-    <para>
-      Translation is considered a kind of modification, so you may
-      distribute translations of the <link
-      linkend="fdl-document">Document</link> under the terms of <link
-      linkend="fdl-section4">section 4</link>. Replacing <link
-      linkend="fdl-invariant"> Invariant Sections</link> with
-      translations requires special permission from their copyright
-      holders, but you may include translations of some or all
-      Invariant Sections in addition to the original versions of these
-      Invariant Sections. You may include a translation of this
-      License provided that you also include the original English
-      version of this License. In case of a disagreement between the
-      translation and the original English version of this License,
-      the original English version will prevail.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section9">
-    <title>9. TERMINATION</title>
-    <para>
-      You may not copy, modify, sublicense, or distribute the <link
-      linkend="fdl-document">Document</link> except as expressly
-      provided for under this License. Any other attempt to copy,
-      modify, sublicense or distribute the Document is void, and will
-      automatically terminate your rights under this License. However,
-      parties who have received copies, or rights, from you under this
-      License will not have their licenses terminated so long as such
-      parties remain in full compliance.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section10">
-    <title>10. FUTURE REVISIONS OF THIS LICENSE</title>
-    <para>
-      The <ulink type="http"
-      url="http://www.gnu.org/fsf/fsf.html">Free Software
-      Foundation</ulink> may publish new, revised versions of the GNU
-      Free Documentation License from time to time. Such new versions
-      will be similar in spirit to the present version, but may differ
-      in detail to address new problems or concerns. See <ulink
-      type="http"
-      url="http://www.gnu.org/copyleft">http://www.gnu.org/copyleft/</ulink>.
-    </para>
-    
-    <para>
-      Each version of the License is given a distinguishing version
-      number. If the <link linkend="fdl-document">Document</link>
-      specifies that a particular numbered version of this License
-      <quote>or any later version</quote> applies to it, you have the
-      option of following the terms and conditions either of that
-      specified version or of any later version that has been
-      published (not as a draft) by the Free Software Foundation. If
-      the Document does not specify a version number of this License,
-      you may choose any version ever published (not as a draft) by
-      the Free Software Foundation.
-    </para>
-  </sect1>
-
-  <sect1 id="fdl-using">
-    <title>Addendum</title>
-    <para>
-      To use this License in a document you have written, include a copy of
-      the License in the document and put the following copyright and
-      license notices just after the title page:
-    </para>
-    
-    <blockquote>
-      <para>
-	Copyright YEAR YOUR NAME.
-      </para>
-      <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the GNU Free Documentation
-	License, Version 1.1 or any later version published by the
-	Free Software Foundation; with the <link
-	linkend="fdl-invariant">Invariant Sections</link> being LIST
-	THEIR TITLES, with the <link
-	linkend="fdl-cover-texts">Front-Cover Texts</link> being LIST,
-	and with the <link linkend="fdl-cover-texts">Back-Cover
-	Texts</link> being LIST.  A copy of the license is included in
-	the section entitled <quote>GNU Free Documentation
-	License</quote>.
-      </para>
-    </blockquote>
-      
-    <para>
-      If you have no <link linkend="fdl-invariant">Invariant
-      Sections</link>, write <quote>with no Invariant Sections</quote>
-      instead of saying which ones are invariant.  If you have no
-      <link linkend="fdl-cover-texts">Front-Cover Texts</link>, write
-      <quote>no Front-Cover Texts</quote> instead of
-      <quote>Front-Cover Texts being LIST</quote>; likewise for <link
-      linkend="fdl-cover-texts">Back-Cover Texts</link>.
-    </para>
-    
-    <para>
-      If your document contains nontrivial examples of program code,
-      we recommend releasing these examples in parallel under your
-      choice of free software license, such as the <ulink type="http"
-      url="http://www.gnu.org/copyleft/gpl.html"> GNU General Public
-      License</ulink>, to permit their use in free software.
-    </para>
-  </sect1>
-</appendix>  
-
-
diff --git a/test/testdoc1/help/testdoc1/C/legal.xml b/test/testdoc1/help/testdoc1/C/legal.xml
deleted file mode 100644
index ac97e1de..00000000
--- a/test/testdoc1/help/testdoc1/C/legal.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-  <legalnotice id="legalnotice">
-	<para>
-	  Permission is granted to copy, distribute and/or modify this
-	  document under the terms of the GNU Free Documentation
-	  License (GFDL), Version 1.1 or any later version published
-	  by the Free Software Foundation with no Invariant Sections,
-	  no Front-Cover Texts, and no Back-Cover Texts.  You can find
-	  a copy of the GFDL at this <ulink type="help"
-	  url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
-	  distributed with this manual.
-         </para>
-         <para> This manual is part of a collection of GNOME manuals
-          distributed under the GFDL.  If you want to distribute this
-          manual separately from the collection, you can do so by
-          adding a copy of the license to the manual, as described in
-          section 6 of the license.
-	</para>
-
-	<para>
-	  Many of the names used by companies to distinguish their
-	  products and services are claimed as trademarks. Where those
-	  names appear in any GNOME documentation, and the members of
-	  the GNOME Documentation Project are made aware of those
-	  trademarks, then the names are in capital letters or initial
-	  capital letters.
-	</para>
-
-	<para>
-	  DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
-	  UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
-	  WITH THE FURTHER UNDERSTANDING THAT:
-
-	  <orderedlist>
-		<listitem>
-		  <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
-                    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-                    IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-                    THAT THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
-                    A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
-                    RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
-                    OF THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
-                    MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
-                    YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
-                    CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-                    SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-                    OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
-                    LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
-                    VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
-                    EXCEPT UNDER THIS DISCLAIMER; AND
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
-                       THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
-                       CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
-                       INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
-                       DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
-                       OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
-                       PARTIES, BE LIABLE TO ANY PERSON FOR ANY
-                       DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
-                       CONSEQUENTIAL DAMAGES OF ANY CHARACTER
-                       INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
-                       OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
-                       MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
-                       LOSSES ARISING OUT OF OR RELATING TO USE OF THE
-                       DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
-                       EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-                       THE POSSIBILITY OF SUCH DAMAGES.
-		  </para>
-		</listitem>
-	  </orderedlist>
-	</para>
-  </legalnotice>
-
diff --git a/test/testdoc1/help/testdoc1/C/testdoc1.xml b/test/testdoc1/help/testdoc1/C/testdoc1.xml
deleted file mode 100644
index 2cb4d12a..00000000
--- a/test/testdoc1/help/testdoc1/C/testdoc1.xml
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
-  <!ENTITY GFDL SYSTEM "fdl-appendix.xml">
-]>
-
-<article id="index" lang="en">
-<articleinfo>
-  <title>GNOME Documentation Utilites Test Document 1</title>
-  <copyright>
-    <year>2002</year>
-    <holder>Shaun McCance</holder>
-  </copyright>
-  <publisher>
-    <publishername>GNOME Documentation Project</publishername>
-  </publisher>
-  &legal;
-  <authorgroup>
-    <author>
-      <firstname>Shaun</firstname>
-      <surname>McCance</surname>
-      <affiliation>
-	<orgname>GNOME Documentation Project</orgname>
-      </affiliation>
-      <email>shaunm@gnome.org</email>
-    </author>
-  </authorgroup>
-  <legalnotice>
-    <title>Feedback</title>
-    <para>To report a bug or make a suggestion regarding this package or
-    this manual, follow the directions in the
-    <ulink url="ghelp:gnome-feedback">GNOME Feedback Page</ulink>.
-    </para>
-  </legalnotice>
-</articleinfo>
-
-<sect1 id="overview">
-<title>Overview</title>
-<para>
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed id dui. In
-hac habitasse platea dictumst. Vestibulum eget quam. Suspendisse posuere,
-sem non rutrum tincidunt, mi quam euismod nunc, placerat eleifend pede
-metus eget justo. Cras tortor est, fermentum ac, egestas ut, accumsan ut,
-erat. Pellentesque eros mauris, ultrices sed, vestibulum eget, consequat
-consequat, orci. Donec non elit. Integer eget augue. Mauris aliquam. Donec
-mauris sem, consequat at, volutpat vel, convallis ut, orci. Nunc in augue.
-Morbi eget ante. Nulla varius, dolor a dapibus tincidunt, dolor dolor
-molestie velit, quis lacinia justo wisi et ipsum. Aenean condimentum
-aliquet metus. Praesent urna.
-</para>
-<para>
-Cras mollis convallis wisi. Cras adipiscing eros quis dolor. Proin nulla
-urna, sodales eu, posuere condimentum, pretium eget, arcu. Cum sociis
-natoque penatibus et magnis dis parturient montes, nascetur ridiculus
-mus. Cras blandit, ante at malesuada accumsan, est sapien interdum wisi,
-vel bibendum risus ante ut turpis. Proin porta consequat risus. Nullam
-sed mauris sed ligula tempus congue. Praesent nec quam non orci feugiat
-hendrerit. Donec leo mi, pretium at, tristique a, accumsan in, mi.
-Curabitur sed enim. Phasellus facilisis felis ut magna. Cras dolor
-urna, consectetuer in, semper nec, luctus sit amet, felis. Quisque
-vitae massa id arcu elementum aliquam.
-</para>
-<para>
-Pellentesque consectetuer, eros iaculis aliquet volutpat, eros eros commodo
-odio, sit amet malesuada eros mi tempor lectus. Donec suscipit turpis quis
-lectus. Vestibulum id purus elementum purus tincidunt mattis. Pellentesque
-vulputate, justo quis mattis vulputate, est risus convallis diam, id
-pellentesque augue libero in dui. In ultricies augue ac tortor. Sed
-ligula ligula, ultricies eget, faucibus vitae, iaculis sed, dolor. In
-dignissim lobortis magna. Curabitur at sapien. Nullam a nisl. Fusce
-hendrerit, felis sagittis tempor adipiscing, dolor sapien ornare arcu,
-quis egestas ante est dictum metus. Nam vulputate, massa eu porta interdum,
-turpis ligula cursus nibh, id hendrerit elit eros eget augue. Nullam
-pellentesque porttitor nunc.
-</para>
-<para>
-Etiam mi diam, pharetra eget, ornare pretium, tempor non, nunc. Nam pharetra
-feugiat justo. Donec mattis urna. Donec neque. Class aptent taciti sociosqu
-ad litora torquent per conubia nostra, per inceptos hymenaeos. Etiam sed est.
-In lobortis magna a magna. Aliquam a enim sed dolor scelerisque auctor. Ut
-suscipit. Suspendisse nulla. Suspendisse eu lorem eu mauris cursus semper.
-Vivamus vel quam. Fusce enim. Pellentesque habitant morbi tristique senectus
-et netus et malesuada fames ac turpis egestas. Fusce cursus euismod wisi.
-Sed blandit velit vitae nibh. Aliquam sed metus. Nulla facilisi.
-</para>
-<para>
-Ut id justo non justo congue cursus. Suspendisse sodales velit vel nibh.
-Morbi sit amet sem ut magna mollis tincidunt. Phasellus pellentesque, tortor
-at luctus tempus, metus nibh mattis lectus, nec vestibulum nulla nisl sit amet
-odio. Cras id dui non metus convallis congue. Vivamus ut urna. Proin fringilla
-pretium wisi. Sed porttitor augue ac mi. Integer lorem pede, hendrerit ut,
-placerat ac, dignissim ac, ante. Ut dictum. Nunc aliquet.
-</para>
-<para>
-Praesent id tellus. Praesent tortor odio, vulputate hendrerit, sollicitudin
-ut, varius quis, est. Ut id arcu ac tortor eleifend suscipit. Donec wisi est,
-laoreet vel, consectetuer id, consequat sit amet, elit. Vestibulum libero.
-Aliquam elementum convallis risus. Suspendisse nunc sem, vehicula quis,
-rutrum blandit, fringilla ac, nisl. Nulla sagittis scelerisque urna.
-Suspendisse id dolor. Curabitur blandit erat non leo. Vestibulum in
-quam. Sed felis velit, accumsan vel, pulvinar eu, commodo vel, felis.
-Nullam pellentesque tellus et elit. Aenean arcu nibh, mollis in, laoreet
-vel, faucibus imperdiet, enim. Phasellus pede. Pellentesque habitant morbi
-tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur
-nibh nibh, adipiscing eu, luctus at, hendrerit at, mauris. Maecenas in turpis.
-Quisque dui.
-</para>
-<para>
-Fusce consequat est sed ipsum. Sed ullamcorper diam non odio. Proin accumsan
-laoreet justo. Nunc sagittis, est sit amet vehicula ultrices, quam sapien
-tincidunt risus, ac viverra justo elit ac ligula. Vestibulum pharetra. Donec
-a quam. Ut sem ipsum, imperdiet nec, posuere ac, scelerisque eu, est. Fusce
-nec augue mattis nisl congue porta. Donec mauris leo, vehicula nonummy, auctor
-pellentesque, convallis porttitor, nunc. Quisque fringilla odio eu ipsum. In
-hac habitasse platea dictumst.
-</para>
-<para>
-Suspendisse ac nunc. Duis fringilla sem ut lacus. Cum sociis natoque penatibus
-et magnis dis parturient montes, nascetur ridiculus mus. In hac habitasse
-platea dictumst. Donec a velit. Proin eget dolor. Duis posuere. Nullam ultrices
-eleifend mi. Nam velit. Quisque sem justo, convallis quis, lacinia et, eleifend
-non, pede. Suspendisse potenti. Etiam tempor porttitor sem.
-</para>
-<para>
-Etiam vestibulum felis a libero. Vivamus pharetra nisl aliquet arcu tristique
-varius. Aenean diam. Praesent elit nisl, convallis a, fringilla at, rutrum
-sed, mauris. Sed ipsum nisl, aliquet nec, malesuada id, malesuada sed, eros.
-Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac
-turpis egestas. Nullam cursus ultricies elit. Nullam semper feugiat nunc.
-Curabitur consequat ultricies eros. Fusce gravida. Nam et purus eget nibh
-vehicula hendrerit. Proin eleifend, orci in interdum suscipit, lectus dui
-consequat mauris, eu facilisis libero wisi et erat. Maecenas ac wisi in
-lectus pharetra fermentum. Nam a lectus sed dui mollis fermentum. Proin
-elementum. Sed nibh sapien, lobortis eget, dignissim et, luctus eu, mauris.
-</para>
-<para>
-Sed feugiat. Donec nibh. Sed placerat nunc ac tellus sagittis fermentum. Cras
-neque nulla, tempor eu, vestibulum vestibulum, varius non, felis. Duis pretium
-massa vitae velit. Cras mattis. Sed congue. Sed mollis tortor. Suspendisse
-faucibus, justo vitae pellentesque porta, sem enim luctus justo, non iaculis
-risus nunc imperdiet pede. Morbi justo massa, lobortis vitae, sagittis non,
-feugiat at, risus. Aenean posuere elementum arcu.
-</para>
-<para>
-Sed pharetra. Proin ultricies mattis ipsum. Nam scelerisque. Praesent augue
-arcu, dignissim at, ultrices at, condimentum in, lacus. Mauris augue diam,
-consequat ac, facilisis sed, convallis eu, wisi. Pellentesque vitae lectus.
-Proin non velit sit amet lacus sodales tincidunt. Fusce sed eros ac ipsum
-dignissim interdum. Fusce vestibulum aliquet arcu. Vivamus laoreet felis
-non elit. Curabitur turpis. Sed pulvinar. Quisque tempus. Suspendisse
-fringilla tempus tortor. Aliquam placerat commodo lectus. Vestibulum ante
-ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;
-</para>
-<para>
-In dapibus scelerisque ante. Nunc sit amet sem. Nam posuere, wisi et eleifend
-hendrerit, erat velit rhoncus lacus, ac gravida sem velit ut neque. In sed nisl.
-Nulla facilisi. Mauris tincidunt. Maecenas dolor. Integer euismod. Nulla eget
-augue in tellus ornare cursus. Etiam in quam. Proin diam dolor, lobortis nec,
-semper at, luctus eget, nisl. Maecenas tempus varius lorem.
-</para>
-<para>
-Ut purus lectus, tristique quis, ornare vel, mattis in, nulla. Morbi ultrices,
-tortor ultrices placerat adipiscing, ante urna vulputate enim, sed tempor orci
-lectus sed odio. Donec bibendum, turpis bibendum blandit malesuada, risus quam
-ullamcorper augue, vitae sollicitudin felis lacus vel nisl. Phasellus iaculis
-auctor risus. Mauris pellentesque bibendum ante. Duis ultrices porttitor sapien.
-Integer a erat placerat leo iaculis accumsan. Donec fermentum laoreet mi. Nunc
-feugiat consequat magna. Fusce molestie ultrices justo. Vivamus consequat
-porta orci.
-</para>
-<para>
-Ut feugiat, eros vitae nonummy cursus, nibh dui adipiscing diam, vel vehicula
-wisi urna quis sapien. Nulla facilisi. Maecenas euismod diam in sapien facilisis
-porta. Quisque consectetuer ante. Mauris justo est, sodales at, tincidunt ut,
-ultrices a, mi. Praesent ultricies. Vestibulum ullamcorper augue id quam. Morbi
-sed nisl. Morbi massa. Sed sed lorem. Quisque neque ipsum, vestibulum vel,
-convallis a, viverra ac, sem. Aenean tincidunt justo eu leo. Nullam pretium,
-tellus a dictum tincidunt, leo mauris varius metus, quis aliquam massa lectus
-a leo. Nunc est odio, vestibulum id, lobortis eu, pretium et, tellus. Aliquam
-erat volutpat. Quisque cursus turpis a neque consequat gravida. Maecenas varius
-libero a tellus. Sed imperdiet nisl eu odio. 
-</para>
-</sect1>
-
-<sect1 id="examples">
-<title>Examples and Warnings</title>
-<para>
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas porta, magna
-quis dapibus sodales, velit erat commodo odio, nec porta elit velit vel pede.
-Aliquam est ligula, vulputate vel, scelerisque ut, porta sit amet, mi. Sed
-enim. Donec auctor fermentum tortor. Sed lectus purus, faucibus ut, rhoncus
-eu, iaculis at, turpis. Nam porttitor velit vel sem. Fusce ac dolor et nulla
-fringilla aliquet. Vestibulum wisi nibh, dictum dapibus, dictum nec, tincidunt
-nec, purus. Nunc nulla mi, nonummy sit amet, eleifend vitae, imperdiet non,
-augue. Maecenas nonummy bibendum magna. Praesent feugiat, nunc vel bibendum
-bibendum, tellus urna interdum purus, eget sagittis pede metus ut sem. Nulla
-vulputate, pede eu ultricies rutrum, mauris quam iaculis lorem, eget facilisis
-nibh purus sed diam.
-</para>
-<para>
-Nam sapien. Quisque arcu dolor, consectetuer a, auctor id, ullamcorper at,
-lectus. Praesent lectus urna, scelerisque ut, viverra et, fermentum in, est.
-Mauris id augue. Etiam dolor. Nunc lacinia massa et purus. Nam purus nunc,
-sagittis ac, cursus sed, condimentum ac, mi. Praesent feugiat quam in ligula.
-Donec sodales. Nam lectus felis, hendrerit quis, pretium vitae, imperdiet vitae,
-nunc. Mauris eleifend consequat dui. Cum sociis natoque penatibus et magnis dis
-parturient montes, nascetur ridiculus mus. Donec turpis. Nunc sed odio. Duis
-urna. Curabitur congue mattis purus. Mauris luctus sem in tortor.
-</para>
-<example>
-<title>Pellentesque Enim</title>
-<para>
-Pellentesque enim. Nunc vel ipsum in turpis sollicitudin tincidunt. Cum sociis
-natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
-Phasellus sapien orci, facilisis ac, luctus vitae, suscipit in, lectus. Cras
-varius. Duis tortor leo, ornare vitae, vehicula quis, tempus sit amet, nibh.
-Suspendisse vel mauris sed wisi pretium nonummy. Etiam metus pede, interdum
-et, scelerisque id, vulputate in, nibh. Quisque sed tortor id ante malesuada
-mattis. Fusce suscipit purus nec dui. In hac habitasse platea dictumst. Integer
-nulla orci, adipiscing quis, tristique eu, adipiscing sed, neque. Aliquam risus
-leo, condimentum vitae, ullamcorper at, viverra euismod, lacus. Proin interdum
-wisi. Sed egestas, ligula posuere consectetuer tempus, tellus massa dictum mi,
-eu commodo metus ipsum nec sapien. Curabitur ac orci non augue dignissim
-vestibulum.
-</para>
-<para>
-Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus
-mus. Nulla vel mi. Curabitur non eros. Sed gravida facilisis turpis. Integer est
-odio, lacinia sit amet, imperdiet vel, vehicula eget, dolor. Praesent sed eros
-in neque tempus ultrices. Suspendisse fermentum, lorem in commodo euismod, erat
-magna cursus nunc, vel viverra pede ipsum vulputate diam. Aenean tincidunt nulla
-non urna. Nulla dictum, eros et dapibus sagittis, leo nulla hendrerit orci, ac
-blandit est elit sed ante. Aliquam vehicula erat nec neque. In neque. Quisque
-facilisis felis et lacus. Integer sed pede sit amet turpis vestibulum gravida.
-Proin consectetuer. Vivamus hendrerit tempus magna. In ut tortor. Morbi mi
-augue, iaculis non, faucibus tempor, hendrerit eu, sem. Nulla ut mauris.
-Vestibulum fringilla laoreet ligula. Suspendisse interdum risus.
-</para>
-</example>
-<para>
-Sed eleifend est et ante. Phasellus euismod, sapien id sagittis pretium, orci
-orci vehicula ante, nec pulvinar massa ipsum sit amet sem. Cum sociis natoque
-penatibus et magnis dis parturient montes, nascetur ridiculus mus. Integer
-velit felis, facilisis in, eleifend pulvinar, accumsan eget, sem. Fusce justo.
-Sed sed dolor eget elit ornare dignissim. In ornare varius sem. Curabitur
-dignissim, nisl eu sollicitudin pellentesque, orci metus pulvinar ipsum,
-quis dapibus metus orci vitae neque. Cum sociis natoque penatibus et magnis
-dis parturient montes, nascetur ridiculus mus. Etiam posuere adipiscing augue.
-Sed vulputate rhoncus nibh. Sed eu lorem id lacus tristique semper.
-</para>
-<note>
-<title>Nam Nec Purus</title>
-<para>
-Nam nec purus. Etiam porta. Aenean nec risus at nisl sollicitudin porttitor.
-Proin imperdiet justo et tortor. Nullam sollicitudin bibendum enim. Aenean
-aliquam tempus neque. Morbi aliquet, justo ac lobortis tristique, felis nibh
-semper erat, sit amet vulputate nunc felis ut lorem. Duis augue ante, venenatis
-eget, rutrum sit amet, dictum sed, ipsum. Pellentesque habitant morbi tristique
-senectus et netus et malesuada fames ac turpis egestas. Nunc quis arcu. Duis
-fermentum neque quis urna. Nunc non odio vel nibh lobortis posuere. Phasellus
-dignissim orci. Morbi urna ante, sagittis a, consectetuer at, venenatis eget,
-risus. Cras ac eros ut purus ullamcorper molestie. Fusce accumsan commodo erat.
-Suspendisse justo. Cras feugiat convallis ligula.
-</para>
-</note>
-<para>
-Suspendisse dui. Vestibulum tellus velit, adipiscing at, feugiat vitae, mattis
-non, est. Sed gravida nisl laoreet lorem. Vestibulum ante ipsum primis in
-faucibus orci luctus et ultrices posuere cubilia Curae; Nullam ut massa sit
-amet nibh ornare mattis. Vivamus ante ante, volutpat sollicitudin, euismod a,
-elementum non, nunc. Cum sociis natoque penatibus et magnis dis parturient
-montes, nascetur ridiculus mus. Etiam sit amet arcu nec lorem commodo
-ullamcorper. Cum sociis natoque penatibus et magnis dis parturient montes,
-nascetur ridiculus mus. Praesent arcu urna, pretium et, consectetuer non,
-sollicitudin sed, enim. Morbi elit mi, lobortis sed, aliquet vitae,
-pellentesque id, diam. Vivamus at eros non ligula elementum cursus.
-Duis et dui. Donec fringilla turpis. Nulla dapibus varius nunc. Donec
-blandit, pede non luctus porttitor, est quam hendrerit libero, at facilisis
-mi lectus vitae est. Mauris suscipit. Nulla ligula. Vestibulum et eros. Fusce
-interdum ultricies neque.
-</para>
-<para>
-Fusce nec lacus eu libero faucibus tincidunt. Pellentesque habitant morbi
-tristique senectus et netus et malesuada fames ac turpis egestas. Ut ultrices
-viverra est. Donec malesuada lorem nec neque. Nulla facilisi. Lorem ipsum dolor
-sit amet, consectetuer adipiscing elit. Duis ante diam, volutpat eget, volutpat
-et, consequat vel, mi. In felis enim, consectetuer et, euismod eget, luctus nec,
-sapien. Proin in pede. Mauris dolor urna, convallis ut, nonummy sed, pulvinar
-tempor, tortor. In dui. Aenean wisi velit, vulputate vitae, fringilla vitae,
-cursus id, ante. Morbi eu wisi. Aenean tellus ipsum, nonummy vel, vehicula et,
-iaculis sit amet, ante. Praesent vitae leo.
-</para>
-<warning>
-<title>Maecenas Laoreet</title>
-<para>
-Maecenas laoreet, quam consequat mattis malesuada, lacus lectus tempor dui, ac
-ullamcorper nisl dui nec lacus. Morbi arcu. Suspendisse tortor nibh, vestibulum
-at, porttitor a, semper et, elit. Quisque cursus aliquam nulla. Phasellus ac
-ipsum. Aenean vehicula auctor tortor. Fusce mauris neque, condimentum eu,
-lobortis nec, interdum ut, orci. Sed wisi lacus, bibendum ac, tincidunt vitae,
-condimentum a, lectus. Curabitur id diam id lectus egestas eleifend. Sed ut
-ante. Sed ipsum magna, condimentum a, ornare a, porttitor sed, tortor.
-</para>
-<para>
-Fusce cursus. Vivamus placerat. Pellentesque quam nibh, tincidunt interdum,
-vulputate sit amet, egestas nec, turpis. Ut diam. Aliquam enim arcu, fringilla
-eu, lobortis sed, viverra at, mi. Donec augue mauris, ultricies ac, luctus at,
-dictum ut, wisi. Curabitur vulputate ante faucibus felis. Phasellus iaculis
-velit vel elit. Duis aliquam, arcu a bibendum lacinia, diam pede nonummy ante,
-vitae vestibulum quam nibh id velit. Aenean aliquam mauris sed velit. Phasellus
-eu dolor ut nunc commodo lobortis. Nunc varius rhoncus risus.
-</para>
-</warning>
-<para>
-Aliquam sed nunc. Praesent at diam ut massa laoreet semper. Vestibulum vulputate
-facilisis ipsum. Vestibulum a ante. Nullam vehicula. Maecenas adipiscing. Donec
-elementum elementum turpis. Proin sem sem, consectetuer blandit, rhoncus vel,
-malesuada luctus, metus. Curabitur pellentesque, felis eget lobortis accumsan,
-ipsum dolor tristique elit, facilisis viverra nulla elit nec diam. Curabitur
-sit amet mauris. Nulla facilisi. Maecenas sed quam. Nam non erat.
-</para>
-<para>
-Nulla varius, odio eu blandit aliquet, diam ante gravida lectus, et dapibus
-felis wisi at ipsum. Nunc nulla ipsum, porta at, posuere eu, adipiscing rutrum,
-libero. Etiam interdum ullamcorper urna. Aliquam scelerisque accumsan nibh. Nam
-urna nibh, volutpat in, interdum ac, imperdiet eu, tortor. Nulla leo nulla,
-condimentum nec, rhoncus ultricies, feugiat vitae, turpis. Morbi at purus sed
-lacus sodales sollicitudin. Fusce mattis ornare augue. Nullam nec purus at wisi
-porttitor vestibulum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-Nunc accumsan adipiscing dolor. Aenean sollicitudin libero quis elit. Donec
-pede. In hac habitasse platea dictumst. Vestibulum turpis enim, blandit non,
-faucibus mattis, aliquet sagittis, turpis. Nam mollis libero ut magna.
-Suspendisse potenti. Nulla vestibulum, dui quis condimentum convallis,
-mi enim porttitor purus, pretium ornare nunc wisi nec augue. Curabitur
-semper est sit amet libero.
-</para>
-<para>
-Quisque in nisl. In at nunc sit amet purus scelerisque euismod. Lorem ipsum
-dolor sit amet, consectetuer adipiscing elit. Aenean facilisis ipsum vel diam.
-Quisque accumsan metus in velit. Praesent a dolor non urna condimentum varius.
-Sed quis felis. Praesent tellus lectus, aliquet a, tempor vel, pharetra non,
-leo. Etiam mi lectus, fringilla rutrum, ultrices sit amet, placerat et, ante.
-Nam suscipit. Nullam eleifend. Sed ut tellus pretium arcu scelerisque congue.
-</para>
-<para>
-Etiam odio. Suspendisse potenti. Proin malesuada. Donec ipsum. Praesent commodo
-venenatis massa. In gravida enim in leo. Nulla tempor vulputate odio. Nulla elit
-neque, bibendum eu, congue vitae, rutrum in, dolor. Nunc tellus dolor, posuere
-at, consectetuer vitae, sagittis id, enim. Maecenas nisl risus, sodales eu,
-sodales nec, mollis quis, nunc. Nulla porttitor. Aenean porttitor. Nullam quis
-wisi. Sed auctor. Vestibulum ac lectus et lorem laoreet lobortis. Aenean feugiat
-pretium leo. Donec in mi eget neque hendrerit rhoncus. Maecenas at tortor vel
-velit mollis tincidunt. Donec metus orci, mattis nec, blandit vitae, varius
-eget, dolor.
-</para>
-<para>
-Sed turpis. Sed tortor nunc, egestas vel, accumsan a, fermentum id, sem.
-Suspendisse feugiat pede sed tortor. Donec gravida. Quisque sit amet augue.
-Quisque suscipit, velit non egestas lobortis, massa dolor aliquet neque, a
-placerat erat nulla a risus. Quisque suscipit wisi sed orci. Praesent sed
-ipsum. Class aptent taciti sociosqu ad litora torquent per conubia nostra,
-per inceptos hymenaeos. Maecenas tortor wisi, tristique nec, tempus eu,
-aliquet sed, ante. Fusce ultrices. Sed ullamcorper elit vel sem. Nullam id
-lacus. Praesent leo nulla, auctor at, cursus a, auctor ac, ipsum. Curabitur
-ut odio.
-</para>
-<example>
-<title>Aenean Eget Metus</title>
-<para>
-Aenean eget metus eu eros auctor pulvinar. Phasellus a velit. Pellentesque
-habitant morbi tristique senectus et netus et malesuada fames ac turpis
-egestas. Curabitur non risus. Nam semper, pede a viverra aliquet, nulla
-nunc venenatis massa, vel elementum ante tellus nec risus. Fusce felis.
-Vivamus ultricies, dui sit amet bibendum scelerisque, nibh ante sodales
-elit, quis euismod magna est non mauris. Nunc et ipsum. Sed nec ante ac
-pede adipiscing fringilla. Integer nunc. Morbi ipsum.
-</para>
-<para>
-In orci. Cras vulputate. Donec nonummy turpis. In neque libero, sagittis
-tempor, pulvinar faucibus, dictum sed, quam. Cras scelerisque aliquam sapien.
-Maecenas leo. Maecenas urna elit, tempor ut, mollis id, iaculis convallis,
-massa. Aliquam ullamcorper ante eget ipsum. Etiam mauris enim, condimentum id,
-luctus tincidunt, condimentum id, nibh. Aliquam fringilla imperdiet est. In id
-enim. Sed nec dolor. Etiam velit ligula, tristique at, cursus ut, vehicula sit
-amet, enim. Donec sed lorem. Sed at massa nec felis posuere faucibus.
-Suspendisse potenti. Aliquam fringilla, purus eget consectetuer aliquet,
-diam turpis pretium sapien, non pretium neque ante non mauris. Integer tempus
-lobortis orci.
-</para>
-<para>
-Pellentesque pellentesque nibh ac ligula. Proin est erat, ultrices et, mattis
-sit amet, nonummy id, dui. Curabitur vel ligula nec erat volutpat luctus. Nullam
-aliquam dolor et dui. Nulla at est id elit euismod fringilla. Praesent mollis,
-lectus ac tempor laoreet, odio eros ornare augue, sed gravida diam wisi a nibh.
-Fusce elit nunc, semper in, rutrum at, hendrerit quis, velit. Nam vitae wisi.
-Phasellus nec erat at est accumsan feugiat. Duis eu sem. Vivamus sed est.
-Vestibulum sollicitudin. Duis et nisl. Quisque nulla dui, blandit sed,
-venenatis quis, pellentesque nec, magna. Curabitur posuere felis quis elit.
-Cras et felis. Nulla feugiat turpis a justo.
-</para>
-<para>
-Cras volutpat risus a odio accumsan ultricies. Suspendisse potenti. Nulla
-facilisi. Duis quam lectus, malesuada nec, pretium quis, egestas nec, libero.
-Nunc eu orci. Aliquam fringilla, dolor et laoreet commodo, risus nulla mattis
-mi, non lacinia dolor diam vel dolor. Pellentesque habitant morbi tristique
-senectus et netus et malesuada fames ac turpis egestas. Morbi et ligula.
-Curabitur vel leo. Nulla facilisi. Sed molestie. Nullam quis arcu. Class
-aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos
-hymenaeos. Donec mollis purus quis eros. Curabitur felis erat, sodales vel,
-egestas vel, blandit at, ipsum. Donec accumsan, metus sed dapibus laoreet,
-eros sapien facilisis velit, vel feugiat enim leo a purus.
-</para>
-<para>
-Quisque tincidunt. Ut consectetuer sagittis elit. Sed aliquam, nunc sed aliquam
-consequat, lorem lectus fringilla turpis, nec cursus enim mauris et lectus.
-Vestibulum vel ante vel nunc facilisis suscipit. Donec enim lectus, eleifend
-ac, vestibulum in, elementum a, wisi. Nulla suscipit est a diam. In luctus
-posuere purus. Curabitur rutrum porttitor lacus. Nullam scelerisque. Cum sociis
-natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
-Pellentesque vel tellus vel ante venenatis nonummy.
-</para>
-</example>
-
-
-<para>
-Suspendisse purus lorem, porta a, sagittis vel, ultrices ut, sapien. Vestibulum
-quam elit, blandit sit amet, cursus a, porta molestie, eros. Morbi fringilla
-ultricies lacus. Nulla urna metus, facilisis in, vehicula quis, tincidunt sit
-amet, orci. Proin felis. Ut vitae eros at massa accumsan bibendum. Duis pulvinar
-ornare purus. Fusce tincidunt mauris. Vestibulum ante ipsum primis in faucibus
-orci luctus et ultrices posuere cubilia Curae; Suspendisse interdum tristique
-nunc. Nam eget est a wisi interdum pharetra. Nullam quam. Nulla facilisi.
-Vestibulum enim lorem, convallis at, accumsan accumsan, facilisis ut, orci.
-</para>
-<para>
-Curabitur tortor wisi, consectetuer at, consequat ultricies, volutpat sed,
-turpis. Etiam sapien nibh, feugiat vel, interdum non, congue eget, tellus.
-Vivamus fringilla, turpis nec bibendum lobortis, magna magna sodales mauris,
-gravida facilisis turpis magna et risus. Duis at enim. Nunc nibh risus, varius
-vel, congue id, consectetuer varius, quam. Donec at tortor. Maecenas condimentum
-libero ut velit. Vivamus ullamcorper nisl ut felis. Sed ultrices, tortor id
-molestie cursus, ligula ante placerat eros, et ornare wisi velit ut magna.
-Quisque venenatis, leo eget ullamcorper euismod, dui arcu gravida ligula, id
-tincidunt nunc sapien sit amet orci. Phasellus dapibus mi at sem.
-</para>
-<para>
-Sed lacinia tincidunt lacus. Pellentesque habitant morbi tristique senectus et
-netus et malesuada fames ac turpis egestas. Pellentesque diam. Vivamus id arcu
-et arcu adipiscing viverra. Mauris magna turpis, luctus ac, consequat eu,
-egestas non, felis. Donec dictum facilisis neque. Nulla ultrices quam vitae
-augue. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur
-ridiculus mus. Vestibulum interdum consequat lorem. Cras rutrum ligula eget
-purus. Suspendisse orci felis, luctus at, sodales vel, volutpat id, enim.
-Mauris eget purus. Mauris interdum sem. Duis purus. Nam id nunc.
-</para>
-<para>
-Sed viverra vestibulum pede. Aliquam vel dui nec erat dictum dapibus. Aliquam
-commodo, dolor id aliquam gravida, orci turpis hendrerit quam, sed dapibus risus
-mi vel lorem. Fusce iaculis, orci vitae malesuada tristique, leo tellus lobortis
-tortor, et lacinia lacus nibh sit amet purus. Nullam ligula dui, fringilla nec,
-faucibus sed, ultricies faucibus, mauris. Nulla bibendum nunc. Aenean convallis
-leo at dolor. Donec interdum dolor at pede. In hac habitasse platea dictumst.
-Pellentesque vestibulum. Proin feugiat dui a arcu. Donec ultricies sapien quis
-nibh. Morbi tristique tincidunt quam. Sed ut ipsum at wisi sollicitudin
-pellentesque. Duis leo felis, mattis id, volutpat non, convallis sit amet,
-dolor. Mauris vitae enim id tortor elementum mattis. Nulla enim wisi, eleifend
-eget, rutrum vel, laoreet quis, nunc. Vivamus at augue.
-</para>
-<para>
-Donec ipsum augue, tincidunt ac, auctor at, ultricies in, sem. Curabitur erat
-quam, tempus non, vestibulum quis, fringilla et, ante. Maecenas sed felis non
-lectus nonummy ullamcorper. Duis eu dolor. Quisque a magna. In hac habitasse
-platea dictumst. Nunc lacus tortor, molestie nec, aliquam vitae, facilisis
-quis, turpis. Donec tortor augue, vestibulum eu, posuere in, commodo sit amet,
-libero. Nullam sit amet urna. Mauris porta. Praesent eget ligula vel libero
-venenatis blandit. Mauris at tellus non mauris suscipit pulvinar. Praesent
-porttitor.
-</para>
-<para>
-Duis nec odio quis nisl semper cursus. Ut tellus massa, imperdiet in, ultrices
-quis, suscipit sit amet, elit. Morbi et augue. Aenean dui massa, vulputate id,
-lacinia et, semper at, nibh. Fusce ac pede vel augue varius ultrices. Vestibulum
-a orci non pede posuere tincidunt. Pellentesque non orci et leo consequat
-ultrices. Mauris cursus urna sit amet leo. In tincidunt. Sed venenatis metus
-tincidunt urna. Mauris malesuada facilisis velit. Nunc orci risus, cursus vitae,
-dignissim vitae, sagittis ac, velit. Vivamus ac augue. Integer wisi. Suspendisse
-quis dui. Phasellus molestie nunc ut erat. Vestibulum in ipsum. Vestibulum ante
-ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;
-</para>
-<para>
-Aliquam erat volutpat. Vestibulum faucibus nisl sed odio. Proin laoreet volutpat
-massa. In a lorem. Proin ac magna. Etiam eleifend diam at nisl. Integer et enim.
-Vivamus eu tortor. Cras magna. In odio. Nulla ac tortor. In vitae magna tempus
-lorem eleifend porta.
-</para>
-<para>
-Duis sollicitudin sem. Aenean feugiat. Quisque vel sapien in nisl imperdiet
-vehicula. Sed odio. Suspendisse potenti. Quisque sem tellus, tempor id, aliquam
-id, placerat et, urna. Nullam lacinia. Donec non quam at elit condimentum
-rhoncus. Curabitur vitae nunc at libero faucibus hendrerit. Sed cursus.
-Phasellus consequat hendrerit pede. Nullam venenatis vestibulum massa. Integer
-eget massa vel lectus congue aliquet. Curabitur eleifend, dui id fermentum
-vulputate, ipsum urna blandit nisl, non tristique arcu est at ligula. Aliquam
-vitae libero nec metus blandit placerat. Suspendisse nec erat. Vestibulum ante
-ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;
-</para>
-<para>
-Nullam iaculis placerat ante. Etiam wisi. Nunc mattis mattis quam. Sed congue
-pretium est. Mauris tempus justo vel leo. Vivamus dictum hendrerit nisl. Lorem
-ipsum dolor sit amet, consectetuer adipiscing elit. Cum sociis natoque penatibus
-et magnis dis parturient montes, nascetur ridiculus mus. Donec tincidunt turpis
-non metus. Integer justo. Quisque pede. Ut commodo. Pellentesque lorem ante,
-ullamcorper vel, congue quis, hendrerit a, augue. In arcu. Fusce auctor, massa
-sit amet consequat convallis, massa ante iaculis arcu, eget porta dui dolor at
-tellus.
-</para>
-<para>
-Quisque id lacus. Quisque ultricies mauris ornare wisi. Curabitur molestie
-sapien eget felis. Etiam malesuada, sapien nec pretium hendrerit, dui nibh
-sodales enim, in dictum mi elit vitae justo. Vestibulum consequat scelerisque
-velit. Nunc nisl leo, nonummy non, egestas non, scelerisque sit amet, lorem.
-Integer commodo dui ac wisi. Donec facilisis risus vitae neque. Integer dolor.
-Aliquam adipiscing, lectus ac fermentum adipiscing, purus magna posuere ante,
-sed vehicula dolor purus eu risus. Cum sociis natoque penatibus et magnis dis
-parturient montes, nascetur ridiculus mus. Nam pede. Nunc risus. Sed varius.
-Pellentesque in ante non metus lacinia pharetra. Pellentesque euismod eros.
-</para>
-<para>
-Praesent gravida libero non orci. Aliquam at nulla ac nunc consequat fermentum.
-Ut quis tellus. Vestibulum ut turpis. Nullam vel metus et ligula dictum semper.
-Nunc egestas, felis vulputate elementum auctor, ipsum metus lobortis mauris,
-non cursus eros nisl nec massa. Nullam id diam. Sed consequat mi vel nulla.
-Pellentesque consequat. Proin rhoncus quam id eros. Mauris commodo. Aenean
-accumsan lobortis velit. Curabitur est nulla, consectetuer sit amet, ultricies
-sed, consequat non, wisi. Nulla placerat elit sed augue. Nullam et wisi et nunc
-molestie consequat. Nam ut lectus vulputate risus luctus lobortis. Aliquam erat
-volutpat.
-</para>
-</sect1>
-
-&GFDL;
-
-</article>
diff --git a/test/testdoc1/help/testdoc1/Makefile.am b/test/testdoc1/help/testdoc1/Makefile.am
deleted file mode 100644
index d018aeed..00000000
--- a/test/testdoc1/help/testdoc1/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-@GNOME_DOC_RULE@
-
-GNOME_DOC_MODULE = testdoc1
diff --git a/test/testdoc1/help/testdoc1/testdoc1.omf.in b/test/testdoc1/help/testdoc1/testdoc1.omf.in
deleted file mode 100644
index 5fe7466e..00000000
--- a/test/testdoc1/help/testdoc1/testdoc1.omf.in
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<omf>
-  <resource>
-    <date>
-     2002-03-23
-    </date>
-    <version identifier="0.1" date="2003-03-09" description="First Release"/>
-    <subject category="System|Other"/>
-    <type>
-     manual
-    </type>
-    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier url=""/>
-    <relation seriesid="cf2bed6a-3e28-11d6-88f3-c2f7a14f1d6b"/>
-    <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html" holder="Shaun McCance"/>
-  </resource>
-</omf>
diff --git a/test/testdocs/Makefile b/test/testdocs/Makefile
deleted file mode 100644
index 89de9f96..00000000
--- a/test/testdocs/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-db2html = db2html.xsl
-
-tests = $(filter-out template.xml,$(wildcard *.xml))
-htmls = $(patsubst %.xml,html/%,$(tests))
-
-htmlargs =							\
-	--stringparam db.chunk.max_depth 0 			\
-	--stringparam theme.icons.base_url			\
-	../../../../icons/hicolor/48x48/status/			\
-	--stringparam theme.icons.watermark.code		\
-	../../../../icons/hicolor/watermarks/watermark-code.png	\
-	$(db2html)
-
-test: $(htmls) html/index.html
-
-$(htmls) : html/% : %.xml
-	@mkdir -p $@
-	@mkdir -p $@-a
-	xsltproc \
-	 -o $@/ \
-	 --param annotate 'false()' \
-	 $(call htmlargs,$@) $<
-	xsltproc \
-	 -o $@-a/ \
-	 --param annotate 'true()' \
-	 $(call htmlargs,$@) $<
-
-html/index.html:
-	(cd html && echo '<html><body><ul>' &&				\
-	 for html in $(sort $(htmls)); do				\
-	  base=`basename $$html`;					\
-	  echo "<li><a href='"`ls $$base/*.html`"'>$$base</a>";		\
-	  echo "(<a href='"`ls $$base-a/*.html`"'>annotated</a>)</li>";	\
-	 done && echo '</ul></body></html>') > $@
-
-clean:
-	rm -rf html/*
diff --git a/test/testdocs/README b/test/testdocs/README
deleted file mode 100644
index 41bfa4b5..00000000
--- a/test/testdocs/README
+++ /dev/null
@@ -1,19 +0,0 @@
-These files are from DocBook testdocs revision 8591.
-
-https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/testdocs/tests
-
-The 5.0 tests are not included.
-
-If you update the files to a newer version of testdocs, change this file to
-reflect the change.  If you make a change to one of these files, note that
-change in this file so that change can be preserved when upgrading to newer
-versions of testdocs.
-
-These files are not found in testdocs:
-classsynopsis.x001.xml
-funcsynopsis.x001.xml
-inline.x001.xml
-simplelist.x001.xml
-table.x001.xml
-
-The title of epigraph.001 was changed from article.001 to epigraph.001
diff --git a/test/testdocs/admonitions.001.xml b/test/testdocs/admonitions.001.xml
deleted file mode 100644
index 521cfecb..00000000
--- a/test/testdocs/admonitions.001.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>Unit Test: admonitions.001</title>
-<releaseinfo role="CVS">$Id: admonitions.001.xml 4613 2005-04-20 11:54:35Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This article tests admonitions.</para>
-
-<tip>
-<para>This tip has no title.</para>
-</tip>
-
-<note>
-<para>This note has no title.</para>
-</note>
-
-<important>
-<para>This important has no title.</para>
-</important>
-
-<warning>
-<para>This warning has no title.</para>
-</warning>
-
-<caution>
-<para>This caution has no title.</para>
-</caution>
-
-<tip>
-<title>Tip Title</title>
-<para>This is a tip.</para>
-</tip>
-
-<note>
-<title>Note Title</title>
-<para>This is a note.</para>
-</note>
-
-<important>
-<title>Important Title</title>
-<para>This is an important.</para>
-</important>
-
-<warning>
-<title>Warning Title</title>
-<para>This is a warning.</para>
-</warning>
-
-<caution>
-<title>Caution Title</title>
-<para>This is a caution.</para>
-</caution>
-
-</article>
diff --git a/test/testdocs/article.001.xml b/test/testdocs/article.001.xml
deleted file mode 100644
index 1f8a5bc5..00000000
--- a/test/testdocs/article.001.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: article.001.xml</title>
-<releaseinfo role="CVS">$Id: article.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<authorgroup>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<author><firstname>Jane</firstname><surname>Doe</surname></author>
-</authorgroup>
-<abstract>
-<para>This is the abstract.</para>
-<para>It has several paras.</para>
-<para>It has several paras.</para>
-</abstract>
-</articleinfo>
-
-<para>This is an article tests.</para>
-
-<ackno>I'd like to thank all the tests that came before me.</ackno>
-
-</article>
diff --git a/test/testdocs/article.002.xml b/test/testdocs/article.002.xml
deleted file mode 100644
index a63c78ad..00000000
--- a/test/testdocs/article.002.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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 id="article" status="draft">
-<articleinfo>
-<title>Unit Test: article.002.xml</title>
-<releaseinfo role="CVS">$Id: article.002.xml 6120 2006-08-03 07:20:20Z xmldoc $</releaseinfo>
-<authorgroup>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<author><firstname>Jane</firstname><surname>Doe</surname></author>
-</authorgroup>
-<abstract>
-<para>This is the abstract.</para>
-<para>It has several paras.</para>
-<para>It has several paras.</para>
-</abstract>
-</articleinfo>
-
-<para>This is an article tests.</para>
-
-<ackno>I'd like to thank all the tests that came before me.</ackno>
-
-</article>
diff --git a/test/testdocs/article.003.xml b/test/testdocs/article.003.xml
deleted file mode 100644
index 015fff04..00000000
--- a/test/testdocs/article.003.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: article.003.xml</title>
-<releaseinfo role="CVS">$Id: article.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<authorgroup>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<author><firstname>Jane</firstname><surname>Doe</surname></author>
-</authorgroup>
-<abstract>
-<para>This is the abstract.</para>
-<para>It has several paras.</para>
-<para>It has several paras.</para>
-</abstract>
-</articleinfo>
-
-<para>Some preambulatory paragraph.</para>
-
-<section>
-<title>Section One</title>
-
-<para>Some other paragraph.</para>
-
-<section>
-<title>Section One.Two</title>
-
-<para>Some other paragraph.</para>
-
-</section>
-
-<section>
-<title>Section One.Three</title>
-
-<para>Some other paragraph.</para>
-
-</section>
-</section>
-
-<section>
-<title>Section Two</title>
-
-<para>Some other paragraph.</para>
-
-</section>
-
-<appendix>
-<title>Appendix One</title>
-
-<para>Some other paragraph.</para>
-
-<section>
-<title>Section One</title>
-
-<para>Some other paragraph.</para>
-
-<section>
-<title>Section One.Two</title>
-
-<para>Some other paragraph.</para>
-
-</section>
-
-<section>
-<title>Section One.Three</title>
-
-<para>Some other paragraph.</para>
-
-</section>
-</section>
-</appendix>
-
-</article>
diff --git a/test/testdocs/article.004.xml b/test/testdocs/article.004.xml
deleted file mode 100644
index 5bc0c799..00000000
--- a/test/testdocs/article.004.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: article.004.xml</title>
-<releaseinfo role="CVS">$Id: article.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<authorgroup>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<author><firstname>Jane</firstname><surname>Doe</surname></author>
-</authorgroup>
-<abstract>
-<para>This is the abstract.</para>
-<para>It has several paras.</para>
-<para>It has several paras. One of the paras is long because it contains
-the same sentence repeated many times. One of the paras is long because it contains
-the same sentence repeated many times. One of the paras is long because it contains
-the same sentence repeated many times. One of the paras is long because it contains
-the same sentence repeated many times. One of the paras is long because it contains
-the same sentence repeated many times. One of the paras is long because it contains
-the same sentence repeated many times. One of the paras is long because it contains
-the same sentence repeated many times. One of the paras is long because it contains
-the same sentence repeated many times. One of the paras is long because it contains
-the same sentence repeated many times. </para>
-</abstract>
-<copyright><year>2002</year><holder>No one in particular</holder></copyright>
-<legalnotice>
-<para>This is the legal notice. It says you can do whatever you please with
-this content. It says it many times. It says you can do whatever you please with
-this content. It says you can do whatever you please with
-this content. It says you can do whatever you please with
-this content. It says you can do whatever you please with
-this content. It says you can do whatever you please with
-this content. It says you can do whatever you please with
-this content. It says you can do whatever you please with
-this content. It says you can do whatever you please with
-this content.</para>
-</legalnotice>
-</articleinfo>
-
-<para>This is an article tests.</para>
-
-<ackno>I'd like to thank all the tests that came before me.</ackno>
-
-</article>
diff --git a/test/testdocs/article.005.xml b/test/testdocs/article.005.xml
deleted file mode 100644
index 085dedb4..00000000
--- a/test/testdocs/article.005.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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 id="article.005">
-<articleinfo>
-<title>Unit Test: article.005.xml</title>
-<subtitle>The Subtitle</subtitle>
-<releaseinfo role="CVS">$Id: article.005.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>aph@debian.org</email></address></affiliation>
-</author>
-</articleinfo>
-  <para>
-Testing article subtitle, TOC title and sect1info.</para>
-
-  <sect1>
-    <title>Sect1</title>
-    <para>
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-</para>
-
-    <sect2>
-      <title>Sect2</title>
-      <para>
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-</para>
-    </sect2>
-  </sect1>
-
-  <sect1>
-    <title>Second Sect1</title>
-    <titleabbrev>SecondAbbrev</titleabbrev>
-    <para>
-The <sgmltag>titleabbrev</sgmltag> is set to
-<literal>SecondAbbrev</literal>.  Ensure it's using the abbreviated
-title in the TOC.</para>
-    <para>
-Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.
-Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.
-Foo bar foo bar.  Foo bar foo bar.
-</para>
-  </sect1>
-
-  <sect1>
-    <sect1info>
-      <titleabbrev>Sect1Info</titleabbrev>
-    </sect1info>
-    <title>Using Sect1Info</title>
-    <para>
-The <sgmltag>titleabbrev</sgmltag> is set to
-<literal>Second1Info</literal>.  Ensure it's using the abbreviated
-title in the TOC.</para>
-    <para>
-Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.
-Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.
-Foo bar foo bar.  Foo bar foo bar.
-</para>
-  </sect1>
-</article>
diff --git a/test/testdocs/article.006.xml b/test/testdocs/article.006.xml
deleted file mode 100644
index 923e4867..00000000
--- a/test/testdocs/article.006.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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 id="article.006">
-<articleinfo>
-<title>Unit Test: article.006.xml</title>
-<subtitle>The Subtitle</subtitle>
-<releaseinfo role="CVS">$Id: article.006.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>aph@debian.org</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <para>
-Testing artheader (old Docbook 3.1), article subtitle, TOC title and sect1info.</para>
-
-  <sect1>
-    <title>Sect1</title>
-    <para>
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-</para>
-
-    <sect2>
-      <title>Sect2</title>
-      <para>
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-Some text.  Some text.  Some text.  Some text.  Some text.  Some text.
-</para>
-    </sect2>
-  </sect1>
-
-  <sect1>
-    <title>Second Sect1</title>
-    <titleabbrev>SecondAbbrev</titleabbrev>
-    <para>
-The <sgmltag>titleabbrev</sgmltag> is set to
-<literal>SecondAbbrev</literal>.  Ensure it's using the abbreviated
-title in the TOC.</para>
-    <para>
-Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.
-Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.
-Foo bar foo bar.  Foo bar foo bar.
-</para>
-  </sect1>
-
-  <sect1>
-    <sect1info>
-      <titleabbrev>Sect1Info</titleabbrev>
-    </sect1info>
-    <title>Using Sect1Info</title>
-    <para>
-The <sgmltag>titleabbrev</sgmltag> is set to
-<literal>Second1Info</literal>.  Ensure it's using the abbreviated
-title in the TOC.</para>
-    <para>
-Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.
-Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.  Foo bar foo bar.
-Foo bar foo bar.  Foo bar foo bar.
-</para>
-  </sect1>
-</article>
-
-
-
diff --git a/test/testdocs/author.001.xml b/test/testdocs/author.001.xml
deleted file mode 100644
index e3194307..00000000
--- a/test/testdocs/author.001.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book id="book">
-<bookinfo>
-<title>Unit Test: author.001</title>
-<releaseinfo role="CVS">$Id: author.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<authorgroup>
-<corpauthor>SomeCorp</corpauthor>
-<author role="first-last">
-  <honorific>Mr</honorific>
-  <firstname>FirstFirstlast</firstname>
-  <othername>Middlename</othername>
-  <surname>Surname</surname>
-  <lineage>Jr</lineage>
-</author>
-<author role="last-first">
-  <honorific>Mr</honorific>
-  <firstname>FirstLastfirst</firstname>
-  <othername>Middlename</othername>
-  <surname>Surname</surname>
-  <lineage>Jr</lineage>
-</author>
-<author role="family-given">
-  <honorific>Mr</honorific>
-  <firstname>FirstFamilygiven</firstname>
-  <othername>Middlename</othername>
-  <surname>Surname</surname>
-  <lineage>Jr</lineage>
-</author>
-</authorgroup>
-</bookinfo>
-
-<chapter>
-<title>Chapter Title</title>
-
-<para>Content statisfies a book.</para>
-</chapter>
-
-</book>
diff --git a/test/testdocs/author.002.xml b/test/testdocs/author.002.xml
deleted file mode 100644
index 88e78328..00000000
--- a/test/testdocs/author.002.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book id="book">
-<bookinfo>
-<title>Unit Test: author.002</title>
-<releaseinfo role="CVS">$Id: author.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-</bookinfo>
-
-<chapter>
-<title>Chapter Title</title>
-
-<simplelist>
-<member>
-<author id="a1" role="first-last">
-  <honorific>Mr</honorific>
-  <firstname>FirstFirstlast</firstname>
-  <othername>Middlename</othername>
-  <surname>Surname</surname>
-  <lineage>Jr</lineage>
-</author>
-</member>
-<member id="m2">
-<author role="last-first">
-  <honorific>Mr</honorific>
-  <firstname>FirstLastfirst</firstname>
-  <othername>Middlename</othername>
-  <surname>Surname</surname>
-  <lineage>Jr</lineage>
-</author>
-</member>
-<member>
-<author role="family-given">
-  <honorific>Mr</honorific>
-  <firstname>FirstFamilygiven</firstname>
-  <othername>Middlename</othername>
-  <surname>Surname</surname>
-  <lineage>Jr</lineage>
-</author>
-</member>
-</simplelist>
-
-<para>See <link linkend="a1">first author</link> or
-<link linkend="m2">second member</link>.</para>
-
-</chapter>
-
-</book>
diff --git a/test/testdocs/bibliography.001.xml b/test/testdocs/bibliography.001.xml
deleted file mode 100644
index 6b3668a6..00000000
--- a/test/testdocs/bibliography.001.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE bibliography PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<bibliography>
-<bibliographyinfo>
-<title>Unit Test: bibliography.001</title>
-<releaseinfo role="CVS">$Id: bibliography.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bibliographyinfo>
-
-<biblioentry>
-  <abbrev>AhoSethiUllman96</abbrev>
-  <authorgroup>
-    <author><firstname>Alfred V.</firstname><surname>Aho</surname></author>  
-    <author><firstname>Ravi</firstname><surname>Sethi</surname></author>
-    <author><firstname>Jeffrey D.</firstname><surname>Ullman</surname></author>
-  </authorgroup>
-  <title>Compilers, Principles, Techniques, and Tools</title>    
-  <publisher>
-    <publishername>Addison-Wesley Publishing Company</publishername>
-  </publisher>
-  <copyright><year>1996</year>
-             <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
-  <isbn>0-201-10088-6</isbn>    
-  <editor><firstname>James T.</firstname><surname>DeWolf</surname></editor>
-</biblioentry>
-
-<biblioentry>
-  <abbrev>AhoSethiUllman96</abbrev>
-  <authorgroup>
-    <author><firstname>Alfred V.</firstname><surname>Aho</surname></author>  
-    <author><firstname>Ravi</firstname><surname>Sethi</surname></author>
-    <author><firstname>Jeffrey D.</firstname><surname>Ullman</surname></author>
-  </authorgroup>
-  <citetitle>Compilers, Principles, Techniques, and Tools</citetitle>
-  <publisher>
-    <publishername>Addison-Wesley Publishing Company</publishername>
-  </publisher>
-  <copyright><year>1996</year>
-             <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
-  <isbn>0-201-10088-6</isbn>    
-  <editor><firstname>James T.</firstname><surname>DeWolf</surname></editor>
-</biblioentry>
-
-<biblioentry id="Walsh97">
-  <abbrev>Walsh97</abbrev>
-  <biblioset relation="article">
-    <title>A Guide to XML</title>
-    <author><surname>Walsh</surname><firstname>Norman</firstname></author>
-    <pubdate>1997</pubdate>
-    <copyright><year>1997</year><holder>ArborText, Inc.</holder></copyright>
-    <pagenums>97-108</pagenums>
-  </biblioset>
-  <biblioset relation="journal">
-    <title>XML: Principles, Tools, and Techniques</title>
-    <publisher>
-      <publishername>O'Reilly &amp; Associates, Inc.</publishername>
-    </publisher>
-    <issn>1085-2301</issn>
-    <editor><firstname>Dan</firstname><surname>Connolly</surname></editor>
-  </biblioset>
-</biblioentry>
-
-<biblioentry>
-<abbrev>Abbrev</abbrev>
-<title>A Really Full BiblioEntry</title>
-<subtitle>Subtitle</subtitle>
-<abstract><para>
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-</para></abstract>
-<address>Any Street
-Anywhere, XX 99999
-USA</address>
-<affiliation>
-<shortaffil>shortaffil</shortaffil>
-<jobtitle>jobtitle</jobtitle>
-<orgname>orgname</orgname>
-<orgdiv>orgdiv</orgdiv>
-<address>Any Street
-Anywhere, XX 99999
-USA</address>
-</affiliation>
-<artpagenums>ArtPageNums</artpagenums>
-<author><firstname>AuthorFirstname</firstname><surname>AuthorSurname</surname></author>
-<authorblurb>
-<para>
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-</para></authorblurb>
-<!--<authorgroup>AuthorGroup</authorgroup>-->
-<authorinitials>AuthorInitials</authorinitials>
-<collab><collabname>The names of some collaborators</collabname>
-<affiliation>
-<shortaffil>shortaffil</shortaffil>
-<jobtitle>jobtitle</jobtitle>
-<orgname>orgname</orgname>
-<orgdiv>orgdiv</orgdiv>
-<address>Any Street
-Anywhere, XX 99999
-USA</address>
-</affiliation></collab>
-<confgroup>
-<confdates>confdates</confdates>
-<conftitle>conftitle</conftitle>
-<confnum>confnum</confnum>
-<address>Any Street
-Anywhere, XX 99999
-USA</address>
-<confsponsor>confsponsor</confsponsor>
-</confgroup>
-<contractnum>ContractNum</contractnum>
-<contractsponsor>ContractSponsor</contractsponsor>
-<contrib>Contrib</contrib>
-<copyright><year>1998</year><holder>Copyright holder</holder></copyright>
-<!--<corpauthor>CorpAuthor</corpauthor>-->
-<corpname>CorpName</corpname>
-<date>Date</date>
-<edition>Edition</edition>
-<editor><firstname>EditorFirstName</firstname><surname>EditorSurname</surname></editor>
-<firstname>FirstName</firstname>
-<honorific>Honorific</honorific>
-<isbn>ISBN</isbn>
-<issn>ISSN</issn>
-<invpartnumber>InvPartNumber</invpartnumber>
-<issuenum>IssueNum</issuenum>
-<lineage>Lineage</lineage>
-<orgname>OrgName</orgname>
-<othercredit><firstname>OCFirstName</firstname><surname>OCSurname</surname></othercredit>
-<othername>OtherName</othername>
-<pagenums>PageNums</pagenums>
-<printhistory>
-<para>
-PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
-PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
-PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
-PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
-</para></printhistory>
-<productname>ProductName</productname>
-<productnumber>ProductNumber</productnumber>
-<pubdate>PubDate</pubdate>
-<publisher><publishername>PubPublisherName</publishername>
-<address><street>Any Street</street>
-<city>Anywhere</city>, <state>XX</state> <postcode>99999</postcode>
-<country>USA</country></address>
-</publisher>
-<publishername>PublisherName</publishername>
-<pubsnumber>PubsNumber</pubsnumber>
-<releaseinfo>ReleaseInfo</releaseinfo>
-<revhistory>
-<revision>
-<revnumber>1.0</revnumber><date>20 Nov 1998</date>
-  <authorinitials>ndw</authorinitials>
-  <revremark>Some remark about the revision</revremark></revision>
-<revision>
-<revnumber>0.9</revnumber><date>19 Nov 1998</date>
-  <authorinitials>ndw</authorinitials>
-  <revremark>Some remark about the revision</revremark></revision>
-<revision>
-<revnumber>0.4</revnumber><date>18 Nov 1998</date>
-  <authorinitials>ndw</authorinitials>
-  <revremark>Some remark about the revision</revremark></revision>
-</revhistory>
-<seriesvolnums>SeriesVolNums</seriesvolnums>
-<surname>Surname</surname>
-<titleabbrev>TitleAbbrev</titleabbrev>
-<volumenum>VolumeNum</volumenum>
-</biblioentry>
-
-<bibliomixed id="Walsh96">
-  <bibliomset relation="article">
-    <surname>Walsh</surname>, <firstname>Norman</firstname>.
-    <title role="article">Introduction to Cascading Style Sheets</title>.
-  </bibliomset>
-  <bibliomset relation="journal">
-    <title>The World Wide Web Journal</title>.
-    <volumenum>2</volumenum>(<issuenum>1</issuenum>).
-    <publishername>O'Reilly &amp; Associates, Inc.</publishername> and
-    <corpname>The World Wide Web Consortium</corpname>.
-    <pubdate>Winter, 1996</pubdate></bibliomset>.
-</bibliomixed>
-
-</bibliography>
diff --git a/test/testdocs/bibliography.002.xml b/test/testdocs/bibliography.002.xml
deleted file mode 100644
index 4387eea4..00000000
--- a/test/testdocs/bibliography.002.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE bibliography PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<bibliography>
-<bibliographyinfo>
-<title>Unit Test: bibliography.002</title>
-<releaseinfo role="CVS">$Id: bibliography.002.xml 5266 2005-10-12 23:49:28Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bibliographyinfo>
-
-<bibliodiv><title>Entries using biblioentry</title>
-
-<biblioentry>
-  <abbrev>AhoSethiUllman96</abbrev>
-  <authorgroup>
-    <author><firstname>Alfred V.</firstname><surname>Aho</surname></author>  
-    <author><firstname>Ravi</firstname><surname>Sethi</surname></author>
-    <author><firstname>Jeffrey D.</firstname><surname>Ullman</surname></author>
-  </authorgroup>
-  <title>Compilers, Principles, Techniques, and Tools</title>    
-  <publisher>
-    <publishername>Addison-Wesley Publishing Company</publishername>
-  </publisher>
-  <copyright><year>1996</year>
-             <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
-  <isbn>0-201-10088-6</isbn>    
-  <editor><firstname>James T.</firstname><surname>DeWolf</surname></editor>
-</biblioentry>
-
-<biblioentry id="Walsh97-2">
-  <abbrev>Walsh97</abbrev>
-  <biblioset relation="article">
-    <title>A Guide to XML</title>
-    <author><surname>Walsh</surname><firstname>Norman</firstname></author>
-    <pubdate>1997</pubdate>
-    <copyright><year>1997</year><holder>ArborText, Inc.</holder></copyright>
-    <pagenums>97-108</pagenums>
-  </biblioset>
-  <biblioset relation="journal">
-    <title>XML: Principles, Tools, and Techniques</title>
-    <publisher>
-      <publishername>O'Reilly &amp; Associates, Inc.</publishername>
-    </publisher>
-    <issn>1085-2301</issn>
-    <editor><firstname>Dan</firstname><surname>Connolly</surname></editor>
-  </biblioset>
-</biblioentry>
-
-<biblioentry>
-<abbrev>Abbrev</abbrev>
-<title>A Really Full BiblioEntry</title>
-<subtitle>Subtitle</subtitle>
-<abstract><para>
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-Abstract, abstract, abstract. Abstract, abstract, abstract. 
-</para></abstract>
-<address>Any Street
-Anywhere, XX 99999
-USA</address>
-<affiliation>
-<shortaffil>shortaffil</shortaffil>
-<jobtitle>jobtitle</jobtitle>
-<orgname>orgname</orgname>
-<orgdiv>orgdiv</orgdiv>
-<address>Any Street
-Anywhere, XX 99999
-USA</address>
-</affiliation>
-<artpagenums>ArtPageNums</artpagenums>
-<author><firstname>AuthorFirstname</firstname><surname>AuthorSurname</surname></author>
-<authorblurb>
-<para>
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
-</para></authorblurb>
-<!--<authorgroup>AuthorGroup</authorgroup>-->
-<authorinitials>AuthorInitials</authorinitials>
-<collab><collabname>The names of some collaborators</collabname>
-<affiliation>
-<shortaffil>shortaffil</shortaffil>
-<jobtitle>jobtitle</jobtitle>
-<orgname>orgname</orgname>
-<orgdiv>orgdiv</orgdiv>
-<address>Any Street
-Anywhere, XX 99999
-USA</address>
-</affiliation></collab>
-<confgroup>
-<confdates>confdates</confdates>
-<conftitle>conftitle</conftitle>
-<confnum>confnum</confnum>
-<address>Any Street
-Anywhere, XX 99999
-USA</address>
-<confsponsor>confsponsor</confsponsor>
-</confgroup>
-<contractnum>ContractNum</contractnum>
-<contractsponsor>ContractSponsor</contractsponsor>
-<contrib>Contrib</contrib>
-<copyright><year>1998</year><holder>Copyright holder</holder></copyright>
-<!--<corpauthor>CorpAuthor</corpauthor>-->
-<corpname>CorpName</corpname>
-<date>Date</date>
-<edition>Edition</edition>
-<editor><firstname>EditorFirstName</firstname><surname>EditorSurname</surname></editor>
-<firstname>FirstName</firstname>
-<honorific>Honorific</honorific>
-<isbn>ISBN</isbn>
-<issn>ISSN</issn>
-<invpartnumber>InvPartNumber</invpartnumber>
-<issuenum>IssueNum</issuenum>
-<lineage>Lineage</lineage>
-<orgname>OrgName</orgname>
-<othercredit><firstname>OCFirstName</firstname><surname>OCSurname</surname></othercredit>
-<othername>OtherName</othername>
-<pagenums>PageNums</pagenums>
-<printhistory>
-<para>
-PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
-PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
-PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
-PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
-</para></printhistory>
-<productname>ProductName</productname>
-<productnumber>ProductNumber</productnumber>
-<pubdate>PubDate</pubdate>
-<publisher><publishername>PubPublisherName</publishername>
-<address><street>Any Street</street>
-<city>Anywhere</city>, <state>XX</state> <postcode>99999</postcode>
-<country>USA</country></address>
-</publisher>
-<publishername>PublisherName</publishername>
-<pubsnumber>PubsNumber</pubsnumber>
-<releaseinfo>ReleaseInfo</releaseinfo>
-<revhistory>
-<revision>
-<revnumber>1.0</revnumber><date>20 Nov 1998</date>
-  <authorinitials>ndw</authorinitials>
-  <revremark>Some remark about the revision</revremark></revision>
-<revision>
-<revnumber>0.9</revnumber><date>19 Nov 1998</date>
-  <authorinitials>ndw</authorinitials>
-  <revremark>Some remark about the revision</revremark></revision>
-<revision>
-<revnumber>0.4</revnumber><date>18 Nov 1998</date>
-  <authorinitials>ndw</authorinitials>
-  <revremark>Some remark about the revision</revremark></revision>
-</revhistory>
-<seriesvolnums>SeriesVolNums</seriesvolnums>
-<surname>Surname</surname>
-<titleabbrev>TitleAbbrev</titleabbrev>
-<volumenum>VolumeNum</volumenum>
-</biblioentry>
-
-</bibliodiv>
-<bibliodiv><title>Entries using bibliomixed</title>
-
-<bibliomixed id="Walsh96-2">
-  <bibliomset relation="article">
-    <surname>Walsh</surname>, <firstname>Norman</firstname>.
-    <title role="article">Introduction to Cascading Style Sheets</title>.
-  </bibliomset>
-  <bibliomset relation="journal">
-    <title>The World Wide Web Journal</title>.
-    <volumenum>2</volumenum>(<issuenum>1</issuenum>).
-    <publishername>O'Reilly &amp; Associates, Inc.</publishername> and
-    <corpname>The World Wide Web Consortium</corpname>.
-    <pubdate>Winter, 1996</pubdate></bibliomset>.
-</bibliomixed>
-
-</bibliodiv>
-
-</bibliography>
diff --git a/test/testdocs/bibliography.003.xml b/test/testdocs/bibliography.003.xml
deleted file mode 100644
index f423370d..00000000
--- a/test/testdocs/bibliography.003.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE bibliography PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<bibliography>
-<bibliographyinfo>
-<title>Unit Test: bibliography.003</title>
-<releaseinfo role="CVS">$Id: bibliography.003.xml 5266 2005-10-12 23:49:28Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bibliographyinfo>
-
-<para>This unit test is for the <parameter>bibliography.collection</parameter>
-parameter.</para>
-
-<biblioentry>
-  <abbrev>AhoSethiUllman96</abbrev>
-  <authorgroup>
-    <author><firstname>Alfred V.</firstname><surname>Aho</surname></author>  
-    <author><firstname>Ravi</firstname><surname>Sethi</surname></author>
-    <author><firstname>Jeffrey D.</firstname><surname>Ullman</surname></author>
-  </authorgroup>
-  <title>Compilers, Principles, Techniques, and Tools</title>    
-  <publisher>
-    <publishername>Addison-Wesley Publishing Company</publishername>
-  </publisher>
-  <copyright><year>1996</year>
-             <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
-  <isbn>0-201-10088-6</isbn>    
-  <editor><firstname>James T.</firstname><surname>DeWolf</surname></editor>
-</biblioentry>
-
-<bibliomixed id="Walsh96-3">
-  <bibliomset relation="article">
-    <surname>Walsh</surname>, <firstname>Norman</firstname>.
-    <title role="article">Introduction to Cascading Style Sheets</title>.
-  </bibliomset>
-  <bibliomset relation="journal">
-    <title>The World Wide Web Journal</title>.
-    <volumenum>2</volumenum>(<issuenum>1</issuenum>).
-    <publishername>O'Reilly &amp; Associates, Inc.</publishername> and
-    <corpname>The World Wide Web Consortium</corpname>.
-    <pubdate>Winter, 1996</pubdate></bibliomset>.
-</bibliomixed>
-
-<bibliomixed id="xml11"/>
-<bibliomixed id="bib.docbook43"/>
-
-</bibliography>
diff --git a/test/testdocs/bibliography.004.xml b/test/testdocs/bibliography.004.xml
deleted file mode 100644
index 1e9adf9d..00000000
--- a/test/testdocs/bibliography.004.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE bibliography PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<bibliography>
-<bibliographyinfo>
-<title>Unit Test: bibliography.004</title>
-<releaseinfo role="CVS">$Id: bibliography.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-</bibliographyinfo>
-
- <bibliodiv><title>Normative References</title>
-
- <biblioentry id="xml">
-   <abbrev>XML 1.0</abbrev>
-   <editor>
-      <firstname>Tim</firstname>
-      <surname>Bray</surname>
-   </editor>
-   <title>Extensible Markup Language (XML) 1.0</title>
-   <edition>2nd ed</edition>
-   <releaseinfo>W3C Recommendation</releaseinfo>
-   <date>6 October 2000</date>
-   <copyright>
-     <year>2000</year>
-     <holder>World Wide Web Consortium</holder>
-   </copyright>
-   <biblioid class="uri">
-     <ulink url="http://www.w3.org/TR/2000/REC-xml-20001006/"/>
-   </biblioid>
- </biblioentry>
-
-</bibliodiv>
-
-<bibliodiv><title>Articles</title>
-
- <biblioentry id="flynn-xml-faq">
-   <abbrev>Fl01</abbrev>
-   <author>
-     <firstname>Peter</firstname>
-     <surname>Flynn</surname>
-   </author>
-   <title>The XML FAQ</title>
-   <edition>2.1</edition>
-   <date>1 January 2002</date>
-   <biblioid class="uri">
-     <ulink url="http://www.ucc.ie/xml/faq.html"/>
-   </biblioid>
- </biblioentry>
-
-</bibliodiv>
-
-</bibliography>
diff --git a/test/testdocs/bibliography.005.xml b/test/testdocs/bibliography.005.xml
deleted file mode 100644
index 31afe97f..00000000
--- a/test/testdocs/bibliography.005.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter>
-<chapterinfo>
-<releaseinfo role="CVS">$Id: bibliography.005.xml 5266 2005-10-12 23:49:28Z xmldoc $</releaseinfo>
-</chapterinfo>
-<title>Unit Test: bibliography.005</title>
-
-<para>This test case is for a bibliography in a section.</para>
-
-<section>
-<title>A Section Title</title>
-
-<para>Some content <acronym>here</acronym>.</para>
-
-<bibliography>
-  <title>Bibliography in a Section</title>
- <biblioentry id="xml-1">
-   <abbrev>XML 1.0</abbrev>
-   <editor>
-      <firstname>Tim</firstname>
-      <surname>Bray</surname>
-   </editor>
-   <title>Extensible Markup Language (XML) 1.0</title>
-   <edition>2nd ed</edition>
-   <releaseinfo>W3C Recommendation</releaseinfo>
-   <date>6 October 2000</date>
-   <copyright>
-     <year>2000</year>
-     <holder>World Wide Web Consortium</holder>
-   </copyright>
-   <biblioid class="uri">
-     <ulink url="http://www.w3.org/TR/2000/REC-xml-20001006/"/>
-   </biblioid>
- </biblioentry>
-</bibliography>
-</section>
-
-<section>
-<title>Another Section Title</title>
-
-<para>Some content</para>
-
-<section>
-<title>A Subsection Title</title>
-
-<para>Some content</para>
-
-<bibliography>
-  <title>Bibliography in a Subsection</title>
- <biblioentry id="xml11-1">
-   <abbrev>XML 1.1</abbrev>
-   <editor>
-      <firstname>Tim</firstname>
-      <surname>Bray</surname>
-   </editor>
-   <title>Extensible Markup Language (XML) 1.1</title>
-   <releaseinfo>W3C Recommendation</releaseinfo>
-   <date>04 February 2004</date>
-   <copyright>
-     <year>2004</year>
-     <holder>World Wide Web Consortium</holder>
-   </copyright>
-   <biblioid class="uri">
-     <ulink url="http://www.w3.org/TR/xml11/"/>
-   </biblioid>
- </biblioentry>
-</bibliography>
-</section>
-</section>
-
-<bibliography>
-  <title>Bibliography in a Chapter</title>
- <biblioentry id="flynn-xml-faq-1">
-   <abbrev>Fl01</abbrev>
-   <author>
-     <firstname>Peter</firstname>
-     <surname>Flynn</surname>
-   </author>
-   <title>The XML FAQ</title>
-   <edition>2.1</edition>
-   <date>1 January 2002</date>
-   <biblioid class="uri">
-     <ulink url="http://www.ucc.ie/xml/faq.html"/>
-   </biblioid>
- </biblioentry>
-</bibliography>
-</chapter>
diff --git a/test/testdocs/bibliolist.001.xml b/test/testdocs/bibliolist.001.xml
deleted file mode 100644
index c3ac25fb..00000000
--- a/test/testdocs/bibliolist.001.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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>Unit Test: bibliolist.001</title>
-<releaseinfo role="CVS"
->$Id: bibliolist.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This is a article.</para>
-
-<bibliolist>
-<title>Bibliography List</title>
-
-<biblioentry>
-  <abbrev>AhoSethiUllman96</abbrev>
-  <authorgroup>
-    <author><firstname>Alfred V.</firstname><surname>Aho</surname></author>  
-    <author><firstname>Ravi</firstname><surname>Sethi</surname></author>
-    <author><firstname>Jeffrey D.</firstname><surname>Ullman</surname></author>
-  </authorgroup>
-  <title>Compilers, Principles, Techniques, and Tools</title>    
-  <publisher>
-    <publishername>Addison-Wesley Publishing Company</publishername>
-  </publisher>
-  <copyright><year>1996</year>
-             <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
-  <isbn>0-201-10088-6</isbn>    
-  <editor><firstname>James T.</firstname><surname>DeWolf</surname></editor>
-</biblioentry>
-
-<biblioentry id="Walsh97">
-  <abbrev>Walsh97</abbrev>
-  <biblioset relation="article">
-    <title>A Guide to XML</title>
-    <author><surname>Walsh</surname><firstname>Norman</firstname></author>
-    <pubdate>1997</pubdate>
-    <copyright><year>1997</year><holder>ArborText, Inc.</holder></copyright>
-    <pagenums>97-108</pagenums>
-  </biblioset>
-  <biblioset relation="journal">
-    <title>XML: Principles, Tools, and Techniques</title>
-    <publisher>
-      <publishername>O'Reilly &amp; Associates, Inc.</publishername>
-    </publisher>
-    <issn>1085-2301</issn>
-    <editor><firstname>Dan</firstname><surname>Connolly</surname></editor>
-  </biblioset>
-</biblioentry>
-</bibliolist>
-
-<para>This is another paragraph.</para>
-
-</article>
diff --git a/test/testdocs/blockinfo.001.xml b/test/testdocs/blockinfo.001.xml
deleted file mode 100644
index a644f9cc..00000000
--- a/test/testdocs/blockinfo.001.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>Unit Test: blockinfo.001</title>
-<releaseinfo role="CVS">$Id: blockinfo.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <example>
-    <blockinfo>
-      <author>
-        <firstname>Adam</firstname>
-        <surname>Di Carlo</surname>
-      </author>
-      <date>14 Dec, 2002</date>
-    </blockinfo>
-    <title>Example Title</title>
-    <para>
-Example of an example.  Blockinfo (author, date) exists but is not
-displayed, right?</para>
-  </example>
-</article>
diff --git a/test/testdocs/blockinfo.002.xml b/test/testdocs/blockinfo.002.xml
deleted file mode 100644
index 6e4cdb7d..00000000
--- a/test/testdocs/blockinfo.002.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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>Unit Test: blockinfo.002</title>
-<releaseinfo role="CVS">$Id: blockinfo.002.xml 4613 2005-04-20 11:54:35Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <qandaset defaultlabel='number'>
-    <blockinfo>
-      <title>QandASet BlockInfo Title</title>
-      <legalnotice><para>This is a qandaset legal notice</para></legalnotice>
-    </blockinfo>
-    <qandaentry id="qa1">
-      <blockinfo>
-        <legalnotice><para>This is a qandaentry legal notice</para></legalnotice>
-      </blockinfo>
-      <question id="q1"><para>Question one.</para></question>
-      <answer id="a1">
-	<para>Answer one.
-See <xref linkend="faq-Two"/></para>
-      </answer>
-    </qandaentry>
-
-    <qandaentry id="Two">
-      <question id="faq-Two"><para>Question two.</para></question>
-      <answer id="faa-Two">
-	<para>Answer two.</para>
-      </answer>
-    </qandaentry>
-
-    <qandaentry id="Twoc">
-      <question id="faq-Twoc"><para>Question two.</para></question>
-      <answer id="faa-Twoc">
-	<orderedlist>
-	  <listitem><para>testing a list</para></listitem>
-	  <listitem><para>testing a list</para></listitem>
-	  <listitem><para>testing a list</para></listitem>
-	</orderedlist>
-      </answer>
-    </qandaentry>
-
-  </qandaset>
-
-</article>
diff --git a/test/testdocs/blockquote.001.xml b/test/testdocs/blockquote.001.xml
deleted file mode 100644
index c7cf59ca..00000000
--- a/test/testdocs/blockquote.001.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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>Unit Test: blockquote.001.xml</title>
-<releaseinfo role="CVS">$Id: blockquote.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<!-- Change this: -->
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This file tests block quotes:</para>
-
-<blockquote><para>If you understand: things are as they are. If you do not understand:
-things are as they are.</para>
-</blockquote>
-
-<blockquote><attribution>H. W. Longfellow</attribution>
-<para>If we could read the secret history
-of our enemies, we should find in in each one's life sorrow and
-suffering enough to disarm all hostility.</para>
-</blockquote>
-
-<blockquote><attribution>H. W. Longfellow</attribution>
-<simpara>If we could read the secret history
-of our enemies, we should find in in each one's life sorrow and
-suffering enough to disarm all hostility. (simpara)</simpara>
-</blockquote>
-
-
-<para>The following block quotation occurs inside a paragraph.
-
-<blockquote>
-<para>Knowledge, sense, honesty, learning, good behavior are the chief
-things towards making a man's fortune, next to interest and opportunity.</para>
-</blockquote>
-
-This line of text occurs after the quote, but inside the same para.</para>
-
-<blockquote><title>With A Title</title>
-<para>This block quote has a title.</para>
-</blockquote>
-
-</article>
diff --git a/test/testdocs/book.001.xml b/test/testdocs/book.001.xml
deleted file mode 100644
index a97b4209..00000000
--- a/test/testdocs/book.001.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY blah "<para>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-</para>">
-]>
-<book id="book">
-<bookinfo>
-<title>Unit Test: book.001</title>
-<releaseinfo role="CVS">$Id: book.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<authorgroup>
-<corpauthor>SomeCorp</corpauthor>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<editor><firstname>Jane</firstname><surname>Doe</surname></editor>
-</authorgroup>
-<legalnotice>
-<para>
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-</para>
-</legalnotice>
-<copyright>
-<year>1998</year>
-<year>1999</year>
-<year>2000</year>
-<year>2001</year>
-<year>2002</year>
-<holder>Norman Walsh</holder>
-</copyright>
-<pubdate>18 January 2002</pubdate>
-<abstract>
-<para>Some abstract. Some abstract. Some abstract. Some abstract.
-</para>
-<para>Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-</para>
-</abstract>
-<revhistory>
-<revision>
-<revnumber>1.1</revnumber>
-<date>18 Jan 2002</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Reworked.</revremark>
-</revision>
-<revision>
-<revnumber>1.0</revnumber>
-<date>20 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.9</revnumber>
-<date>19 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.4</revnumber>
-<date>18 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-</revhistory>
-</bookinfo>
-
-<dedication id="ded1"><title>First Dedication</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</dedication>
-
-<dedication id="ded2">
-
-<para>A second dedication without a title.</para>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</dedication>
-
-<preface id="forward"><title>Foreword</title>
-
-<para>A preface.</para>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</preface>
-
-<preface id="preface"><title>Preface</title>
-
-<para>Another preface.</para>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</preface>
-
-<part id="partI">
-<title>Part One Title</title>
-<partintro id="pIpintro">
-<title>PartIntro Title</title>
-
-<para>Partintro content<footnote>
-<para>This is a footnote in a partintro.</para>
-</footnote>.</para>
-
-&blah; &blah; &blah; &blah; &blah;
-
-<sect1 id="pIpis1">
-<title>PartIntro Section</title>
-<para>PartIntros can actually have section content as well.</para>
-&blah; &blah; &blah; &blah; &blah;
-</sect1>
-</partintro>
-
-<chapter id="chap1">
-<title>First Chapter</title>
-<titleabbrev>F. Chap</titleabbrev>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-<section id="c1s1"><title>First Section</title>
-<titleabbrev>F. Sect</titleabbrev>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-<section id="c1s2"><title>Second Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-<section id="c1s3"><title>Third Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-</chapter>
-
-<chapter id="chap2"><title>Second Chapter</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-<section id="c2s1"><title>First Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-<section id="c2s2"><title>Second Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-<section id="c2s3"><title>Third Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-</chapter>
-
-<chapter id="chap3"><title>Third Chapter</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</chapter>
-
-</part>
-<part id="partII"><title>Appendixes</title>
-
-<appendix id="app1"><title>First Appendix</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-<section id="a1s1"><title>First Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-<section id="a1s2"><title>Second Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-<section id="a1s3"><title>Third Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-</appendix>
-
-<appendix id="app2"><title>Second Appendix</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-<section id="a2s1"><title>First Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-<section id="a2s2"><title>Second Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-<section id="a2s3"><title>Third Section</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</section>
-</appendix>
-
-</part>
-</book>
diff --git a/test/testdocs/book.002.xml b/test/testdocs/book.002.xml
deleted file mode 100644
index 28fc11b6..00000000
--- a/test/testdocs/book.002.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY blah "<para>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-</para>">
-]>
-<book>
-<bookinfo>
-<title>Unit Test: book.001</title>
-<releaseinfo role="CVS">$Id: book.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<article><title>First Article</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</article>
-
-<article><title>Second Article</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</article>
-
-<article><title>Third Article</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</article>
-
-</book>
diff --git a/test/testdocs/book.003.xml b/test/testdocs/book.003.xml
deleted file mode 100644
index 838fcaf6..00000000
--- a/test/testdocs/book.003.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY blah "<para>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-</para>">
-]>
-<book id="book">
-<bookinfo>
-<title>Unit Test: book.003</title>
-<releaseinfo role="CVS">$Id: book.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<authorgroup>
-<corpauthor>SomeCorp</corpauthor>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<editor><firstname>Jane</firstname><surname>Doe</surname></editor>
-</authorgroup>
-<legalnotice>
-<para>
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-Some legal notice. Some legal notice. Some legal notice.
-</para>
-</legalnotice>
-<copyright>
-<year>1998</year>
-<year>1999</year>
-<year>2000</year>
-<year>2001</year>
-<year>2002</year>
-<holder>Norman Walsh</holder>
-</copyright>
-<pubdate>18 January 2002</pubdate>
-<abstract>
-<para>Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-</para>
-<para>Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-</para>
-</abstract>
-<revhistory>
-<revision>
-<revnumber>1.1</revnumber>
-<date>18 Jan 2002</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Reworked.</revremark>
-</revision>
-<revision>
-<revnumber>1.0</revnumber>
-<date>20 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.9</revnumber>
-<date>19 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.4</revnumber>
-<date>18 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-</revhistory>
-</bookinfo>
-
-<chapter id="chap1">
-<chapterinfo>
-<abstract><para>bla in the first chapter</para>
-</abstract>
-</chapterinfo>
-<title>First Chapter</title>
-
-&blah;
-
-<figure id="figduck"><title>A Test Figure</title>
-<programlisting>
-A figure. Just to test the numeration.</programlisting>
-</figure>
-
-<section><title>First Section</title>
-
-<figure id="figduck2"><title>Another Test Figure</title>
-<programlisting>
-A figure. Just to test the numeration.</programlisting>
-</figure>
-
- &blah;
-
-<example id="example"><title>Test Example</title>
-<programlisting>
-An example.</programlisting>
-</example>
-
-<section><title>First Subsection</title>
-
-&blah;
-
-</section>
-</section>
-
-<section><title>Second Section</title>
-
-&blah;
-
-</section>
-</chapter>
-</book>
diff --git a/test/testdocs/book.004.xml b/test/testdocs/book.004.xml
deleted file mode 100644
index 4544972c..00000000
--- a/test/testdocs/book.004.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book id="book">
-<title>Unit Test: book.004</title>
-
-<chapter id="chap1">
-<chapterinfo>
-<abstract><para>bla in the first chapter</para>
-</abstract>
-</chapterinfo>
-<title>First <filename>Filename</filename> Chapter</title>
-
-<para>blah with <filename>filename</filename>.</para>
-
-</chapter>
-
-<chapter id="chap2">
-<title>My Product<emphasis><superscript>plus</superscript></emphasis> description</title>
-
-<para>blah.</para>
-
-</chapter>
-</book>
diff --git a/test/testdocs/book.005.xml b/test/testdocs/book.005.xml
deleted file mode 100644
index 915987b3..00000000
--- a/test/testdocs/book.005.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book id="book">
-<bookinfo>
-<title>Unit Test: book.005</title>
-</bookinfo>
-
-<dedication><title>Dedication</title>
-<para>Some Dedication</para>
-</dedication>
-
-<preface><title>Preface</title>
-<para>Some Preface</para>
-</preface>
-
-<part><title>First Part</title>
-<partintro>
-<para>Some Part Intro</para>
-</partintro>
-
-<chapter><title>First Chapter</title>
-<para>Some Chapter</para>
-</chapter>
-
-<chapter><title>Second Chapter</title>
-<para>Some Chapter</para>
-</chapter>
-</part>
-
-<part><title>Second Part</title>
-<partintro>
-<para>Some Part Intro</para>
-</partintro>
-
-<chapter><title>Third Chapter</title>
-<para>Some Chapter</para>
-</chapter>
-
-<chapter><title>Fourth Chapter</title>
-<para>Some Chapter</para>
-</chapter>
-</part>
-
-<appendix><title>Appendix</title>
-<para>Some Appendix</para>
-</appendix>
-</book>
diff --git a/test/testdocs/book.006.xml b/test/testdocs/book.006.xml
deleted file mode 100644
index dcd54fc6..00000000
--- a/test/testdocs/book.006.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-
-<!ELEMENT xi:include (xi:fallback?) >
-<!ATTLIST xi:include
-    xmlns:xi   CDATA       #FIXED    "http://www.w3.org/2001/XInclude"
-    href       CDATA       #REQUIRED
-    parse      (xml|text)  "xml"
-    encoding   CDATA       #IMPLIED >
-
-<!ELEMENT xi:fallback ANY>
-<!ATTLIST xi:fallback
-    xmlns:xi   CDATA   #FIXED   "http://www.w3.org/2001/XInclude" >
-
-<!ENTITY % local.chapter.class "| xi:include">
-]>
-<book id="book">
-  <bookinfo>
-    <title>Unit Test: book.001</title>
-    <subtitle>Wrapper for all bibiliography.nnn.xml files</subtitle>
-    <releaseinfo role="CVS">$Id: book.006.xml 5271 2005-10-13 01:13:51Z xmldoc $</releaseinfo>
-    <corpauthor>DocBook Project Development Team</corpauthor>
-  </bookinfo>
-  <xi:include href="bibliography.005.xml"/>
-  <xi:include href="bibliography.001.xml"/>
-  <xi:include href="bibliography.002.xml"/>
-  <xi:include href="bibliography.003.xml"/>
-  <xi:include href="bibliography.004.xml"/>
-</book>
diff --git a/test/testdocs/book.007.xml b/test/testdocs/book.007.xml
deleted file mode 100644
index 993573da..00000000
--- a/test/testdocs/book.007.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-
-<!ELEMENT xi:include (xi:fallback?) >
-<!ATTLIST xi:include
-    xmlns:xi   CDATA       #FIXED    "http://www.w3.org/2001/XInclude"
-    href       CDATA       #REQUIRED
-    parse      (xml|text)  "xml"
-    encoding   CDATA       #IMPLIED >
-
-<!ELEMENT xi:fallback ANY>
-<!ATTLIST xi:fallback
-    xmlns:xi   CDATA   #FIXED   "http://www.w3.org/2001/XInclude" >
-
-<!ENTITY % local.chapter.class "| xi:include">
-]>
-<book id="book">
-  <bookinfo>
-    <title>Unit Test: book.001</title>
-    <subtitle>A Part + several Chapters + a Glossary</subtitle>
-    <releaseinfo role="CVS">$Id: book.007.xml 5268 2005-10-13 00:45:42Z xmldoc $</releaseinfo>
-    <corpauthor>DocBook Project Development Team</corpauthor>
-  </bookinfo>
-  <xi:include href="part.001.xml"/>
-  <xi:include href="chapter.001.xml"/>
-  <xi:include href="chapter.002.xml"/>
-  <xi:include href="epigraph.001.xml"/>
-  <xi:include href="section.004.xml"/>
-  <xi:include href="simplesect.001.xml"/>
-  <xi:include href="xrefstyle.001.xml"/>
-  <xi:include href="glossary.002.data.xml"/>
-</book>
diff --git a/test/testdocs/book.008.xml b/test/testdocs/book.008.xml
deleted file mode 100644
index a088b419..00000000
--- a/test/testdocs/book.008.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-
-<!ELEMENT xi:include (xi:fallback?) >
-<!ATTLIST xi:include
-    xmlns:xi   CDATA       #FIXED    "http://www.w3.org/2001/XInclude"
-    href       CDATA       #REQUIRED
-    parse      (xml|text)  "xml"
-    encoding   CDATA       #IMPLIED >
-
-<!ELEMENT xi:fallback ANY>
-<!ATTLIST xi:fallback
-    xmlns:xi   CDATA   #FIXED   "http://www.w3.org/2001/XInclude" >
-
-<!ENTITY % local.chapter.class "| xi:include">
-]>
-<book id="book">
-  <bookinfo>
-    <title>Unit Test: book.001</title>
-    <subtitle>Wrapper for some References and Refentries</subtitle>
-    <releaseinfo role="CVS">$Id: book.008.xml 5269 2005-10-13 00:56:08Z xmldoc $</releaseinfo>
-    <corpauthor>DocBook Project Development Team</corpauthor>
-  </bookinfo>
-  <xi:include href="reference.001.xml"/>
-  <xi:include href="reference.002.xml"/>
-
-  <reference>
-    <title>Some Xincluded Refentry instances</title>
-  <xi:include href="refentry.005.xml"/>
-  <xi:include href="refentry.006.xml"/>
-  </reference>
-
-</book>
diff --git a/test/testdocs/bookinfo.001.xml b/test/testdocs/bookinfo.001.xml
deleted file mode 100644
index e121bd5f..00000000
--- a/test/testdocs/bookinfo.001.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: bookinfo.001</title>
-<releaseinfo role="CVS">$Id: bookinfo.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-
-<abstract>
-<para>Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-</para>
-<para>Some abstract. Some abstract. Some abstract. Some abstract.
-Some abstract. Some abstract. Some abstract. Some abstract.
-</para>
-</abstract>
-
-<authorgroup id="authors">
-<author id="j.doe">
-<firstname>John</firstname>
-<surname>Doe</surname>
-</author>
-<author>
-<firstname>Jane</firstname>
-<surname>Doe</surname>
-<contrib>Some contribution</contrib>
-</author>
-<author>
-<firstname>A.</firstname>
-<surname>Nonymous</surname>
-</author>
-<author>
-<firstname>Janice</firstname>
-<surname>Doe</surname>
-</author>
-</authorgroup>
-
-<keywordset>
-<keyword>keyword1</keyword>
-<keyword>keyword2</keyword>
-</keywordset>
-
-<pubdate>18 January 2002</pubdate>
-
-<revhistory>
-<revision>
-<revnumber>2.0</revnumber>
-<date>18 Jan 2002</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>1.0</revnumber>
-<date>20 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.9</revnumber>
-<date>19 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.4</revnumber>
-<date>18 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-</revhistory>
-
-</bookinfo>
-
-<preface><title>Preface</title>
-
-<para>This book is really just a bookinfo test.</para>
-
-</preface>
-
-</book>
diff --git a/test/testdocs/bridgehead.001.xml b/test/testdocs/bridgehead.001.xml
deleted file mode 100644
index 1994570d..00000000
--- a/test/testdocs/bridgehead.001.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>Unit Test: bridgehead.001</title>
-<releaseinfo role="CVS">$Id: bridgehead.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>A test paragraph.</para>
-
-<para>This test para encourages you to see <xref linkend="bh"/>.</para>
-
-<sect1>
-  <title>sect1 title</title>
-  <subtitle>sect1 subtitle</subtitle>
-
-  <para>This is a test paragraph.</para>
-
-  <bridgehead id="bh" renderas="sect1">This is a sect1 bridgehead</bridgehead>
-
-  <para>This is a test paragraph.</para>
-
-  <sect2>
-    <title>first sect2 title</title>
-    <para>Please read <xref linkend="sec-xrefMe"/></para>
-
-    <bridgehead>This is an implied sect3 bridgehead</bridgehead>
-
-    <para>This is a test paragraph.</para>
-
-  </sect2>
-
-  <sect2 id="sec-xrefMe">
-    <title>second sect2 title</title>
-    <para>This is a test paragraph.</para>
-  </sect2>
-</sect1>
-
-</article>
diff --git a/test/testdocs/calloutlist.001.xml b/test/testdocs/calloutlist.001.xml
deleted file mode 100644
index 0d66dc52..00000000
--- a/test/testdocs/calloutlist.001.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>Unit Test: calloutlist.001</title>
-<releaseinfo role="CVS">$Id: calloutlist.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Callouts using <sgmltag>co</sgmltag>:</para>
-
-<screen>
-(let <co id="dl1"/>loopvar <co id="dl2"/>((count 1))
-  <co id="dl3"/>(if (> count 10)
-    <co id="dl4"/>#t
-    (<co id="dl5"/>loopvar <co id="dl6"/>(+ count 1))))</screen>
-
-<calloutlist>
-<callout arearefs="dl1">
-<para>This variable controls the loop. It is declared without an
-initial value, immediately after the <literal>let</literal>
-operand.</para>
-</callout>
-<callout arearefs="dl2">
-<para>Any number of additional local variables can be defined after
-the loop variable, just as they can in any other
-<literal>let</literal> expression.</para>
-</callout>
-<callout arearefs="dl3">
-<para>If you ever want the loop to end, you have to put some sort of a
-test in it.</para>
-</callout>
-<callout arearefs="dl4">
-<para>This is the value that will be returned.</para>
-</callout>
-<callout arearefs="dl5">
-<para>Note that you iterate the loop by using the loop variable as if
-it was a function name.</para>
-</callout>
-<callout arearefs="dl6">
-<para>The arguments to this function are the values that
-you want the local variables declared in <xref linkend="dl2"/> to have
-in the next iteration.</para>
-</callout>
-</calloutlist>
-
-</article>
diff --git a/test/testdocs/calloutlist.002.xml b/test/testdocs/calloutlist.002.xml
deleted file mode 100644
index ab181bcb..00000000
--- a/test/testdocs/calloutlist.002.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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>Unit Test: calloutlist.001</title>
-<subtitle>A screen with 20+ callouts</subtitle>
-<releaseinfo role="CVS">$Id: calloutlist.002.xml 5230 2005-10-07 01:34:14Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Callouts using <sgmltag>co</sgmltag>:</para>
-
-<screen>
-(let <co id="dl1"/>loopvar <co id="dl2"/>((count 1))
-  <co id="dl3"/>(if (> count 10)
-    <co id="dl4"/>#t
-    (<co id="dl5"/>loopvar <co id="dl6"/>(+ count 1))))
-
-(let <co id="dl7"/>loopvar <co id="dl8"/>((count 1))
-  <co id="dl9"/>(if (> count 10)
-    <co id="dl10"/>#t
-    (<co id="dl11"/>loopvar <co id="dl12"/>(+ count 1))))
-
-(let <co id="dl13"/>loopvar <co id="dl14"/>((count 1))
-  <co id="dl15"/>(if (> count 10)
-    <co id="dl16"/>#t
-    (<co id="dl17"/>loopvar <co id="dl18"/>(+ count 1))))
-
-(let <co id="dl19"/>loopvar <co id="dl20"/>((count 1))
-  <co id="dl21"/>(if (> count 10)
-    <co id="dl22"/>#t
-    (<co id="dl23"/>loopvar <co id="dl24"/>(+ count 1))))</screen>
-
-<calloutlist>
-<callout arearefs="dl1">
-<para>This variable controls the loop. It is declared without an
-initial value, immediately after the <literal>let</literal>
-operand.</para>
-</callout>
-<callout arearefs="dl2">
-<para>Any number of additional local variables can be defined after
-the loop variable, just as they can in any other
-<literal>let</literal> expression.</para>
-</callout>
-<callout arearefs="dl3">
-<para>If you ever want the loop to end, you have to put some sort of a
-test in it.</para>
-</callout>
-<callout arearefs="dl4">
-<para>This is the value that will be returned.</para>
-</callout>
-<callout arearefs="dl5">
-<para>Note that you iterate the loop by using the loop variable as if
-it was a function name.</para>
-</callout>
-<callout arearefs="dl6">
-<para>The arguments to this function are the values that
-you want the local variables declared in <xref linkend="dl2"/> to have
-in the next iteration.</para>
-</callout>
-<callout arearefs="dl7">
-<para>This variable controls the loop. It is declared without an
-initial value, immediately after the <literal>let</literal>
-operand.</para>
-</callout>
-<callout arearefs="dl8">
-<para>Any number of additional local variables can be defined after
-the loop variable, just as they can in any other
-<literal>let</literal> expression.</para>
-</callout>
-<callout arearefs="dl9">
-<para>If you ever want the loop to end, you have to put some sort of a
-test in it.</para>
-</callout>
-<callout arearefs="dl10">
-<para>This is the value that will be returned.</para>
-</callout>
-<callout arearefs="dl11">
-<para>Note that you iterate the loop by using the loop variable as if
-it was a function name.</para>
-</callout>
-<callout arearefs="dl12">
-<para>The arguments to this function are the values that
-you want the local variables declared in <xref linkend="dl2"/> to have
-in the next iteration.</para>
-</callout>
-<callout arearefs="dl13">
-<para>This variable controls the loop. It is declared without an
-initial value, immediately after the <literal>let</literal>
-operand.</para>
-</callout>
-<callout arearefs="dl14">
-<para>Any number of additional local variables can be defined after
-the loop variable, just as they can in any other
-<literal>let</literal> expression.</para>
-</callout>
-<callout arearefs="dl15">
-<para>If you ever want the loop to end, you have to put some sort of a
-test in it.</para>
-</callout>
-<callout arearefs="dl16">
-<para>This is the value that will be returned.</para>
-</callout>
-<callout arearefs="dl17">
-<para>Note that you iterate the loop by using the loop variable as if
-it was a function name.</para>
-</callout>
-<callout arearefs="dl18">
-<para>The arguments to this function are the values that
-you want the local variables declared in <xref linkend="dl2"/> to have
-in the next iteration.</para>
-</callout>
-<callout arearefs="dl19">
-<para>This variable controls the loop. It is declared without an
-initial value, immediately after the <literal>let</literal>
-operand.</para>
-</callout>
-<callout arearefs="dl20">
-<para>Any number of additional local variables can be defined after
-the loop variable, just as they can in any other
-<literal>let</literal> expression.</para>
-</callout>
-<callout arearefs="dl21">
-<para>If you ever want the loop to end, you have to put some sort of a
-test in it.</para>
-</callout>
-<callout arearefs="dl22">
-<para>This is the value that will be returned.</para>
-</callout>
-<callout arearefs="dl23">
-<para>Note that you iterate the loop by using the loop variable as if
-it was a function name.</para>
-</callout>
-<callout arearefs="dl24">
-<para>The arguments to this function are the values that
-you want the local variables declared in <xref linkend="dl2"/> to have
-in the next iteration.</para>
-</callout>
-</calloutlist>
-
-</article>
diff --git a/test/testdocs/calloutlist.003.xml b/test/testdocs/calloutlist.003.xml
deleted file mode 100644
index f4dd0dcc..00000000
--- a/test/testdocs/calloutlist.003.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?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>Unit Test: calloutlist.003</title>
-    <releaseinfo role="CVS">$Id: calloutlist.003.xml 7856 2008-03-06 15:31:26Z abdelazer $</releaseinfo>
-    <author>
-      <firstname>Benoit</firstname>
-      <surname>Guillon</surname>
-    </author>
-  </articleinfo>
-  <section>
-    <title>Callouts</title>
-    <section>
-      <title>Embedded <sgmltag>Co</sgmltag>s</title>
-      <programlisting>
-  &lt;refentry&gt;
-    &lt;info&gt;
-      &lt;date&gt;2003-10-20&lt;/date&gt; <co id="V1690_date-co" linkends="V1690_date"/>
-    &lt;/info&gt;
-    &lt;refmeta&gt;
-      &lt;refentrytitle&gt;gtk-options&lt;/refentrytitle&gt; <co id="V1690_title-co" linkends="V1690_title"/>
-      &lt;manvolnum&gt;7&lt;/manvolnum&gt; <co id="V1690_manvolnum-co" linkends="V1690_manvolnum"/>
-      &lt;refmiscinfo class="source-name"&gt;GTK+&lt;/refmiscinfo&gt; <co id="V1690_source-name-co" linkends="V1690_source-name"/>
-      &lt;refmiscinfo class="version"&gt;1.2&lt;/refmiscinfo&gt; <co id="V1690_version-co" linkends="V1690_version"/>
-      &lt;refmiscinfo class="manual"&gt;GTK+ User's Manual&lt;/refmiscinfo&gt; <co id="V1690_manual-co" linkends="V1690_manual"/>
-    &lt;/refmeta&gt;
-    &lt;refnamediv&gt;
-      &lt;refname&gt;gtk-options&lt;/refname&gt;
-      &lt;refpurpose&gt;Standard Command Line Options for GTK+ Programs&lt;/refpurpose&gt;
-    &lt;/refnamediv&gt;
-    &lt;refsect1&gt;
-      &lt;title&gt;Description&lt;/title&gt;
-      &lt;para&gt;This manual page describes the command line options, which
-      are common to all GTK+ based applications.&lt;/para&gt;
-    &lt;/refsect1&gt;
-  &lt;/refentry&gt;
-</programlisting>
-      <calloutlist>
-        <callout arearefs="V1690_date-co" id="V1690_date">
-          <para>Sets the <quote>date</quote> part of the header/footer.</para>
-        </callout>
-        <callout arearefs="V1690_title-co" id="V1690_title">
-          <para>Sets the <quote>title</quote> part.</para>
-        </callout>
-        <callout arearefs="V1690_manvolnum-co" id="V1690_manvolnum">
-          <para>Sets the <quote>section</quote> part.</para>
-        </callout>
-        <callout arearefs="V1690_source-name-co" id="V1690_source-name">
-          <para>Sets the <quote>source name</quote> part.</para>
-        </callout>
-        <callout arearefs="V1690_version-co" id="V1690_version">
-          <para>Sets the <quote>version</quote> part.</para>
-        </callout>
-        <callout arearefs="V1690_manual-co" id="V1690_manual">
-          <para>Sets the <quote>manual</quote> part.</para>
-        </callout>
-      </calloutlist>
-      <para>
-Another <sgmltag>screen</sgmltag> including <sgmltag>coref</sgmltag> too. The
-first <sgmltag>coref</sgmltag> is not valid, the second one is valid. It checks
-also that several items in co/@linkends are correctly handled.
-</para>
-      <screen> Volume in drive C is SYSTEM         Serial number is 2350:717C
- Directory of  C:\
-
-10/17/97   9:04         &lt;DIR&gt;    bin
-10/16/97  14:11         &lt;DIR&gt;    DOS <co id="dos" linkends=" firstco lastco  "/>
-10/16/97  14:40         &lt;DIR&gt;    Program Files
-10/16/97  14:46         &lt;DIR&gt;    TEMP <coref linkend="unknown"/>
-10/17/97   9:04         &lt;DIR&gt;    tmp <coref linkend="dos"/>
-10/16/97  14:37         &lt;DIR&gt;    WINNT
-10/16/97  14:25             119  AUTOEXEC.BAT <co linkends="startup" id="autoexec.bat"/>
- 2/13/94   6:21          54,619  COMMAND.COM <co linkends="startup" id="command.com"/>
-10/16/97  14:25             115  CONFIG.SYS <co id="config.sys"/>
-11/16/97  17:17      61,865,984  pagefile.sys
- 2/13/94   6:21           9,349  WINA20.386 <co id="wina20.386"/></screen>
-      <calloutlist>
-        <callout arearefs="dos" id="firstco">
-          <para>
-  This directory holds <trademark>MS-DOS</trademark>, the
-  operating system that was installed before <trademark>Windows
-  NT</trademark>.
-  </para>
-        </callout>
-        <callout id="startup" arearefs="  autoexec.bat command.com config.sys ">
-          <para>
-  System startup code for DOS.
-  </para>
-        </callout>
-        <callout arearefs="wina20.386" id="lastco">
-          <para>
-  Some sort of <trademark>Windows 3.1</trademark> hack for some 386 processors,
-  as I recall.
-  </para>
-        </callout>
-      </calloutlist>
-    </section>
-    <section>
-      <title>Programlistingco</title>
-      <para>This case checks that spaces are added to reach the expected
-column.</para>
-      <programlistingco>
-        <areaspec>
-          <area id="hermite1" coords="2 55"/>
-          <area id="hermite2" coords="4 55"/>
-        </areaspec>
-        <programlisting>
-This is a line
-This is another line
-This is a third lien
-
-
-...
-</programlisting>
-        <calloutlist>
-          <callout arearefs="hermite1 hermite2">
-            <para>
-here <function>HermiteNormalFormIntegerMat</function>
-is used
-</para>
-          </callout>
-        </calloutlist>
-      </programlistingco>
-      <para>This programlistingco checks that you can put several markups at different
-column positions into the same line, and that several markups with no column
-specification are both put at the end of the line. The special case of a markup at
-the end of the last line is checked too.</para>
-      <programlistingco>
-        <areaspec>
-          <area id="pos10" coords="2 10"/>
-          <area id="pos12" coords="2 12"/>
-          <area id="posend1" coords="2"/>
-          <area id="posend2" coords="2"/>
-          <area id="poslast" coords="8"/>
-        </areaspec>
-        <programlisting>
-This is a line
-This is another line
-This is a third lien
-
-
-...
-The very last line</programlisting>
-        <calloutlist>
-          <callout arearefs="pos10 pos12">
-            <para>
-here <function>HermiteNormalFormIntegerMat</function>
-is used
-</para>
-          </callout>
-        </calloutlist>
-      </programlistingco>
-    </section>
-  </section>
-</article>
diff --git a/test/testdocs/changebars.001.xml b/test/testdocs/changebars.001.xml
deleted file mode 100644
index 55b09faa..00000000
--- a/test/testdocs/changebars.001.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: changebars.001.xml</title>
-<releaseinfo role="CVS">$Id: changebars.001.xml 5255 2005-10-12 13:45:58Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This article tests change bars.</para>
-
-<para revisionflag="added">This paragraph was added.</para>
-
-<para revisionflag="deleted">This paragraph was deleted.</para>
-
-<para>This paragraph contains
-<phrase revisionflag="changed">changed</phrase><phrase revisionflag="deleted">,</phrase>
-<phrase revisionflag="added">and </phrase>
-added<phrase revisionflag="deleted">, and deleted</phrase> inlines.</para>
-
-</article>
diff --git a/test/testdocs/chapter.001.xml b/test/testdocs/chapter.001.xml
deleted file mode 100644
index 1560765d..00000000
--- a/test/testdocs/chapter.001.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter id="chapter">
-<chapterinfo>
-<releaseinfo role="CVS">$Id: chapter.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<revhistory>
-<revision>
-<revnumber>1.0</revnumber>
-<date>18 Mar 2002</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark.</revremark>
-</revision>
-<revision>
-<revnumber>0.9</revnumber>
-<date>20 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.8</revnumber>
-<date>19 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.7</revnumber>
-<date>18 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-</revhistory>
-</chapterinfo>
-<title>Unit Test: chapter.001.xml</title>
-
-<para>This is a chapter test.</para>
-
-</chapter>
diff --git a/test/testdocs/chapter.002.xml b/test/testdocs/chapter.002.xml
deleted file mode 100644
index 014398b7..00000000
--- a/test/testdocs/chapter.002.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter id="chapter" lang="fr">
-<chapterinfo>
-<releaseinfo role="CVS">$Id: chapter.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</chapterinfo>
-<title>Unit Test: chapter.001.xml</title>
-
-<para>This is a chapter test.</para>
-
-<para>It's self-referential, too: <xref linkend="chapter"/>.</para>
-
-</chapter>
diff --git a/test/testdocs/classsynopsis.001.xml b/test/testdocs/classsynopsis.001.xml
deleted file mode 100644
index 94d223fe..00000000
--- a/test/testdocs/classsynopsis.001.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>Unit Test: classsynopsis.001</title>
-<releaseinfo role="CVS">$Id: classsynopsis.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<classsynopsis>
-<ooclass>
-<modifier>public</modifier>
-<classname>Catalog</classname>
-</ooclass>
-<fieldsynopsis>
-<modifier>public</modifier>
-<modifier>static</modifier>
-<modifier>final</modifier>
-<type>int</type>
-<varname>BASE</varname>
-<initializer>CatalogEntry.addEntryType("BASE", 1)</initializer>
-</fieldsynopsis>
-<constructorsynopsis>
-<modifier>public</modifier>
-<methodname>Catalog</methodname>
-<void/>
-</constructorsynopsis>
-<methodsynopsis>
-<modifier>protected</modifier>
-<void/>
-<methodname>copyReaders</methodname>
-<methodparam>
-<type>Catalog</type>
-<parameter>newCatalog</parameter>
-</methodparam>
-</methodsynopsis>
-</classsynopsis>
-
-</article>
diff --git a/test/testdocs/classsynopsis.x001.xml b/test/testdocs/classsynopsis.x001.xml
deleted file mode 100644
index d46d939c..00000000
--- a/test/testdocs/classsynopsis.x001.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<article>
-<articleinfo>
-<title>Unit Test: classsynopsis.x001</title>
-<releaseinfo role="CVS">$Id$</releaseinfo>
-<author><firstname>Shaun</firstname><surname>McCance</surname>
-        <affiliation><address><email>shaunm@gnome.org</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>
-  Here is a <sgmltag>classsynopsis</sgmltag> for C++:
-</para>
-
-<classsynopsis language="cpp">
-  <ooclass><modifier>public</modifier><classname>FooBar</classname></ooclass>
-  <ooclass><modifier>public</modifier><classname>Foo</classname></ooclass>
-  <ooclass><modifier>public</modifier><classname>Bar</classname></ooclass>
-  <fieldsynopsis>
-    <modifier>public</modifier>
-    <type>int</type>
-    <varname>fooNum</varname>
-    <initializer>5</initializer>
-  </fieldsynopsis>
-  <constructorsynopsis>
-    <modifier>public</modifier>
-    <methodparam>
-      <type>Foo</type>
-      <parameter>arg1</parameter>
-    </methodparam>
-    <methodparam>
-      <type>Bar</type>
-      <parameter>arg2</parameter>
-    </methodparam>
-  </constructorsynopsis>
-  <destructorsynopsis>
-    <modifier>public</modifier>
-    <methodname>~FooBar</methodname>
-    <void/>
-  </destructorsynopsis>
-  <destructorsynopsis>
-    <modifier>public</modifier>
-    <methodparam>
-      <type>Foo</type>
-      <parameter>arg1</parameter>
-    </methodparam>
-    <methodparam>
-      <type>Bar</type>
-      <parameter>arg2</parameter>
-    </methodparam>
-  </destructorsynopsis>
-  <methodsynopsis>
-    <modifier>protected</modifier>
-    <methodname>frobnicate</methodname>
-    <methodparam>
-      <type>FooBar</type>
-      <parameter>frobFoo</parameter>
-    </methodparam>
-  </methodsynopsis>
-</classsynopsis>
-
-</article>
diff --git a/test/testdocs/cmdsynopsis.001.xml b/test/testdocs/cmdsynopsis.001.xml
deleted file mode 100644
index cc5135be..00000000
--- a/test/testdocs/cmdsynopsis.001.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?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>Unit Test: cmdsynopsis.001</title>
-<releaseinfo role="CVS">$Id: cmdsynopsis.001.xml 5628 2006-03-09 11:33:44Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<refentry id="minimal">
-<refnamediv>
-<refname>cccp</refname>
-<refname>zzzzzzp</refname>
-<refpurpose>The C++/ZZZ++ preprocessors</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-  <command>cccp</command>
-  <!-- test for nested bold/italic, bug #1446015 -->
-  <arg choice="plain"><option>--path "<replaceable
-  class="option">PATHS</replaceable>"</option></arg>
-  <arg>-$</arg>
-  <arg>-C</arg>
-  <arg rep='repeat'>-D<replaceable>name</replaceable>
-       <arg>=<replaceable>definition</replaceable></arg></arg>
-  <arg>-dD</arg>
-  <arg>-dM</arg>
-  <sbr/>
-  <arg rep='repeat'>-I <replaceable>directory</replaceable></arg>
-  <arg>-H</arg>
-  <arg>-I-</arg>
-  <arg rep='repeat'>-imacros <replaceable>file</replaceable></arg>
-  <sbr/>
-  <arg rep='repeat'>-include <replaceable>file</replaceable></arg>
-  <group>
-    <synopfragmentref linkend="langs">languages</synopfragmentref>
-  </group>
-  <arg>-lint</arg>
-  <sbr/>
-  <group>
-    <arg>-M</arg>
-    <arg>-MD</arg>
-    <arg>-MM</arg>
-    <arg>-MMD</arg>
-  </group>
-  <arg>-nostdinc</arg>
-  <arg>-P</arg>
-  <arg>-pedantic</arg>
-  <sbr/>
-  <arg>-pedantic-errors</arg>
-  <arg>-trigraphs</arg>
-  <arg>-U<replaceable>name</replaceable></arg>
-  <sbr/>
-  <arg>-undef</arg>
-  <arg choice="plain"><synopfragmentref linkend="warn">warnings
-    </synopfragmentref></arg>
-  <group choice='req'>
-    <arg><replaceable>infile</replaceable></arg>
-    <arg>-</arg>
-  </group>
-  <group choice='req'>
-    <arg><replaceable>outfile</replaceable></arg>
-    <arg>-</arg>
-  </group>
-
-  <synopfragment id="langs">
-    <group choice="plain">
-      <arg>-lang-c</arg>
-      <arg>-lang-c++</arg>
-      <arg>-lang-objc</arg>
-    </group>
-  </synopfragment>
-
-  <synopfragment id="warn">
-    <arg>-Wtrigraphs</arg>
-    <arg>-Wcomment</arg>
-    <arg>-Wall</arg>
-    <arg>-Wtraditional</arg>
-  </synopfragment>
-
-</cmdsynopsis>
-<cmdsynopsis>
-  <command>zzzzzzp</command>
-  <arg>-$</arg>
-  <arg>-C</arg>
-  <arg rep='repeat'>-D<replaceable>name</replaceable>
-       <arg>=<replaceable>definition</replaceable></arg></arg>
-  <arg>-dD</arg>
-  <arg>-dM</arg>
-  <sbr/>
-  <arg rep='repeat'>-I <replaceable>directory</replaceable></arg>
-  <arg>-H</arg>
-  <arg>-I-</arg>
-  <arg rep='repeat'>-imacros <replaceable>file</replaceable></arg>
-  <sbr/>
-  <arg rep='repeat'>-include <replaceable>file</replaceable></arg>
-  <group>
-    <synopfragmentref linkend="langsz">languages</synopfragmentref>
-  </group>
-  <arg>-lint</arg>
-  <sbr/>
-  <group>
-    <arg>-M</arg>
-    <arg>-MD</arg>
-    <arg>-MM</arg>
-    <arg>-MMD</arg>
-  </group>
-  <arg>-nostdinc</arg>
-  <arg>-P</arg>
-  <arg>-pedantic</arg>
-  <sbr/>
-  <arg>-pedantic-errors</arg>
-  <arg>-trigraphs</arg>
-  <arg>-U<replaceable>name</replaceable></arg>
-  <sbr/>
-  <arg>-undef</arg>
-  <arg choice="plain"><synopfragmentref linkend="warnz">warnings
-    </synopfragmentref></arg>
-  <group choice='req'>
-    <arg><replaceable>infile</replaceable></arg>
-    <arg>-</arg>
-  </group>
-  <group choice='req'>
-    <arg><replaceable>outfile</replaceable></arg>
-    <arg>-</arg>
-  </group>
-
-  <synopfragment id="langsz">
-    <group choice="plain">
-      <arg>-lang-zzz</arg>
-      <arg>-lang-zzz++</arg>
-      <arg>-lang-objzzz</arg>
-    </group>
-  </synopfragment>
-
-  <synopfragment id="warnz">
-    <arg>-Wtrigraphs</arg>
-    <arg>-Wcomment</arg>
-    <arg>-Wall</arg>
-    <arg>-Wtraditional</arg>
-  </synopfragment>
-
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a dummy description.</para>
-</refsect1>
-</refentry>
-
-</article>
diff --git a/test/testdocs/cmdsynopsis.002.xml b/test/testdocs/cmdsynopsis.002.xml
deleted file mode 100644
index 59692c1b..00000000
--- a/test/testdocs/cmdsynopsis.002.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article>
-<articleinfo>
-<title>Unit test: cmdsynopsis.002</title>
-<releaseinfo role="CVS">$Id: cmdsynopsis.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <section>
-    <title>Cmdsynopsis Test</title>
-    
-    <para>Cmdsynopsis test in the context of glossentry follows.</para>
-
-    <glosslist>
-
-      <glossentry>
-        <glossterm>
-          <cmdsynopsis>
-            <command>command</command>
-            <arg choice="req">req</arg>
-            <arg choice="req" rep="repeat">repeatandreq</arg>
-            <arg rep="repeat">repeat</arg>
-            <arg>optional</arg>
-          </cmdsynopsis>
-        </glossterm>
-        <glossdef>
-          <para>Do black magic.</para>
-        </glossdef>
-      </glossentry>
-
-    </glosslist>
-
-  </section>
-
-</article>
diff --git a/test/testdocs/cmdsynopsis.003.xml b/test/testdocs/cmdsynopsis.003.xml
deleted file mode 100644
index 0a283aa6..00000000
--- a/test/testdocs/cmdsynopsis.003.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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 id="cmdsynopsis.003">
-<articleinfo>
-<title>Unit Test: cmdsynopsis.003</title>
-<releaseinfo role="CVS">$Id: cmdsynopsis.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-  <para>
-    Lets refer to <xref linkend="foo"/>.
-  </para>
-  <refentry id="foo">
-    <refnamediv>
-      <refname>testing</refname>
-      <refpurpose>
-        Testing more cmdsynopsis stuff, esp. permutations of grouped
-        arguments.
-      </refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-      <cmdsynopsis>
-        <command>foo</command>
-
-        <!-- optional -->
-        <group choice="opt">
-          <arg>-foo</arg>
-          <arg>-bar</arg>
-        </group>
-
-        <!-- repeating optional -->
-        <group choice="opt" rep="repeat">
-          <arg>-re</arg>
-          <arg>-peat</arg>
-        </group>
-      </cmdsynopsis>
-    </refsynopsisdiv>
-
-    <refsect1>
-      <title>Description</title>
-      <para>This is a dummy description.</para>
-    </refsect1>
-  </refentry>
-  
-</article>
diff --git a/test/testdocs/co.001.xml b/test/testdocs/co.001.xml
deleted file mode 100644
index 76559b19..00000000
--- a/test/testdocs/co.001.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>Unit Test: co.001</title>
-<releaseinfo role="CVS">$Id: co.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>John</firstname><surname>Himpel</surname>
-        <affiliation><address><email>jwhimpel@users.sourceforge.net</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Callouts inside <sgmltag>userinput</sgmltag> elements.</para>
-
-<screen>
-<prompt>$</prompt><userinput>cp a b<co id='cp-co'
-linkends='cp'/></userinput>
-<prompt>$</prompt><userinput>mv a b<co id='mv-co'
-linkends='mv'/></userinput>
-</screen>
-<calloutlist>
-<callout arearefs='cp-co' id='cp'>
-<para>This is a copy.</para>
-</callout>
-<callout arearefs='mv-co' id='mv'>
-<para>This is a move.</para>
-</callout>
-</calloutlist>
-
-</article>
diff --git a/test/testdocs/db2html.xsl b/test/testdocs/db2html.xsl
deleted file mode 100644
index 53bfe218..00000000
--- a/test/testdocs/db2html.xsl
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?><!-- -*- indent-tabs-mode: nil -*- -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<xsl:import href="../../xslt/docbook/html/db2html.xsl"/>
-
-<xsl:param name="annotate" select="true()"/>
-
-<xsl:template match="/*/*[preceding-sibling::*][name(.) != 'title']">
-  <xsl:if test="$annotate">
-    <pre style="margin: 16px; padding: 0.8em; background-color: #9EB6D1; -moz-border-radius: 8px;">
-      <xsl:apply-templates mode="source.mode" select="."/>
-    </pre>
-  </xsl:if>
-  <xsl:apply-imports/>
-</xsl:template>
-
-<xsl:template mode="source.mode" match="*">
-  <xsl:text>&lt;</xsl:text>
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:for-each select="attribute::*">
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>="</xsl:text>
-    <xsl:value-of select="."/>
-    <xsl:text>"</xsl:text>
-  </xsl:for-each>
-  <xsl:text>&gt;</xsl:text>
-  <xsl:apply-templates mode="source.mode" select="node()"/>
-  <xsl:text>&lt;/</xsl:text>
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:text>&gt;</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/test/testdocs/dir.001.xml b/test/testdocs/dir.001.xml
deleted file mode 100644
index 8ddcbeb6..00000000
--- a/test/testdocs/dir.001.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter id="chapter" dir="ltr">
-<chapterinfo>
-<releaseinfo role="CVS">$Id: dir.001.xml 5600 2006-03-03 08:43:12Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</chapterinfo>
-<title>Unit Test: chapter.001.xml</title>
-
-<para>This is a chapter test.</para>
-
-<para dir="ltr">This is a chapter written in English, a left-to-right
-language. It contains a phrase <phrase dir="rtl">putatively written
-in a right-to-left language</phrase>, though in fact the phrase is
-in English too.</para>
-
-</chapter>
diff --git a/test/testdocs/docbook-43.001.xml b/test/testdocs/docbook-43.001.xml
deleted file mode 100644
index eab77830..00000000
--- a/test/testdocs/docbook-43.001.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: docbook-43.001.xml</title>
-<releaseinfo role="CVS">$Id: docbook-43.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<glosslist>
-<title>Glossary List Title</title>
-<glossentry>
-<glossterm>Some Term</glossterm>
-<glossdef>
-<para>Some definition.</para>
-</glossdef>
-</glossentry>
-</glosslist>
-
-<blockquote>
-<blockinfo>
-<title>Block Quote Title</title>
-</blockinfo>
-<attribution>A. Nonymous</attribution>
-<para>Some memorable quotation.</para>
-</blockquote>
-
-<para>The assignment statement <code>x=1</code> is code.</para>
-
-<table>
-<caption>HTML Table caption</caption>
-<tbody>
-<tr>
-  <td>HTML</td>
-  <td>Table</td>
-</tr>
-</tbody>
-</table>
-
-<programlisting linenumbering="numbered">#!/usr/bin/perl -- # --*-Perl-*--
-
-use Getopt::Std;
-
-$usage = "Usage: $0 [-q] [-u|-p|-m] file [ file ... ]\n";
-
-die $usage if ! getopts('qupm');
-
-die $usage if ($opt_p + $opt_u + $opt_m) != 1;
-
-$file = shift @ARGV || die $usage;
-
-$opt = '-u' if $opt_u;
-$opt = '-p' if $opt_p;
-$opt = '-m' if $opt_m;</programlisting>
-
-
-<task>
-<title>A Task</title>
-<tasksummary>
-<para>This task doesn’t accomplish anything.</para>
-</tasksummary>
-<taskprerequisites>
-<para>Do something else first.</para>
-</taskprerequisites>
-<procedure>
-<step><para>Do This</para></step>
-<step><para>Do That</para></step>
-<step><para>Do one of these things:</para>
-<stepalternatives>
-<step><para>Do A</para></step>
-<step><para>Do B</para></step>
-<step><para>Do C</para></step>
-</stepalternatives>
-</step>
-<step><para>Do the other thing</para></step>
-</procedure>
-<taskrelated>
-<para>See some more interesting task after you’ve done this one.</para>
-</taskrelated>
-</task>
-
-<para>An <orgname>Organization Name</orgname> can now occur inline.</para>
-
-<para>The URI <uri>http://norman.walsh.name</uri> should really be a ulink.</para>
-
-<programlisting continuation="continues" linenumbering="numbered">while ($file) {
-    print "Converting $file to $opt linebreaks.\n" if !$opt_q;
-    open (F, "$file");
-    binmode F;
-    read (F, $_, -s $file);
-    close (F);
-    
-    s/\r\n/\n/sg;
-    s/\r/\n/sg;
-    
-    if ($opt eq '-p') {
-	s/\n/\r\n/sg;
-    } elsif ($opt eq '-m') {
-	s/\n/\r/sg;
-    }
-    
-    open (F, ">$file");
-    binmode F;
-    print F $_;
-    close (F);
-    
-    $file = shift @ARGV;
-}</programlisting>
-
-
-</article>
diff --git a/test/testdocs/draft.001.xml b/test/testdocs/draft.001.xml
deleted file mode 100644
index e20d9365..00000000
--- a/test/testdocs/draft.001.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY blah "<para>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-</para>">
-]>
-<book status="draft">
-<bookinfo>
-<title>Unit Test: draft.001</title>
-<releaseinfo role="CVS">$Id: draft.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<article><title>First Article</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</article>
-
-<article><title>Second Article</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</article>
-
-<article><title>Third Article</title>
-
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-&blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
-
-</article>
-
-</book>
diff --git a/test/testdocs/emphasis.001.xml b/test/testdocs/emphasis.001.xml
deleted file mode 100644
index 3939e45c..00000000
--- a/test/testdocs/emphasis.001.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>Unit Test: emphasis.001</title>
-<releaseinfo role="CVS">$Id: emphasis.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This is <emphasis>emphasis</emphasis>.</para>
-
-<para>Should these variants, with role, be supported?</para>
-
-<para>This is <emphasis role="bold">bold emphasis</emphasis>.</para>
-
-<para>This is <emphasis role="strikethrough">strikethrough emphasis</emphasis>.</para>
-
-<para>This is <emphasis role="underline">underline emphasis</emphasis>.</para>
-
-<para>This is <emphasis>nested <emphasis>emphasis</emphasis> inside
-emphasis</emphasis>.</para>
-
-</article>
diff --git a/test/testdocs/epigraph.001.xml b/test/testdocs/epigraph.001.xml
deleted file mode 100644
index 6df84fe1..00000000
--- a/test/testdocs/epigraph.001.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter>
-<chapterinfo>
-<title>Unit Test: epigraph.001.xml</title>
-<releaseinfo role="CVS">$Id: article.001.xml,v 1.2 2002/04/18 22:15:39 nwalsh Exp $</releaseinfo>
-<authorgroup>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<author><firstname>Jane</firstname><surname>Doe</surname></author>
-</authorgroup>
-</chapterinfo>
-<title>Unit Test: article.001.xml</title>
-<epigraph><attribution>H. W. Longfellow</attribution>
-<para>If we could read the secret history
-of our enemies, we should find in in each one's life sorrow and
-suffering enough to disarm all hostility.</para>
-</epigraph>
-
-<para>This is an epigraph test.</para>
-
-</chapter>
diff --git a/test/testdocs/equation.001.xml b/test/testdocs/equation.001.xml
deleted file mode 100644
index 4ce8d70f..00000000
--- a/test/testdocs/equation.001.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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>Unit Test: equation.001</title>
-<releaseinfo role="CVS">$Id: equation.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<equation><title>First Equation</title>
-<mediaobject>
-<imageobject>
-<imagedata fileref="emc2.png"/>
-</imageobject>
-<textobject>
-<phrase>e=mc^2</phrase>
-</textobject>
-</mediaobject>
-</equation>
-
-</article>
diff --git a/test/testdocs/equation.002.xml b/test/testdocs/equation.002.xml
deleted file mode 100644
index 35e985c4..00000000
--- a/test/testdocs/equation.002.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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>Unit Test: equation.002</title>
-<releaseinfo role="CVS">$Id: equation.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<equation id="eq2"><title>Second Equation</title>
-<mediaobject>
-<imageobject>
-<imagedata fileref="emc2.png"/>
-</imageobject>
-<textobject>
-<phrase>e=mc^2</phrase>
-</textobject>
-</mediaobject>
-</equation>
-
-</article>
diff --git a/test/testdocs/equation.003.xml b/test/testdocs/equation.003.xml
deleted file mode 100644
index e09b87cc..00000000
--- a/test/testdocs/equation.003.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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>Unit Test: equation.003</title>
-<releaseinfo role="CVS">$Id: equation.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<equation><title>Third Equation</title>
-<mediaobject>
-<imageobject>
-<imagedata fileref="emc2.png"/>
-</imageobject>
-<textobject>
-<phrase>e=mc^2</phrase>
-</textobject>
-</mediaobject>
-</equation>
-
-</article>
diff --git a/test/testdocs/equation.004.xml b/test/testdocs/equation.004.xml
deleted file mode 100644
index a86fb347..00000000
--- a/test/testdocs/equation.004.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book id="book">
-<bookinfo>
-<title>Unit Test: equation.004</title>
-<releaseinfo role="CVS">$Id: equation.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<chapter>
-<title>Equations</title>
-
-<para>blah blah blah.</para>
-
-<equation><title>First Equation</title>
-<mediaobject>
-<imageobject>
-<imagedata fileref="emc2.png"/>
-</imageobject>
-<textobject>
-<phrase>e=mc^2</phrase>
-</textobject>
-</mediaobject>
-</equation>
-
-<para>blah blah blah.</para>
-
-<equation><!-- equation with no title: don't do this; use informalequation -->
-<mediaobject>
-<imageobject>
-<imagedata fileref="emc2.png"/>
-</imageobject>
-<textobject>
-<phrase>e=mc^2</phrase>
-</textobject>
-</mediaobject>
-</equation>
-
-<para>blah blah blah.</para>
-
-<equation id="eq2"><title>Second Equation</title>
-<mediaobject>
-<imageobject>
-<imagedata fileref="emc2.png"/>
-</imageobject>
-<textobject>
-<phrase>e=mc^2</phrase>
-</textobject>
-</mediaobject>
-</equation>
-
-<figure id="fig1"><title>A Figure</title>
-<mediaobject>
-<imageobject>
-<imagedata fileref="emc2.png"/>
-</imageobject>
-<textobject>
-<phrase>e=mc^2</phrase>
-</textobject>
-</mediaobject>
-</figure>
-
-</chapter>
-
-</book>
diff --git a/test/testdocs/example.001.xml b/test/testdocs/example.001.xml
deleted file mode 100644
index 4af16d6e..00000000
--- a/test/testdocs/example.001.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>Unit Test: example.001</title>
-<releaseinfo role="CVS">$Id: example.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<example><title>An Example</title>
-<programlisting>
-This is a programlisting in an example.
-</programlisting>
-</example>
-
-</article>
diff --git a/test/testdocs/extensions.001.xml b/test/testdocs/extensions.001.xml
deleted file mode 100644
index 7dad5500..00000000
--- a/test/testdocs/extensions.001.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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>Unit Test: extensions.001</title>
-<releaseinfo role="CVS">$Id: extensions.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Callouts using <sgmltag>programlistingco</sgmltag>. The following program
-listing should be decorated with callout bullets:</para>
-
-<programlistingco>
-<areaspec>
-<area coords="1" id="prologue"/>
-<area coords="4" id="skipeof"/>
-<areaset coords="" id="xreq">
-<area coords="9" id="require1"/>
-<area coords="10" id="require2"/>
-</areaset>
-<area coords="11 12" id="use"/>
-<area coords="27" id="funccall"/>
-</areaspec>
-<programlisting>@rem = '--*-Perl-*--
-@echo off
-perl.exe %_batchname %$
-goto endofperl
-@rem ';
-
-# Compress mail...
-
-require 'n:/home/nwalsh/lib/cygnus.pl';
-require 'timelocal.pl';
-use Cwd;
-
-select (STDERR); $| = 1;
-select (STDOUT); $| = 1;
-
-@DIRS = ("/home/nwalsh/Mail");
-while (@DIRS) {
-    $dir = shift @DIRS;
-    opendir (DIR, $dir);
-    while ($fname = readdir(DIR)) {
-        $file = "$dir/$fname";
-        next if ! -d $file;
-        next if $fname =~ /^\.\.?$/;
-
-        print "$file\n";
-        push (@DIRS, $file);
-        &amp;compress ($file);
-    }
-}
-
-exit;</programlisting>
-<calloutlist>
-<callout arearefs="prologue">
-<para>The prologue handles embedding a Perl script in a DOS batch file.</para>
-</callout>
-<callout arearefs="skipeof">
-<para>The <literal>goto</literal> statement, interpreted by the DOS batch
-file interpreter, skips over the body of the Perl script.</para>
-</callout>
-<callout arearefs="require1">
-<para>The <literal>require</literal> statement sources in external program
-fragments.</para>
-</callout>
-<callout arearefs="use">
-<para>The <literal>use</literal> statement is similar, but has additional
-utility.  It is a Perl5 function.  (Note that this callout area specifies
-both a line and a column.)</para>
-</callout>
-<callout arearefs="funccall">
-<para>This is a user subroutine call.</para>
-</callout>
-</calloutlist>
-</programlistingco>
-
-</article>
diff --git a/test/testdocs/extensions.002.xml b/test/testdocs/extensions.002.xml
deleted file mode 100644
index 3484fa2b..00000000
--- a/test/testdocs/extensions.002.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>Unit Test: extensions.002</title>
-<releaseinfo role="CVS">$Id: extensions.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Text insert. The source of this document should appear between</para>
-
-<programlisting><inlinemediaobject>
-<imageobject>
-<imagedata format="linespecific" fileref="extensions.002.xml"/>
-</imageobject>
-</inlinemediaobject></programlisting>
-
-<para>these two lines.</para>
-
-</article>
diff --git a/test/testdocs/extensions.003.xml b/test/testdocs/extensions.003.xml
deleted file mode 100644
index e97d7fa9..00000000
--- a/test/testdocs/extensions.003.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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>Unit Test: extensions.003</title>
-<releaseinfo role="CVS">$Id: extensions.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This program listing should be numbered:</para>
-
-<programlisting linenumbering="numbered">@rem = '--*-Perl-*--
-@echo off
-perl.exe %_batchname %$
-goto endofperl
-@rem ';
-
-# Compress mail...
-
-require 'n:/home/nwalsh/lib/cygnus.pl';
-require 'timelocal.pl';
-use Cwd;
-
-select (STDERR); $| = 1;
-select (STDOUT); $| = 1;
-
-@DIRS = ("/home/nwalsh/Mail");
-while (@DIRS) {
-    $dir = shift @DIRS;
-    opendir (DIR, $dir);
-    while ($fname = readdir(DIR)) {
-        $file = "$dir/$fname";
-        next if ! -d $file;
-        next if $fname =~ /^\.\.?$/;
-
-        print "$file\n";
-        push (@DIRS, $file);
-        &amp;compress ($file);
-    }
-}
-
-exit;</programlisting>
-
-</article>
diff --git a/test/testdocs/extensions.004.xml b/test/testdocs/extensions.004.xml
deleted file mode 100644
index e3df3802..00000000
--- a/test/testdocs/extensions.004.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>Unit Test: extensions.004</title>
-<releaseinfo role="CVS">$Id: extensions.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The following programlisting should contain the source for this
-document. The source should be numbered and decorated with callout marks.
-</para>
-
-<programlistingco>
-<areaspec>
-<area coords="13" id="plco"/>
-<area coords="15" id="areas"/>
-<area coords="21" id="pl"/>
-<area coords="22" id="pi"/>
-<area coords="26" id="textinsert"/>
-</areaspec>
-<programlisting linenumbering="numbered"
-><?dbhtml linenumbering.everyNth="2" linenumbering.separator=" >"
-?><?dbfo linenumbering.everyNth="2" linenumbering.separator=" >"
-?><inlinemediaobject>
-<imageobject>
-<imagedata format="linespecific" fileref="extensions.004.xml"/>
-</imageobject>
-</inlinemediaobject></programlisting>
-</programlistingco>
-
-</article>
diff --git a/test/testdocs/figure.001.xml b/test/testdocs/figure.001.xml
deleted file mode 100644
index a12f5f50..00000000
--- a/test/testdocs/figure.001.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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>Unit Test: figure.001</title>
-<releaseinfo role="CVS">$Id: figure.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<figure id="figduck">
-  <title>The Duck</title>
-  <mediaobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck-small.eps"
-        format="EPS"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck-small.png"
-        format="PNG"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck-small.gif"
-        format="GIF"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck-small.bmp"
-        format="BMP"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-  </mediaobject>
-</figure>
-
-</article>
diff --git a/test/testdocs/figure.002.xml b/test/testdocs/figure.002.xml
deleted file mode 100644
index 3ea21507..00000000
--- a/test/testdocs/figure.002.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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>Unit Test: figure.002</title>
-<releaseinfo role="CVS">$Id: figure.002.xml 5256 2005-10-12 13:47:16Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This paragraph precedes the first figure. The following figure has
-float="1".</para>
-
-<figure id="figduck1" float="1">
-  <title>The Duck</title>
-  <mediaobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck-small.png"
-        format="PNG"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-  </mediaobject>
-</figure>
-
-<para>This paragraph is between the figures. The following figure has
-float="right".</para>
-
-<figure id="figduck2" float="right">
-  <title>The Duck</title>
-  <mediaobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck-small.png"
-        format="PNG"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-  </mediaobject>
-</figure>
-
-<para>This paragraph follows the figures.</para>
-
-</article>
diff --git a/test/testdocs/figure.003.xml b/test/testdocs/figure.003.xml
deleted file mode 100644
index 6dcd260a..00000000
--- a/test/testdocs/figure.003.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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" [
-<!ATTLIST xref
-  xrefstyle CDATA #IMPLIED
->
-]>
-<article>
-<articleinfo>
-<title>Unit Test: figure.003</title>
-<releaseinfo role="CVS">$Id: figure.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Cross reference to the figure: <xref linkend="figduck" xrefstyle="title"/>.</para>
-
-<figure id="figduck">
-  <title>The Wood Duck as seen on the Cover of DocBook: The Definitive Guide</title>
-  <titleabbrev>The Duck</titleabbrev>
-  <mediaobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck-small.eps"
-        format="EPS"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck-small.png"
-        format="PNG"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-  </mediaobject>
-</figure>
-
-</article>
diff --git a/test/testdocs/figure.004.xml b/test/testdocs/figure.004.xml
deleted file mode 100644
index d14cd952..00000000
--- a/test/testdocs/figure.004.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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>Unit Test: figure.004</title>
-<releaseinfo role="CVS">$Id: figure.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>A centered figure.</para>
-
-<figure id="figduck">
-  <title>The Duck</title>
-  <mediaobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck-small.png"
-        format="PNG"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-  </mediaobject>
-</figure>
-
-<para>A centered screenshot.</para>
-
-<figure id="figduckscreen">
-  <title>The Duck Screenshot (looks the same)</title>
-  <screenshot>
-    <mediaobject>
-      <imageobject>
-        <imagedata
-          align="center"
-          fileref="graphics/duck-small.png"
-          format="PNG"
-          srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-      </imageobject>
-      <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-    </mediaobject>
-  </screenshot>
-</figure>
-
-</article>
diff --git a/test/testdocs/figure.005.xml b/test/testdocs/figure.005.xml
deleted file mode 100644
index 4c43d3ac..00000000
--- a/test/testdocs/figure.005.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>Unit Test: figure.005</title>
-<releaseinfo role="CVS">$Id: figure.005.xml 4613 2005-04-20 11:54:35Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<figure id="figduck">
-  <title>The Duck</title>
-  <mediaobject>
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="graphics/duck.png"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-    <textobject><para>A woodcut from the Dover Archives, this wood
-duck is used as the “animal” for <citetitle>DocBook: The Definitive
-Guide</citetitle>.</para>
-    </textobject>
-  </mediaobject>
-</figure>
-
-</article>
diff --git a/test/testdocs/firstterm.001.xml b/test/testdocs/firstterm.001.xml
deleted file mode 100644
index a2fb2c6a..00000000
--- a/test/testdocs/firstterm.001.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>Unit Test: firstterm.001</title>
-<releaseinfo role="CVS">$Id: firstterm.001.xml 4613 2005-04-20 11:54:35Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This is a <firstterm>firstterm</firstterm>.</para>
-
-<para>This is a <glossterm>glossterm</glossterm>.</para>
-
-</article>
diff --git a/test/testdocs/footnote.001.xml b/test/testdocs/footnote.001.xml
deleted file mode 100644
index aa60be3a..00000000
--- a/test/testdocs/footnote.001.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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>Unit Test: footnote.001</title>
-<releaseinfo role="CVS">$Id: footnote.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
- <para>This paragraph contains a footnote<footnote>
-<para>This is a footnote.</para></footnote>.</para>
-
- <sect1><title>First Section</title>
-  <para>A paragraph.</para>
- <para>This paragraph contains a footnote<footnote>
-<para>This is another footnote.</para></footnote>.</para>
- </sect1>
-
- <sect1>
-  <title>Section Title<footnote>
-      <para>Boring, I know, but it just tests the fact that a footnote
-can occur in a title.</para></footnote></title>
-  <para>A paragraph.</para>
-
- <sect2>
-  <title>Subsection Title</title>
- <para>This paragraph contains a footnote<footnote>
-<para>This is yet another footnote.</para></footnote>.</para>
-  </sect2>
-
-  </sect1>
-
-</article>
diff --git a/test/testdocs/footnote.002.xml b/test/testdocs/footnote.002.xml
deleted file mode 100644
index 6be465de..00000000
--- a/test/testdocs/footnote.002.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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>Unit Test: footnote.002</title>
-<releaseinfo role="CVS">$Id: footnote.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This paragraph contains a footnote<footnote>
-<para>This is a footnote.</para></footnote>.</para>
-
-<table><title>A table</title>
-<tgroup cols="3">
-<tbody>
-<row>
-  <entry>A Cell</entry>
-  <entry>A Cell<footnote><para>First footnote.</para></footnote></entry>
-  <entry>A Cell</entry>
-</row>
-<row>
-  <entry>A Cell<footnote><simpara>Second footnote.</simpara></footnote></entry>
-  <entry>A Cell</entry>
-  <entry>A Cell</entry>
-</row>
-<row>
-  <entry>A Cell</entry>
-  <entry>A Cell</entry>
-  <entry>A Cell<footnote><address>100 Any Street
-East Yahoo, XX</address></footnote></entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-<para>This is a longer paragraph. It will eventually contain a footnote, but first
-it has enough text to make the footnote appear in the middle of the paragraph.
-This is so we can test the effect of changing the
-<property>line-height-shift-adjustment</property> property. This paragraph
-contains a footnote<footnote>
-<para>This is a footnote.</para></footnote> (see, I said it would).
-Now it has more text to make the footnote appear in the middle of the paragraph.
-Now it has more text to make the footnote appear in the middle of the paragraph.
-</para>
-
-</article>
diff --git a/test/testdocs/footnote.003.xml b/test/testdocs/footnote.003.xml
deleted file mode 100644
index 389fa240..00000000
--- a/test/testdocs/footnote.003.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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>Unit Test: footnote.003</title>
-<releaseinfo role="CVS">$Id: footnote.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This paragraph contains a footnote<footnote>
-<para>This is a footnote.</para></footnote>.</para>
-
-<table><title>A table</title>
-<tgroup cols="3">
-<tbody>
-<row>
-  <entry>A Cell</entry>
-  <entry>A Cell<footnote><para>First footnote.</para></footnote></entry>
-  <entry>A Cell</entry>
-</row>
-<row>
-  <entry>A Cell<footnote><simpara>Second footnote.</simpara></footnote></entry>
-  <entry>A Cell</entry>
-  <entry>A Cell</entry>
-</row>
-<row>
-  <entry>A Cell</entry>
-  <entry>A Cell</entry>
-  <entry>A Cell<footnote><address>100 Any Street
-East Yahoo, XX</address></footnote></entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-<para>This paragraph contains a footnote<footnote>
-<para>This is a footnote.</para></footnote>.</para>
-
-<table><title>A table</title>
-<tgroup cols="3">
-<tbody>
-<row>
-  <entry>A Cell</entry>
-  <entry>A Cell<footnote><para>First footnote.</para></footnote></entry>
-  <entry>A Cell</entry>
-</row>
-<row>
-  <entry>A Cell<footnote><simpara>Second footnote.</simpara></footnote></entry>
-  <entry>A Cell</entry>
-  <entry>A Cell</entry>
-</row>
-<row>
-  <entry>A Cell</entry>
-  <entry>A Cell</entry>
-  <entry>A Cell<footnote><address>100 Any Street
-East Yahoo, XX</address></footnote></entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-<para>This paragraph contains a footnote<footnote>
-<para>This is a footnote.</para></footnote>.</para>
-
-</article>
diff --git a/test/testdocs/formalpara.001.xml b/test/testdocs/formalpara.001.xml
deleted file mode 100644
index 95efb12c..00000000
--- a/test/testdocs/formalpara.001.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>Unit Test: formalpara.001</title>
-<releaseinfo role="CVS">$Id: formalpara.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<formalpara><title>Test title</title>
-<para>Some para</para>
-</formalpara>
-
-</article>
diff --git a/test/testdocs/formalpara.002.xml b/test/testdocs/formalpara.002.xml
deleted file mode 100644
index b1cb8131..00000000
--- a/test/testdocs/formalpara.002.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>Unit Test: formalpara.002</title>
-<releaseinfo role="CVS">$Id: formalpara.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<formalpara><title>Test title:</title>
-<para>Some para</para>
-</formalpara>
-
-</article>
diff --git a/test/testdocs/formalpara.003.xml b/test/testdocs/formalpara.003.xml
deleted file mode 100644
index 689e3aa3..00000000
--- a/test/testdocs/formalpara.003.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?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>Unit Test: formalpara.003</title>
-<releaseinfo role="CVS">$Id: formalpara.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-  <section>
-    <title>Testing formalpara title keep-with-next</title>
-    <formalpara>
-      <title>
-        Test title
-      </title>
-      <para>
-        Some para.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Test title</title>
-      <para>Some para.</para>
-    </formalpara>
-
-    <formalpara>
-      <title>Test title</title>
-      <para>Some para.</para>
-    </formalpara>
-
-    <formalpara>
-      <title>
-        Test Informalexample
-      </title>
-      <para><informalexample>
-          <para>Foo Bar</para>
-        </informalexample></para>
-    </formalpara>
-
-    <formalpara>
-      <title>
-        Test Informalexample
-      </title>
-      <para><informalexample>
-          <para>Foo Bar</para>
-        </informalexample></para>
-    </formalpara>
-
-    <formalpara>
-      <title>
-        Test Informalexample
-      </title>
-      <para><informalexample>
-          <para>Foo Bar</para>
-        </informalexample></para>
-    </formalpara>
-
-    <formalpara>
-      <title>
-        Test Informalexample
-      </title>
-      <para><informalexample>
-          <para>Foo Bar</para>
-        </informalexample></para>
-    </formalpara>
-
-    <formalpara>
-      <title>
-        Test Informalexample
-      </title>
-      <para><informalexample>
-          <para>Foo Bar</para>
-        </informalexample></para>
-    </formalpara>
-
-    <para>
-      Push the spacing, push the spacing, push the spacing, 
-      foo bar foo bar foo bar foo bar foo bar foo bar foo bar.
-    </para>
-
-    <formalpara>
-      <title>
-        Test Informalexample
-      </title>
-      <para><informalexample>
-          <para>
-            Foo bar foo bar foo bar foo bar foo bar foo bar foo bar
-            foo bar foo bar foo bar foo bar foo bar foo bar foo bar
-            foo bar foo bar foo bar foo bar foo bar foo bar foo bar
-            foo bar foo bar.
-          </para>
-        </informalexample></para>
-    </formalpara>
-
-    <formalpara>
-      <title>
-        Test Informalexample
-      </title>
-      <para><informalexample>
-          <para>Foo Bar</para>
-        </informalexample></para>
-    </formalpara>
-
-    <formalpara>
-      <title>
-        Test Informalexample
-      </title>
-      <para><informalexample>
-          <para>Foo Bar</para>
-        </informalexample></para>
-    </formalpara>
-  </section>
-</article>
diff --git a/test/testdocs/funcsynopsis.001.xml b/test/testdocs/funcsynopsis.001.xml
deleted file mode 100644
index e479c801..00000000
--- a/test/testdocs/funcsynopsis.001.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: funcsynopsis.001.xml</title>
-<releaseinfo role="CVS">$Id: funcsynopsis.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<section><title>"Default" rendering</title>
-
-<para>A funcsynopsis.</para>
-
-<funcsynopsis>
-<funcsynopsisinfo>
-#include &lt;varargs.h&gt;
-</funcsynopsisinfo>
-<funcprototype>
-  <funcdef><type>float</type> <function>rand</function></funcdef>
-  <void/>
-</funcprototype>
-
-<funcprototype>
-  <funcdef>int <function>max</function></funcdef>
-  <varargs/>
-</funcprototype>
-
-<funcprototype>
-  <funcdef>int <function>idiv</function></funcdef>
-    <paramdef><type>int</type> <parameter>n</parameter></paramdef>
-    <paramdef><type>int</type> <parameter>m</parameter></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-<para>Another.</para>
-
-<funcsynopsis>
-<funcprototype>
-  <funcdef>void <function>qsort</function></funcdef>
-    <paramdef>void *<parameter>dataptr</parameter>[]</paramdef>
-    <paramdef>int <parameter>left</parameter></paramdef>
-    <paramdef>int <parameter>right</parameter></paramdef>
-    <paramdef>int (*<parameter>comp</parameter>)
-      <funcparams>void *, void *</funcparams></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-<para>Another.</para>
-
-<funcsynopsis>
-<funcprototype>
-  <funcdef>int <function>foo_frob_something</function></funcdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm1</parameter></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm2</parameter></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm3</parameter></paramdef>
-    <paramdef><type>int</type> (* <parameter>parm4</parameter> )
-      <funcparams>int a, int b, int c</funcparams>
-    </paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm5</parameter></paramdef>
-</funcprototype>
-
-<funcprototype>
-  <funcdef>int <function>foo_frob_something</function></funcdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm1</parameter></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm2</parameter></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm3</parameter></paramdef>
-    <paramdef><type>int</type> (* <parameter>parm4</parameter> )
-      <funcparams>int a, int b, int c</funcparams>
-    </paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm5</parameter></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-</section>
-<section><title>ANSI Rendering</title>
-
-<para>Another.</para>
-
-<funcsynopsis><?dbhtml funcsynopsis-style="ansi"?>
-<funcsynopsisinfo>
-#include &lt;varargs.h&gt;
-</funcsynopsisinfo>
-<funcprototype>
-  <funcdef><type>float</type> <function>rand</function></funcdef>
-  <void/>
-</funcprototype>
-
-<funcprototype>
-  <funcdef>int <function>max</function></funcdef>
-  <varargs/>
-</funcprototype>
-
-<funcprototype>
-  <funcdef>int <function>idiv</function></funcdef>
-    <paramdef><type>int</type> <parameter>n</parameter></paramdef>
-    <paramdef><type>int</type> <parameter>m</parameter></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-<para>Another.</para>
-
-<funcsynopsis><?dbhtml funcsynopsis-style="ansi"?>
-<funcprototype>
-  <funcdef>void <function>qsort</function></funcdef>
-    <paramdef>void *<parameter>dataptr</parameter>[]</paramdef>
-    <paramdef>int <parameter>left</parameter></paramdef>
-    <paramdef>int <parameter>right</parameter></paramdef>
-    <paramdef><type>int</type> (*<parameter>comp</parameter>)
-      <funcparams>void *, void *</funcparams></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-<para>Another.</para>
-
-<funcsynopsis><?dbhtml funcsynopsis-style="ansi"?>
-<funcprototype>
-  <funcdef>int <function>foo_frob_something</function></funcdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm1</parameter></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm2</parameter></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm3</parameter></paramdef>
-    <paramdef>int (* <parameter>parm4</parameter> )
-      <funcparams>int a, int b, int c</funcparams></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm5</parameter></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-</section>
-<section><title>K&amp;R Rendering</title>
-
-<para>Another.</para>
-
-<funcsynopsis><?dbhtml funcsynopsis-style="kr"?>
-<funcsynopsisinfo>
-#include &lt;varargs.h&gt;
-</funcsynopsisinfo>
-<funcprototype>
-  <funcdef><type>float</type> <function>rand</function></funcdef>
-  <void/>
-</funcprototype>
-
-<funcprototype>
-  <funcdef>int <function>max</function></funcdef>
-  <varargs/>
-</funcprototype>
-
-<funcprototype>
-  <funcdef>int <function>idiv</function></funcdef>
-    <paramdef><type>int</type> <parameter>n</parameter></paramdef>
-    <paramdef><type>int</type> <parameter>m</parameter></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-<para>Another.</para>
-
-<funcsynopsis><?dbhtml funcsynopsis-style="kr"?>
-<funcprototype>
-  <funcdef>void <function>qsort</function></funcdef>
-    <paramdef>void *<parameter>dataptr</parameter>[]</paramdef>
-    <paramdef>int <parameter>left</parameter></paramdef>
-    <paramdef>int <parameter>right</parameter></paramdef>
-    <paramdef><type>int</type> (*<parameter>comp</parameter>)
-      <funcparams>void *, void *</funcparams></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-<para>Another.</para>
-
-<funcsynopsis><?dbhtml funcsynopsis-style="kr"?>
-<funcprototype>
-  <funcdef>int <function>foo_frob_something</function></funcdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm1</parameter></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm2</parameter></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm3</parameter></paramdef>
-    <paramdef>int (* <parameter>parm4</parameter> )
-      <funcparams>int a, int b, int c</funcparams></paramdef>
-    <paramdef>foo_sometype1 <parameter>foo_frob_parm5</parameter></paramdef>
-</funcprototype>
-</funcsynopsis>
-
-</section>
-
-</article>
diff --git a/test/testdocs/funcsynopsis.x001.xml b/test/testdocs/funcsynopsis.x001.xml
deleted file mode 100644
index b8ffbe31..00000000
--- a/test/testdocs/funcsynopsis.x001.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<article>
-<articleinfo>
-<title>Unit Test: funcsynopsis.x001.xml</title>
-<releaseinfo role="CVS">$Id$</releaseinfo>
-<author><firstname>Shaun</firstname><surname>McCance</surname>
-        <affiliation><address><email>shaunm@gnome.org</email></address></affiliation>
-</author>
-</articleinfo>
-
-<funcsynopsis>
-  <?db2html.funcsynopsis.style ANSI?>
-  <funcprototype>
-    <funcdef>void <function>crash</function></funcdef>
-    <void/>
-  </funcprototype>
-</funcsynopsis>
-
-<funcsynopsis>
-  <?db2html.funcsynopsis.style KR?>
-  <funcprototype>
-    <funcdef>void <function>crash</function></funcdef>
-    <void/>
-  </funcprototype>
-</funcsynopsis>
-
-<funcsynopsis>
-  <?db2html.funcsynopsis.style ANSI?>
-  <funcprototype>
-    <funcdef>int <function>frobnicate</function></funcdef>
-    <paramdef>int  *<parameter>intptr</parameter></paramdef>
-    <paramdef>void *<parameter>voidptr</parameter></paramdef>
-    <paramdef>int (*<parameter>intfunc</parameter>) <funcparams>void *, void *</funcparams></paramdef>
-    <varargs/>
-  </funcprototype>
-</funcsynopsis>
-
-<funcsynopsis>
-  <?db2html.funcsynopsis.style KR?>
-  <funcprototype>
-    <funcdef>int <function>frobnicate</function></funcdef>
-    <paramdef>int  *<parameter>intptr</parameter></paramdef>
-    <paramdef>void *<parameter>voidptr</parameter></paramdef>
-    <paramdef>int (*<parameter>intfunc</parameter>) <funcparams>void *, void *</funcparams></paramdef>
-    <varargs/>
-  </funcprototype>
-</funcsynopsis>
-
-</article>
diff --git a/test/testdocs/glossary.001.xml b/test/testdocs/glossary.001.xml
deleted file mode 100644
index 9bd204d1..00000000
--- a/test/testdocs/glossary.001.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: glossary.001</title>
-<releaseinfo role="CVS">$Id: glossary.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<editor><firstname>Eric</firstname><surname>Raymond</surname></editor>
-<subtitle>Jargon File 4.2.3 (abridged)</subtitle>
-<releaseinfo>Just some test data</releaseinfo>
-</bookinfo>
-
-<chapter>
-<title>A Chapter</title>
-
-<para>There's a <sgmltag>firstterm</sgmltag> here:
-<firstterm>1TBS</firstterm>.</para>
-
-<para>And there's a couple of <sgmltag>glossterm</sgmltag>s here:
-<glossterm>1TBS</glossterm>, <glossterm>@-party</glossterm>.</para>
-</chapter>
-
-<glossary>
-<?dbfo glossterm-width="1in"?>
-
-<glossdiv><title>0</title>
-
-<glossentry>
-<glossterm>0</glossterm>
-<glossdef>
-<para>Numeric zero, as opposed to the letter `O' (the 15th letter of
-the English alphabet). In their unmodified forms they look a lot
-alike, and various kluges invented to make them visually distinct have
-compounded the confusion. If your zero is center-dotted and letter-O
-is not, or if letter-O looks almost rectangular but zero looks more
-like an American football stood on end (or the reverse), you're
-probably looking at a modern character display (though the dotted zero
-seems to have originated as an option on IBM 3270 controllers). If
-your zero is slashed but letter-O is not, you're probably looking at
-an old-style ASCII graphic set descended from the default typewheel on
-the venerable ASR-33 Teletype (Scandinavians, for whom /O is a letter,
-curse this arrangement). (Interestingly, the slashed zero long
-predates computers; Florian Cajori's monumental "A History of
-Mathematical Notations" notes that it was used in the twelfth and
-thirteenth centuries.) If letter-O has a slash across it and the zero
-does not, your display is tuned for a very old convention used at IBM
-and a few other early mainframe makers (Scandinavians curse <emphasis>this</emphasis>
-arrangement even more, because it means two of their letters collide).
-Some Burroughs/Unisys equipment displays a zero with a <emphasis>reversed</emphasis>
-slash. Old CDC computers rendered letter O as an unbroken oval and 0
-as an oval broken at upper right and lower left. And yet another
-convention common on early line printers left zero unornamented but
-added a tail or hook to the letter-O so that it resembled an inverted
-Q or cursive capital letter-O (this was endorsed by a draft ANSI
-standard for how to draw ASCII characters, but the final standard
-changed the distinguisher to a tick-mark in the upper-left corner).
-Are we sufficiently confused yet?</para>
-</glossdef>
-</glossentry>
-
-<glossentry>
-<glossterm>1TBS</glossterm>
-<glossdef>
-<para role="pos">
-<phrase role="pronounce"></phrase>
-<phrase role="partsofspeach">n</phrase>
-</para>
-<para>The "One True Brace Style"</para>
-<glossseealso>indent style</glossseealso>
-</glossdef>
-</glossentry>
-
-<glossentry>
-<glossterm>120 reset</glossterm>
-<glossdef>
-<para role="pos">
-<phrase role="pronounce">wuhn-twen'tee ree'set</phrase>
-<phrase role="partofspeach">n</phrase>
-</para>
-<para>[from 120 volts, U.S. wall voltage] To cycle power on a machine
-in order to reset or unjam it. Compare <glossterm>Big Red Switch</glossterm>,
-<glossterm>power cycle</glossterm>.</para>
-</glossdef>
-</glossentry>
-
-<glossentry>
-<glossterm>2</glossterm>
-<glossdef>
-<para>infix. In translation software written by hackers, infix 2 often
-represents the syllable <emphasis>to</emphasis> with the connotation
-<quote>translate to</quote>: as in dvi2ps (DVI to PostScript), int2string (integer
-to string), and texi2roff (Texinfo to [nt]roff). Several versions of a
-joke have floated around the internet in which some idiot programmer
-fixes the Y2K bug by changing all the Y's in something to K's, as in
-Januark, Februark, etc.</para>
-</glossdef>
-</glossentry>
-
-<glossentry>
-<glossterm>@-party</glossterm>
-<glossdef>
-<para role="pos">
-<phrase role="pronounce">at'par`tee</phrase>
-<phrase role="partofspeach">n</phrase>
-</para>
-<para>[from the @-sign in an Internet
-address] (alt. `@-sign party' <phrase role="pronounce">at'si:n
-par`tee</phrase>) A semi-closed party thrown for hackers at a
-science-fiction convention (esp. the annual World Science Fiction
-Convention or "Worldcon"); one must have a {network address} to get
-in, or at least be in company with someone who does. One of the most
-reliable opportunities for hackers to meet face to face with people
-who might otherwise be represented by mere phosphor dots on their
-screens. Compare <glossterm>boink</glossterm>.
-</para>
-<para>The first recorded @-party was held at the Westercon (a U.S.
-western regional SF convention) over the July 4th weekend in 1980.
-It is not clear exactly when the canonical @-party venue shifted to the
-Worldcon but it had certainly become established by Constellation in 1983.
-Sadly, the @-party tradition has been in decline since about 1996, mainly
-because having an @-address no longer functions as an effective lodge pin.
-</para>
-</glossdef>
-</glossentry>
-</glossdiv>
-
-<glossdiv><title>A</title>
-
-<glossentry>
-<glossterm>abbrev</glossterm>
-<glossdef>
-<para role="pos">
-<phrase role="pronounce">*-breev'</phrase>
-<phrase role="pronounce">*-brev'</phrase>
-<phrase role="partofspeach">n</phrase>
-</para>
-<para>Common abbreviation for <quote>abbreviation</quote>.</para>
-</glossdef>
-</glossentry>
-
-<glossentry>
-<glossterm>ABEND</glossterm>
-<glossdef>
-<para role="pos">
-<phrase role="pronounce">a'bend</phrase>
-<phrase role="pronounce">*-bend'</phrase>
-<phrase role="partofspeach">n</phrase>
-</para>
-<para>[ABnormal END] 1. Abnormal
-termination (of software); {crash}; {lossage}.	Derives from an error
-message on the IBM 360; used jokingly by hackers but seriously mainly
-by {code grinder}s.  Usually capitalized, but may appear as `abend'.
-Hackers will try to persuade you that ABEND is called `abend' because
-it is what system operators do to the machine late on Friday when
-they want to call it a day, and hence is from the German `Abend' =
-`Evening'.  2. [alt.callahans] Absent By Enforced Net Deprivation -
-used in the subject lines of postings warning friends of an imminent
-loss of Internet access.  (This can be because of computer downtime,
-loss of provider, moving or illness.)  Variants of this also appear:
-ABVND = `Absent By Voluntary Net Deprivation' and ABSEND = `Absent By
-Self-Enforced Net Deprivation' have been sighted.</para>
-</glossdef>
-</glossentry>
-
-<glossentry>
-<glossterm>ACK</glossterm>
-<glossdef>
-<para role="pos">
-<phrase role="pronounce">ak</phrase>
-<phrase role="partofspeach">interj</phrase>
-</para>
-<para>1. [common; from the ASCII mnemonic for
-0000110] Acknowledge. Used to register one's presence (compare
-mainstream <emphasis>Yo!</emphasis>emphasis>). An appropriate response
-to {ping} or {ENQ}. 2. [from the comic strip "Bloom County"] An
-exclamation of surprised disgust, esp. in "Ack pffft!" Semi-humorous.
-Generally this sense is not spelled in caps (ACK) and is distinguished
-by a following exclamation point. 3. Used to politely interrupt
-someone to tell them you understand their point (see {NAK}). Thus, for
-example, you might cut off an overly long explanation with "Ack. Ack.
-Ack. I get it now". 4. An affirmative. "Think we ought to ditch that
-damn NT server for a Linux box?" "ACK!"
-</para>
-<para>There is also a usage "ACK?" (from sense 1) meaning "Are you
-there?", often used in email when earlier mail has produced no reply,
-or during a lull in {talk mode} to see if the person has gone away
-(the standard humorous response is of course {NAK} (sense 1), i.e.,
-"I'm not here").</para>
-</glossdef>
-</glossentry>
-</glossdiv>
-
-<glossdiv><title>B</title>
-
-<glossentry>
-<glossterm>B5</glossterm>
-<glossdef>
-<para role="pos">
-<phrase role="pronounce"></phrase>
-</para>
-<para>[common] Abbreviation for "Babylon 5", a science-fiction
-TV series as revered among hackers as was the original Star Trek.
-</para>
-</glossdef>
-</glossentry>
-
-<glossentry>
-<glossterm>back door</glossterm>
-<glossdef>
-<para role="pos">
-<phrase role="partofspeach">n</phrase>
-</para>
-<para>[common] A hole in the security of a system
-deliberately left in place by designers or maintainers.  The motivation
-for such holes is not always sinister; some operating systems, for
-example, come out of the box with privileged accounts intended for use
-by field service technicians or the vendor's maintenance programmers.
-Syn. {trap door}; may also be called a `wormhole'.  See also {iron box},
-{cracker}, {worm}, {logic bomb}.
-</para>
-<para>Historically, back doors have often lurked in systems longer than
-anyone expected or planned, and a few have become widely known.  Ken
-Thompson's 1983 Turing Award lecture to the ACM admitted the existence
-of a back door in early Unix versions that may have qualified as the
-most fiendishly clever security hack of all time.  In this scheme, the
-C compiler contained code that would recognize when the `login' command
-was being recompiled and insert some code recognizing a password chosen
-by Thompson, giving him entry to the system whether or not an account
-had been created for him.
-</para>
-<para>Normally such a back door could be removed by removing it from the
-source code for the compiler and recompiling the compiler.  But to
-recompile the compiler, you have to <emphasis>use</emphasis> the compiler -- so Thompson
-also arranged that the compiler would <emphasis>recognize when it was compiling a
-version of itself</emphasis>, and insert into the recompiled compiler the code to
-insert into the recompiled `login' the code to allow Thompson entry --
-and, of course, the code to recognize itself and do the whole thing again
-the next time around!  And having done this once, he was then able to
-recompile the compiler from the original sources; the hack perpetuated
-itself invisibly, leaving the back door in place and active but with no
-trace in the sources.
-</para>
-<para>The talk that suggested this truly moby hack was published as
-"Reflections on Trusting Trust", "Communications of the ACM 27", 8 (August
-1984), pp. 761-763 (text available at `http://www.acm.org/classics').
-Ken Thompson has since confirmed that this hack was implemented and that
-the Trojan Horse code did appear in the login binary of a Unix Support
-group machine.	Ken says the crocked compiler was never distributed.
-Your editor has heard two separate reports that suggest that the crocked
-login did make it out of Bell Labs, notably to BBN, and that it enabled
-at least one late-night login across the network by someone using the
-login name `kt'.
-</para>
-</glossdef>
-</glossentry>
-
-<glossentry>
-<glossterm>backbone cabal</glossterm>
-<glossdef>
-<para role="pos">
-<phrase role="partofspeach">n</phrase>
-</para>
-<para>A group of large-site administrators who
-pushed through the {Great Renaming} and reined in the chaos of {Usenet}
-during most of the 1980s.  During most of its lifetime, the Cabal (as
-it was sometimes capitalized) steadfastly denied its own existence;
-it was almost obligatory for anyone privy to their secrets to respond
-"There is no Cabal" whenever the existence or activities of the group
-were speculated on in public.
-</para>
-<para>The result of this policy was an attractive aura of mystery.  Even
-a decade after the cabal {mailing list} disbanded in late 1988 following
-a bitter internal catfight, many people believed (or claimed to believe)
-that it had not actually disbanded but only gone deeper underground with
-its power intact.</para>
-
-<para>This belief became a model for various paranoid theories about
-various Cabals with dark nefarious objectives beginning with taking over
-the Usenet or Internet.  These paranoias were later satirized in ways
-that took on a life of their own.  See {Eric Conspiracy} for one example.</para>
-
-<para>See {NANA} for the subsequent history of "the Cabal".</para>
-</glossdef>
-</glossentry>
-</glossdiv>
-</glossary>
-</book>
diff --git a/test/testdocs/glossary.002.data.xml b/test/testdocs/glossary.002.data.xml
deleted file mode 100644
index f5766477..00000000
--- a/test/testdocs/glossary.002.data.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<glossary>
-
-<glossdiv><title>Terms-1</title>
-
-<glossentry>
-<glossterm>gloss-1</glossterm>
-<acronym>G1</acronym>
-<glossdef><para>A description.</para>
-<glossseealso>gloss-2</glossseealso>
-</glossdef>
-</glossentry>
-
-</glossdiv>
-
-<glossdiv><title>Terms-2</title>
-
-<glossentry>
-<glossterm>gloss-2</glossterm>
-<glossdef><para>A description.</para>
-</glossdef>
-</glossentry>
-
-</glossdiv>
-
-</glossary>
diff --git a/test/testdocs/glossary.002.xml b/test/testdocs/glossary.002.xml
deleted file mode 100644
index 06c7e537..00000000
--- a/test/testdocs/glossary.002.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>Unit Test: glossary.002</title>
-<releaseinfo role="CVS">$Id: glossary.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-</articleinfo>
-
-<para>This test tests the <parameter>glossary.collection</parameter> machinery.</para>
-
-<para>Referencing <firstterm>gloss-1</firstterm>.</para>
-
-<glossary role="auto">
-<remark>make sure <glossterm>gloss-2</glossterm> is referenced</remark>
-<glossdiv><title>foo</title>
-<glossentry><glossterm>irrelevant</glossterm>
-<glossdef><para/></glossdef>
-</glossentry>
-</glossdiv>
-</glossary>
-
-</article>
diff --git a/test/testdocs/glossary.003.xml b/test/testdocs/glossary.003.xml
deleted file mode 100644
index c7e28833..00000000
--- a/test/testdocs/glossary.003.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>Unit Test: glossary.003</title>
-<releaseinfo role="CVS">$Id: glossary.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-</articleinfo>
-
-<para>This is a test. Xref to fifo: <xref linkend="fifo"/>.</para>
-
-<glossary>
-<glossentry><glossterm>test1</glossterm>
-<glossdef><para>First definition</para></glossdef>
-</glossentry>
-
-<glossentry><glossterm>test2</glossterm>
-<glossdef><para>First definition</para></glossdef>
-<glossdef><para>Second definition</para></glossdef>
-</glossentry>
-
-<glossentry><glossterm>first thing</glossterm>
-<acronym>FT</acronym>
-<abbrev>fthing</abbrev>
-<glossdef><para>Alphabetically first entry</para></glossdef>
-</glossentry>
-
-<glossentry id="fifo"><glossterm>First-in First-out</glossterm>
-<acronym>FIFO</acronym>
-<glossdef><para>Alphabetically second entry</para></glossdef>
-</glossentry>
-
-</glossary>
-
-</article>
diff --git a/test/testdocs/imagelib.001.xml b/test/testdocs/imagelib.001.xml
deleted file mode 100644
index aac6a534..00000000
--- a/test/testdocs/imagelib.001.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: imagelib.001.xml</title>
-<releaseinfo role="CVS">$Id: imagelib.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This is an image library test.</para>
-
-<!--
-<graphic fileref="graphics/duck-small.gif"/>
--->
-
-  <mediaobject>
-    <imageobject>
-      <imagedata
-        align="right"
-        width="50%"
-        fileref="graphics/duck-small.gif"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <imageobject>
-      <imagedata
-        align="right"
-        width="50%"
-        fileref="graphics/duck-small.png"
-        format="PNG"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-    <textobject>
-<para>The bird on the cover of <citetitle>DocBook: The Definitive
-Guide</citetitle> is a wood duck.  Often considered one of the most
-beautiful ducks in North America, the mail wood duck has a metallic
-purple and green head with white streaks extending from its bill
-around the eyes and down to its blue and green, gold-flecked
-wings. It has a white neck, chestnut-colored chest, a white or red
-bill, and yellow-orange legs and feet. Females have more brown, gray,
-and subdueed hues.
-</para>
-
-<para>Edie Freedman designed the cover of this book, using a
-19th-century engraving from the Dover Pictorial Archive. The
-cover layout was produced by Kathleen Wilson using QuarkXPress
-3.32 and Adobe's ITC Garamond font. The inside layout was
-designed by Alicia Cech, based on a series design by Nancy
-Priest. The text was formatted from SGML into FrameMaker 5.5
-with Jade, using a DSSSL conversion stylesheet written by
-Chris Maden. The interior fonts are ITC Garamond Light,
-Garamond Book, and ConstantWillison.
-</para>
-    </textobject>
-    <caption><para>The Duck</para></caption>
-  </mediaobject>
-
-</article>
diff --git a/test/testdocs/imageobjectco.001.xml b/test/testdocs/imageobjectco.001.xml
deleted file mode 100644
index fcdf2b4c..00000000
--- a/test/testdocs/imageobjectco.001.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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>Unit Test: imageobjectco.001</title>
-<releaseinfo role="CVS">$Id: imageobjectco.001.xml 4637 2005-04-21 16:24:26Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>A whole duck</para>
-
-  <mediaobject>
-    <imageobjectco>
-      <areaspec>
-	<area id="wholeduck" coords="0,0 10000,10000" units="calspair"
-	      linkends="p1"/>
-      </areaspec>
-      <imageobject>
-	<imagedata
-	    align="left"
-	    fileref="graphics/duck-small.png"
-	    format="PNG"
-	    srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-      </imageobject>
-    </imageobjectco>
-  </mediaobject>
-
-<para>A duck with callouts</para>
-
-  <mediaobject>
-    <imageobjectco>
-      <areaspec>
-	<area id="p1" coords="240,9049 497,8786" units="calspair" linkends="c1"/>
-	<area id="p2" coords="2905,1360 3162,1098" linkends="c2"/>
-	<area id="p3" coords="8796,1491 9052,1229" units="calspair" linkends="c3"/>
-      </areaspec>
-      <imageobject>
-	<imagedata
-	    align="left"
-	    fileref="graphics/duck-co.png"
-	    format="PNG"
-	    srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-      </imageobject>
-    </imageobjectco>
-  </mediaobject>
-
-  <calloutlist>
-    <callout arearefs="p1" id="c1"><para>The bill.</para></callout>
-    <callout arearefs="p2" id="c2"><para>The feet.</para></callout>
-    <callout arearefs="p3" id="c3"><para>The tail.</para></callout>
-  </calloutlist>
-
-</article>
diff --git a/test/testdocs/index.001.xml b/test/testdocs/index.001.xml
deleted file mode 100644
index 906d512b..00000000
--- a/test/testdocs/index.001.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE set PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<set>
-<setinfo>
-<title>Unit Test: index.001</title>
-<releaseinfo role="CVS">$Id: index.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</setinfo>
-
-<book><title>First Book</title>
-<chapter><title>Chapter</title>
-<para>Some test data
-<indexterm>
-<primary>First Book</primary>
-</indexterm></para>
-</chapter>
-<index/>
-</book>
-
-<book><title>Second Book</title>
-<chapter><title>Chapter</title>
-<para>Some test data
-<indexterm>
-<primary>Second Book</primary>
-</indexterm></para>
-</chapter>
-<index/>
-</book>
-
-<book><title>Third Book</title>
-<part><title>Part Title</title>
-<chapter><title>Chapter</title>
-<para>Some test data
-<indexterm>
-<primary>Third Book</primary>
-</indexterm></para>
-</chapter>
-<index/>
-</part>
-</book>
-
-<setindex/>
-
-</set>
diff --git a/test/testdocs/index.002.xml b/test/testdocs/index.002.xml
deleted file mode 100644
index 37eeab4e..00000000
--- a/test/testdocs/index.002.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-  <bookinfo>
-    <title>Unit Test: index.002</title>
-    <subtitle>Index in Part within Book</subtitle>
-    <releaseinfo role="CVS">$Id: index.002.xml 6298 2006-09-14 01:34:57Z xmldoc $</releaseinfo>
-    <author><firstname>Michael</firstname><surname>Smith</surname>
-    <affiliation><address><email>smith@sideshowbarker.net</email></address></affiliation>
-    </author>
-  </bookinfo>
-
-  <part><title>First Part</title>
-  <chapter><title>Chapter</title>
-  <para>Some test data
-  <indexterm>
-    <primary>First Part</primary>
-  </indexterm></para>
-  </chapter>
-  <index/>
-  </part>
-
-  <part><title>Second Part</title>
-  <chapter><title>Chapter</title>
-  <para>Some test data
-  <indexterm>
-    <primary>Second Part</primary>
-  </indexterm></para>
-  </chapter>
-  <index/>
-  </part>
-
-  <part><title>Third Part</title>
-  <chapter><title>Chapter</title>
-  <para>Some test data
-  <indexterm>
-    <primary>Third Part</primary>
-  </indexterm></para>
-  </chapter>
-  <index/>
-  </part>
-
-  <index/>
-
-</book>
diff --git a/test/testdocs/index.003.xml b/test/testdocs/index.003.xml
deleted file mode 100644
index c9bd87f3..00000000
--- a/test/testdocs/index.003.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: index.003</title>
-<releaseinfo role="CVS">$Id: index.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<index>
-<title>Index</title>
-
-<indexdiv>
-<title>Index Div</title>
-
-<indexentry>
-<primaryie>foo</primaryie>
-</indexentry>
-</indexdiv>
-</index>
-</book>
diff --git a/test/testdocs/index.x001.xml b/test/testdocs/index.x001.xml
deleted file mode 100644
index ae132e23..00000000
--- a/test/testdocs/index.x001.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE index PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<index id="index">
-<indexinfo>
-<title>Unit Test: index.x001.xml</title>
-<authorgroup>
-<author><firstname>Shaun</firstname><surname>McCance</surname>
-<affiliation><address><email>shaunm@gnome.org</email></address></affiliation>
-</author>
-</authorgroup>
-</indexinfo>
-
-<indexentry>
-<primaryie>code</primaryie>
-<secondaryie>block</secondaryie>
-<secondaryie>inline</secondaryie>
-</indexentry>
-
-<indexentry>
-<primaryie>comment</primaryie>
-</indexentry>
-
-<indexentry>
-<primaryie>example</primaryie>
-</indexentry>
-
-<indexentry id="figure">
-<primaryie>figure</primaryie>
-<seeie linkend="listing">listing</seeie>
-<seeie linkend="listing">media</seeie>
-</indexentry>
-
-<indexentry id="listing">
-<primaryie>listing</primaryie>
-<seealsoie linkend="figure">figure</seealsoie>
-</indexentry>
-
-<indexentry>
-<primaryie>media</primaryie>
-<secondaryie>block</secondaryie>
-<secondaryie>inline</secondaryie>
-</indexentry>
-
-<indexentry>
-<primaryie>note</primaryie>
-</indexentry>
-
-<indexentry>
-<primaryie>p</primaryie>
-</indexentry>
-
-<indexentry>
-<primaryie>quote</primaryie>
-</indexentry>
-
-<indexentry>
-<primaryie>screen</primaryie>
-</indexentry>
-
-<indexentry>
-<primaryie>synopsis</primaryie>
-</indexentry>
-
-</index>
diff --git a/test/testdocs/indexterm.001.xml b/test/testdocs/indexterm.001.xml
deleted file mode 100644
index cbf7016c..00000000
--- a/test/testdocs/indexterm.001.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: indexterm.001</title>
-<releaseinfo role="CVS">$Id: indexterm.001.xml 5357 2005-10-26 04:16:20Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<chapter><title>First Chapter</title>
-
-<indexterm zone="app"><primary>Appendix</primary></indexterm>
-
-<para>This is a test paragraph.
-<indexterm id="foo">
-<primary>@foo</primary>
-</indexterm>
-<indexterm>
-<primary>&gt; operator</primary>
-</indexterm>
-<indexterm>
-<primary>&lt; operator</primary>
-</indexterm>
-<indexterm id="ap1.a">
-<primary>ap1</primary>
-</indexterm>
-
-<indexterm id="ap1.b">
-<primary>ap1</primary>
-</indexterm>
-<indexterm id="ap1.d">
-<primary>ap1</primary>
-</indexterm>
-<indexterm>
-<primary>ap2</primary>
-</indexterm>
-
-<indexterm>
-<primary>bp1</primary>
-<secondary>bp1bs1</secondary>
-</indexterm>
-<indexterm>
-<primary>bp2</primary>
-</indexterm>
-
-<indexterm>
-<primary>cp1</primary>
-<secondary>cp1cs1</secondary>
-<tertiary>cp1cs1ct1</tertiary>
-</indexterm>
-
-<indexterm>
-<primary>cp2</primary>
-</indexterm>
-<indexterm>
-<primary>cp2see</primary><see>cp2</see>
-</indexterm>
-
-<indexterm>
-<primary>dp1</primary>
-<secondary>dp1ds1</secondary>
-</indexterm>
-<indexterm>
-<primary>dp1</primary>
-<secondary>dp1ds2</secondary>
-</indexterm>
-<indexterm>
-<primary>dp2</primary>
-<seealso>dp1, dp1ds1</seealso>
-</indexterm></para>
-
-
-<section>
-  <title>Foo section</title>
-<para>Another test paragraph with type=”foo” indexterms
-
-<indexterm id="ffoo" type="foo">
-<primary>@ffoo</primary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>&gt; hoge</primary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>&lt; hoge</primary>
-</indexterm>
-
-<indexterm id="fap1.a" type="foo">
-<primary>fap1</primary>
-</indexterm>
-
-<indexterm id="fap1.b" type="foo">
-<primary>fap1</primary>
-</indexterm>
-
-<indexterm id="fap1.d" type="foo">
-<primary>fap1</primary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>fap2</primary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>fbp1</primary>
-<secondary>fbp1bs1</secondary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>fbp2</primary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>fcp1</primary>
-<secondary>fcp1cs1</secondary>
-<tertiary>fcp1cs1ct1</tertiary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>fcp2</primary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>fcp2see</primary><see>fcp2</see>
-</indexterm>
-
-<indexterm type="foo">
-<primary>fdp1</primary>
-<secondary>fdp1ds1</secondary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>fdp1</primary>
-<secondary>fdp1ds2</secondary>
-</indexterm>
-
-<indexterm type="foo">
-<primary>fdp2</primary>
-<seealso>fdp1, fdp1ds1</seealso>
-</indexterm></para>
-</section>
-
-<section>
-  <title>Bar section</title>
-<para>Another test paragraph with type=”bar” indexterms
-
-<indexterm id="bar" type="bar">
-<primary>@bar</primary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>&gt; moge</primary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>&lt; moge</primary>
-</indexterm>
-
-<indexterm id="bap1.a" type="bar">
-<primary>bap1</primary>
-</indexterm>
-
-<indexterm id="bap1.b" type="bar">
-<primary>bap1</primary>
-</indexterm>
-
-<indexterm id="bap1.d" type="bar">
-<primary>bap1</primary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>bap2</primary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>bbp1</primary>
-<secondary>bbp1bs1</secondary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>bbp2</primary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>bcp1</primary>
-<secondary>bcp1cs1</secondary>
-<tertiary>bcp1cs1ct1</tertiary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>bcp2</primary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>bcp2see</primary><see>bcp2</see>
-</indexterm>
-
-<indexterm type="bar">
-<primary>bdp1</primary>
-<secondary>bdp1ds1</secondary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>bdp1</primary>
-<secondary>bdp1ds2</secondary>
-</indexterm>
-
-<indexterm type="bar">
-<primary>bdp2</primary>
-<seealso>bdp1, bdp1ds1</seealso>
-</indexterm></para>
-</section>
-</chapter>
-
-<appendix id="app"><title>First Appendix</title>
-
-<para>This is just a test.
-<indexterm id="ap1.e">
-<primary>ap1</primary>
-</indexterm>
-<indexterm>
-<primary>ap2</primary>
-</indexterm>
-
-<indexterm>
-<primary>bp1</primary>
-<secondary>bp1bs1</secondary>
-</indexterm>
-<indexterm>
-<primary>bp2</primary>
-</indexterm>
-
-<indexterm>
-<primary>cp1</primary>
-<secondary>cp1cs1</secondary>
-<tertiary>cp1cs1ct1</tertiary>
-</indexterm>
-<indexterm>
-<primary>cp2</primary>
-</indexterm>
-
-<indexterm>
-<primary>dp1</primary>
-<secondary>dp1ds1</secondary>
-</indexterm>
-<indexterm>
-<primary>dp1</primary>
-<secondary>dp1ds2</secondary>
-</indexterm>
-<indexterm>
-<primary>dp2</primary>
-</indexterm></para>
-</appendix>
-
-<appendix><title>Another Appendix</title>
-
-<para>More testing.</para>
-
-<indexterm>
-<primary id="ap1.c">ap1</primary>
-</indexterm>
-<indexterm>
-<primary>ap1</primary>
-</indexterm>
-<indexterm>
-<primary>ap2</primary>
-</indexterm>
-
-</appendix>
-
-<index id="idx"/>
-<index id="foo-idx" type="foo">
-  <title>Foo Index</title>
-</index>
-<index id="bar-idx" type="bar">
-  <title>Bar Index</title>
-</index>
-
-
-</book>
diff --git a/test/testdocs/indexterm.002.xml b/test/testdocs/indexterm.002.xml
deleted file mode 100644
index 0017b205..00000000
--- a/test/testdocs/indexterm.002.xml
+++ /dev/null
@@ -1,705 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: indexterm.001</title>
-<releaseinfo role="CVS">$Id: indexterm.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<chapter><title>First Chapter</title>
-
-<para>This is a test paragraph.
-<indexterm>
-<primary>ap1</primary>
-</indexterm>
-<indexterm>
-<primary>ap2</primary>
-</indexterm>
-<indexterm id="spanstart" class="startofrange">
-<primary>spanning</primary>
-</indexterm>
-
-<indexterm>
-<primary>bp1</primary>
-<secondary>bp1bs1</secondary>
-</indexterm>
-<indexterm>
-<primary>bp2</primary>
-</indexterm>
-
-<indexterm>
-<primary>cp1</primary>
-<secondary>cp1cs1</secondary>
-<tertiary>cp1cs1ct1</tertiary>
-</indexterm>
-
-<indexterm>
-<primary>cp2</primary>
-</indexterm>
-<indexterm>
-<primary>cp2see</primary><see>cp2</see>
-</indexterm>
-
-<indexterm>
-<primary>dp1</primary>
-<secondary>dp1ds1</secondary>
-</indexterm>
-<indexterm>
-<primary>dp1</primary>
-<secondary>dp1ds2</secondary>
-</indexterm>
-<indexterm>
-<primary>dp2</primary>
-</indexterm></para>
-
-</chapter>
-
-<appendix><title>First Appendix</title>
-
-<para>This is just a test.
-<indexterm>
-<primary>ap1</primary>
-</indexterm>
-<indexterm>
-<primary>ap2</primary>
-</indexterm>
-
-<indexterm>
-<primary>bp1</primary>
-<secondary>bp1bs1</secondary>
-</indexterm>
-<indexterm>
-<primary>bp2</primary>
-</indexterm>
-
-<indexterm>
-<primary>cp1</primary>
-<secondary>cp1cs1</secondary>
-<tertiary>cp1cs1ct1</tertiary>
-</indexterm>
-<indexterm>
-<primary>cp2</primary>
-</indexterm>
-
-<indexterm>
-<primary>dp1</primary>
-<secondary>dp1ds1</secondary>
-</indexterm>
-<indexterm>
-<primary>dp1</primary>
-<secondary>dp1ds2</secondary>
-</indexterm>
-<indexterm>
-<primary>dp2</primary>
-</indexterm></para>
-
-<para>This para contains a <emphasis>whole lotta</emphasis> index terms.
-<indexterm>
-  <primary>a</primary>
-</indexterm>
-<indexterm>
-  <primary>b</primary>
-</indexterm>
-<indexterm>
-  <primary>c</primary>
-</indexterm>
-<indexterm>
-  <primary>d</primary>
-</indexterm>
-<indexterm>
-  <primary>e</primary>
-</indexterm>
-<indexterm>
-  <primary>f</primary>
-</indexterm>
-<indexterm>
-  <primary>g</primary>
-</indexterm>
-<indexterm>
-  <primary>h</primary>
-</indexterm>
-<indexterm>
-  <primary>i</primary>
-</indexterm>
-<indexterm>
-  <primary>j</primary>
-</indexterm>
-<indexterm>
-  <primary>k</primary>
-</indexterm>
-<indexterm>
-  <primary>l</primary>
-</indexterm>
-<indexterm>
-  <primary>m</primary>
-</indexterm>
-<indexterm>
-  <primary>n</primary>
-</indexterm>
-<indexterm>
-  <primary>o</primary>
-</indexterm>
-<indexterm>
-  <primary>p</primary>
-</indexterm>
-<indexterm>
-  <primary>q</primary>
-</indexterm>
-<indexterm>
-  <primary>r</primary>
-</indexterm>
-<indexterm>
-  <primary>s</primary>
-</indexterm>
-<indexterm>
-  <primary>t</primary>
-</indexterm>
-<indexterm>
-  <primary>u</primary>
-</indexterm>
-<indexterm>
-  <primary>v</primary>
-</indexterm>
-<indexterm>
-  <primary>w</primary>
-</indexterm>
-<indexterm>
-  <primary>x</primary>
-</indexterm>
-<indexterm>
-  <primary>y</primary>
-</indexterm>
-<indexterm>
-  <primary>z</primary>
-</indexterm>
-<indexterm>
-  <primary>aa</primary>
-</indexterm>
-<indexterm>
-  <primary>ab</primary>
-</indexterm>
-<indexterm>
-  <primary>ac</primary>
-</indexterm>
-<indexterm>
-  <primary>ad</primary>
-</indexterm>
-<indexterm>
-  <primary>ae</primary>
-</indexterm>
-<indexterm>
-  <primary>af</primary>
-</indexterm>
-<indexterm>
-  <primary>ag</primary>
-</indexterm>
-<indexterm>
-  <primary>ah</primary>
-</indexterm>
-<indexterm>
-  <primary>ai</primary>
-</indexterm>
-<indexterm>
-  <primary>aj</primary>
-</indexterm>
-<indexterm>
-  <primary>ak</primary>
-</indexterm>
-<indexterm>
-  <primary>al</primary>
-</indexterm>
-<indexterm>
-  <primary>am</primary>
-</indexterm>
-<indexterm>
-  <primary>an</primary>
-</indexterm>
-<indexterm>
-  <primary>ao</primary>
-</indexterm>
-<indexterm>
-  <primary>ap</primary>
-</indexterm>
-<indexterm>
-  <primary>aq</primary>
-</indexterm>
-<indexterm>
-  <primary>ar</primary>
-</indexterm>
-<indexterm>
-  <primary>as</primary>
-</indexterm>
-<indexterm>
-  <primary>at</primary>
-</indexterm>
-<indexterm>
-  <primary>au</primary>
-</indexterm>
-<indexterm>
-  <primary>av</primary>
-</indexterm>
-<indexterm>
-  <primary>aw</primary>
-</indexterm>
-<indexterm>
-  <primary>ax</primary>
-</indexterm>
-<indexterm>
-  <primary>ay</primary>
-</indexterm>
-<indexterm>
-  <primary>az</primary>
-</indexterm>
-<indexterm>
-  <primary>ba</primary>
-</indexterm>
-<indexterm>
-  <primary>bb</primary>
-</indexterm>
-<indexterm>
-  <primary>bc</primary>
-</indexterm>
-<indexterm>
-  <primary>bd</primary>
-</indexterm>
-<indexterm>
-  <primary>be</primary>
-</indexterm>
-<indexterm>
-  <primary>bf</primary>
-</indexterm>
-<indexterm>
-  <primary>bg</primary>
-</indexterm>
-<indexterm>
-  <primary>bh</primary>
-</indexterm>
-<indexterm>
-  <primary>bi</primary>
-</indexterm>
-<indexterm>
-  <primary>bj</primary>
-</indexterm>
-<indexterm>
-  <primary>bk</primary>
-</indexterm>
-<indexterm>
-  <primary>bl</primary>
-</indexterm>
-<indexterm>
-  <primary>bm</primary>
-</indexterm>
-<indexterm>
-  <primary>bn</primary>
-</indexterm>
-<indexterm>
-  <primary>bo</primary>
-</indexterm>
-<indexterm>
-  <primary>bp</primary>
-</indexterm>
-<indexterm>
-  <primary>bq</primary>
-</indexterm>
-<indexterm>
-  <primary>br</primary>
-</indexterm>
-<indexterm>
-  <primary>bs</primary>
-</indexterm>
-<indexterm>
-  <primary>bt</primary>
-</indexterm>
-<indexterm>
-  <primary>bu</primary>
-</indexterm>
-<indexterm>
-  <primary>bv</primary>
-</indexterm>
-<indexterm>
-  <primary>bw</primary>
-</indexterm>
-<indexterm>
-  <primary>bx</primary>
-</indexterm>
-<indexterm>
-  <primary>by</primary>
-</indexterm>
-<indexterm>
-  <primary>bz</primary>
-</indexterm>
-<indexterm>
-  <primary>ca</primary>
-</indexterm>
-<indexterm>
-  <primary>cb</primary>
-</indexterm>
-<indexterm>
-  <primary>cc</primary>
-</indexterm>
-<indexterm>
-  <primary>cd</primary>
-</indexterm>
-<indexterm>
-  <primary>ce</primary>
-</indexterm>
-<indexterm>
-  <primary>cf</primary>
-</indexterm>
-<indexterm>
-  <primary>cg</primary>
-</indexterm>
-<indexterm>
-  <primary>ch</primary>
-</indexterm>
-<indexterm>
-  <primary>ci</primary>
-</indexterm>
-<indexterm>
-  <primary>cj</primary>
-</indexterm>
-<indexterm>
-  <primary>ck</primary>
-</indexterm>
-<indexterm>
-  <primary>cl</primary>
-</indexterm>
-<indexterm>
-  <primary>cm</primary>
-</indexterm>
-<indexterm>
-  <primary>cn</primary>
-</indexterm>
-<indexterm>
-  <primary>co</primary>
-</indexterm>
-<indexterm>
-  <primary>cp</primary>
-</indexterm>
-<indexterm>
-  <primary>cq</primary>
-</indexterm>
-<indexterm>
-  <primary>cr</primary>
-</indexterm>
-<indexterm>
-  <primary>cs</primary>
-</indexterm>
-<indexterm>
-  <primary>ct</primary>
-</indexterm>
-<indexterm>
-  <primary>cu</primary>
-</indexterm>
-<indexterm>
-  <primary>cv</primary>
-</indexterm>
-<indexterm>
-  <primary>cw</primary>
-</indexterm>
-<indexterm>
-  <primary>cx</primary>
-</indexterm>
-<indexterm>
-  <primary>cy</primary>
-</indexterm>
-<indexterm>
-  <primary>cz</primary>
-</indexterm>
-<indexterm>
-  <primary>da</primary>
-</indexterm>
-<indexterm>
-  <primary>db</primary>
-</indexterm>
-<indexterm>
-  <primary>dc</primary>
-</indexterm>
-<indexterm>
-  <primary>dd</primary>
-</indexterm>
-<indexterm>
-  <primary>de</primary>
-</indexterm>
-<indexterm>
-  <primary>df</primary>
-</indexterm>
-<indexterm>
-  <primary>dg</primary>
-</indexterm>
-<indexterm>
-  <primary>dh</primary>
-</indexterm>
-<indexterm>
-  <primary>di</primary>
-</indexterm>
-<indexterm>
-  <primary>dj</primary>
-</indexterm>
-<indexterm>
-  <primary>dk</primary>
-</indexterm>
-<indexterm>
-  <primary>dl</primary>
-</indexterm>
-<indexterm>
-  <primary>dm</primary>
-</indexterm>
-<indexterm>
-  <primary>dn</primary>
-</indexterm>
-<indexterm>
-  <primary>do</primary>
-</indexterm>
-<indexterm>
-  <primary>dp</primary>
-</indexterm>
-<indexterm>
-  <primary>dq</primary>
-</indexterm>
-<indexterm>
-  <primary>dr</primary>
-</indexterm>
-<indexterm>
-  <primary>ds</primary>
-</indexterm>
-<indexterm>
-  <primary>dt</primary>
-</indexterm>
-<indexterm>
-  <primary>du</primary>
-</indexterm>
-<indexterm>
-  <primary>dv</primary>
-</indexterm>
-<indexterm>
-  <primary>dw</primary>
-</indexterm>
-<indexterm>
-  <primary>dx</primary>
-</indexterm>
-<indexterm>
-  <primary>dy</primary>
-</indexterm>
-<indexterm>
-  <primary>dz</primary>
-</indexterm>
-<indexterm>
-  <primary>ea</primary>
-</indexterm>
-<indexterm>
-  <primary>eb</primary>
-</indexterm>
-<indexterm>
-  <primary>ec</primary>
-</indexterm>
-<indexterm>
-  <primary>ed</primary>
-</indexterm>
-<indexterm>
-  <primary>ee</primary>
-</indexterm>
-<indexterm>
-  <primary>ef</primary>
-</indexterm>
-<indexterm>
-  <primary>eg</primary>
-</indexterm>
-<indexterm>
-  <primary>eh</primary>
-</indexterm>
-<indexterm>
-  <primary>ei</primary>
-</indexterm>
-<indexterm>
-  <primary>ej</primary>
-</indexterm>
-<indexterm>
-  <primary>ek</primary>
-</indexterm>
-<indexterm>
-  <primary>el</primary>
-</indexterm>
-<indexterm>
-  <primary>em</primary>
-</indexterm>
-<indexterm>
-  <primary>en</primary>
-</indexterm>
-<indexterm>
-  <primary>eo</primary>
-</indexterm>
-<indexterm>
-  <primary>ep</primary>
-</indexterm>
-<indexterm>
-  <primary>eq</primary>
-</indexterm>
-<indexterm>
-  <primary>er</primary>
-</indexterm>
-<indexterm>
-  <primary>es</primary>
-</indexterm>
-<indexterm>
-  <primary>et</primary>
-</indexterm>
-<indexterm>
-  <primary>eu</primary>
-</indexterm>
-<indexterm>
-  <primary>ev</primary>
-</indexterm>
-<indexterm>
-  <primary>ew</primary>
-</indexterm>
-<indexterm>
-  <primary>ex</primary>
-</indexterm>
-<indexterm>
-  <primary>ey</primary>
-</indexterm>
-<indexterm>
-  <primary>ez</primary>
-</indexterm>
-<indexterm>
-  <primary>fa</primary>
-</indexterm>
-<indexterm>
-  <primary>fb</primary>
-</indexterm>
-<indexterm>
-  <primary>fc</primary>
-</indexterm>
-<indexterm>
-  <primary>fd</primary>
-</indexterm>
-<indexterm>
-  <primary>fe</primary>
-</indexterm>
-<indexterm>
-  <primary>ff</primary>
-</indexterm>
-<indexterm>
-  <primary>fg</primary>
-</indexterm>
-<indexterm>
-  <primary>fh</primary>
-</indexterm>
-<indexterm>
-  <primary>fi</primary>
-</indexterm>
-<indexterm>
-  <primary>fj</primary>
-</indexterm>
-<indexterm>
-  <primary>fk</primary>
-</indexterm>
-<indexterm>
-  <primary>fl</primary>
-</indexterm>
-<indexterm>
-  <primary>fm</primary>
-</indexterm>
-<indexterm>
-  <primary>fn</primary>
-</indexterm>
-<indexterm>
-  <primary>fo</primary>
-</indexterm>
-<indexterm>
-  <primary>fp</primary>
-</indexterm>
-<indexterm>
-  <primary>fq</primary>
-</indexterm>
-<indexterm>
-  <primary>fr</primary>
-</indexterm>
-<indexterm>
-  <primary>fs</primary>
-</indexterm>
-<indexterm>
-  <primary>ft</primary>
-</indexterm>
-<indexterm>
-  <primary>fu</primary>
-</indexterm>
-<indexterm>
-  <primary>fv</primary>
-</indexterm>
-<indexterm>
-  <primary>fw</primary>
-</indexterm>
-<indexterm>
-  <primary>fx</primary>
-</indexterm>
-<indexterm>
-  <primary>fy</primary>
-</indexterm>
-<indexterm>
-  <primary>fz</primary>
-</indexterm>
-<indexterm>
-  <primary>ga</primary>
-</indexterm>
-<indexterm>
-  <primary>gb</primary>
-</indexterm>
-<indexterm>
-  <primary>gc</primary>
-</indexterm>
-<indexterm>
-  <primary>gd</primary>
-</indexterm>
-<indexterm>
-  <primary>ge</primary>
-</indexterm>
-<indexterm>
-  <primary>gf</primary>
-</indexterm>
-<indexterm>
-  <primary>gg</primary>
-</indexterm>
-<indexterm>
-  <primary>gh</primary>
-</indexterm>
-<indexterm>
-  <primary>gi</primary>
-</indexterm>
-<indexterm>
-  <primary>gj</primary>
-</indexterm>
-<indexterm>
-  <primary>gk</primary>
-</indexterm>
-<indexterm>
-  <primary>gl</primary>
-</indexterm>
-<indexterm>
-  <primary>gm</primary>
-</indexterm>
-<indexterm>
-  <primary>gn</primary>
-</indexterm>
-<indexterm>
-  <primary>go</primary>
-</indexterm>
-<indexterm>
-  <primary>gp</primary>
-</indexterm>
-<indexterm>
-  <primary>gq</primary>
-</indexterm></para>
-
-<indexterm startref="spanstart" class="endofrange"/>
-
-</appendix>
-
-<index id="idx"/>
-
-</book>
diff --git a/test/testdocs/indexterm.003.xml b/test/testdocs/indexterm.003.xml
deleted file mode 100644
index a71458ca..00000000
--- a/test/testdocs/indexterm.003.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: indexterm.003</title>
-<releaseinfo role="CVS">$Id: indexterm.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<chapter><title>First Chapter</title>
-
-<para>An indexterm starts
-here.<indexterm class="startofrange" id="start">
-<primary>Start</primary></indexterm></para>
-
-</chapter>
-
-<chapter><title>Second Chapter</title>
-
-<para>The term ends
-here.<indexterm class="endofrange" startref="start"/>
-</para>
-
-</chapter>
-
-<index id="idx"/>
-
-</book>
diff --git a/test/testdocs/indexterm.004.xml b/test/testdocs/indexterm.004.xml
deleted file mode 100644
index 29daff64..00000000
--- a/test/testdocs/indexterm.004.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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" [
-<!ENTITY index    SYSTEM '../indexterm.004.index.xml'>
-]>
-<article id="indexterm.004">
-<articleinfo>
-<title>Unit Test: indexterm.004</title>
-<releaseinfo role="CVS">$Id: indexterm.004.xml 5270 2005-10-13 01:11:51Z xmldoc $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-  <section id="sec1">
-    <title>First Section</title>
-    <para>
-      This is first test paragraph.
-      <indexterm>
-        <primary>foo</primary>
-        <seealso>bar</seealso>
-      </indexterm>
-      <indexterm>
-        <primary>bar</primary>
-      </indexterm>
-      <indexterm>
-        <primary>baz</primary>
-      </indexterm>
-    </para>
-  </section>
-
-  <section id="sec2">
-    <title>Second Section</title>
-    <para>
-      This is second test paragraph.  We're testing identical
-      <sgmltag>indexterm</sgmltag>s with two different
-      <sgmltag>seealso</sgmltag>s.
-
-      <indexterm>
-        <primary>foo</primary>
-        <seealso>baz</seealso>
-      </indexterm>
-    </para>
-  </section>
-
-  <index/>
-  <!-- * Note: To test DSSSL index support, comment out the <index/> above -->
-  <!-- * and uncomment the entity ref below -->
-  <!-- * --> 
-  <!-- * &index; -->
-  <!-- * -->
-</article>
diff --git a/test/testdocs/indexterm.005.xml b/test/testdocs/indexterm.005.xml
deleted file mode 100644
index 02c4f422..00000000
--- a/test/testdocs/indexterm.005.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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" [
-<!ENTITY index    SYSTEM '../indexterm.005.index.xml'>
-]>
-<article id="indexterm.005">
-<articleinfo>
-<title>Unit Test: indexterm.005</title>
-<releaseinfo role="CVS">$Id: indexterm.005.xml 5270 2005-10-13 01:11:51Z xmldoc $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-  <section id="sec1">
-    <title>Bizarre Indexterm Test</title>
-    <para>
-      This is first test paragraph.
-      <programlisting>#include &lt;stdio.h&gt;
-      </programlisting>
-      <indexterm>
-        <primary>&lt;stdio.h&gt;</primary>
-      </indexterm>
-    </para>
-  </section>
-
-  <index/>
-  <!-- * Note: To test DSSSL index support, comment out the <index/> above -->
-  <!-- * and uncomment the entity ref below -->
-  <!-- * --> 
-  <!-- * &index; -->
-  <!-- * -->
-</article>
diff --git a/test/testdocs/informalequation-mml.001.xml b/test/testdocs/informalequation-mml.001.xml
deleted file mode 100644
index 0cdabb15..00000000
--- a/test/testdocs/informalequation-mml.001.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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" [
-<!ENTITY % local.article.attrib "xmlns:mml CDATA #REQUIRED">
-]>
-<article xmlns:mml="http://www.w3.org/1998/Math/MathML">
-<articleinfo>
-<title>Unit Test: informalequation-mml.001</title>
-<releaseinfo role="CVS">$Id: informalequation-mml.001.xml 5290 2005-10-16 02:07:50Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<informalequation>
-   <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
-     <mml:apply><mml:divide/><mml:ci>1</mml:ci><mml:ci>6</mml:ci></mml:apply>
-   </mml:math>
- </informalequation>
-
-</article>
diff --git a/test/testdocs/informaltable.001.xml b/test/testdocs/informaltable.001.xml
deleted file mode 100644
index 82198fc5..00000000
--- a/test/testdocs/informaltable.001.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>Unit Test: informaltable.001</title>
-<releaseinfo role="CVS">$Id: informaltable.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-  <para>
-Table should appear like this:</para>
-  <screen>
-+........+........+........+........+
-|        |   B    |        |   D    |
-+   A    +........+   C    +........+
-|        |        |        |   E    |
-+........+........+........+........+</screen>
-
-<informaltable frame="all">
-<tgroup cols="4" align="center">
-<colspec colname="c4a" colnum="4"/>
-<tbody valign="middle">
-<row>
-  <entry morerows="1">A</entry>
-  <entry>B</entry>
-  <entry morerows="1">C</entry>
-  <entry>D</entry>
-</row>
-<row>
-  <entry namest="c4a">E</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.002.xml b/test/testdocs/informaltable.002.xml
deleted file mode 100644
index 365548a4..00000000
--- a/test/testdocs/informaltable.002.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>Unit Test: informaltable.002</title>
-<releaseinfo role="CVS">$Id: informaltable.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+
-|   A    |   B    |   C    |   D    |
-+........+........+        +        +
-|   E    |   F    |        |        |
-+        +........+        +        +
-|        |   G    |        |        |
-+        +........+........+........+
-|        |   H    |        |   I    |
-+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="4">
-<colspec colname="c4b" colnum="4"/>
-<tbody>
-<row>
-  <entry>A</entry>
-  <entry>B</entry>
-  <entry morerows="2">C</entry>
-  <entry morerows="2">D</entry>
-</row>
-<row>
-  <entry morerows="2">E</entry>
-  <entry>F</entry>
-</row>
-<row>
-  <entry>G</entry>
-</row>
-<row>
-  <entry>H</entry>
-  <entry namest="c4b">I</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.003.xml b/test/testdocs/informaltable.003.xml
deleted file mode 100644
index 9a7b6e31..00000000
--- a/test/testdocs/informaltable.003.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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>Unit Test: informaltable.003</title>
-<releaseinfo role="CVS">$Id: informaltable.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+
-|   A    |   B    |   C    |   D    |
-+........+        +........+        +
-|   E    |        |   F    |        |
-+        +        +........+........+
-|        |        |        |   G    |
-+........+........+........+........+
-|   H    |        |   I    |   J    |
-+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="4">
-<colspec colname="c3c" colnum="3"/>
-<colspec colname="c4c" colnum="4"/>
-<tbody>
-<row>
-  <entry>A</entry>
-  <entry morerows="2">B</entry>
-  <entry>C</entry>
-  <entry morerows="1">D</entry>
-</row>
-<row>
-  <entry morerows="1">E</entry>
-  <entry>F</entry>
-</row>
-<row>
-  <entry namest="c4c">G</entry>
-</row>
-<row>
-  <entry>H</entry>
-  <entry namest="c3c">I</entry>
-  <entry>J</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.004.xml b/test/testdocs/informaltable.004.xml
deleted file mode 100644
index 50b3dcdb..00000000
--- a/test/testdocs/informaltable.004.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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>Unit Test: informaltable.004</title>
-<releaseinfo role="CVS">$Id: informaltable.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+........+
-|   A    |        |        |        |        |
-+        +........+........+........+........+
-|        |   B    |        |        C        |
-+        +........+........+........+........+
-|        |        |   D    |   F    |        |
-+........+........+        +........+........+
-|        |        |        |        |   E    |
-+........+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="5">
-<colspec colname="c3d" colnum="3"/>
-<colspec colname="c4d" colnum="4"/>
-<colspec colname="c5d" colnum="5"/>
-<tbody>
-<row>
-  <entry morerows="2">A</entry>
-</row>
-<row>
-  <entry>B</entry>
-  <entry namest="c4d" nameend="c5d">C</entry>
-</row>
-<row>
-  <entry namest="c3d" morerows="1">D</entry>
-  <entry>F</entry>
-</row>
-<row>
-  <entry namest="c5d">E</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.005.xml b/test/testdocs/informaltable.005.xml
deleted file mode 100644
index 75a46865..00000000
--- a/test/testdocs/informaltable.005.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>Unit Test: informaltable.005</title>
-<releaseinfo role="CVS">$Id: informaltable.005.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+
-|        |   B    |        |   D    |
-+   A    +........+   C    +........+
-|        |        |        |   E    |
-+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="4">
-<colspec colname="c4a" colnum="4"/>
-<tbody>
-<row>
-  <entry morerows="1">A</entry>
-  <entry>B</entry>
-  <entry morerows="1">C</entry>
-  <entry>D</entry>
-</row>
-<row>
-  <entry namest="c4a">E</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.006.xml b/test/testdocs/informaltable.006.xml
deleted file mode 100644
index 5ea3175c..00000000
--- a/test/testdocs/informaltable.006.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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>Unit Test: informaltable.006</title>
-<releaseinfo role="CVS">$Id: informaltable.006.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+
-|   A    |        |        |        |
-+        +........+........+........+
-|        |   B    |        |   C    |
-+        +........+........+........+
-|        |        |   D    |   F    |
-+........+........+        +........+
-|        |        |        |   E    |
-+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="4">
-<colspec colname="c3d" colnum="3"/>
-<colspec colname="c4d" colnum="4"/>
-<tbody>
-<row>
-  <entry morerows="2">A</entry>
-</row>
-<row>
-  <entry>B</entry>
-  <entry namest="c4d">C</entry>
-</row>
-<row>
-  <entry namest="c3d" morerows="1">D</entry>
-  <entry>F</entry>
-</row>
-<row>
-  <entry namest="c4d">E</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.007.xml b/test/testdocs/informaltable.007.xml
deleted file mode 100644
index 0a1afa7c..00000000
--- a/test/testdocs/informaltable.007.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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>Unit Test: informaltable.007</title>
-<releaseinfo role="CVS">$Id: informaltable.007.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+........+
-|        A        |        |        B        |
-+........+........+........+........+........+
-|   X    |                          |        |
-+........+            C             +........+
-|   Y    |                          |        |
-+........+........+........+........+........+
-|        D        |        |        E        |
-+........+........+........+........+........+
-|   F    |   G    |   H    |   I    |   J    |
-+........+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="5">
-<colspec colname="c1c"/>
-<colspec colname="c2c"/>
-<colspec colname="c3c"/>
-<colspec colname="c4c"/>
-<colspec colname="c5c"/>
-<tbody>
-<row>
-  <entry namest="c1c" nameend="c2c">A</entry>
-  <entry namest="c4c" nameend="c5c">B</entry>
-</row>
-<row>
-  <entry>X</entry>
-  <entry namest="c2c" nameend="c4c" morerows="1">C</entry>
-</row>
-<row>
-  <entry>Y</entry>
-</row>
-<row>
-  <entry namest="c1c" nameend="c2c">D</entry>
-  <entry namest="c4c" nameend="c5c">E</entry>
-</row>
-<row>
-  <entry>F</entry>
-  <entry>G</entry>
-  <entry>H</entry>
-  <entry>I</entry>
-  <entry>J</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.008.xml b/test/testdocs/informaltable.008.xml
deleted file mode 100644
index 2c29b626..00000000
--- a/test/testdocs/informaltable.008.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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>Unit Test: informaltable.008</title>
-<releaseinfo role="CVS">$Id: informaltable.008.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+........+
-|        A        |        |        B        |
-+........+........+........+........+........+
-|   X    |                          |        |
-+........+            C             +........+
-|   Y    |                          |        |
-+........+........+........+........+........+
-|        D        |        |        E        |
-+........+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="5">
-<colspec colname="c1c"/>
-<colspec colname="c2c"/>
-<colspec colname="c3c"/>
-<colspec colname="c4c"/>
-<colspec colname="c5c"/>
-<tbody>
-<row>
-  <entry namest="c1c" nameend="c2c">A</entry>
-  <entry namest="c4c" nameend="c5c">B</entry>
-</row>
-<row>
-  <entry>X</entry>
-  <entry namest="c2c" nameend="c4c" morerows="1">C</entry>
-</row>
-<row>
-  <entry>Y</entry>
-</row>
-<row>
-  <entry namest="c1c" nameend="c2c">D</entry>
-  <entry namest="c4c" nameend="c5c">E</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.009.xml b/test/testdocs/informaltable.009.xml
deleted file mode 100644
index 5c8fca9f..00000000
--- a/test/testdocs/informaltable.009.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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>Unit Test: informaltable.009</title>
-<releaseinfo role="CVS">$Id: informaltable.009.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+........+
-|        A        |        |        B        |
-+........+........+........+........+........+
-|        |            C             |        |
-+........+........+........+........+........+
-|        D        |        |        E        |
-+........+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="5">
-<colspec colname="c1c"/>
-<colspec colname="c2c"/>
-<colspec colname="c3c"/>
-<colspec colname="c4c"/>
-<colspec colname="c5c"/>
-<tbody>
-<row>
-  <entry namest="c1c" nameend="c2c">A</entry>
-  <entry namest="c4c" nameend="c5c">B</entry>
-</row>
-<row>
-  <entry namest="c2c" nameend="c4c">C</entry>
-</row>
-<row>
-  <entry namest="c1c" nameend="c2c">D</entry>
-  <entry namest="c4c" nameend="c5c">E</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.010.xml b/test/testdocs/informaltable.010.xml
deleted file mode 100644
index fedd8b20..00000000
--- a/test/testdocs/informaltable.010.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>Unit Test: informaltable.010</title>
-<releaseinfo role="CVS">$Id: informaltable.010.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+
-|   A    |        |        |    F   |
-+........+........+........+........+
-|        |   B    |                 |
-+........+........+        D        +
-|   C    |        |                 |
-+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="4">
-<colspec colname="c1a" colnum="1"/>
-<colspec colname="c2a" colnum="2"/>
-<colspec colname="c3a" colnum="3"/>
-<colspec colname="c4a" colnum="4"/>
-<tbody>
-<row>
-  <entry>A</entry>
-  <entry colname="c4a">F</entry>
-</row>
-<row>
-  <entry colname="c2a">B</entry>
-  <entry namest="c3a" nameend="c4a" morerows="1">D</entry>
-</row>
-<row>
-  <entry>C</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.011.xml b/test/testdocs/informaltable.011.xml
deleted file mode 100644
index cd693f19..00000000
--- a/test/testdocs/informaltable.011.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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>Unit Test: informaltable.011</title>
-<releaseinfo role="CVS">$Id: informaltable.011.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+
-|        |        |        |    F   |
-+   A    +........+........+........+
-|        |        B                 |
-+........+                          +
-|   C    |                          |
-+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="4">
-<colspec colname="c1a" colnum="1"/>
-<colspec colname="c2a" colnum="2"/>
-<colspec colname="c3a" colnum="3"/>
-<colspec colname="c4a" colnum="4"/>
-<tbody>
-<row>
-  <entry morerows="1">A</entry>
-  <entry colname="c4a">F</entry>
-</row>
-<row>
-  <entry namest="c2a" nameend="c4a" morerows="1">B</entry>
-</row>
-<row>
-  <entry>C</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.012.xml b/test/testdocs/informaltable.012.xml
deleted file mode 100644
index 8705da4b..00000000
--- a/test/testdocs/informaltable.012.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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>Unit Test: informaltable.012</title>
-<releaseinfo role="CVS">$Id: informaltable.012.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+
-|   A    |        |        |
-+........+........+........+
-|        |        B        |
-+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="3">
-<colspec colname="c2a" colnum="2"/>
-<colspec colname="c3a" colnum="3"/>
-<tbody>
-<row>
-  <entry>A</entry>
-</row>
-<row>
-  <entry namest="c2a" nameend="c3a">B</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.013.xml b/test/testdocs/informaltable.013.xml
deleted file mode 100644
index 4d9386ac..00000000
--- a/test/testdocs/informaltable.013.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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>Unit Test: informaltable.013</title>
-<releaseinfo role="CVS">$Id: informaltable.013.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+........+
-|   A    |        |        |        |        |
-+........+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="5">
-<tbody>
-<row>
-  <entry>A</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.014.xml b/test/testdocs/informaltable.014.xml
deleted file mode 100644
index f1196768..00000000
--- a/test/testdocs/informaltable.014.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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>Unit Test: informaltable.014</title>
-<releaseinfo role="CVS">$Id: informaltable.014.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!--
-+........+........+........+........+........+
-|   A    |        |        |        |        |
-+        +........+........+........+........+
-|        |   B    |        |        C        |
-+        +........+........+........+........+
-|        |        |   D    |   G    |        |
-+........+........+        +........+........+
-|        |        |        |        |   E    |
-+........+........+........+........+........+
-|        |        |            F             |
-+........+........+........+........+........+
--->
-
-<informaltable frame="all">
-<tgroup cols="5">
-<colspec colname="c3d" colnum="3"/>
-<colspec colname="c4d" colnum="4"/>
-<colspec colname="c5d" colnum="5"/>
-<tbody>
-<row>
-  <entry morerows="2">A</entry>
-</row>
-<row>
-  <entry>B</entry>
-  <entry namest="c4d" nameend="c5d">C</entry>
-</row>
-<row>
-  <entry namest="c3d" morerows="1">D</entry>
-  <entry>G</entry>
-</row>
-<row>
-  <entry namest="c5d">E</entry>
-</row>
-<row>
-  <entry namest="c3d" nameend="c5d">F</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/informaltable.015.xml b/test/testdocs/informaltable.015.xml
deleted file mode 100644
index ceb4cfc7..00000000
--- a/test/testdocs/informaltable.015.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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 id="informaltable.015">
-<articleinfo>
-<title>Unit Test: informaltable.015</title>
-<releaseinfo role="CVS">$Id: informaltable.015.xml 5600 2006-03-03 08:43:12Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname> <surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <para>
-Three column table, but entries only in one column.  Last column
-should expand to fill entire horizontal space.</para>
-
-  <informaltable id="informaltable" pgwide="1">
-    <tgroup cols="3" colsep="1" rowsep="1" align="left">
-      <colspec colname="cat" colwidth="2in"/>
-      <colspec colname="issue" colwidth="2in"/>
-      <colspec colname="response" colwidth="4in"/>
-      <thead>
-        <row>
-          <entry>Category</entry>
-          <entry>System Considerations, Issues</entry>
-          <entry>Notes</entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry>General Company Information</entry>
-        </row>
-        <row>
-          <entry>Company Financials</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</article>
diff --git a/test/testdocs/informaltable.016.xml b/test/testdocs/informaltable.016.xml
deleted file mode 100644
index f1b7a3e0..00000000
--- a/test/testdocs/informaltable.016.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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 id="informaltable.016">
-<articleinfo>
-<title>Unit Test: informaltable.016</title>
-<releaseinfo role="CVS">$Id: informaltable.016.xml 5257 2005-10-12 13:48:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname> <surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-
-<!--
-+........+........+........+........+
-|   A    |   B    |   C    |   D    |
-+........+........+........+........+
-|   E    |                         F|
-+........+........+........+........+
-
--->
-
-  <para>Spanspec test.  Cell "F" should be right aligned and spanning
-  the last 3 columns.</para>
-
-<informaltable frame="all" id="informaltable">
-      <tgroup cols="4" colsep="1" rowsep="1">
-        <colspec colname="one" align="center"/>
-        <colspec colname="two" align="center"/>
-        <colspec colname="three" align="center"/>
-        <colspec colname="four" align="center"/>
-        <spanspec namest="two" nameend="four" spanname="thespan"
-          align="right"/>
-        <tbody>
-          <row>
-            <entry>A</entry>
-            <entry>B</entry>
-            <entry>C</entry>
-            <entry>D</entry>
-          </row>
-          <row>
-            <entry>E</entry>
-            <entry spanname="thespan">F</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</article>
diff --git a/test/testdocs/informaltable.017.xml b/test/testdocs/informaltable.017.xml
deleted file mode 100644
index 9a52e152..00000000
--- a/test/testdocs/informaltable.017.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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 id="informaltable.017">
-<articleinfo>
-<title>Unit Test: informaltable.017</title>
-<releaseinfo role="CVS">$Id: informaltable.017.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname> <surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Row valign test.</para>
-
-  <informaltable frame="all" id="informaltable">
-    <tgroup cols="2">
-      <tbody>
-        <row valign="top">
-          <entry>
-            <para>Para one.</para>
-            <para>Para two.</para>
-          </entry>
-          <entry>Top align me.</entry>
-        </row>
-        <row valign="middle">
-          <entry>
-            <para>Para one.</para>
-            <para>Para two.</para>
-          </entry>
-          <entry>Middle align me.</entry>
-        </row>
-        <row valign="bottom">
-          <entry>
-            <para>Para one.</para>
-            <para>Para two.</para>
-          </entry>
-          <entry>Bottom align me.</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-
-  <para>This one should look the same, we use valign setting on the tbody.</para>
-
-  <informaltable frame="all">
-    <tgroup cols="2">
-      <tbody valign="top">
-        <row>
-          <entry>
-            <para>Para one.</para>
-            <para>Para two.</para>
-          </entry>
-          <entry>Top align me.</entry>
-        </row>
-        <row valign="middle">
-          <entry>
-            <para>Para one.</para>
-            <para>Para two.</para>
-          </entry>
-          <entry>Middle align me.</entry>
-        </row>
-        <row valign="bottom">
-          <entry>
-            <para>Para one.</para>
-            <para>Para two.</para>
-          </entry>
-          <entry>Bottom align me.</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</article>
diff --git a/test/testdocs/informaltable.018.xml b/test/testdocs/informaltable.018.xml
deleted file mode 100644
index 32efb0b9..00000000
--- a/test/testdocs/informaltable.018.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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 id="informaltable.018">
-<articleinfo>
-<title>Unit Test: informaltable.018</title>
-<releaseinfo role="CVS">$Id: informaltable.018.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname> <surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <para>
-    Table entry whitespace trim test.  Both entries should left
-    align the same.
-  </para>
-
-  <informaltable frame="all" id="informaltable">
-    <tgroup cols="1">
-      <tbody>
-        <row>
-          <entry>
-            <para>Entry contents one.</para>
-          </entry>
-        </row>
-        <row>
-          <entry>
-            <para>
-              Entry contents two.
-            </para>
-          </entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</article>
diff --git a/test/testdocs/inline.001.xml b/test/testdocs/inline.001.xml
deleted file mode 100644
index ffb716fa..00000000
--- a/test/testdocs/inline.001.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: inline.001.xml</title>
-<releaseinfo role="CVS">$Id: inline.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This article tests inline objects.</para>
-
-<para>This is a <phrase role="red">red phrase</phrase>.
-This <emphasis role="strong">emphasis is strong</emphasis>.
-</para>
-
-<section><title>Trademarks</title>
-
-<para><trademark>This is trademarked</trademark>.
-<trademark class="copyright">This is copyrighted</trademark>.
-<trademark class="registered">This is a registered trademark</trademark>.
-<trademark class="service">This is is a service mark</trademark>.</para>
-</section>
-
-</article>
diff --git a/test/testdocs/inline.002.xml b/test/testdocs/inline.002.xml
deleted file mode 100644
index bdccac46..00000000
--- a/test/testdocs/inline.002.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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 id="article">
-  <articleinfo>
-    <title>Unit Test: inline.002.xml</title>
-    <releaseinfo role="CVS">$Id: inline.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-    <author><firstname>Michael</firstname><surname>Smith</surname>
-    <affiliation><address><email>smith@sideshowbarker.net</email></address></affiliation>
-    </author>
-  </articleinfo>
-
-  <para>This article tests <sgmltag>userinput</sgmltag> and
-  <sgmltag>computeroutput</sgmltag> and maybe eventually some of the
-  other "computer" inlines whose HTML renderings people like to argue
-  about.</para>
-
-  <section><title>Computer stuff</title>
-
-  <para>Sometimes when you are working at a computer, things will go
-  sorta like the following. You type in something:
-  <literallayout><userinput><command>tail</command>&#xa0;<option>-f</option>&#xa0;<filename>mta.log</filename></userinput></literallayout>
-  And then the computer outputs something like:
-  <literallayout><computeroutput>stuff here
-then more stuff here
-and further stuff here</computeroutput></literallayout></para>
-  </section>
-
-</article>
diff --git a/test/testdocs/inline.x001.xml b/test/testdocs/inline.x001.xml
deleted file mode 100644
index 275c9325..00000000
--- a/test/testdocs/inline.x001.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<article>
-<articleinfo>
-<title>Unit Test: inline.x001.xml</title>
-<!-- Change this: -->
-<author><firstname>Shaun</firstname><surname>McCance</surname>
-        <affiliation><address><email>shaunm@gnome.org</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para><abbrev>abbrev</abbrev></para>
-<para><interface>a<accel>c</accel>cel</interface></para>
-<para><acronym>ACRONYM</acronym></para>
-<para><action>action</action></para>
-<para><application>application</application></para>
-<para><authorinitials>authorinitials</authorinitials></para>
-<para><citation>citation</citation></para>
-<para><citetitle>citetitle</citetitle></para>
-<para><classname>classname</classname></para>
-<para><code>code</code></para>
-<para><command>command</command></para>
-<para><computeroutput>computeroutput</computeroutput></para>
-<para><constant>constant</constant></para>
-<para><corpauthor>corpauthor</corpauthor></para>
-<para><database>database</database></para>
-<para><email>email</email></para>
-<para>
-  <emphasis>emphasis</emphasis>
-  <emphasis role="bold">bold</emphasis>
-  <emphasis role="strong">strong</emphasis>
-</para>
-<para><envar>envar</envar></para>
-<para><errorcode>errorcode</errorcode></para>
-<para><errorname>errorname</errorname></para>
-<para><errortext>errortext</errortext></para>
-<para><errortype>errortype</errortype></para>
-<para><exceptionname>exceptionname</exceptionname></para>
-<para><filename>filename</filename></para>
-<para><firstterm>firstterm</firstterm></para>
-<para><foreignphrase>foreignphrase</foreignphrase></para>
-<para><function>function</function></para>
-<para><glossterm>glossterm</glossterm></para>
-<para><guibutton>guibutton</guibutton></para>
-<para><guiicon>guiicon</guiicon></para>
-<para><guilabel>guilabel</guilabel></para>
-<para><guimenu>guimenu</guimenu></para>
-<para><guimenuitem>guimenuitem</guimenuitem></para>
-<para><guisubmenu>guisubmenu</guisubmenu></para>
-<para><hardware>hardware</hardware></para>
-<para><interface>interface</interface></para>
-<para><interfacename>interfacename</interfacename></para>
-<para><keycap>keycap</keycap></para>
-<para><keycode>keycode</keycode></para>
-<para><keycombo><keycap>key</keycap><keycap>combo</keycap></keycombo></para>
-<para><keysym>keysym</keysym></para>
-<para><literal>literal</literal></para>
-<para><markup>markup</markup></para>
-<para><medialabel>medialabel</medialabel></para>
-<para><menuchoice><shortcut><mousebutton>shortcut</mousebutton></shortcut><guimenu>menu</guimenu><guimenuitem>choice</guimenuitem></menuchoice></para>
-<para><methodname>methodname</methodname></para>
-<para><mousebutton>mousebutton</mousebutton></para>
-<para><option>option</option></para>
-<para><optional>optional</optional></para>
-<para>
-<parameter>parameter</parameter>
-<parameter class="command">command</parameter>
-<parameter class="function">function</parameter>
-<parameter class="option">option</parameter>
-</para>
-<para><phrase>phrase</phrase></para>
-<para><productname>productname</productname></para>
-<para><productnumber>productnumber</productnumber></para>
-<para><prompt>prompt</prompt></para>
-<para><property>property</property></para>
-<para><replaceable>replaceable</replaceable></para>
-<para><returnvalue>returnvalue</returnvalue></para>
-<para><sgmltag>sgmltag</sgmltag></para>
-<para><structfield>structfield</structfield></para>
-<para><structname>structname</structname></para>
-<para>sub<subscript>script</subscript></para>
-<para>super<superscript>script</superscript></para>
-<para><symbol>symbol</symbol></para>
-<para><systemitem>systemitem</systemitem></para>
-<para><token>token</token></para>
-<para><trademark>trademark</trademark></para>
-<para><type>type</type></para>
-<para><uri>uri</uri></para>
-<para><userinput>userinput</userinput></para>
-<para><varname>varname</varname></para>
-<para><wordasword>wordasword</wordasword></para>
-
-</article>
diff --git a/test/testdocs/itemizedlist.001.xml b/test/testdocs/itemizedlist.001.xml
deleted file mode 100644
index 69216edc..00000000
--- a/test/testdocs/itemizedlist.001.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>Unit Test: itemizedlist.001</title>
-<releaseinfo role="CVS">$Id: itemizedlist.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-  <para>
-Testing page breaking, variablelist nested in itemizedlist</para>
-
-<itemizedlist><title>YE OLDE ITEMIZEDLIST</title>
-<listitem><para>Item 1</para></listitem>
-<listitem><para>Item 2</para></listitem>
-<listitem><para>Item 3</para>
-<variablelist termlength="3pc">
-<varlistentry>
-<term>A</term><listitem><para>xxxxx</para></listitem></varlistentry>
-<varlistentry>
-<term>B</term><listitem><para>xxxxx</para></listitem></varlistentry>
-</variablelist>
-</listitem>
-<listitem><para>Item 4</para></listitem>
-<listitem><para>Item 5</para></listitem>
-<listitem><para>Item 6</para></listitem>
-<listitem><para>Item 7</para></listitem>
-<listitem><para>another (trying to cause a page break)</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem><para>another</para></listitem>
-<listitem id="problem"><variablelist>
-<varlistentry>
-<term>C</term><listitem><para>xxxxx</para></listitem></varlistentry>
-<varlistentry>
-<term>D</term><listitem><para>xxxxx</para></listitem></varlistentry>
-</variablelist>
-</listitem>
-</itemizedlist>
-
-</article>
diff --git a/test/testdocs/itemizedlist.002.xml b/test/testdocs/itemizedlist.002.xml
deleted file mode 100644
index 65fcb5cd..00000000
--- a/test/testdocs/itemizedlist.002.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>Unit Test: itemizedlist.002</title>
-<releaseinfo role="CVS">$Id: itemizedlist.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<itemizedlist>
-  <listitem><para>Level 1</para>
-    <itemizedlist>
-    <listitem><para>Level 2</para>
-      <itemizedlist>
-      <listitem id="someOtherILI"><para>Level 3</para>
-        <itemizedlist>
-        <listitem><para>Level 4</para>
-          <itemizedlist mark="disc">
-          <listitem><para>Level 5</para>
-            <itemizedlist mark="disc">
-            <listitem override="round"><para>Level 6, override=round</para>
-            </listitem>
-            </itemizedlist>
-          </listitem>
-          </itemizedlist>
-        </listitem>
-        </itemizedlist>
-    </listitem>
-    </itemizedlist>
-  </listitem>
-  </itemizedlist>
-</listitem>
-</itemizedlist>
-
-</article>
diff --git a/test/testdocs/itemizedlist.003.xml b/test/testdocs/itemizedlist.003.xml
deleted file mode 100644
index 79fafd54..00000000
--- a/test/testdocs/itemizedlist.003.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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>Unit Test: itemizedlist.003</title>
-<releaseinfo role="CVS">$Id: itemizedlist.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This is a para.</para>
-
-<para>This is another para.  See the space of separate between
-    paragraphs.  The following lists should have additional space
-    before/after them, since they are not within paragraphs and thus
-    should use paragraph spacing.</para>
-
-<itemizedlist>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-</itemizedlist>
-
-<orderedlist>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-  <listitem><para>some text (not compact)</para></listitem>
-</orderedlist>
-
-<itemizedlist spacing="compact">
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-</itemizedlist>
-
-<orderedlist spacing="compact">
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-</orderedlist>
-
-<para>Here is a para.</para>
-
-<para>
-The following two itemizedlists are within a block element and such
-    should use paragraph spacing between them.
-
-<itemizedlist spacing="compact">
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-</itemizedlist>
-
-<itemizedlist spacing="compact">
-  <listitem><para>some text (compact)</para></listitem>
-  <listitem><para>some text (compact)</para></listitem>
-</itemizedlist>
-  </para>
-</article>
diff --git a/test/testdocs/itemizedlist.004.xml b/test/testdocs/itemizedlist.004.xml
deleted file mode 100644
index d4a307bd..00000000
--- a/test/testdocs/itemizedlist.004.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>Unit Test: itemizedlist.001</title>
-<releaseinfo role="CVS">$Id: itemizedlist.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname> <surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<itemizedlist>
-<listitem><para>This is the first one.</para></listitem>
-<listitem><para>
-        This second item should be flush left with first one (trim
-        whitespace).</para>
-</listitem>
-</itemizedlist>
-
-</article>
diff --git a/test/testdocs/itemizedlist.005.xml b/test/testdocs/itemizedlist.005.xml
deleted file mode 100644
index c573dfec..00000000
--- a/test/testdocs/itemizedlist.005.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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 id="itemizedlist.005">
-<articleinfo>
-<title>Unit Test: itemizedlist.005</title>
-<releaseinfo role="CVS">$Id: itemizedlist.005.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname> <surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <para>
-    Here we're testing an <sgmltag class="element"
-    >itemizedlist</sgmltag> with a title nested within another one.
-
-    <itemizedlist>
-      <listitem>
-        <itemizedlist>
-          <title>Nested Itemized List Title</title>
-          <listitem>
-            <para>Itemized list entry</para>             
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
-</article>
diff --git a/test/testdocs/itemizedlist.006.xml b/test/testdocs/itemizedlist.006.xml
deleted file mode 100644
index e5f068b4..00000000
--- a/test/testdocs/itemizedlist.006.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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 id="itemizedlist.006">
-<articleinfo>
-<title>Unit Test: itemizedlist.006</title>
-<releaseinfo role="CVS">$Id: itemizedlist.006.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname> <surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <para>Itemized list mark styles.</para>
-
-  <itemizedlist mark="bullet">
-    <title>Bullet marks</title>
-    <listitem>
-      <para>One</para>
-    </listitem>
-    <listitem>
-      <para>Type</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist mark="box">
-    <title>Box marks</title>
-    <listitem>
-      <para>One</para>
-    </listitem>
-    <listitem>
-      <para>Type</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>
-    Are there more?  Check CSS spec.  DSSSL styling requires CSS for
-    this; is there a way to do it w/o CSS?
-  </para>
-</article>
diff --git a/test/testdocs/legalnotice.001.xml b/test/testdocs/legalnotice.001.xml
deleted file mode 100644
index 681ffdc1..00000000
--- a/test/testdocs/legalnotice.001.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY debian "<productname>Debian</productname>">
-]>
-<book id="legalnotice.001">
-<bookinfo>
-<title>Unit Test: legalnotice.001</title>
-<releaseinfo role="CVS">$Id: legalnotice.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-<edition>draft</edition>
-<legalnotice>
-      <para>
-        A copy of the GNU GPL is available as
-        <filename>/usr/share/common-licenses/GPL</filename> on a
-        &debian; system.  A copy of the GNU General Public License is
-        available.  It is available. It is available. It is
-        available. It is available. It is available. It is
-        available. It is available. It is available. It is available.
-      </para>
-      <para>
-        We're testing how <sgmltag
-        class="element">productname</sgmltag> looks inside of <sgmltag
-        class="element">legalnotice</sgmltag>.
-      </para>
-    </legalnotice>
-</bookinfo>
-</book>
diff --git a/test/testdocs/lineannotation.001.xml b/test/testdocs/lineannotation.001.xml
deleted file mode 100644
index 26969cd5..00000000
--- a/test/testdocs/lineannotation.001.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: lineannotation.001.xml</title>
-<releaseinfo role="CVS">$Id: lineannotation.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This article tests <sgmltag>lineannotation</sgmltag>.</para>
-
-<screen>This is a
-screen                  <lineannotation>annotation 1</lineannotation>
-with several
-lines that have no      <lineannotation>annotation 2</lineannotation>
-particular meaning</screen>
-
-</article>
diff --git a/test/testdocs/link.001.xml b/test/testdocs/link.001.xml
deleted file mode 100644
index fa8830ac..00000000
--- a/test/testdocs/link.001.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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>Unit Test: link.001</title>
-<releaseinfo role="CVS">$Id: link.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<section id="section"><title>Section Title</title>
-
-<para>A <link linkend="section">self-referential link</link>.</para>
-
-<para>A link without content: <link linkend="section2"/>.</para>
-
-<para>A link without content, but with an xreflabel:
-<link linkend="section2" xreflabel="stb"/>.</para>
-
-<para>A link with content and an xreflabel:
-<link linkend="section2" xreflabel="stb">here</link>.</para>
-
-</section>
-
-<section id="section2">
-<title>A Very Long Section Title That I Don't Want To Use For My XRef</title>
-<titleabbrev id="stb">Long Section Title</titleabbrev>
-
-<para>Some text with a <link linkend="section">link back</link> to the
-first section.</para>
-
-</section>
-
-</article>
diff --git a/test/testdocs/literallayout.001.xml b/test/testdocs/literallayout.001.xml
deleted file mode 100644
index ff549d45..00000000
--- a/test/testdocs/literallayout.001.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>Unit Test: literallayout.001</title>
-<releaseinfo role="CVS">$Id: literallayout.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<literallayout>LiteralLayout: This is a test
-  Only a test.
-Had this been a real emegency,
-  We would have fled in terror
-And you would not have been informed.</literallayout>
-
-</article>
diff --git a/test/testdocs/literallayout.002.xml b/test/testdocs/literallayout.002.xml
deleted file mode 100644
index 3c31674c..00000000
--- a/test/testdocs/literallayout.002.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>Unit Test: literallayout.002</title>
-<releaseinfo role="CVS">$Id: literallayout.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<literallayout><ulink url="http://docbook.org/tdg/en/html/literallayout.html">LiteralLayout</ulink>: This is a test
-    This is a test with <emphasis>    embedded
-  markup</emphasis>; but still
-  Only a test.
-Had this been a real emegency,
-  We would have fled in terror
-And you would not have been informed.</literallayout>
-
-</article>
diff --git a/test/testdocs/literallayout.003.xml b/test/testdocs/literallayout.003.xml
deleted file mode 100644
index 9534d16f..00000000
--- a/test/testdocs/literallayout.003.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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>Unit Test: literallayout.003</title>
-<releaseinfo role="CVS">$Id: literallayout.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<literallayout>LiteralLayout: This is a test
-  Only a test.
-Had this been a real emegency,
-  We would have fled in terror
-And you would not have been informed.</literallayout>
-
-<literallayout class="monospaced">LiteralLayout(monospaced): This is a test
-  Only a test.
-Had this been a real emegency,
-  We would have fled in terror
-And you would not have been informed.</literallayout>
-
-</article>
diff --git a/test/testdocs/lot.001.xml b/test/testdocs/lot.001.xml
deleted file mode 100644
index 283048f0..00000000
--- a/test/testdocs/lot.001.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY blah "<para>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-</para>">
-]>
-<book id="book">
-<bookinfo>
-<title>Unit Test: lot.001</title>
-<releaseinfo role="CVS">$Id: lot.001.xml 4056 2004-11-23 13:28:50Z nwalsh $
-</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<chapter id="chap1"><title>First Chapter</title>
-
-&blah;
-
-<figure id="figduck1"><title>A Test Figure</title>
-<programlisting>
-A figure. Just to test the numeration.</programlisting>
-</figure>
-
-<section><title>First Section</title>
-
-&blah;
-
-</section>
-</chapter>
-
-<chapter id="chap2"><title>Second Chapter</title>
-
-&blah;
-
-<figure id="figduck2"><title>A Test Figure</title>
-<programlisting>
-A figure. Just to test the numeration.</programlisting>
-</figure>
-
-<sidebar><title>A Sidebar</title>
-
-&blah;
-
-<figure id="figduck3"><title>A Test Figure</title>
-<programlisting>
-A figure. Just to test the numeration.</programlisting>
-</figure>
-
-&blah;
-
-</sidebar>
-</chapter>
-</book>
diff --git a/test/testdocs/mathml.001.xml b/test/testdocs/mathml.001.xml
deleted file mode 100644
index f670f864..00000000
--- a/test/testdocs/mathml.001.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: mathml.001.xml</title>
-<releaseinfo role="CVS">$Id: mathml.001.xml 5290 2005-10-16 02:07:50Z xmldoc $</releaseinfo>
-</articleinfo>
-
-<para>The following equation is in MathML:</para>
-
- <informalequation>
-   <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
-     <mml:apply><mml:divide/><mml:ci>1</mml:ci><mml:ci>6</mml:ci></mml:apply>
-   </mml:math>
- </informalequation>
-
-</article>
diff --git a/test/testdocs/mediaobject.001.xml b/test/testdocs/mediaobject.001.xml
deleted file mode 100644
index 36fe9ef9..00000000
--- a/test/testdocs/mediaobject.001.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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>Unit Test: mediaobject.001</title>
-<releaseinfo role="CVS">$Id: mediaobject.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <mediaobject>
-    <imageobject>
-      <imagedata
-        align="right"
-        width="6in"
-        fileref="graphics/duck-small.png"
-        format="PNG"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <imageobject>
-      <imagedata
-        align="right"
-        width="6in"
-        fileref="graphics/duck-small.gif"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-    <textobject>
-<para>The bird on the cover of <citetitle>DocBook: The Definitive
-Guide</citetitle> is a wood duck.  Often considered one of the most
-beautiful ducks in North America, the mail wood duck has a metallic
-purple and green head with white streaks extending from its bill
-around the eyes and down to its blue and green, gold-flecked
-wings. It has a white neck, chestnut-colored chest, a white or red
-bill, and yellow-orange legs and feet. Females have more brown, gray,
-and subdueed hues.
-</para>
-
-<para>Edie Freedman designed the cover of this book, using a
-19th-century engraving from the Dover Pictorial Archive. The
-cover layout was produced by Kathleen Wilson using QuarkXPress
-3.32 and Adobe's ITC Garamond font. The inside layout was
-designed by Alicia Cech, based on a series design by Nancy
-Priest. The text was formatted from SGML into FrameMaker 5.5
-with Jade, using a DSSSL conversion stylesheet written by
-Chris Maden. The interior fonts are ITC Garamond Light,
-Garamond Book, and ConstantWillison.
-</para>
-    </textobject>
-    <caption><para>The Duck</para></caption>
-  </mediaobject>
-
-</article>
diff --git a/test/testdocs/mediaobject.002.xml b/test/testdocs/mediaobject.002.xml
deleted file mode 100644
index cb93233f..00000000
--- a/test/testdocs/mediaobject.002.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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>Unit Test: mediaobject.002</title>
-<releaseinfo role="CVS">$Id: mediaobject.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <mediaobject>
-    <imageobject>
-      <imagedata
-        fileref="graphics/duck-small.png"
-        format="PNG"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-    <textobject role="text">
-<para>The bird on the cover of <citetitle>DocBook: The Definitive
-Guide</citetitle> is a wood duck.  Often considered one of the most
-beautiful ducks in North America, the mail wood duck has a metallic
-purple and green head with white streaks extending from its bill
-around the eyes and down to its blue and green, gold-flecked
-wings. It has a white neck, chestnut-colored chest, a white or red
-bill, and yellow-orange legs and feet. Females have more brown, gray,
-and subdueed hues.
-</para>
-
-<para>Edie Freedman designed the cover of this book, using a
-19th-century engraving from the Dover Pictorial Archive. The
-cover layout was produced by Kathleen Wilson using QuarkXPress
-3.32 and Adobe's ITC Garamond font. The inside layout was
-designed by Alicia Cech, based on a series design by Nancy
-Priest. The text was formatted from SGML into FrameMaker 5.5
-with Jade, using a DSSSL conversion stylesheet written by
-Chris Maden. The interior fonts are ITC Garamond Light,
-Garamond Book, and ConstantWillison.
-</para>
-    </textobject>
-    <caption><para>The Duck</para></caption>
-  </mediaobject>
-
-</article>
diff --git a/test/testdocs/mediaobjectco.001.xml b/test/testdocs/mediaobjectco.001.xml
deleted file mode 100644
index eea9c153..00000000
--- a/test/testdocs/mediaobjectco.001.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>Unit Test: mediaobjectco.001</title>
-<releaseinfo role="CVS">$Id: mediaobjectco.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <mediaobjectco>
-    <imageobjectco>
-      <areaspec>
-        <area id="a1" units="calspair" coords="50,50,50,50"/>
-        <areaset id="s1" coords="">
-          <area id="a2" units="calspair" coords="25,25,25,25"/>
-          <area id="a3" units="calspair" coords="75,75,75,75"/>
-        </areaset>
-      </areaspec>
-      <imageobject>
-        <imagedata
-          fileref="graphics/duck.png"
-          contentwidth="400px"
-          contentdepth="400px"
-          srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-      </imageobject>
-    </imageobjectco>
-    <textobject><phrase>alt text</phrase></textobject>
-  </mediaobjectco>
-
-</article>
diff --git a/test/testdocs/mediaobjectco.002.xml b/test/testdocs/mediaobjectco.002.xml
deleted file mode 100644
index bb1905d3..00000000
--- a/test/testdocs/mediaobjectco.002.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?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>Unit Test: mediaobjectco.002</title>
-<releaseinfo role="CVS"
-             >$Id: mediaobjectco.002.xml 5308 2005-10-17 14:46:44Z xmldoc $</releaseinfo>
-<corpauthor>DocBook Project Development Team</corpauthor>
-</articleinfo>
-
-<para>Invalid calspair coordinates format.</para>
-
-  <mediaobjectco>
-    <imageobjectco>
-      <areaspec>
-        <area id="a1" units="calspair" coords="50,50,50,50"/>
-        <areaset id="s1" coords="">
-          <area id="a2" units="calspair" coords="25000,25 25,15000"/>
-          <area id="a3" units="calspair" coords="XX,75 75,YY"/>
-        </areaset>
-      </areaspec>
-      <imageobject>
-        <imagedata
-          fileref="graphics/duck.png"
-          contentwidth="400px"
-          contentdepth="400px"
-          srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-      </imageobject>
-    </imageobjectco>
-    <textobject><phrase>alt text</phrase></textobject>
-  </mediaobjectco>
-
-<para>Valid mediaobjectco. It checks that the coordinates of the markups are
-correct, and that the <sgmltag>calloutlist</sgmltag> is correct too.</para>
-
-<mediaobjectco>
-  <imageobjectco>
-    <areaspec>
-      <area id="va1" units="calspair" coords="0,0 0,0"/>
-      <area id="va2" units="calspair" coords="5000,0 5000,0"/>
-      <area id="va3" units="calspair" coords="10000,0 10000,0"/>
-      <area id="va4" units="calspair" coords="10000,5000 10000,5000"/>
-      <area id="va5" units="calspair" coords="10000,10000 10000,10000"/>
-      <area id="va6" units="calspair" coords="5000,10000 5000,10000"/>
-      <area id="va7" units="calspair" coords="0,10000 0,10000"/>
-      <area id="va8" units="calspair" coords="0,5000 0,5000"/>
-      <area id="va9" units="calspair" coords="3333,1666 3333,1666" linkends="co-va9"/>
-      <area id="va10" units="calspair" coords="6666,1666 6666,1666" linkends="co-va10"/>
-    </areaspec>
-    <imageobject>
-      <imagedata
-        fileref="graphics/duck.png"
-        contentwidth="400px"
-        contentdepth="400px"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <calloutlist>
-    <callout arearefs="va1">
-    <para>Coordinates are (0,0)</para>
-    </callout>
-    <callout arearefs="va2">
-    <para>Coordinates are (50%,0)</para>
-    </callout>
-    <callout arearefs="va3">
-    <para>Coordinates are (100%,0)</para>
-    </callout>
-    <callout arearefs="va4">
-    <para>Coordinates are (100%,50%)</para>
-    </callout>
-    <callout arearefs="va5">
-    <para>Coordinates are (100%,100%)</para>
-    </callout>
-    <callout arearefs="va6">
-    <para>Coordinates are (50%,100%)</para>
-    </callout>
-    <callout arearefs="va7">
-    <para>Coordinates are (0,100%)</para>
-    </callout>
-    <callout arearefs="va8">
-    <para>Coordinates are (0,50%)</para>
-    </callout>
-    <callout arearefs="va9" id="co-va9">
-    <para>Coordinates are (1/3,1/6)</para>
-    </callout>
-    <callout arearefs="va10" id="co-va10">
-    <para>Coordinates are (2/3,1/6)</para>
-    </callout>
-    </calloutlist>
-    </imageobjectco>
-    <textobject><phrase>alt text</phrase></textobject>
-  </mediaobjectco>
-
-<para>Valid mediaobjectco. It checks that the coordinates follow the actual
-image sizes.</para>
-
-<mediaobjectco>
-  <imageobjectco>
-    <areaspec>
-      <area id="vb1" units="calspair" coords="0,0 0,0"/>
-      <area id="vb2" units="calspair" coords="5000,0 5000,0"/>
-      <area id="vb3" units="calspair" coords="10000,0 10000,0"/>
-      <area id="vb4" units="calspair" coords="10000,5000 10000,5000"/>
-      <area id="vb5" units="calspair" coords="10000,10000 10000,10000"/>
-      <area id="vb6" units="calspair" coords="5000,10000 5000,10000"/>
-      <area id="vb7" units="calspair" coords="0,10000 0,10000"/>
-      <area id="vb8" units="calspair" coords="0,5000 0,5000"/>
-      <area id="vb9" units="calspair" coords="3333,1666 3333,1666" linkends="co-vb9"/>
-      <area id="vb10" units="calspair" coords="6666,1666 6666,1666" linkends="co-vb10"/>
-    </areaspec>
-    <imageobject>
-      <imagedata
-        fileref="graphics/duck.png"
-        contentwidth="300px"
-        contentdepth="400px"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <calloutlist>
-    <callout arearefs="vb1">
-    <para>Coordinates are (0,0)</para>
-    </callout>
-    <callout arearefs="vb2">
-    <para>Coordinates are (50%,0)</para>
-    </callout>
-    <callout arearefs="vb3">
-    <para>Coordinates are (100%,0)</para>
-    </callout>
-    <callout arearefs="vb4">
-    <para>Coordinates are (100%,50%)</para>
-    </callout>
-    <callout arearefs="vb5">
-    <para>Coordinates are (100%,100%)</para>
-    </callout>
-    <callout arearefs="vb6">
-    <para>Coordinates are (50%,100%)</para>
-    </callout>
-    <callout arearefs="vb7">
-    <para>Coordinates are (0,100%)</para>
-    </callout>
-    <callout arearefs="vb8">
-    <para>Coordinates are (0,50%)</para>
-    </callout>
-    <callout arearefs="vb9" id="co-vb9">
-    <para>Coordinates are (1/3,1/6)</para>
-    </callout>
-    <callout arearefs="vb10" id="co-vb10">
-    <para>Coordinates are (2/3,1/6)</para>
-    </callout>
-    </calloutlist>
-  </imageobjectco>
-  <textobject><phrase>alt text</phrase></textobject>
-</mediaobjectco>
-
-<mediaobjectco>
-  <imageobjectco>
-    <areaspec>
-      <area id="vc1" units="calspair" coords="0,0 0,0"/>
-      <area id="vc2" units="calspair" coords="5000,0 5000,0"/>
-      <area id="vc3" units="calspair" coords="10000,0 10000,0"/>
-      <area id="vc4" units="calspair" coords="10000,5000 10000,5000"/>
-      <area id="vc5" units="calspair" coords="10000,10000 10000,10000"/>
-      <area id="vc6" units="calspair" coords="5000,10000 5000,10000"/>
-      <area id="vc7" units="calspair" coords="0,10000 0,10000"/>
-      <area id="vc8" units="calspair" coords="0,5000 0,5000"/>
-      <area id="vc9" units="calspair" coords="3333,1666 3333,1666" linkends="co-vc9"/>
-      <area id="vc10" units="calspair" coords="6666,1666 6666,1666" linkends="co-vc10"/>
-    </areaspec>
-    <imageobject>
-      <imagedata
-        fileref="graphics/duck.png"
-        contentwidth="300px"
-        contentdepth="200px"
-        srccredit="O'Reilly &amp; Associates/Dover Archives"/>
-    </imageobject>
-    <calloutlist>
-    <callout arearefs="vc1">
-    <para>Coordinates are (0,0)</para>
-    </callout>
-    <callout arearefs="vc2">
-    <para>Coordinates are (50%,0)</para>
-    </callout>
-    <callout arearefs="vc3">
-    <para>Coordinates are (100%,0)</para>
-    </callout>
-    <callout arearefs="vc4">
-    <para>Coordinates are (100%,50%)</para>
-    </callout>
-    <callout arearefs="vc5">
-    <para>Coordinates are (100%,100%)</para>
-    </callout>
-    <callout arearefs="vc6">
-    <para>Coordinates are (50%,100%)</para>
-    </callout>
-    <callout arearefs="vc7">
-    <para>Coordinates are (0,100%)</para>
-    </callout>
-    <callout arearefs="vc8">
-    <para>Coordinates are (0,50%)</para>
-    </callout>
-    <callout arearefs="vc9" id="co-vc9">
-    <para>Coordinates are (1/3,1/6)</para>
-    </callout>
-    <callout arearefs="vc10" id="co-vc10">
-    <para>Coordinates are (2/3,1/6)</para>
-    </callout>
-    </calloutlist>
-  </imageobjectco>
-  <textobject><phrase>alt text</phrase></textobject>
-</mediaobjectco>
-
-
-</article>
diff --git a/test/testdocs/methodsynopsis.001.xml b/test/testdocs/methodsynopsis.001.xml
deleted file mode 100644
index 2e8ee288..00000000
--- a/test/testdocs/methodsynopsis.001.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: methodsynopsis.001.xml</title>
-<releaseinfo role="CVS">$Id: methodsynopsis.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Here's a <sgmltag>methodsynopsis</sgmltag> in a <sgmltag>classsynopsis</sgmltag>:
-</para>
-
-<classsynopsis>
-<ooclass>
-<classname>Foo</classname>
-</ooclass>
-<methodsynopsis>
-<modifier>public</modifier>
-<modifier>static</modifier>
-<type>double</type>
-<methodname>getQuote</methodname>
-<methodparam>
-<type>String</type>
-<parameter>symbol</parameter>
-</methodparam>
-<methodparam>
-<type>double</type>
-<parameter>price</parameter>
-</methodparam>
-</methodsynopsis>
-</classsynopsis>
-
-<para>Here's a <sgmltag>methodsynopsis</sgmltag>
-<emphasis>outside</emphasis> a <sgmltag>classsynopsis</sgmltag>:
-</para>
-
-<methodsynopsis>
-<modifier>public</modifier>
-<modifier>static</modifier>
-<type>double</type>
-<methodname>getQuote</methodname>
-<methodparam>
-<type>String</type>
-<parameter>symbol</parameter>
-</methodparam>
-<methodparam>
-<type>double</type>
-<parameter>price</parameter>
-</methodparam>
-</methodsynopsis>
-
-</article>
diff --git a/test/testdocs/note.001.xml b/test/testdocs/note.001.xml
deleted file mode 100644
index 5ee6e796..00000000
--- a/test/testdocs/note.001.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>Unit Test: note.001</title>
-<releaseinfo role="CVS">$Id: note.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<note> 
-<title>Who can do this</title> 
-<para>All operators</para> 
-</note> 
-
-</article>
diff --git a/test/testdocs/olink.001.xml b/test/testdocs/olink.001.xml
deleted file mode 100644
index c0f258ee..00000000
--- a/test/testdocs/olink.001.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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" [
-<!ENTITY olink.001.xml SYSTEM "olink.001.xml" NDATA SGML>
-]>
-<article>
-<articleinfo>
-<title>Unit Test: olink.001</title>
-<releaseinfo role="CVS">$Id: olink.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<modespec id="olink">file:///sourceforge/projects/docbook/testdocs/tests/olink.001.html</modespec>
-</articleinfo>
-
-<para>This is an <olink targetdocent="olink.001.xml" linkmode="olink">OLink</olink>
-with a linkmode. (It is self-referential).</para>
-
-<para>This is an <olink targetdocent="olink.001.xml">OLink</olink>
-without a linkmode. (It is also self-referential).</para>
-
-</article>
diff --git a/test/testdocs/orderedlist.001.xml b/test/testdocs/orderedlist.001.xml
deleted file mode 100644
index 8a52b370..00000000
--- a/test/testdocs/orderedlist.001.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>Unit Test: orderedlist.001</title>
-<releaseinfo role="CVS">$Id: orderedlist.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<orderedlist>
-  <listitem><para>Level 1</para>
-    <orderedlist>
-    <listitem><para>Level 2</para>
-      <orderedlist>
-      <listitem id="someOLI"><para>Level 3</para>
-        <orderedlist>
-        <listitem><para>Level 4</para>
-          <orderedlist>
-          <listitem><para>Level 5</para>
-            <orderedlist>
-            <listitem override="13"><para>Level 6, override=13</para>
-            </listitem>
-            </orderedlist>
-          </listitem>
-          </orderedlist>
-        </listitem>
-        </orderedlist>
-    </listitem>
-    </orderedlist>
-  </listitem>
-  </orderedlist>
-</listitem>
-</orderedlist>
-
-</article>
diff --git a/test/testdocs/orderedlist.002.xml b/test/testdocs/orderedlist.002.xml
deleted file mode 100644
index 2242bd5c..00000000
--- a/test/testdocs/orderedlist.002.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>Unit Test: orderedlist.002</title>
-<releaseinfo role="CVS">$Id: orderedlist.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<orderedlist numeration="loweralpha">
-  <listitem><para>Level 1, numeration="loweralpha"</para>
-    <orderedlist>
-    <listitem><para>Level 2</para>
-      <orderedlist>
-      <listitem><para>Level 3</para>
-        <orderedlist>
-        <listitem><para>Level 4</para>
-          <orderedlist>
-          <listitem><para>Level 5</para>
-            <orderedlist>
-            <listitem><para>Level 6</para>
-            </listitem>
-            </orderedlist>
-          </listitem>
-          </orderedlist>
-        </listitem>
-        </orderedlist>
-    </listitem>
-    </orderedlist>
-  </listitem>
-  </orderedlist>
-</listitem>
-</orderedlist>
-
-</article>
diff --git a/test/testdocs/orderedlist.003.xml b/test/testdocs/orderedlist.003.xml
deleted file mode 100644
index 360312d8..00000000
--- a/test/testdocs/orderedlist.003.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>Unit Test: orderedlist.003</title>
-<releaseinfo role="CVS">$Id: orderedlist.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Test list continuation. And cross-references;
-item “2”: <xref linkend="i2"/> and item “4”: <xref linkend="i4"/>.</para>
-
-<orderedlist spacing="compact">
-<listitem><simpara>First item</simpara></listitem>
-<listitem id="i2"><simpara>Second item</simpara></listitem>
-<listitem><simpara>Third item</simpara></listitem>
-</orderedlist>
-
-<para>And then a break occurs...a break in my sanity, apparently,
-because changing the numeration style across a “continues” break seems
-really stupid. But this a unit test, after all. Stupid is
-allowed.</para>
-
-<orderedlist spacing="compact" continuation="continues" numeration="upperalpha">
-<listitem id="i4"><simpara>Fourth item</simpara></listitem>
-<listitem><simpara>Fifth item</simpara></listitem>
-<listitem><simpara>Sixth item</simpara></listitem>
-</orderedlist>
-
-</article>
diff --git a/test/testdocs/part.001.xml b/test/testdocs/part.001.xml
deleted file mode 100644
index ab1aedf1..00000000
--- a/test/testdocs/part.001.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<part>
-  <partinfo>
-    <releaseinfo role="CVS">$Id: part.001.xml 8020 2008-05-30 16:28:36Z abdelazer $</releaseinfo>
-  </partinfo>
-  <title>Unit Test: part.001</title>
-  <chapter>
-    <title>Chapter</title>
-    <para>Some test data
-    <indexterm>
-      <primary>First Part</primary>
-    </indexterm></para>
-    <para>Referencing <firstterm>gloss-1</firstterm>.</para>
-    <sect1>
-      <title>A sect1 in a chapter</title>
-      <para>With a little text.</para>
-    </sect1>
-  </chapter>
-
-  <glossary role="auto">
-    <remark>make sure <glossterm>gloss-2</glossterm> is referenced</remark>
-    <glossdiv>
-      <title>foo</title>
-      <glossentry><glossterm>irrelevant</glossterm>
-      <glossdef><para/></glossdef>
-      </glossentry>
-    </glossdiv>
-  </glossary>
-
-  <bibliography>
-    <bibliographyinfo>
-      <author><firstname>Norman</firstname><surname>Walsh</surname>
-      <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-      </author>
-    </bibliographyinfo>
-
-    <bibliodiv>
-      <title>Entries using biblioentry</title>
-
-      <biblioentry>
-	<abbrev>AhoSethiUllman96</abbrev>
-	<authorgroup>
-	  <author><firstname>Alfred V.</firstname><surname>Aho</surname></author>  
-	  <author><firstname>Ravi</firstname><surname>Sethi</surname></author>
-	  <author><firstname>Jeffrey D.</firstname><surname>Ullman</surname></author>
-	</authorgroup>
-	<title>Compilers, Principles, Techniques, and Tools</title>    
-	<publisher>
-	  <publishername>Addison-Wesley Publishing Company</publishername>
-	</publisher>
-	<copyright><year>1996</year>
-	<holder>Bell Telephone Laboratories, Inc.</holder></copyright>
-	<isbn>0-201-10088-6</isbn>    
-	<editor><firstname>James T.</firstname><surname>DeWolf</surname></editor>
-      </biblioentry>
-
-    </bibliodiv>
-  </bibliography>
-  <index/>
-</part>
diff --git a/test/testdocs/personname.001.xml b/test/testdocs/personname.001.xml
deleted file mode 100644
index 1fb905f3..00000000
--- a/test/testdocs/personname.001.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>Unit Test: personname.001</title>
-<releaseinfo role="CVS">$Id: personname.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <para>My name is <personname><firstname>Adam</firstname
-><othername>P.</othername><surname>Di Carlo</surname
-></personname>.  Please don't squish my name all together.</para>
-</article>
diff --git a/test/testdocs/procedure.001.xml b/test/testdocs/procedure.001.xml
deleted file mode 100644
index b0b705f0..00000000
--- a/test/testdocs/procedure.001.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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>Unit Test: procedure.001</title>
-<releaseinfo role="CVS">$Id: procedure.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<procedure id="proc"><title>Procedure Title</title>
-<step><para>Press MENUS.</para>
-</step>
-<step id="step-x"><para>Press MENUS.</para>
-</step>
-<step><para>Press MENUS.</para>
-</step>
-<step><para>Press MENUS.</para>
-</step>
-<step><para>Select SETUP.</para>
-<substeps>
-<step><para>Should be an <quote>a</quote></para>
-</step>
-<step id="step-y"><para>Should be a <quote>b</quote></para>
-</step>
-<step><para>Should be a <quote>c</quote></para>
-</step>
-<step><para>Should be a <quote>d</quote></para>
-</step>
-<step><para>should be an <quote>e</quote></para>
-<substeps>
-<step><para>should be an <quote>i</quote></para>
-</step>
-<step id="step-z"><para>should be an <quote>ii</quote></para>
-</step>
-</substeps>
-</step>
-</substeps>
-</step>
-</procedure>
-
-</article>
diff --git a/test/testdocs/procedure.002.xml b/test/testdocs/procedure.002.xml
deleted file mode 100644
index d451e417..00000000
--- a/test/testdocs/procedure.002.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>Unit Test: procedure.002</title>
-<releaseinfo role="CVS">$Id: procedure.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<procedure>
-<step><para>Press MENUS.</para>
-</step>
-<step><para>Press MENUS.</para>
-</step>
-<step><para>Press MENUS.</para>
-</step>
-<step><para>Press MENUS.</para>
-</step>
-<step><title>Setup</title>
-<para>Select SETUP.</para>
-<substeps>
-<step><para>Should be an “a”</para>
-</step>
-<step><para>Should be a “b”</para>
-</step>
-<step><para>Should be a “c”</para>
-</step>
-<step><para>Should be a “d”</para>
-</step>
-<step><para>should be an “e”</para>
-<substeps>
-<step><para>should be an “i”</para>
-</step>
-<step><para>should be an “ii”</para>
-</step>
-</substeps>
-</step>
-</substeps>
-</step>
-</procedure>
-
-</article>
diff --git a/test/testdocs/procedure.003.xml b/test/testdocs/procedure.003.xml
deleted file mode 100644
index 19673f20..00000000
--- a/test/testdocs/procedure.003.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>Unit Test: procedure.003</title>
-<releaseinfo role="CVS">$Id: procedure.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<procedure>
-<para>Do the following:</para>
-<step><para>One step?</para>
-</step>
-</procedure>
-
-</article>
diff --git a/test/testdocs/productionset.001.xml b/test/testdocs/productionset.001.xml
deleted file mode 100644
index 6b3c992b..00000000
--- a/test/testdocs/productionset.001.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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>Unit Test: productionset.001</title>
-<releaseinfo role="CVS">$Id: productionset.001.xml 4105 2004-12-15 23:00:31Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<productionset><title>Arithemetic Expressions</title>
-<production id="ebnf.expression">
-  <lhs>Expression</lhs>
-  <rhs><nonterminal def="#ebnf.arith">ArithExpression</nonterminal> |
-       <nonterminal def="#ebnf.mult">MultExpression</nonterminal>
-  <lineannotation>Does this grammar actually get precedence right?
-  </lineannotation>
-  </rhs>
-</production>
-<production id="ebnf.arith">
-  <lhs>ArithExpression</lhs>
-  <rhs><nonterminal def="#ebnf.expression">Expression</nonterminal>
-       '+'
-       <nonterminal def="#ebnf.mult">MultExpression</nonterminal>
-  </rhs>
-<!--
-  <rhs><nonterminal def="#ebnf.expression">Expression</nonterminal>
-       '-'
-       <nonterminal def="#ebnf.mult">MultExpression</nonterminal>
-  </rhs>
--->
-</production>
-<production id="ebnf.mult">
-  <lhs>MultExpression</lhs>
-  <rhs><nonterminal def="#ebnf.mult">MultExpression</nonterminal>
-       '*'
-       <nonterminal def="#ebnf.mult">MultExpression</nonterminal>
-  </rhs>
-<!--
-  <rhs>
-       <nonterminal def="#ebnf.mult">MultExpression</nonterminal>
-       '/'
-       <nonterminal def="#ebnf.mult">MultExpression</nonterminal>
-  </rhs>
--->
-  <constraint linkend="div0"/>
-<!--
-  <rhs>
-       <nonterminal def="#ebnf.number">Number</nonterminal>
-  </rhs>
--->
-</production>
-<production id="ebnf.number">
-  <lhs>Number</lhs>
-  <rhs>[0-9]+</rhs>
-</production>
-</productionset>
-
-<constraintdef id="div0" role="Err">
-<title>Division by Zero</title>
-<para>Division by zero is an error.</para>
-</constraintdef>
-
-</article>
diff --git a/test/testdocs/productionset.002.xml b/test/testdocs/productionset.002.xml
deleted file mode 100644
index 4e2bb66e..00000000
--- a/test/testdocs/productionset.002.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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>Unit Test: productionset.002</title>
-<releaseinfo role="CVS">$Id: productionset.002.xml 4105 2004-12-15 23:00:31Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<productionset><title>Character Range</title>
-<production id="NT-Char">
-<lhs>Char</lhs>
-<rhs>#x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
-<!-- The above line break in the source file has nothing to do with the
-line breaks in the output. -->
-| [#x10000-#x10FFFF]
-<lineannotation>any Unicode character, excluding the surrogate
-blocks, FFFE, and FFFF.
-</lineannotation>
-</rhs>
-</production>
-</productionset>
-
-</article>
diff --git a/test/testdocs/productionset.003.xml b/test/testdocs/productionset.003.xml
deleted file mode 100644
index da3d76dd..00000000
--- a/test/testdocs/productionset.003.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>Unit Test: productionset.003</title>
-<releaseinfo role="CVS">$Id: productionset.003.xml 4105 2004-12-15 23:00:31Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<productionset><title>Standalone Document Declaration</title>
-<production id="NT-SDDecl">
-<lhs>SDDecl</lhs>
-<rhs><nonterminal def="#NT-S">S</nonterminal> 'standalone' <nonterminal def="#NT-Eq">Eq</nonterminal>
-<!-- The above line break in the source file has nothing to do with the
-line breaks in the output. -->
-(("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"'))
-</rhs>
-<constraint linkend="check-rmd"/>
-</production>
-</productionset>
-
-<constraintdef id="check-rmd" role="VC">
-<title>Standalone Document Declaration</title>
-<para>Some description...</para>
-</constraintdef>
-
-</article>
diff --git a/test/testdocs/productionset.004.xml b/test/testdocs/productionset.004.xml
deleted file mode 100644
index a58bf2ee..00000000
--- a/test/testdocs/productionset.004.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>Unit Test: productionset.004</title>
-<releaseinfo role="CVS">$Id: productionset.004.xml 4105 2004-12-15 23:00:31Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<productionset>
-<production id="NT-SDDecl">
-<lhs>SDDecl</lhs>
-<rhs><nonterminal def="#NT-S">S</nonterminal> 'standalone' <nonterminal def="#NT-Eq">Eq</nonterminal>
-<!-- The above line break in the source file has nothing to do with the
-line breaks in the output. -->
-(("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"'))
-</rhs>
-<constraint linkend="check-rmd"/>
-</production>
-<production id="NT-element">
-<lhs>element</lhs>
-<rhs>
-<nonterminal def="#NT-EmptyElemTag">EmptyElemTag</nonterminal>
-<sbr/><!-- There will be a line break in the output because of the sbr. -->
-| <nonterminal def="#NT-STag">STag</nonterminal> <nonterminal def="#NT-content">content</nonterminal>
-<!-- The above line break has nothing to do with the output. -->
-<nonterminal def="#NT-SDDecl"/>
-</rhs>
-<constraint linkend="GIMatch"/>
-<constraint linkend="elementvalid"/>
-</production>
-<productionrecap linkend="NT-SDDecl"/>
-</productionset>
-
-<constraintdef id="GIMatch" role="WFC">
-<title>Element Type Match</title>
-<para>Some description...</para>
-</constraintdef>
-
-<constraintdef id="elementvalid" role="VC">
-<title>Element Valid</title>
-<para>Some description...</para>
-</constraintdef>
-
-<constraintdef id="check-rmd" role="VC">
-<title>Standalone Document Declaration</title>
-<para>Some description...</para>
-</constraintdef>
-
-</article>
diff --git a/test/testdocs/productionset.005.xml b/test/testdocs/productionset.005.xml
deleted file mode 100644
index 2a49930d..00000000
--- a/test/testdocs/productionset.005.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: productionset.005</title>
-<releaseinfo role="CVS">$Id: productionset.005.xml 4105 2004-12-15 23:00:31Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<preface><title>Preface</title>
-<para>This book tests EBNF constraint links that cross chunk boundaries.</para>
-</preface>
-
-<chapter><title>EBNF</title>
-
-<productionset>
-<production id="NT-SDDecl">
-<lhs>SDDecl</lhs>
-<rhs><nonterminal def="#NT-S">S</nonterminal> 'standalone' <nonterminal def="#NT-Eq">Eq</nonterminal>
-<!-- The above line break in the source file has nothing to do with the
-line breaks in the output. -->
-(("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"'))
-</rhs>
-<constraint linkend="check-rmd"/>
-</production>
-<production id="NT-element">
-<lhs>element</lhs>
-<rhs>
-<nonterminal def="#NT-EmptyElemTag">EmptyElemTag</nonterminal>
-<sbr/><!-- There will be a line break in the output because of the sbr. -->
-| <nonterminal def="#NT-STag">STag</nonterminal> <nonterminal def="#NT-content">content</nonterminal>
-<!-- The above line break has nothing to do with the output. -->
-<nonterminal def="#NT-SDDecl"/>
-</rhs>
-<constraint linkend="GIMatch"/>
-<constraint linkend="elementvalid"/>
-</production>
-<productionrecap linkend="NT-SDDecl"/>
-</productionset>
-
-</chapter>
-
-<chapter><title>Constraints</title>
-
-<constraintdef id="GIMatch" role="WFC">
-<title>Element Type Match</title>
-<para>Some description...</para>
-</constraintdef>
-
-<constraintdef id="elementvalid" role="VC">
-<title>Element Valid</title>
-<para>Some description...</para>
-</constraintdef>
-
-<constraintdef id="check-rmd" role="VC">
-<title>Standalone Document Declaration</title>
-<para>Some description...</para>
-</constraintdef>
-
-<constraintdef id="NT-S">
-<title>NT-S</title>
-<para>Just for link integrity...</para>
-</constraintdef>
-
-<constraintdef id="NT-Eq">
-<title>NT-Eq</title>
-<para>Just for link integrity...</para>
-</constraintdef>
-
-<constraintdef id="NT-EmptyElemTag">
-<title>NT-EmptyElemTag</title>
-<para>Just for link integrity...</para>
-</constraintdef>
-
-<constraintdef id="NT-STag">
-<title>NT-STag</title>
-<para>Just for link integrity...</para>
-</constraintdef>
-
-<constraintdef id="NT-content">
-<title>NT-content</title>
-<para>Just for link integrity...</para>
-</constraintdef>
-
-</chapter>
-</book>
diff --git a/test/testdocs/productionset.006.xml b/test/testdocs/productionset.006.xml
deleted file mode 100644
index 647a199e..00000000
--- a/test/testdocs/productionset.006.xml
+++ /dev/null
@@ -1,809 +0,0 @@
-<?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>Unit Test: productionset.006</title>
-<releaseinfo role="CVS">$Id: productionset.006.xml 4105 2004-12-15 23:00:31Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<productionset><title>Python Grammar<footnote>
-<para>Derived pseudo-mechanically from
-<ulink url="http://www.python.org/doc/current/ref/grammar.txt"/>.</para>
-</footnote></title>
-
-<production id="identifier">
-<lhs>identifier</lhs>
-<rhs>(<nonterminal def="#letter">letter</nonterminal>|"_") (<nonterminal def="#letter">letter</nonterminal>|<nonterminal def="#digit">digit</nonterminal>| "_")*</rhs>
-</production>
-
-<production id="letter">
-<lhs>letter</lhs>
-<rhs><nonterminal def="#lowercase">lowercase</nonterminal> <sbr/>| <nonterminal def="#uppercase">uppercase</nonterminal>
-</rhs>
-</production>
-
-<production id="lowercase">
-<lhs>lowercase</lhs>
-<rhs>"a"..."z"
-</rhs>
-</production>
-
-<production id="uppercase">
-<lhs>uppercase</lhs>
-<rhs>"A"..."Z"
-</rhs>
-</production>
-
-<production id="digit">
-<lhs>digit</lhs>
-<rhs>"0"..."9"
-</rhs>
-</production>
-
-<production id="stringliteral">
-<lhs>stringliteral</lhs>
-<rhs>[<nonterminal def="#stringprefix">stringprefix</nonterminal>](<nonterminal def="#shortstring">shortstring</nonterminal> | <nonterminal def="#longstring">longstring</nonterminal>)
-</rhs>
-</production>
-
-<production id="stringprefix">
-<lhs>stringprefix</lhs>
-<rhs>"r" | "u" | "ur" | "R" | "U" | "UR" | "Ur" | "uR"
-</rhs>
-</production>
-
-<production id="shortstring">
-<lhs>shortstring</lhs>
-<rhs>"'" <nonterminal def="#shortstringitem">shortstringitem</nonterminal>* "'" <sbr/>| '"' <nonterminal def="#shortstringitem">shortstringitem</nonterminal>* '"'
-</rhs>
-</production>
-
-<production id="longstring">
-<lhs>longstring</lhs>
-<rhs>"'''" <nonterminal def="#longstringitem">longstringitem</nonterminal>* "'''" <sbr/>| '"""' <nonterminal def="#longstringitem">longstringitem</nonterminal>* '"""'
-</rhs>
-</production>
-
-<production id="shortstringitem">
-<lhs>shortstringitem</lhs>
-<rhs><nonterminal def="#shortstringchar">shortstringchar</nonterminal> <sbr/>| <nonterminal def="#escapeseq">escapeseq</nonterminal>
-</rhs>
-</production>
-
-<production id="longstringitem">
-<lhs>longstringitem</lhs>
-<rhs><nonterminal def="#longstringchar">longstringchar</nonterminal> <sbr/>| <nonterminal def="#escapeseq">escapeseq</nonterminal>
-</rhs>
-</production>
-
-<production id="shortstringchar">
-<lhs>shortstringchar</lhs>
-<rhs>any ASCII character except "\" or newline or the quote
-</rhs>
-</production>
-
-<production id="longstringchar">
-<lhs>longstringchar</lhs>
-<rhs>any ASCII character except "\"
-</rhs>
-</production>
-
-<production id="escapeseq">
-<lhs>escapeseq</lhs>
-<rhs>"\" any ASCII character
-</rhs>
-</production>
-
-<production id="longinteger">
-<lhs>longinteger</lhs>
-<rhs><nonterminal def="#integer">integer</nonterminal> ("l" | "L")
-</rhs>
-</production>
-
-<production id="integer">
-<lhs>integer</lhs>
-<rhs><nonterminal def="#decimalinteger">decimalinteger</nonterminal> <sbr/>| <nonterminal def="#octinteger">octinteger</nonterminal> <sbr/>| <nonterminal def="#hexinteger">hexinteger</nonterminal>
-</rhs>
-</production>
-
-<production id="decimalinteger">
-<lhs>decimalinteger</lhs>
-<rhs><nonterminal def="#nonzerodigit">nonzerodigit</nonterminal> <nonterminal def="#digit">digit</nonterminal>* | "0"
-</rhs>
-</production>
-
-<production id="octinteger">
-<lhs>octinteger</lhs>
-<rhs>"0" <nonterminal def="#octdigit">octdigit</nonterminal>+
-</rhs>
-</production>
-
-<production id="hexinteger">
-<lhs>hexinteger</lhs>
-<rhs>"0" ("x" | "X") <nonterminal def="#hexdigit">hexdigit</nonterminal>+
-</rhs>
-</production>
-
-<production id="nonzerodigit">
-<lhs>nonzerodigit</lhs>
-<rhs>"1"..."9"
-</rhs>
-</production>
-
-<production id="octdigit">
-<lhs>octdigit</lhs>
-<rhs>"0"..."7"
-</rhs>
-</production>
-
-<production id="hexdigit">
-<lhs>hexdigit</lhs>
-<rhs><nonterminal def="#digit">digit</nonterminal> <sbr/>| "a"..."f" <sbr/>| "A"..."F"
-</rhs>
-</production>
-
-<production id="floatnumber">
-<lhs>floatnumber</lhs>
-<rhs><nonterminal def="#pointfloat">pointfloat</nonterminal> <sbr/>| <nonterminal def="#exponentfloat">exponentfloat</nonterminal>
-</rhs>
-</production>
-
-<production id="pointfloat">
-<lhs>pointfloat</lhs>
-<rhs>[<nonterminal def="#intpart">intpart</nonterminal>] <nonterminal def="#fraction">fraction</nonterminal> <sbr/>| <nonterminal def="#intpart">intpart</nonterminal> "."
-</rhs>
-</production>
-
-<production id="exponentfloat">
-<lhs>exponentfloat</lhs>
-<rhs>(<nonterminal def="#intpart">intpart</nonterminal> | <nonterminal def="#pointfloat">pointfloat</nonterminal>) <nonterminal def="#exponent">exponent</nonterminal>
-</rhs>
-</production>
-
-
-<production id="intpart">
-<lhs>intpart</lhs>
-<rhs><nonterminal def="#digit">digit</nonterminal>+
-</rhs>
-</production>
-
-<production id="fraction">
-<lhs>fraction</lhs>
-<rhs>"." <nonterminal def="#digit">digit</nonterminal>+
-</rhs>
-</production>
-
-<production id="exponent">
-<lhs>exponent</lhs>
-<rhs>("e" | "E") ["+" | "-"] <nonterminal def="#digit">digit</nonterminal>+
-</rhs>
-</production>
-
-<production id="imagnumber">
-<lhs>imagnumber</lhs>
-<rhs>(<nonterminal def="#floatnumber">floatnumber</nonterminal> <sbr/>| <nonterminal def="#intpart">intpart</nonterminal>) ("j" | "J")
-</rhs>
-</production>
-
-<production id="atom">
-<lhs>atom</lhs>
-<rhs><nonterminal def="#identifier">identifier</nonterminal> <sbr/>| <nonterminal def="#literal">literal</nonterminal> <sbr/>| <nonterminal def="#enclosure">enclosure</nonterminal>
-</rhs>
-</production>
-
-<production id="enclosure">
-<lhs>enclosure</lhs>
-<rhs><nonterminal def="#parenth_form">parenth_form</nonterminal> <sbr/>| <nonterminal def="#list_display">list_display</nonterminal> <sbr/>| <nonterminal def="#dict_display">dict_display</nonterminal> <sbr/>| <nonterminal def="#string_conversion">string_conversion</nonterminal>
-</rhs>
-</production>
-
-
-<production id="literal">
-<lhs>literal</lhs>
-<rhs><nonterminal def="#stringliteral">stringliteral</nonterminal> <sbr/>| <nonterminal def="#integer">integer</nonterminal> <sbr/>| <nonterminal def="#longinteger">longinteger</nonterminal> <sbr/>| <nonterminal def="#floatnumber">floatnumber</nonterminal> <sbr/>| <nonterminal def="#imagnumber">imagnumber</nonterminal>
-</rhs>
-</production>
-
-
-<production id="parenth_form">
-<lhs>parenth_form</lhs>
-<rhs>"(" [<nonterminal def="#expression_list">expression_list</nonterminal>] ")"
-</rhs>
-</production>
-
-<production id="list_display">
-<lhs>list_display</lhs>
-<rhs>"[" [<nonterminal def="#listmaker">listmaker</nonterminal>] "]"
-</rhs>
-</production>
-
-<production id="listmaker">
-<lhs>listmaker</lhs>
-<rhs><nonterminal def="#expression">expression</nonterminal> ( <nonterminal def="#list_for">list_for</nonterminal> | ( "," <nonterminal def="#expression">expression</nonterminal>)* [","] )
-</rhs>
-</production>
-
-
-<production id="list_iter">
-<lhs>list_iter</lhs>
-<rhs><nonterminal def="#list_for">list_for</nonterminal> <sbr/>| <nonterminal def="#list_if">list_if</nonterminal>
-</rhs>
-</production>
-
-<production id="list_for">
-<lhs>list_for</lhs>
-<rhs>"for" <nonterminal def="#expression_list">expression_list</nonterminal> "in" testlist [<nonterminal def="#list_iter">list_iter</nonterminal>]
-</rhs>
-</production>
-
-
-<production id="list_if">
-<lhs>list_if</lhs>
-<rhs>"if" test [<nonterminal def="#list_iter">list_iter</nonterminal>]
-</rhs>
-</production>
-
-<production id="dict_display">
-<lhs>dict_display</lhs>
-<rhs>"\{" [<nonterminal def="#key_datum_list">key_datum_list</nonterminal>] "\}"
-</rhs>
-</production>
-
-<production id="key_datum_list">
-<lhs>key_datum_list</lhs>
-<rhs><nonterminal def="#key_datum">key_datum</nonterminal> ("," <nonterminal def="#key_datum">key_datum</nonterminal>)* [","]
-</rhs>
-</production>
-
-<production id="key_datum">
-<lhs>key_datum</lhs>
-<rhs><nonterminal def="#expression">expression</nonterminal> ":" <nonterminal def="#expression">expression</nonterminal>
-</rhs>
-</production>
-
-<production id="string_conversion">
-<lhs>string_conversion</lhs>
-<rhs>"`" <nonterminal def="#expression_list">expression_list</nonterminal> "`"
-</rhs>
-</production>
-
-<production id="primary">
-<lhs>primary</lhs>
-<rhs><nonterminal def="#atom">atom</nonterminal> <sbr/>| <nonterminal def="#attributeref">attributeref</nonterminal> <sbr/>| <nonterminal def="#subscription">subscription</nonterminal> <sbr/>| <nonterminal def="#slicing">slicing</nonterminal> <sbr/>| <nonterminal def="#call">call</nonterminal>
-</rhs>
-</production>
-
-
-<production id="attributeref">
-<lhs>attributeref</lhs>
-<rhs><nonterminal def="#primary">primary</nonterminal> "." <nonterminal def="#identifier">identifier</nonterminal>
-</rhs>
-</production>
-
-<production id="subscription">
-<lhs>subscription</lhs>
-<rhs><nonterminal def="#primary">primary</nonterminal> "[" <nonterminal def="#expression_list">expression_list</nonterminal> "]"
-</rhs>
-</production>
-
-<production id="slicing">
-<lhs>slicing</lhs>
-<rhs><nonterminal def="#simple_slicing">simple_slicing</nonterminal> <sbr/>| <nonterminal def="#extended_slicing">extended_slicing</nonterminal>
-</rhs>
-</production>
-
-<production id="simple_slicing">
-<lhs>simple_slicing</lhs>
-<rhs><nonterminal def="#primary">primary</nonterminal> "[" <nonterminal def="#short_slice">short_slice</nonterminal> "]"
-</rhs>
-</production>
-
-<production id="extended_slicing">
-<lhs>extended_slicing</lhs>
-<rhs><nonterminal def="#primary">primary</nonterminal> "[" <nonterminal def="#slice_list">slice_list</nonterminal> "]"
-</rhs>
-</production>
-
-<production id="slice_list">
-<lhs>slice_list</lhs>
-<rhs><nonterminal def="#slice_item">slice_item</nonterminal> ("," <nonterminal def="#slice_item">slice_item</nonterminal>)* [","]
-</rhs>
-</production>
-
-<production id="slice_item">
-<lhs>slice_item</lhs>
-<rhs><nonterminal def="#expression">expression</nonterminal> <sbr/>| <nonterminal def="#proper_slice">proper_slice</nonterminal> <sbr/>| <nonterminal def="#ellipsis">ellipsis</nonterminal>
-</rhs>
-</production>
-
-<production id="proper_slice">
-<lhs>proper_slice</lhs>
-<rhs><nonterminal def="#short_slice">short_slice</nonterminal> <sbr/>| <nonterminal def="#long_slice">long_slice</nonterminal>
-</rhs>
-</production>
-
-<production id="short_slice">
-<lhs>short_slice</lhs>
-<rhs>[<nonterminal def="#lower_bound">lower_bound</nonterminal>] ":" [<nonterminal def="#upper_bound">upper_bound</nonterminal>]
-</rhs>
-</production>
-
-<production id="long_slice">
-<lhs>long_slice</lhs>
-<rhs><nonterminal def="#short_slice">short_slice</nonterminal> ":" [<nonterminal def="#stride">stride</nonterminal>]
-</rhs>
-</production>
-
-<production id="lower_bound">
-<lhs>lower_bound</lhs>
-<rhs><nonterminal def="#expression">expression</nonterminal>
-</rhs>
-</production>
-
-<production id="upper_bound">
-<lhs>upper_bound</lhs>
-<rhs><nonterminal def="#expression">expression</nonterminal>
-</rhs>
-</production>
-
-<production id="stride">
-<lhs>stride</lhs>
-<rhs><nonterminal def="#expression">expression</nonterminal>
-</rhs>
-</production>
-
-<production id="ellipsis">
-<lhs>ellipsis</lhs>
-<rhs>"..."
-</rhs>
-</production>
-
-<production id="call">
-<lhs>call</lhs>
-<rhs><nonterminal def="#primary">primary</nonterminal> "(" [<nonterminal def="#argument_list">argument_list</nonterminal> [","]] ")"
-</rhs>
-</production>
-
-<production id="argument_list">
-<lhs>argument_list</lhs>
-<rhs><nonterminal def="#positional_arguments">positional_arguments</nonterminal> ["," <nonterminal def="#keyword_arguments">keyword_arguments</nonterminal>
-                   ["," "*" <nonterminal def="#expression">expression</nonterminal> ["," "**" <nonterminal def="#expression">expression</nonterminal>]]]
-                <sbr/>| <nonterminal def="#keyword_arguments">keyword_arguments</nonterminal> ["," "*" <nonterminal def="#expression">expression</nonterminal>
-                                             ["," "**" <nonterminal def="#expression">expression</nonterminal>]]
-                <sbr/>| "*" <nonterminal def="#expression">expression</nonterminal> ["," "**" <nonterminal def="#expression">expression</nonterminal>]
-                <sbr/>| "**" <nonterminal def="#expression">expression</nonterminal></rhs>
-</production>
-
-<production id="positional_arguments">
-<lhs>positional_arguments</lhs>
-<rhs><nonterminal def="#expression">expression</nonterminal> ("," <nonterminal def="#expression">expression</nonterminal>)*
-</rhs>
-</production>
-
-<production id="keyword_arguments">
-<lhs>keyword_arguments</lhs>
-<rhs><nonterminal def="#keyword_item">keyword_item</nonterminal> ("," <nonterminal def="#keyword_item">keyword_item</nonterminal>)*
-</rhs>
-</production>
-
-<production id="keyword_item">
-<lhs>keyword_item</lhs>
-<rhs><nonterminal def="#identifier">identifier</nonterminal> "=" <nonterminal def="#expression">expression</nonterminal>
-</rhs>
-</production>
-
-<production id="power">
-<lhs>power</lhs>
-<rhs><nonterminal def="#primary">primary</nonterminal> ["**" <nonterminal def="#u_expr">u_expr</nonterminal>]
-</rhs>
-</production>
-
-<production id="u_expr">
-<lhs>u_expr</lhs>
-<rhs><nonterminal def="#power">power</nonterminal> <sbr/>| "-" <nonterminal def="#u_expr">u_expr</nonterminal> <sbr/>| "+" <nonterminal def="#u_expr">u_expr</nonterminal> <sbr/>| "\~" <nonterminal def="#u_expr">u_expr</nonterminal>
-</rhs>
-</production>
-
-
-<production id="m_expr">
-<lhs>m_expr</lhs>
-<rhs><nonterminal def="#u_expr">u_expr</nonterminal> <sbr/>| <nonterminal def="#m_expr">m_expr</nonterminal> "*" <nonterminal def="#u_expr">u_expr</nonterminal> <sbr/>| <nonterminal def="#m_expr">m_expr</nonterminal> "/" <nonterminal def="#u_expr">u_expr</nonterminal> <sbr/>| <nonterminal def="#m_expr">m_expr</nonterminal> "\%" <nonterminal def="#u_expr">u_expr</nonterminal>
-</rhs>
-</production>
-
-
-
-<production id="a_expr">
-<lhs>a_expr</lhs>
-<rhs><nonterminal def="#m_expr">m_expr</nonterminal> <sbr/>| aexpr "+" <nonterminal def="#m_expr">m_expr</nonterminal> aexpr "-" <nonterminal def="#m_expr">m_expr</nonterminal>
-</rhs>
-</production>
-
-
-<production id="shift_expr">
-<lhs>shift_expr</lhs>
-<rhs><nonterminal def="#a_expr">a_expr</nonterminal> <sbr/>| <nonterminal def="#shift_expr">shift_expr</nonterminal> ( "&lt;&lt;" | "&gt;&gt;" ) <nonterminal def="#a_expr">a_expr</nonterminal>
-</rhs>
-</production>
-
-
-<production id="and_expr">
-<lhs>and_expr</lhs>
-<rhs><nonterminal def="#shift_expr">shift_expr</nonterminal> <sbr/>| <nonterminal def="#and_expr">and_expr</nonterminal> "&amp;" <nonterminal def="#shift_expr">shift_expr</nonterminal>
-</rhs>
-</production>
-
-<production id="xor_expr">
-<lhs>xor_expr</lhs>
-<rhs><nonterminal def="#and_expr">and_expr</nonterminal> <sbr/>| <nonterminal def="#xor_expr">xor_expr</nonterminal> "^" <nonterminal def="#and_expr">and_expr</nonterminal>
-</rhs>
-</production>
-
-<production id="or_expr">
-<lhs>or_expr</lhs>
-<rhs><nonterminal def="#xor_expr">xor_expr</nonterminal> <sbr/>| <nonterminal def="#or_expr">or_expr</nonterminal> "|" <nonterminal def="#xor_expr">xor_expr</nonterminal>
-</rhs>
-</production>
-
-<production id="comparison">
-<lhs>comparison</lhs>
-<rhs><nonterminal def="#or_expr">or_expr</nonterminal> ( <nonterminal def="#comp_operator">comp_operator</nonterminal> <nonterminal def="#or_expr">or_expr</nonterminal> )*
-</rhs>
-</production>
-
-<production id="comp_operator">
-<lhs>comp_operator</lhs>
-<rhs>"&lt;" <sbr/>| "&gt;" <sbr/>| "==" <sbr/>| "&gt;=" <sbr/>| "&lt;=" <sbr/>| "&lt;&gt;" <sbr/>| "!=" <sbr/>| "is" ["not"] <sbr/>| ["not"] "in"
-</rhs>
-</production>
-
-
-<production id="expression">
-<lhs>expression</lhs>
-<rhs><nonterminal def="#or_test">or_test</nonterminal> <sbr/>| <nonterminal def="#lambda_form">lambda_form</nonterminal>
-</rhs>
-</production>
-
-<production id="or_test">
-<lhs>or_test</lhs>
-<rhs><nonterminal def="#and_test">and_test</nonterminal> <sbr/>| <nonterminal def="#or_test">or_test</nonterminal> "or" <nonterminal def="#and_test">and_test</nonterminal>
-</rhs>
-</production>
-
-<production id="and_test">
-<lhs>and_test</lhs>
-<rhs><nonterminal def="#not_test">not_test</nonterminal> <sbr/>| <nonterminal def="#and_test">and_test</nonterminal> "and" <nonterminal def="#not_test">not_test</nonterminal>
-</rhs>
-</production>
-
-<production id="not_test">
-<lhs>not_test</lhs>
-<rhs><nonterminal def="#comparison">comparison</nonterminal> <sbr/>| "not" <nonterminal def="#not_test">not_test</nonterminal>
-</rhs>
-</production>
-
-<production id="lambda_form">
-<lhs>lambda_form</lhs>
-<rhs>"lambda" [<nonterminal def="#parameter_list">parameter_list</nonterminal>]: <nonterminal def="#expression">expression</nonterminal>
-</rhs>
-</production>
-
-<production id="expression_list">
-<lhs>expression_list</lhs>
-<rhs><nonterminal def="#expression">expression</nonterminal> ( "," <nonterminal def="#expression">expression</nonterminal> )* [","]
-</rhs>
-</production>
-
-<production id="simple_stmt">
-<lhs>simple_stmt</lhs>
-<rhs><nonterminal def="#expression_stmt">expression_stmt</nonterminal>
-<sbr/>| <nonterminal def="#assert_stmt">assert_stmt</nonterminal>
-<sbr/>| <nonterminal def="#assignment_stmt">assignment_stmt</nonterminal>
-<sbr/>| <nonterminal def="#augmented_assignment_stmt">augmented_assignment_stmt</nonterminal>
-<sbr/>| <nonterminal def="#pass_stmt">pass_stmt</nonterminal>
-<sbr/>| <nonterminal def="#del_stmt">del_stmt</nonterminal>
-<sbr/>| <nonterminal def="#print_stmt">print_stmt</nonterminal>
-<sbr/>| <nonterminal def="#return_stmt">return_stmt</nonterminal>
-<sbr/>| <nonterminal def="#yield_stmt">yield_stmt</nonterminal>
-<sbr/>| <nonterminal def="#raise_stmt">raise_stmt</nonterminal>
-<sbr/>| <nonterminal def="#break_stmt">break_stmt</nonterminal>
-<sbr/>| <nonterminal def="#continue_stmt">continue_stmt</nonterminal>
-<sbr/>| <nonterminal def="#import_stmt">import_stmt</nonterminal>
-<sbr/>| <nonterminal def="#global_stmt">global_stmt</nonterminal>
-<sbr/>| <nonterminal def="#exec_stmt">exec_stmt</nonterminal>
-</rhs>
-</production>
-
-<production id="expression_stmt">
-<lhs>expression_stmt</lhs>
-<rhs><nonterminal def="#expression_list">expression_list</nonterminal>
-</rhs>
-</production>
-
-<production id="assert_stmt">
-<lhs>assert_stmt</lhs>
-<rhs>"assert" <nonterminal def="#expression">expression</nonterminal> ["," <nonterminal def="#expression">expression</nonterminal>]
-</rhs>
-</production>
-
-<production id="assignment_stmt">
-<lhs>assignment_stmt</lhs>
-<rhs>(<nonterminal def="#target_list">target_list</nonterminal> "=")+ <nonterminal def="#expression_list">expression_list</nonterminal>
-</rhs>
-</production>
-
-<production id="target_list">
-<lhs>target_list</lhs>
-<rhs><nonterminal def="#target">target</nonterminal> ("," <nonterminal def="#target">target</nonterminal>)* [","]
-</rhs>
-</production>
-
-<production id="target">
-<lhs>target</lhs>
-<rhs><nonterminal def="#identifier">identifier</nonterminal>
-<sbr/>| "(" <nonterminal def="#target_list">target_list</nonterminal> ")"
-<sbr/>| "[" <nonterminal def="#target_list">target_list</nonterminal> "]"
-<sbr/>| <nonterminal def="#attributeref">attributeref</nonterminal>
-<sbr/>| <nonterminal def="#subscription">subscription</nonterminal>
-<sbr/>| <nonterminal def="#slicing">slicing</nonterminal>
-</rhs>
-</production>
-
-<production id="augmented_assignment_stmt">
-<lhs>augmented_assignment_stmt</lhs>
-<rhs><nonterminal def="#target">target</nonterminal> <nonterminal def="#augop">augop</nonterminal> <nonterminal def="#expression_list">expression_list</nonterminal>
-</rhs>
-</production>
-
-<production id="augop">
-<lhs>augop</lhs>
-<rhs>"+=" <sbr/>| "-=" <sbr/>| "*=" <sbr/>| "/=" <sbr/>| "\%=" <sbr/>| "**=" <sbr/>| "&gt;&gt;=" <sbr/>| "&lt;&lt;=" <sbr/>| "\&amp;=" <sbr/>| "\textasciicircum=" <sbr/>| "|="
-</rhs>
-</production>
-
-
-<production id="pass_stmt">
-<lhs>pass_stmt</lhs>
-<rhs>"pass"
-</rhs>
-</production>
-
-<production id="del_stmt">
-<lhs>del_stmt</lhs>
-<rhs>"del" <nonterminal def="#target_list">target_list</nonterminal>
-</rhs>
-</production>
-
-<production id="print_stmt">
-<lhs>print_stmt</lhs>
-<rhs>"print" ( \optionalexpression ("," <nonterminal def="#expression">expression</nonterminal>)* \optional","
-                | "&gt;\code&gt;" <nonterminal def="#expression">expression</nonterminal>
-                  \optional("," <nonterminal def="#expression">expression</nonterminal>)+ \optional"," )
-</rhs>
-</production>
-
-<production id="return_stmt">
-<lhs>return_stmt</lhs>
-<rhs>"return" [<nonterminal def="#expression_list">expression_list</nonterminal>]
-</rhs>
-</production>
-
-<production id="yield_stmt">
-<lhs>yield_stmt</lhs>
-<rhs>"yield" <nonterminal def="#expression_list">expression_list</nonterminal>
-</rhs>
-</production>
-
-<production id="raise_stmt">
-<lhs>raise_stmt</lhs>
-<rhs>"raise" [<nonterminal def="#expression">expression</nonterminal> ["," <nonterminal def="#expression">expression</nonterminal> ["," <nonterminal def="#expression">expression</nonterminal>]]]
-</rhs>
-</production>
-
-
-<production id="break_stmt">
-<lhs>break_stmt</lhs>
-<rhs>"break"
-</rhs>
-</production>
-
-<production id="continue_stmt">
-<lhs>continue_stmt</lhs>
-<rhs>"continue"
-</rhs>
-</production>
-
-<production id="import_stmt">
-<lhs>import_stmt</lhs>
-<rhs>"import" <nonterminal def="#module">module</nonterminal> ["as" name]
-( "," <nonterminal def="#module">module</nonterminal> ["as" name] )*
-<sbr/>| "from" <nonterminal def="#module">module</nonterminal> "import" <nonterminal def="#identifier">identifier</nonterminal>
-    ["as" name]
-  ( "," <nonterminal def="#identifier">identifier</nonterminal> ["as" name] )*
-<sbr/>| "from" <nonterminal def="#module">module</nonterminal> "import" "*"
-</rhs>
-</production>
-
-<production id="module">
-<lhs>module</lhs>
-<rhs>(<nonterminal def="#identifier">identifier</nonterminal> ".")* <nonterminal def="#identifier">identifier</nonterminal>
-</rhs>
-</production>
-
-<production id="global_stmt">
-<lhs>global_stmt</lhs>
-<rhs>"global" <nonterminal def="#identifier">identifier</nonterminal> ("," <nonterminal def="#identifier">identifier</nonterminal>)*
-</rhs>
-</production>
-
-<production id="exec_stmt">
-<lhs>exec_stmt</lhs>
-<rhs>"exec" <nonterminal def="#expression">expression</nonterminal> ["in" <nonterminal def="#expression">expression</nonterminal> ["," <nonterminal def="#expression">expression</nonterminal>]]
-</rhs>
-</production>
-
-
-<production id="compound_stmt">
-<lhs>compound_stmt</lhs>
-<rhs><nonterminal def="#if_stmt">if_stmt</nonterminal>
-<sbr/>| <nonterminal def="#while_stmt">while_stmt</nonterminal>
-<sbr/>| <nonterminal def="#for_stmt">for_stmt</nonterminal>
-<sbr/>| <nonterminal def="#try_stmt">try_stmt</nonterminal>
-<sbr/>| <nonterminal def="#funcdef">funcdef</nonterminal>
-<sbr/>| <nonterminal def="#classdef">classdef</nonterminal>
-</rhs>
-</production>
-
-
-<production id="suite">
-<lhs>suite</lhs>
-<rhs><nonterminal def="#stmt_list">stmt_list</nonterminal> NEWLINE <sbr/>| NEWLINE INDENT <nonterminal def="#statement">statement</nonterminal>+ DEDENT
-</rhs>
-</production>
-
-
-<production id="statement">
-<lhs>statement</lhs>
-<rhs><nonterminal def="#stmt_list">stmt_list</nonterminal> NEWLINE <sbr/>| <nonterminal def="#compound_stmt">compound_stmt</nonterminal>
-</rhs>
-</production>
-
-<production id="stmt_list">
-<lhs>stmt_list</lhs>
-<rhs><nonterminal def="#simple_stmt">simple_stmt</nonterminal> (";" <nonterminal def="#simple_stmt">simple_stmt</nonterminal>)* [";"]
-</rhs>
-</production>
-
-<production id="if_stmt">
-<lhs>if_stmt</lhs>
-<rhs>"if" <nonterminal def="#expression">expression</nonterminal> ":" <nonterminal def="#suite">suite</nonterminal>
-( "elif" <nonterminal def="#expression">expression</nonterminal> ":" <nonterminal def="#suite">suite</nonterminal> )*
-["else" ":" <nonterminal def="#suite">suite</nonterminal>]
-</rhs>
-</production>
-
-<production id="while_stmt">
-<lhs>while_stmt</lhs>
-<rhs>"while" <nonterminal def="#expression">expression</nonterminal> ":" <nonterminal def="#suite">suite</nonterminal> ["else" ":" <nonterminal def="#suite">suite</nonterminal>]
-</rhs>
-</production>
-
-
-<production id="for_stmt">
-<lhs>for_stmt</lhs>
-<rhs>"for" <nonterminal def="#target_list">target_list</nonterminal> "in" <nonterminal def="#expression_list">expression_list</nonterminal> ":" <nonterminal def="#suite">suite</nonterminal> ["else" ":" <nonterminal def="#suite">suite</nonterminal>]
-</rhs>
-</production>
-
-
-
-<production id="try_stmt">
-<lhs>try_stmt</lhs>
-<rhs><nonterminal def="#try_exc_stmt">try_exc_stmt</nonterminal> <sbr/>| <nonterminal def="#try_fin_stmt">try_fin_stmt</nonterminal>
-</rhs>
-</production>
-
-<production id="try_exc_stmt">
-<lhs>try_exc_stmt</lhs>
-<rhs>"try" ":" <nonterminal def="#suite">suite</nonterminal>
-                ("except" [<nonterminal def="#expression">expression</nonterminal>
-                             ["," <nonterminal def="#target">target</nonterminal>]] ":" <nonterminal def="#suite">suite</nonterminal>)+
-                ["else" ":" <nonterminal def="#suite">suite</nonterminal>]
-</rhs>
-</production>
-
-<production id="try_fin_stmt">
-<lhs>try_fin_stmt</lhs>
-<rhs>"try" ":" <nonterminal def="#suite">suite</nonterminal> "finally" ":" <nonterminal def="#suite">suite</nonterminal>
-</rhs>
-</production>
-
-<production id="funcdef">
-<lhs>funcdef</lhs>
-<rhs>"def" <nonterminal def="#funcname">funcname</nonterminal> "(" [<nonterminal def="#parameter_list">parameter_list</nonterminal>] ")" ":" <nonterminal def="#suite">suite</nonterminal>
-</rhs>
-</production>
-
-<production id="parameter_list">
-<lhs>parameter_list</lhs>
-<rhs>(<nonterminal def="#defparameter">defparameter</nonterminal> ",")*
-("*" <nonterminal def="#identifier">identifier</nonterminal> [, "**" <nonterminal def="#identifier">identifier</nonterminal>]
-<sbr/>| "**" <nonterminal def="#identifier">identifier</nonterminal>
-  <sbr/>| <nonterminal def="#defparameter">defparameter</nonterminal> [","])
-</rhs>
-</production>
-
-<production id="defparameter">
-<lhs>defparameter</lhs>
-<rhs><nonterminal def="#parameter">parameter</nonterminal> ["=" <nonterminal def="#expression">expression</nonterminal>]
-</rhs>
-</production>
-
-<production id="sublist">
-<lhs>sublist</lhs>
-<rhs><nonterminal def="#parameter">parameter</nonterminal> ("," <nonterminal def="#parameter">parameter</nonterminal>)* [","]
-</rhs>
-</production>
-
-<production id="parameter">
-<lhs>parameter</lhs>
-<rhs><nonterminal def="#identifier">identifier</nonterminal> | "(" <nonterminal def="#sublist">sublist</nonterminal> ")"
-</rhs>
-</production>
-
-<production id="funcname">
-<lhs>funcname</lhs>
-<rhs><nonterminal def="#identifier">identifier</nonterminal>
-</rhs>
-</production>
-
-<production id="classdef">
-<lhs>classdef</lhs>
-<rhs>"class" <nonterminal def="#classname">classname</nonterminal> [<nonterminal def="#inheritance">inheritance</nonterminal>] ":" <nonterminal def="#suite">suite</nonterminal>
-</rhs>
-</production>
-
-
-<production id="inheritance">
-<lhs>inheritance</lhs>
-<rhs>"(" [<nonterminal def="#expression_list">expression_list</nonterminal>] ")"
-</rhs>
-</production>
-
-<production id="classname">
-<lhs>classname</lhs>
-<rhs><nonterminal def="#identifier">identifier</nonterminal>
-</rhs>
-</production>
-
-<production id="file_input">
-<lhs>file_input</lhs>
-<rhs>(NEWLINE | <nonterminal def="#statement">statement</nonterminal>)*
-</rhs>
-</production>
-
-<production id="interactive_input">
-<lhs>interactive_input</lhs>
-<rhs>[<nonterminal def="#stmt_list">stmt_list</nonterminal>] NEWLINE | <nonterminal def="#compound_stmt">compound_stmt</nonterminal> NEWLINE
-</rhs>
-</production>
-
-<production id="eval_input">
-<lhs>eval_input</lhs>
-<rhs><nonterminal def="#expression_list">expression_list</nonterminal> NEWLINE*
-</rhs>
-</production>
-
-<production id="input_input">
-<lhs>input_input</lhs>
-<rhs><nonterminal def="#expression_list">expression_list</nonterminal> NEWLINE
-</rhs>
-</production>
-
-</productionset>
-
-</article>
diff --git a/test/testdocs/profile.001.xml b/test/testdocs/profile.001.xml
deleted file mode 100644
index 72c246f4..00000000
--- a/test/testdocs/profile.001.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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>Unit Test: profile.001</title>
-<releaseinfo role="CVS">$Id: profile.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>John</firstname><surname>Himpel</surname>
-        <affiliation><address><email>jwhimpel@users.sourceforge.net</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Profile and linkends attribute.</para>
-
-<screen>
-xxxxxxx <co id="id-co" linkends="co"/>
-</screen>
-
-<calloutlist>
-<callout arearefs="id-co" id="co">
-<para>xxxx</para>
-</callout>
-</calloutlist>
-</article>
diff --git a/test/testdocs/programlisting.001.xml b/test/testdocs/programlisting.001.xml
deleted file mode 100644
index 7858dfa9..00000000
--- a/test/testdocs/programlisting.001.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>Unit Test: programlisting.001</title>
-<releaseinfo role="CVS">$Id: programlisting.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<programlisting linenumbering="numbered">ProgramListing: This is a test
-  Only a test.
-Had this been a real emegency,
-  We would have fled in terror
-And you would not have been informed.
-
-Foo &lt;Bar&gt;</programlisting>
-
-</article>
diff --git a/test/testdocs/programlisting.002.xml b/test/testdocs/programlisting.002.xml
deleted file mode 100644
index ca8d7559..00000000
--- a/test/testdocs/programlisting.002.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>Unit Test: programlisting.002</title>
-<releaseinfo role="CVS">$Id: programlisting.002.xml 5600 2006-03-03 08:43:12Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<programlisting><inlinemediaobject>
-<imageobject>
-<imagedata format="linespecific" fileref="programlisting.002.xml"/>
-</imageobject>
-</inlinemediaobject></programlisting>
-
-</article>
diff --git a/test/testdocs/programlisting.003.xml b/test/testdocs/programlisting.003.xml
deleted file mode 100644
index c24aa50a..00000000
--- a/test/testdocs/programlisting.003.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>Unit Test: programlisting.003</title>
-<releaseinfo role="CVS">$Id: programlisting.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<programlisting linenumbering="numbered">@rem = '--*-Perl-*--
-@echo off
-perl.exe %_batchname %$
-goto endofperl
-@rem ';
-
-# Compress mail...
-
-require 'n:/home/nwalsh/lib/cygnus.pl';
-require 'timelocal.pl';
-use Cwd;
-
-select (STDERR); $| = 1;
-select (STDOUT); $| = 1;
-
-@DIRS = ("/home/nwalsh/Mail");
-while (@DIRS) {
-    $dir = shift @DIRS;
-    opendir (DIR, $dir);
-    while ($fname = readdir(DIR)) {
-        $file = "$dir/$fname";
-        next if ! -d $file;
-        next if $fname =~ /^\.\.?$/;
-
-        print "$file\n";
-        push (@DIRS, $file);
-        &amp;compress ($file);
-    }
-}
-
-exit;</programlisting>
-
-</article>
diff --git a/test/testdocs/programlisting.004.xml b/test/testdocs/programlisting.004.xml
deleted file mode 100644
index 3aa454ca..00000000
--- a/test/testdocs/programlisting.004.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article id="programlisting.004">
-  <articleinfo>
-    <title>Unit Test: programlisting.004</title>
-    <author>
-      <firstname>St�phane</firstname><surname>Bortzmeyer</surname>
-    </author>
-  </articleinfo>
-
-  <section>
-    <title>The only one</title>
-
-    <para>Testing footnote within programlisting.
-      Please try with footnotes as end notes, and footnotes at bottom
-      of page (<parameter>bop-footnotes</parameter> in DSSSL).</para>
-
-    <programlisting>
-      hostname RTA
-      router ospf
-          ospf router-id 192.134.7.241	<footnote><para>It is not
-necessary to set the router ID.</para>
-	</footnote>
-          network 192.134.7.0/24 area 0
-</programlisting>
-  </section>
-</article>
diff --git a/test/testdocs/programlisting.005.xml b/test/testdocs/programlisting.005.xml
deleted file mode 100644
index 9723f938..00000000
--- a/test/testdocs/programlisting.005.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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>Unit Test: programlisting.005</title>
-    <subtitle>A programlisting within a table</subtitle>
-    <releaseinfo role="CVS">$Id: programlisting.005.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-    <author><firstname>Michael</firstname><surname>Smith</surname>
-    <affiliation><address><email>smith@sideshowbarker.net</email></address></affiliation>
-    </author>
-  </articleinfo>
-  <!-- test case from Sam Steingold -->
-  <table>
-    <title>Lisp function</title>
-    <tgroup cols="1">
-      <tbody>
-	<row>
-	  <entry><programlisting language="lisp">(defun cycle-length (n &amp; (len 1) (top 0))
-  (cond ((= n 1) (values len top))
-        ((evenp n) (cycle-length (ash n -1) (1+ len) (max top n)))
-        (t (let ((next (1+ (* 3 n))))
-             (cycle-length next (1+ len) (max top next))))))</programlisting>
-	  </entry>
-	</row>
-      </tbody>
-    </tgroup>
-  </table>
-</article>
diff --git a/test/testdocs/programlisting.006.xml b/test/testdocs/programlisting.006.xml
deleted file mode 100644
index 00c5f447..00000000
--- a/test/testdocs/programlisting.006.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>Unit Test: programlisting.006</title>
-<releaseinfo role="CVS">$Id: programlisting.006.xml 5367 2005-10-27 03:07:42Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This test checks that an external file referenced by
-<sgmltag>inlinegraphic</sgmltag> is correctly handled.</para>
-
-<programlisting><inlinegraphic format="linespecific" fileref="programlisting.006.xml"/></programlisting>
-
-</article>
diff --git a/test/testdocs/programlistingco.001.xml b/test/testdocs/programlistingco.001.xml
deleted file mode 100644
index 9f336d67..00000000
--- a/test/testdocs/programlistingco.001.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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>Unit Test: programlistingco.001</title>
-<releaseinfo role="CVS">$Id: programlistingco.001.xml 5258 2005-10-12 14:35:03Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<programlistingco>
-<areaspec>
-<area coords="1" id="prologue"/>
-<area coords="4" id="skipeof" linkends="skipeof-desc"/>
-<areaset coords="" id="xreq">
-<area coords="9" id="require1"/>
-<area coords="10" id="require2"/>
-</areaset>
-<area coords="11 50" id="use"/>
-<area coords="27" id="funccall"/>
-</areaspec>
-<programlisting>@rem = '--*-Perl-*--
-@echo off
-perl.exe %_batchname %$
-goto endofperl
-@rem ';
-
-# Compress mail...
-
-require 'n:/home/nwalsh/lib/cygnus.pl';
-require 'timelocal.pl';
-use Cwd;
-
-select (STDERR); $| = 1;
-select (STDOUT); $| = 1;
-
-@DIRS = ("/home/nwalsh/Mail");
-while (@DIRS) {
-    $dir = shift @DIRS;
-    opendir (DIR, $dir);
-    while ($fname = readdir(DIR)) {
-        $file = "$dir/$fname";
-        next if ! -d $file;
-        next if $fname =~ /^\.\.?$/;
-
-        print "$file\n";
-        push (@DIRS, $file);
-        &amp;compress ($file);
-    }
-}
-
-exit;</programlisting>
-<calloutlist>
-<callout arearefs="prologue">
-<para>The prologue handles embedding a Perl script in a DOS batch file.</para>
-</callout>
-<callout arearefs="skipeof" id="skipeof-desc">
-<para>The <literal>goto</literal> statement, interpreted by the DOS
-batch file interpreter, skips over the body of the Perl script. (Note
-that this callout has an “id” attribute that is referenced by a
-“linkends” attribute on the callout bug for line 4 above.)</para>
-</callout>
-<callout arearefs="require1 require2">
-<para>The <literal>require</literal> statement sources in external program
-fragments.</para>
-</callout>
-<callout arearefs="use">
-<para>The <literal>use</literal> statement is similar, but has additional
-utility.  It is a Perl5 function.  (Note that this callout area specifies
-both a line and a column.)</para>
-</callout>
-<callout arearefs="funccall">
-<para>This is a user subroutine call.</para>
-</callout>
-</calloutlist>
-</programlistingco>
-
-</article>
diff --git a/test/testdocs/programlistingco.002.xml b/test/testdocs/programlistingco.002.xml
deleted file mode 100644
index b1fea89e..00000000
--- a/test/testdocs/programlistingco.002.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?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"  [
-<!ENTITY codesample SYSTEM './codesample.txt' NDATA linespecific>
-]>
-
-<article>
-  <articleinfo>
-    <title>Unit Test: programlistingco.002</title>
-    <subtitle>Tests for inserting external text files, with callouts</subtitle>
-    <releaseinfo role="CVS">$Id: programlistingco.002.xml 5366 2005-10-27 02:46:53Z xmldoc $</releaseinfo>
-    <corpauthor>DocBook Project Development Team</corpauthor>
-  </articleinfo>
-
-  <section>
-    <title>imagedata/@fileref + numbering + sep.</title>
-    <programlistingco>
-      <areaspec>
-        <area coords="1" id="prologue1"/>
-        <area coords="4" id="skipeof1"/>
-        <areaset coords="" id="xreq1">
-          <area coords="9" id="require11"/>
-          <area coords="10" id="require1"/>
-        </areaset>
-        <area coords="11 12" id="use1"/>
-        <area coords="27" id="funccall1"/>
-      </areaspec>
-      <programlisting linenumbering="numbered"
-                      ><?dbhtml linenumbering.everyNth="2" linenumbering.separator=" >"
-                      ?><?dbfo linenumbering.everyNth="2" linenumbering.separator=" >"
-                      ?><inlinemediaobject>
-      <imageobject>
-        <imagedata format="linespecific" fileref="codesample.txt"/>
-      </imageobject>
-      </inlinemediaobject></programlisting>
-    </programlistingco>
-  </section>
-
-  <section>
-    <title>inlinegraphic/@fileref + numbering</title>
-    <programlistingco>
-      <areaspec>
-        <area coords="1" id="prologue2"/>
-        <area coords="4" id="skipeof2"/>
-        <areaset coords="" id="xreq2">
-          <area coords="9" id="require12"/>
-          <area coords="10" id="require22"/>
-        </areaset>
-        <area coords="11 12" id="use2"/>
-        <area coords="27" id="funccall2"/>
-      </areaspec>
-      <programlisting linenumbering="numbered"
-                      ><inlinegraphic
-                      format="linespecific"
-                      fileref="codesample.txt"/></programlisting>
-    </programlistingco>
-  </section>
-
-  <section>
-    <title>textdata/@fileref w/o numbering or sep</title>
-    <programlistingco>
-      <areaspec>
-        <area coords="1" id="prologue3"/>
-        <area coords="4" id="skipeof3"/>
-        <areaset coords="" id="xreq3">
-          <area coords="9" id="require13"/>
-          <area coords="10" id="require3"/>
-        </areaset>
-        <area coords="11 12" id="use3"/>
-        <area coords="27" id="funccall3"/>
-      </areaspec>
-      <programlisting><textobject><textdata
-                      format="linespecific"
-                      fileref="codesample.txt"/></textobject></programlisting>
-    </programlistingco>
-  </section>
-
-  <section>
-    <title>textdata/@entityref</title>
-    <programlistingco>
-      <areaspec>
-        <area coords="1" id="prologue4"/>
-        <area coords="4" id="skipeof4"/>
-        <areaset coords="" id="xreq4">
-          <area coords="9" id="require14"/>
-          <area coords="10" id="require4"/>
-        </areaset>
-        <area coords="11 12" id="use4"/>
-        <area coords="27" id="funccall4"/>
-      </areaspec>
-      <programlisting><textobject><textdata
-                      format="linespecific"
-                      entityref="codesample"/></textobject></programlisting>
-    </programlistingco>
-  </section>
-
-  <section>
-    <title>imagedata/@fileref, absolute path</title>
-    <para>The listing is an external file with an absolute path.</para>
-
-    <programlistingco>
-    <areaspec>
-      <area coords="1" id="a1"/>
-      <area coords="4" id="a2"/>
-      <area coords="5 50" id="a3"/>
-    </areaspec>
-    <programlisting linenumbering="numbered"
-      ><?dbhtml linenumbering.everyNth="2" linenumbering.separator=" >"
-      ?><?dbfo linenumbering.everyNth="2" linenumbering.separator=" >"
-      ?><inlinemediaobject>
-      <imageobject>
-      <imagedata format="linespecific" fileref="/etc/hosts"/>
-      </imageobject>
-      </inlinemediaobject></programlisting>
-    </programlistingco>
-
-    <para>The listing is an external file with an absolute path using the URI scheme
-    "file".</para>
-
-    <programlistingco>
-    <areaspec>
-      <area coords="1" id="b1"/>
-      <area coords="4" id="b2"/>
-      <area coords="5 50" id="b3"/>
-    </areaspec>
-    <programlisting linenumbering="numbered"
-      ><?dbhtml linenumbering.everyNth="2" linenumbering.separator=" >"
-      ?><?dbfo linenumbering.everyNth="2" linenumbering.separator=" >"
-      ?><inlinemediaobject>
-      <imageobject>
-      <imagedata format="linespecific" fileref="file:/etc/hosts"/>
-      </imageobject>
-      </inlinemediaobject></programlisting>
-    </programlistingco>
-  </section>
-
-</article>
diff --git a/test/testdocs/protocol.001.xml b/test/testdocs/protocol.001.xml
deleted file mode 100644
index 94159bee..00000000
--- a/test/testdocs/protocol.001.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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 id="ws">
-<articleinfo>
-<title>Unit Test: protocol.001.xml</title>
-<releaseinfo role="CVS">
-$Id: protocol.001.xml 4056 2004-11-23 13:28:50Z nwalsh $
-</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This is a test of the <sgmltag class="attvalue">protocol</sgmltag>
-value of the <sgmltag class="attribute">class</sgmltag> attribute on
-<sgmltag>systemitem</sgmltag>: <systemitem class="protocol">http</systemitem>.
-</para>
-
-</article>
diff --git a/test/testdocs/pubsnumber.xml b/test/testdocs/pubsnumber.xml
deleted file mode 100644
index 9e0809fa..00000000
--- a/test/testdocs/pubsnumber.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: pubsnumber.001.xml</title>
-<releaseinfo role="CVS">$Id: pubsnumber.xml 5600 2006-03-03 08:43:12Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-<affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<pubsnumber>12345</pubsnumber>
-</articleinfo>
-
-<para>This is an article test. It has a <sgmltag>pubsnumber</sgmltag>.</para>
-
-</article>
diff --git a/test/testdocs/qandaset.001.xml b/test/testdocs/qandaset.001.xml
deleted file mode 100644
index 88e717e0..00000000
--- a/test/testdocs/qandaset.001.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>Unit Test: qandaset.001</title>
-<releaseinfo role="CVS">$Id: qandaset.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>What about <xref linkend="Two"/>?</para>
-
-  <qandaset defaultlabel='number'>
-    <?dbhtml table-summary="summary"?>
-    <qandaentry id="qa1">
-      <question id="q1"><para>Question one.</para></question>
-      <answer id="a1">
-	<para>Answer one.
-See <xref linkend="faq-Two"/></para>
-      </answer>
-    </qandaentry>
-
-    <qandaentry id="Two">
-      <question id="faq-Two"><para>Question two.</para></question>
-      <answer id="faa-Two">
-	<para>Answer two.</para>
-      </answer>
-    </qandaentry>
-
-    <qandaentry id="Twoc">
-      <question id="faq-Twoc"><para>Question two.</para></question>
-      <answer id="faa-Twoc">
-	<orderedlist>
-	  <listitem><para>testing a list</para></listitem>
-	  <listitem><para>testing a list</para></listitem>
-	  <listitem><para>testing a list</para></listitem>
-	</orderedlist>
-      </answer>
-    </qandaentry>
-
-  </qandaset>
-
-</article>
diff --git a/test/testdocs/qandaset.002.xml b/test/testdocs/qandaset.002.xml
deleted file mode 100644
index 7ddd6118..00000000
--- a/test/testdocs/qandaset.002.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>Unit Test: qandaset.002</title>
-<releaseinfo role="CVS">$Id: qandaset.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-       <qandaset>
-    <?dbhtml toc="0"?>
-         <qandaentry id="qa1">
-           <question id="q1">
-             <para>Blah blah blah.</para>
-           </question>
-	  <answer id="a1">
-	    <example>
-	      <title><filename
-	          moreinfo="none">file.name</filename></title>
-	      <programlisting format="linespecific">// Hello, World</programlisting>
-	    </example>
-	    <example>
-	      <title><filename
-	          moreinfo="none">file2.name</filename></title>
-	      <programlisting format="linespecific">// Goodbye, World</programlisting>
-	    </example>
-	  </answer>
-         </qandaentry>
-       </qandaset>
-
-
-</article>
diff --git a/test/testdocs/qandaset.003.xml b/test/testdocs/qandaset.003.xml
deleted file mode 100644
index ec2ba0e0..00000000
--- a/test/testdocs/qandaset.003.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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>Unit Test: qandaset.003</title>
-<releaseinfo role="CVS">$Id: qandaset.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-       <qandaset>
-    <title>QandA Title</title>
-<para>Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.</para>
-<para>Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.</para>
-    <qandadiv><title>Division 1</title>
-         <qandaentry>
-           <question>
-             <para>Blah blah blah.</para>
-           </question>
-	  <answer>
-	    <example>
-	      <title><filename
-	          moreinfo="none">file.name</filename></title>
-	      <programlisting format="linespecific">// Hello, World</programlisting>
-	    </example>
-	    <example>
-	      <title><filename
-	          moreinfo="none">file2.name</filename></title>
-	      <programlisting format="linespecific">// Goodbye, World</programlisting>
-	    </example>
-	  </answer>
-         </qandaentry>
-    </qandadiv>
-    <qandadiv><title>Division 2</title>
-<para>Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.</para>
-<para>Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.</para>
-    <qandadiv><title>Division 2.1</title>
-         <qandaentry>
-           <question>
-             <para>Blah blah blah.</para>
-           </question>
-	  <answer>
-	    <example>
-	      <title><filename
-	          moreinfo="none">file.name</filename></title>
-	      <programlisting format="linespecific">// Hello, World</programlisting>
-	    </example>
-	    <example>
-	      <title><filename
-	          moreinfo="none">file2.name</filename></title>
-	      <programlisting format="linespecific">// Goodbye, World</programlisting>
-	    </example>
-	  </answer>
-         </qandaentry>
-    </qandadiv>
-    <qandadiv><title>Division 2.2</title>
-         <qandaentry>
-           <question>
-             <para>Blah blah blah.</para>
-           </question>
-	  <answer>
-	    <example>
-	      <title><filename
-	          moreinfo="none">file.name</filename></title>
-	      <programlisting format="linespecific">// Hello, World</programlisting>
-	    </example>
-	    <example>
-	      <title><filename
-	          moreinfo="none">file2.name</filename></title>
-	      <programlisting format="linespecific">// Goodbye, World</programlisting>
-	    </example>
-	  </answer>
-         </qandaentry>
-    </qandadiv>
-    </qandadiv>
-       </qandaset>
-
-</article>
diff --git a/test/testdocs/qandaset.004.xml b/test/testdocs/qandaset.004.xml
deleted file mode 100644
index c3a96227..00000000
--- a/test/testdocs/qandaset.004.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article>
-<articleinfo>
-<title>Unit Test: qandaset.004</title>
-<releaseinfo role="CVS">$Id: qandaset.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Stephane</firstname><surname>Bortzmeyer</surname>
-</author>
-</articleinfo>
-
-<qandaset>
-<title>Exercices</title>
-<qandadiv>
-<title>First test</title>
-<qandaentry>
-<question>
-<para>Do something.</para>
-</question>
-<answer><para>It is possible<footnote><para>May be.</para>
-</footnote>to solve the problem?</para>
-</answer>
-</qandaentry>
-</qandadiv>
-</qandaset>
-
-</article>
diff --git a/test/testdocs/qandaset.005.xml b/test/testdocs/qandaset.005.xml
deleted file mode 100644
index ebc1df93..00000000
--- a/test/testdocs/qandaset.005.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>Unit Test: qandaset.005</title>
-    <subtitle>Autolabeling test </subtitle>
-    <releaseinfo role="CVS">$Id: qandaset.005.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-    <author><firstname>Harald</firstname><surname>J&#246;rg</surname>
-    <affiliation><address><email>smith@sideshowbarker.net</email></address></affiliation>
-    </author>
-  </articleinfo>
-
-  <section label="foo">
-    <title>A section labelled 'foo'</title>
-    <para>Without a surrounding section, I seem to be unable to get a
-    qandaset processed. Let's ignore that for the moment.
-    </para>
-    <qandaset defaultlabel="number">
-      <qandadiv>
-        <title>Qandadiv One</title>
-        <qandaentry id="q1">
-          <question>
-            <para>Why is this question foo.foo.1.1?</para>
-          </question>
-          <answer>
-            <para>Probably a bug in common/labels.xsl.</para>
-          </answer>
-        </qandaentry>
-      </qandadiv>
-    </qandaset>
-  </section>
-</article>
diff --git a/test/testdocs/refentry.001.xml b/test/testdocs/refentry.001.xml
deleted file mode 100644
index e4bd1cf8..00000000
--- a/test/testdocs/refentry.001.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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>Unit Test: refentry.001</title>
-<releaseinfo role="CVS">$Id: refentry.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<refentry id="minimal">
-<refnamediv>
-<refname>Minimal</refname>
-<refpurpose>Test of a minimal RefEntry</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-</refsect1>
-</refentry>
-
-</article>
diff --git a/test/testdocs/refentry.002.xml b/test/testdocs/refentry.002.xml
deleted file mode 100644
index 7c65de9c..00000000
--- a/test/testdocs/refentry.002.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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>Unit Test: refentry.002</title>
-<releaseinfo role="CVS">$Id: refentry.002.xml 5801 2006-04-07 07:11:47Z xmldoc $</releaseinfo>
-<author>
-  <firstname>Norman</firstname>
-  <surname>Walsh</surname>
-  <affiliation>
-    <address><email>ndw@nwalsh.com</email></address>
-  </affiliation>
-</author>
-<editor>
-  <firstname>Michael (tm)</firstname>
-  <surname>Smith</surname>
-  <affiliation>
-    <orgname>The DocBook Project</orgname>
-  </affiliation>
-</editor>
-<othercredit>
-  <firstname>Michael (tm)</firstname>
-  <surname>Smith</surname>
-  <personblurb><para>Did other stuff.</para></personblurb>
-</othercredit>
-</articleinfo>
-
-<refentry id="lessminimal">
-<refmeta>
-<refentrytitle>Also Minimal Title</refentrytitle>
-<manvolnum>3</manvolnum>
-</refmeta>
-<refnamediv>
-<refname>Also Minimal</refname>
-<refpurpose>Another test of a minimal RefEntry</refpurpose>
-</refnamediv>
-
-<refsection>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-
-<refsection>
-<title>Subsection</title>
-<para>This is a minimal RefEntry.</para>
-
-<refsection>
-<title>Sub-subsection</title>
-<para>This is a minimal RefEntry.</para>
-
-<refsection>
-  <title>Refsect4-level subsection</title>
-  <para>Check the indenting.</para>
-  <refsection>
-    <title>Refsect5-level subsection</title>
-    <para>Check the indenting.</para>
-  </refsection>
-</refsection>
-
-</refsection>
-</refsection>
-</refsection>
-
-<refsection>
-<title>More Description</title>
-<para>This is a not-so minimal RefEntry.</para>
-<formalpara>
-  <title>Ladjwqopnsfil</title>
-  <para>This is a formalpara. That is, a paragraph with a title. One
-  way to generate output for it is to take the title, “Ladjwqopnsfil”,
-  and use it as a “run in” heading that is rendered inline at the
-  start of the paragraph, followed by a period (or some other
-  punctuation mark).</para>
-</formalpara>
-</refsection>
-
-<refsection>
-<title>Even More Description</title>
-<para>The following two words, “foo” and “bar”, are both empasized,
-separately, with a space between them: <emphasis>foo</emphasis>
-<emphasis>bar</emphasis>. Here is the same pair of words in bold, with
-a space
-
-
-
-
-
-
- between them: <emphasis role="strong">foo</emphasis> <emphasis role="strong">bar</emphasis></para>
-</refsection>
-
-</refentry>
-
-</article>
diff --git a/test/testdocs/refentry.003.xml b/test/testdocs/refentry.003.xml
deleted file mode 100644
index 49db0e6b..00000000
--- a/test/testdocs/refentry.003.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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>Unit Test: refentry.003</title>
-<releaseinfo role="CVS">$Id: refentry.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<refentry id="evenlessminimal">
-<refmeta>
-<refentrytitle>Fred</refentrytitle>
-<manvolnum>3</manvolnum>
-</refmeta>
-<refnamediv>
-<refname>Less Minimal</refname>
-<refname>Even Less Minimal</refname>
-<refpurpose>Test of a minimal RefEntry</refpurpose>
-</refnamediv>
-<refsynopsisdiv><title>Synopsis</title>
-<cmdsynopsis>
-<command>command</command>
-<group><arg choice="plain">-a</arg><arg choice="plain">-alpha</arg>
-</group>
-</cmdsynopsis>
-<cmdsynopsis>
-<command>command</command>
-<group><arg choice="plain">-b</arg><arg choice="plain">-beta</arg>
-</group>
-</cmdsynopsis>
-<cmdsynopsis>
-<command>command</command>
-<group choice="plain"><arg choice="plain">-c</arg><arg choice="plain">
--charlie</arg>
-</group>
-</cmdsynopsis>
-<cmdsynopsis>
-<command>command</command>
-<group choice="plain"><arg choice="plain">-d</arg><arg choice="plain">
--delta</arg>
-</group>
-</cmdsynopsis>
-<cmdsynopsis>
-<command>command</command>
-<arg choice="plain">--help</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a less minimal RefEntry.</para>
-
-<figure><title>Some Program</title>
-<programlisting>Testing
-Some
-Text</programlisting>
-</figure>
-
-</refsect1>
-</refentry>
-
-</article>
diff --git a/test/testdocs/refentry.004.xml b/test/testdocs/refentry.004.xml
deleted file mode 100644
index 9f92dad5..00000000
--- a/test/testdocs/refentry.004.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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>Unit Test: refentry.004</title>
-<releaseinfo role="CVS">$Id: refentry.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Test an <sgmltag>xref</sgmltag> to <sgmltag>refnamediv</sgmltag>:
-<xref linkend="lm"/>.</para>
-
-<refentry id="evenlessminimal">
-<refmeta>
-<refentrytitle>Fred</refentrytitle>
-<manvolnum>3</manvolnum>
-</refmeta>
-<refnamediv id="lm">
-<refname>Less Minimal</refname>
-<refname>Even Less Minimal</refname>
-<refpurpose>Test of a minimal RefEntry</refpurpose>
-</refnamediv>
-<refsynopsisdiv><title>Synopsis</title>
-<cmdsynopsis>
-<command>command</command>
-<group><arg choice="plain">-a</arg><arg choice="plain">-alpha</arg>
-</group>
-</cmdsynopsis>
-<cmdsynopsis>
-<command>command</command>
-<group><arg choice="plain">-b</arg><arg choice="plain">-beta</arg>
-</group>
-</cmdsynopsis>
-<cmdsynopsis>
-<command>command</command>
-<group choice="plain"><arg choice="plain">-c</arg><arg choice="plain">
--charlie</arg>
-</group>
-</cmdsynopsis>
-<cmdsynopsis>
-<command>command</command>
-<group choice="plain"><arg choice="plain">-d</arg><arg choice="plain">
--delta</arg>
-</group>
-</cmdsynopsis>
-<cmdsynopsis>
-<command>command</command>
-<arg choice="plain">--help</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a less minimal RefEntry.</para>
-
-<figure><title>Some Program</title>
-<programlisting>Testing
-Some
-Text</programlisting>
-</figure>
-
-</refsect1>
-</refentry>
-
-</article>
diff --git a/test/testdocs/refentry.005.xml b/test/testdocs/refentry.005.xml
deleted file mode 100644
index 3e830797..00000000
--- a/test/testdocs/refentry.005.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<refentry id="lessminimal">
-<refentryinfo>
-<title>Unit Test: refentry.005</title>
-<releaseinfo role="CVS">$Id: refentry.005.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</refentryinfo>
-
-<refmeta>
-<refentrytitle>Also Minimal Title</refentrytitle>
-<manvolnum>3</manvolnum>
-</refmeta>
-<refnamediv>
-<refname>Also Minimal</refname>
-<refpurpose>Another test of a minimal RefEntry</refpurpose>
-</refnamediv>
-
-<refsection>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-
-<refsection>
-<title>Subsection</title>
-<para>This is a minimal RefEntry.</para>
-
-<refsection>
-<title>Sub-subsection</title>
-<para>This is a minimal RefEntry.</para>
-</refsection>
-</refsection>
-</refsection>
-
-<refsection>
-<title>More Description</title>
-<para>This is a not-so minimal RefEntry.</para>
-</refsection>
-
-<refsection>
-<title>Even More Description</title>
-<para>This is an even less minimal RefEntry.</para>
-</refsection>
-
-</refentry>
diff --git a/test/testdocs/refentry.006.xml b/test/testdocs/refentry.006.xml
deleted file mode 100644
index 3d30abbd..00000000
--- a/test/testdocs/refentry.006.xml
+++ /dev/null
@@ -1,507 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<refentry id="lessminimal">
-<refentryinfo>
-<title>Unit Test: refentry.006</title>
-<subtitle>Refentry with some tables</subtitle>
-<releaseinfo role="CVS">$Id: refentry.006.xml 5432 2005-11-04 07:53:25Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</refentryinfo>
-
-<refmeta>
-<refentrytitle>Also Minimal Title</refentrytitle>
-<manvolnum>3</manvolnum>
-</refmeta>
-<refnamediv>
-<refname>Also Minimal</refname>
-<refpurpose>Another test of a minimal RefEntry</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-
-<refsect2>
-<title>Subsection</title>
-<para>This is a minimal RefEntry.</para>
-
-<refsect3>
-<title>Sub-subsection</title>
-<para>This is a minimal RefEntry.</para>
-</refsect3>
-</refsect2>
-</refsect1>
-
-<refsect1>
-<title>More Description</title>
-<para>This is a not-so minimal RefEntry.</para>
-</refsect1>
-
-<refsect1>
-<title>Even More Description</title>
-<para>This is an even less minimal RefEntry.</para>
-
-<informaltable frame="all">
-<tgroup cols="4">
-<colspec colname="b" colnum="2"/>
-<colspec colname="c" colnum="3"/>
-<colspec colname="d"/>
-<spanspec spanname="cd" namest="c" nameend="d"/>
-<tbody>
-  <row>
-    <entry>a1</entry>
-    <entry morerows="1" namest="b" nameend="c">b1-c2</entry>
-    <entry>d1</entry>
-  </row>
-  <row>
-    <entry morerows="2">a2-a4</entry>
-    <!-- b2, c2 spans from above -->
-    <entry>d2</entry>
-  </row>
-  <row>
-    <!-- a3 spans from above -->
-    <entry>b3</entry>
-    <entry>c3</entry>
-    <entry>d3</entry>
-  </row>
-  <row>
-    <!-- a4 spans from above -->
-    <entry>b4</entry>
-    <entry spanname="cd">c4-d4</entry>
-  </row>
-  <row>
-    <entry>a5</entry>
-    <entry>b5</entry>
-    <!-- c4 is missing -->
-    <entry colname="d">d5</entry>
-  </row>
-</tbody>
-</tgroup>
-</informaltable>
-
-<informaltable pgwide='0' frame='all'>
-  <tgroup cols='3' align='center' colsep='1' rowsep='1'>
-    <colspec colname='c1'/>
-    <colspec colname='c2'/>
-    <colspec colname='c3'/>
-    <tbody>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>Prior</entry>
-        <entry align='left'>Prev Screen</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>Next</entry>
-        <entry align='left'>Next Screen</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>Left</entry>
-        <entry align='left'>Prev Desktop</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>Left</entry>
-        <entry align='left'>Prev Desktop Drag Focused Window</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>Right</entry>
-        <entry align='left'>Next Desktop</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>Right</entry>
-        <entry align='left'>Next Desktop Drag Focused Window</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>F1-F12</entry>
-        <entry align='left'>Jump to desktop 1-12</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>BackSpace</entry>
-        <entry align='left'>Toggle Subdesktop</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>Up</entry>
-        <entry align='left'>Prev Window</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>Down</entry>
-        <entry align='left'>Next Window</entry>
-      </row>
-      <row>
-        <entry align='left'>Control-Alt</entry>
-        <entry align='left'>z</entry>
-        <entry align='left'>Hide Window</entry>
-      </row>
-      <row>
-        <entry align='left'>Control-Alt</entry>
-        <entry align='left'>x</entry>
-        <entry align='left'>Unhide last hidden window</entry>
-      </row>
-      <row>
-        <entry align='left'>Control-Alt</entry>
-        <entry align='left'>w</entry>
-        <entry align='left'>Close Window</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>space</entry>
-        <entry align='left'>Move window to other subdesktop</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</informaltable>
-
-<informaltable pgwide='0' frame='all'>
-  <tgroup cols='3' align='center' colsep='1' rowsep='1'>
-    <colspec colname='c1'/>
-    <colspec colname='c2'/>
-    <colspec colname='c3'/>
-    <tbody>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>space</entry>
-        <entry align='left'>Select Zoom</entry>
-      </row>
-      <row>
-        <entry align='left'>Control-Alt</entry>
-        <entry align='left'>space</entry>
-        <entry align='left'>Put/restore aside window</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>0</entry>
-        <entry align='left'>Put aside all other windows</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>KP_Home</entry>
-        <entry align='left'>Move window to top left</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>KP_Up</entry>
-        <entry align='left'>Move window to top center</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>KP_Prior</entry>
-        <entry align='left'>Move window to top right</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>KP_Left</entry>
-        <entry align='left'>Move window to left center</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>KP_Begin</entry>
-        <entry align='left'>Center window</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>KP_Right</entry>
-        <entry align='left'>Move window to right center</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>KP_End</entry>
-        <entry align='left'>Move window to bottom left</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>KP_Down</entry>
-        <entry align='left'>Move window to bottom center</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>KP_Next</entry>
-        <entry align='left'>Move window to bottom right</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>KP_Up</entry>
-        <entry align='left'>Move window up</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>KP_Down</entry>
-        <entry align='left'>Move window down</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>KP_Left</entry>
-        <entry align='left'>Move window left</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>KP_Right</entry>
-        <entry align='left'>Move window right</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Up</entry>
-        <entry align='left'>Grow window vertically</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Down</entry>
-        <entry align='left'>Shrink window vertically</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Left</entry>
-        <entry align='left'>Shrink window horizontally</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Right</entry>
-        <entry align='left'>Grow window horizontally</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Home</entry>
-        <entry align='left'>Grow window both ways</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_End</entry>
-        <entry align='left'>Shrink window both ways</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>KP_Insert</entry>
-        <entry align='left'>Toggle move/resize increment</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>KP_Home</entry>
-        <entry align='left'>Maximize window vertically</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>KP_End</entry>
-        <entry align='left'>Maximize window horizontally</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>KP_Begin</entry>
-        <entry align='left'>Maximize window</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Begin</entry>
-        <entry align='left'>Full screen</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</informaltable>
-
-<informaltable pgwide='0' frame='all'>
-  <tgroup cols='3' align='center' colsep='1' rowsep='1'>
-    <colspec colname='c1'/>
-    <colspec colname='c2'/>
-    <colspec colname='c3'/>
-    <tbody>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Up</entry>
-        <entry align='left'>Maximize left track</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Down</entry>
-        <entry align='left'>Restore left track</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Left</entry>
-        <entry align='left'>Shrink left track</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>KP_Right</entry>
-        <entry align='left'>Grow left track</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>KP_Begin</entry>
-        <entry align='left'>Move window to/from left track</entry>
-      </row>
-      <row>
-        <entry align='left'>Control-Alt</entry>
-        <entry align='left'>space</entry>
-        <entry align='left'>Restore aside window</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</informaltable>
-
-<informaltable pgwide='0' frame='all'>
-  <tgroup cols='4' align='center' colsep='1' rowsep='1'>
-    <colspec colname='c1'/>
-    <colspec colname='c2'/>
-    <colspec colname='c3'/>
-    <colspec colname='c4'/>
-    <thead>
-      <row>
-        <entry align='center'>Modifier</entry>
-        <entry align='center'>Button1</entry>
-        <entry align='center'>Button2</entry>
-        <entry align='center'>Button3</entry>
-      </row>
-    </thead>
-    <tbody>
-      <row>
-        <entry align='left'>None</entry>
-        <entry align='left'>Prev Desktop</entry>
-        <entry align='left'>Subdesktop</entry>
-        <entry align='left'>Next Desktop</entry>
-      </row>
-      <row>
-        <entry align='left'>Control</entry>
-        <entry align='left'>Prev Menu</entry>
-        <entry align='left'>Select Menu</entry>
-        <entry align='left'>Next Menu</entry>
-      </row>
-      <row>
-        <entry align='left'>Alt</entry>
-        <entry align='left'>Prev Hidden</entry>
-        <entry align='left'>Hide/Unhide</entry>
-        <entry align='left'>Next Hidden</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>Shrink</entry>
-        <entry align='left'>Select Zoom</entry>
-        <entry align='left'>Grow</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>Move Window</entry>
-        <entry align='left'></entry>
-        <entry align='left'></entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>Resize Window</entry>
-        <entry align='left'>Lower Window</entry>
-        <entry align='left'>Maximize Window</entry>
-      </row>
-      <row>
-        <entry align='left'>Control-Alt</entry>
-        <entry align='left'>Restore Aside</entry>
-        <entry align='left'>Put/Restore Aside</entry>
-        <entry align='left'>Put Aside</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</informaltable>
-
-<informaltable pgwide='0' frame='all'>
-  <tgroup cols='3' align='center' colsep='1' rowsep='1'>
-    <colspec colname='c1'/>
-    <colspec colname='c2'/>
-    <colspec colname='c3'/>
-    <thead>
-      <row>
-        <entry align='center'>Modifier</entry>
-        <entry align='center'>Roll Up</entry>
-        <entry align='center'>Roll Down</entry>
-      </row>
-    </thead>
-    <tbody>
-      <row>
-        <entry align='left'>None</entry>
-        <entry align='left'>Prev Desktop</entry>
-        <entry align='left'>Next Desktop</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift</entry>
-        <entry align='left'>Prev Window</entry>
-        <entry align='left'>Next Window</entry>
-      </row>
-      <row>
-        <entry align='left'>Control</entry>
-        <entry align='left'>Prev Menu</entry>
-        <entry align='left'>Next Menu</entry>
-      </row>
-      <row>
-        <entry align='left'>Alt</entry>
-        <entry align='left'>Prev Hidden</entry>
-        <entry align='left'>Next Hidden</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control</entry>
-        <entry align='left'>Shrink</entry>
-        <entry align='left'>Grow</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Alt</entry>
-        <entry align='left'>Move Up</entry>
-        <entry align='left'>Move Down</entry>
-      </row>
-      <row>
-        <entry align='left'>Shift-Control-Alt</entry>
-        <entry align='left'>Move Left</entry>
-        <entry align='left'>Move Right</entry>
-      </row>
-      <row>
-        <entry align='left'>Control-Alt</entry>
-        <entry align='left'>Restore Aside</entry>
-        <entry align='left'>Put Aside</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</informaltable>
-
-<informaltable pgwide='0' frame='all'>
-  <tgroup cols='2' align='center' colsep='1' rowsep='1'>
-    <colspec colname='c1'/>
-    <colspec colname='c2'/>
-    <thead>
-      <row>
-        <entry align='center'>Format</entry>
-        <entry align='center'>Affected desktops/screens</entry>
-      </row>
-    </thead>
-    <tbody>
-      <row>
-        <entry align='left'>larswm.S.D.resource</entry>
-        <entry align='left'>Only desktop D on screen S</entry>
-      </row>
-      <row>
-        <entry align='left'>larswm.S.?.resource</entry>
-        <entry align='left'>All desktops on screen S</entry>
-      </row>
-      <row>
-        <entry align='left'>larswm.?.D.resource</entry>
-        <entry align='left'>Only desktop D on all screens.</entry>
-      </row>
-      <row>
-        <entry align='left'>larswm.?.?.resource</entry>
-        <entry align='left'>All desktops on all screens.</entry>
-      </row>
-      <row>
-        <entry align='left'>larswm*resource</entry>
-        <entry align='left'>All desktops on all screens.</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</informaltable>
-
-
-
-</refsect1>
-
-</refentry>
diff --git a/test/testdocs/refentry.007.xml b/test/testdocs/refentry.007.xml
deleted file mode 100644
index 57f5440d..00000000
--- a/test/testdocs/refentry.007.xml
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: refentry.007</title>
-<releaseinfo role="CVS">$Id: refentry.007.xml 7465 2007-09-27 14:00:45Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-<reference>
-<title>Reference</title>
-<refentry>
-  <refentryinfo>
-    <authorgroup>
-      <author>
-        <firstname>Norman</firstname><surname>Walsh</surname>
-        <email>ndw@nwalsh.com</email>
-        <personblurb>
-          <para>Wrote the original version of this document.</para>
-        </personblurb>
-      </author>
-      <editor>
-        <contrib>Added a bunch of test cases.</contrib>
-        <firstname>Michael(tm)</firstname><surname>Smith</surname>
-        <email>smith@sideshowbarker.net</email>
-      </editor>
-    </authorgroup>
-    <copyright>
-      <year>2003</year>
-      <holder>Norman Walsh</holder>
-    </copyright>
-    <copyright>
-      <year>2006</year>
-      <holder>Michael(tm) Smith</holder>
-    </copyright>
-    <legalnotice>
-      <para>This file is a product of the DocBook Project.</para>
-    </legalnotice>
-    <legalnotice>
-      <para>Share and share alike.</para>
-    </legalnotice>
-  </refentryinfo>
-<refnamediv>
-<refname>FirstName</refname>
-<refname>SecondName</refname>
-<refpurpose>Purpose for FirstName</refpurpose>
-</refnamediv>
-
-<refnamediv>
-<refname>ThirdName</refname>
-<refpurpose>Purpose for ThirdName</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <?dbfunclist ?>
-  <funcsynopsis>
-    <!-- * Yes, friend, Funcsynopsis is a verbatim -->
-    <funcsynopsisinfo
->#include &lt;varargs.h&gt;
-#include &lt;mouteyh.h&gt;
-#include &lt;qlmppzj.h&gt;</funcsynopsisinfo>
-    <funcprototype>
-      <funcdef><type>float</type> <function>rand</function></funcdef>
-      <void/>
-    </funcprototype>
-
-    <funcprototype>
-      <funcdef>int <function>max</function></funcdef>
-      <varargs/>
-    </funcprototype>
-
-    <funcprototype>
-      <funcdef>int <function>idiv</function></funcdef>
-      <paramdef><type>int</type> <parameter>n</parameter></paramdef>
-      <paramdef><type>int</type> <parameter>m</parameter></paramdef>
-    </funcprototype>
-  </funcsynopsis>
-
-  <para>Another.</para>
-
-  <funcsynopsis>
-    <funcprototype>
-      <funcdef>void <function>qsort</function></funcdef>
-      <paramdef>void *<parameter>dataptr</parameter>[]</paramdef>
-      <paramdef>int <parameter>left</parameter></paramdef>
-      <paramdef>int <parameter>right</parameter></paramdef>
-      <paramdef>int (*<parameter>comp</parameter>)
-      <funcparams>void *, void *</funcparams></paramdef>
-    </funcprototype>
-  </funcsynopsis>
-
-  <funcsynopsis>
-    <funcprototype>
-      <funcdef>int <function>foo_frob_something</function></funcdef>
-      <paramdef>foo_sometype1 <parameter>foo_frob_parm1</parameter></paramdef>
-      <paramdef>foo_sometype1 <parameter>foo_frob_parm2</parameter></paramdef>
-      <paramdef>foo_sometype1 <parameter>foo_frob_parm3</parameter></paramdef>
-      <paramdef><type>int</type> (* <parameter>parm4</parameter> )
-      <funcparams>int a, int b, int c</funcparams>
-      </paramdef>
-      <paramdef>foo_sometype1 <parameter>foo_frob_parm5</parameter></paramdef>
-    </funcprototype>
-
-    <funcprototype>
-      <funcdef>int <function>foo_frob_something</function></funcdef>
-      <paramdef>foo_sometype1 <parameter>foo_frob_parm1</parameter></paramdef>
-      <paramdef>foo_sometype1 <parameter>foo_frob_parm2</parameter></paramdef>
-      <paramdef>foo_sometype1 <parameter>foo_frob_parm3</parameter></paramdef>
-      <paramdef><type>int</type> (* <parameter>parm4</parameter> )
-      <funcparams>int a, int b, int c</funcparams>
-      </paramdef>
-      <paramdef>foo_sometype1 <parameter>foo_frob_parm5</parameter></paramdef>
-    </funcprototype>
-  </funcsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-
-<para>The following is a Variablelist with a title.
-<variablelist>
-  <title>My variablelist</title>
-  <varlistentry>
-    <term>varlistentry term 1</term>
-    <listitem><para>some listitem text</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>varlistentry term 2</term>
-    <listitem><para>some more listitem text</para></listitem>
-  </varlistentry>
-</variablelist>
-</para>
-<refsect2>
-<title>Subsection</title>
-<para>This is a minimal RefEntry.</para>
-
-<para>The following is a Variablelist with a title and a nested variablelist
-  <glosslist>
-    <title>My glosslist</title>
-  <glossentry>
-    <glossterm>glossentry term 1</glossterm>
-    <glossdef><para>some glossdef text</para></glossdef>
-  </glossentry>
-  <glossentry>
-    <glossterm>glossentry term 2</glossterm>
-    <glossdef>
-      <variablelist>
-        <varlistentry>
-          <term>nested variablelist term 1</term>
-          <listitem><para>some variablelist text</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>nested variablelist term 2</term>
-          <listitem><para>some more variablelist text</para></listitem>
-        </varlistentry>
-      </variablelist>
-    </glossdef>
-  </glossentry>
-  </glosslist>
-</para>
-
-<refsect3>
-<title>Sub-subsection</title>
-<para>This is a minimal RefEntry.</para>
-</refsect3>
-</refsect2>
-</refsect1>
-
-<refsect1>
-<title>More Description</title>
-<para>This is a not-so minimal RefEntry.</para>
-<screen>
-This is a screen [break here]
-that starts with a line of space. [break here]
-And it ends with a line of space.
-</screen>
-
-<para>normal paragraph here</para>
-
-<screen>This is a screen [break here]
-that does not start with a line of space. [break here]
-And does not end with a line of space.</screen>
-
-<para>This is a normal paragraph that contains a screen.
-<screen>This is a screen within a normal paragraph [break here]
-that does not start with a line of space. [break here]
-And does not end with a line of space but is followed
-by a line of space.</screen>
-</para>
-
-<para>This is another  normal paragraph that contains a screen.
-<screen>This is a screen within a normal paragraph [break here]
-that does not start with a line of space. [break here]
-And does not end with a line of space and is not followed
-by a line of space.</screen></para>
-
-<para>This is another  normal paragraph that contains a screen.
-<screen>
-This is a screen within a normal paragraph [break here]
-that starts with a line of space. [break here]
-And ends with a line of space but is not followed by a line of space.
-</screen></para>
-
-<para>This is another  normal paragraph that contains a screen.
-<screen>
-This is a screen within a normal paragraph [break here]
-that starts with a line of space. [break here]
-And ends with a line of space and is followed by a line of space.
-</screen>
-</para>
-
-<para>This is another  normal paragraph that contains a screen.
-<screen>
-
-This is a screen within a normal paragraph [break here]
-that starts with a 2 lines of space. [break here]
-And ends with 3 lines of space and is followed by a line of space.
-
-
-</screen>
-</para>
-
-<para>This paragraph contains an itemizedlist with a title. The title
-is “Mrignkwolmcng”.
-<orderedlist>
-  <title>Mrignkwolmcng</title>
-  <listitem>
-    <para>itemizedlist listitem 1</para>
-  </listitem>
-  <listitem>
-    <para>itemizedlist listitem 2</para>
-  </listitem>
-</orderedlist>
-
-This is some useless text that follows the “Mrignkwolmcng” orderedlist
-in the same para.</para>
-
-<para>The following is a Variablelist with a title and with a nested itemizedlist.
-<variablelist>
-  <title>My variablelist</title>
-  <varlistentry>
-    <term>varlistentry term 1</term>
-    <listitem>
-      <itemizedlist>
-        <title>nested itemizedlist</title>
-        <listitem>
-          <para>itemizedlist listitem 1</para>
-        </listitem>
-        <listitem>
-          <para>itemizedlist listitem 2</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>varlistentry term 2</term>
-    <listitem><para>some more listitem text</para></listitem>
-  </varlistentry>
-</variablelist>
-</para>
-
-<para>The following is a Variablelist with a title and with a
-nested Varlistentry that contains multiple Terms
-<variablelist>
-  <title>My nested-multi-term-per-varlistentry variablelist</title>
-  <varlistentry>
-    <term>Varlistentry term 1</term>
-    <listitem>
-      <variablelist>
-        <varlistentry>
-          <term>  varlistentry term 1.1</term>
-          <term>varlistentry term 1.2  </term>
-          <term>varlistentry         term 1.3</term>
-          <listitem><para>All 'bout terms 1.1, 1.2, and 1.3</para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>varlistentry term 2</term>
-    <listitem><para>some more listitem text</para></listitem>
-  </varlistentry>
-</variablelist>
-</para>
-
-<refsect2>
-<title>Subsection</title>
-<para>This is a minimal RefEntry.</para>
-</refsect2>
-</refsect1>
-
-<refsect1>
-<title>Even More Description</title>
-<para>This is an even less minimal RefEntry.</para>
-
-<para>This is a paragraph. It contains the following segmentedlist,
-titled “Gibbererish”, with several segtitle elements.
-<segmentedlist>
-  <title>Gibbererish</title>
-  <segtitle>Floober</segtitle>
-  <segtitle>Buugler</segtitle>
-  <segtitle>Sstangooo</segtitle>
-  <segtitle>Borobinda</segtitle>
-  <seglistitem>
-  <seg>Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda</seg>
-  <seg>Mondorotoluafu</seg>
-  <seg>Ganafutralinga</seg>
-  <seg>Patagularamakundra</seg>
-  </seglistitem>
-  <seglistitem>
-  <seg>Cadraracondar</seg>
-  <seg>Hentirotomaambu</seg>
-  <seg>BdomentriolaiaBdomentriolaiaBdomentriolaia</seg>
-  <seg>Candamalaturuanio</seg>
-  </seglistitem>
-</segmentedlist>
-This is some text that follows the segementedlist within the same
-paragraph. The next part of this same paragraph is an
-<sgmltag>important</sgmltag> admonition.
-<important>
-  <para>It is very important that you read this. That’s why it stands
-  out the way that it does.</para>
-</important>
-</para>
-
-<para>This is a para with a footnote
-  <footnote
-    ><para>Stuff here <programlisting>This is a program listing
-that's two lines long.</programlisting></para></footnote>
-    and stuff after the
-footnote.</para>
-</refsect1>
-
-</refentry>
-</reference>
-</book>
diff --git a/test/testdocs/refentry.008.xml b/test/testdocs/refentry.008.xml
deleted file mode 100644
index 6ea14556..00000000
--- a/test/testdocs/refentry.008.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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>Unit Test: refentry.008</title>
-<releaseinfo role="CVS"
->$Id: refentry.008.xml 7220 2007-08-09 09:02:56Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<refentry id="minimal">
-<refnamediv>
-<refdescriptor>This is the refdescriptor</refdescriptor>
-<refname>Minimal</refname>
-<refpurpose>Test of a minimal RefEntry</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-
-<literallayout><?dbhtml-include href="foo.xml"?></literallayout>
-
-<para><?dbhtml-include href="foo.xml"?></para>
-
-<para><?dbhtml-include href="bar.xml"?></para>
-
-</refsect1>
-</refentry>
-
-</article>
diff --git a/test/testdocs/refentry.009.xml b/test/testdocs/refentry.009.xml
deleted file mode 100644
index 7ae7e013..00000000
--- a/test/testdocs/refentry.009.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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>Unit Test: refentry.009</title>
-    <subtitle>Refentry for a OO Class</subtitle>
-    <releaseinfo role="CVS"
-                 >$Id: refentry.009.xml 5443 2005-11-09 12:20:29Z xmldoc $</releaseinfo>
-    <corpauthor>DocBook Project Development Team</corpauthor>
-  </articleinfo>
-
-  <refentry id="Catalog_refentry">
-    <refnamediv>
-      <refname>Catalog</refname>
-      <refpurpose>do something with a catalog</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-      <para>@language='java'</para>
-      <classsynopsis language="java">
-        <ooclass>
-          <modifier>public</modifier>
-          <classname>Catalog</classname>
-        </ooclass>
-        <fieldsynopsis>
-          <modifier>public</modifier>
-          <modifier>static</modifier>
-          <modifier>final</modifier>
-          <type>int</type>
-          <varname>BASE</varname>
-          <initializer>CatalogEntry.addEntryType("BASE", 1)</initializer>
-        </fieldsynopsis>
-        <constructorsynopsis>
-          <modifier>public</modifier>
-          <methodname>Catalog</methodname>
-          <void/>
-        </constructorsynopsis>
-        <methodsynopsis>
-          <modifier>protected</modifier>
-          <void/>
-          <methodname>copyReaders</methodname>
-          <methodparam>
-            <type>Catalog</type>
-            <parameter>newCatalog</parameter>
-          </methodparam>
-        </methodsynopsis>
-      </classsynopsis>
-
-      <para>@language='cpp'</para>
-      <classsynopsis language="cpp">
-        <ooclass>
-          <modifier>public</modifier>
-          <classname>Catalog</classname>
-        </ooclass>
-        <fieldsynopsis>
-          <modifier>public</modifier>
-          <modifier>static</modifier>
-          <modifier>final</modifier>
-          <type>int</type>
-          <varname>BASE</varname>
-          <initializer>CatalogEntry.addEntryType("BASE", 1)</initializer>
-        </fieldsynopsis>
-        <constructorsynopsis>
-          <modifier>public</modifier>
-          <methodname>Catalog</methodname>
-          <void/>
-        </constructorsynopsis>
-        <methodsynopsis>
-          <modifier>protected</modifier>
-          <void/>
-          <methodname>copyReaders</methodname>
-          <methodparam>
-            <type>Catalog</type>
-            <parameter>newCatalog</parameter>
-          </methodparam>
-        </methodsynopsis>
-      </classsynopsis>
-
-      <para>@language='idl'</para>
-      <classsynopsis language="idl">
-        <ooclass>
-          <modifier>public</modifier>
-          <classname>Catalog</classname>
-        </ooclass>
-        <fieldsynopsis>
-          <modifier>public</modifier>
-          <modifier>static</modifier>
-          <modifier>final</modifier>
-          <type>int</type>
-          <varname>BASE</varname>
-          <initializer>CatalogEntry.addEntryType("BASE", 1)</initializer>
-        </fieldsynopsis>
-        <constructorsynopsis>
-          <modifier>public</modifier>
-          <methodname>Catalog</methodname>
-          <void/>
-        </constructorsynopsis>
-        <methodsynopsis>
-          <modifier>protected</modifier>
-          <void/>
-          <methodname>copyReaders</methodname>
-          <methodparam>
-            <type>Catalog</type>
-            <parameter>newCatalog</parameter>
-          </methodparam>
-        </methodsynopsis>
-      </classsynopsis>
-
-      <para>@language='perl'</para>
-      <classsynopsis language="perl">
-        <ooclass>
-          <modifier>public</modifier>
-          <classname>Catalog</classname>
-        </ooclass>
-        <fieldsynopsis>
-          <modifier>public</modifier>
-          <modifier>static</modifier>
-          <modifier>final</modifier>
-          <type>int</type>
-          <varname>BASE</varname>
-          <initializer>CatalogEntry.addEntryType("BASE", 1)</initializer>
-        </fieldsynopsis>
-        <constructorsynopsis>
-          <modifier>public</modifier>
-          <methodname>Catalog</methodname>
-          <void/>
-        </constructorsynopsis>
-        <methodsynopsis>
-          <modifier>protected</modifier>
-          <void/>
-          <methodname>copyReaders</methodname>
-          <methodparam>
-            <type>Catalog</type>
-            <parameter>newCatalog</parameter>
-          </methodparam>
-        </methodsynopsis>
-      </classsynopsis>
-    </refsynopsisdiv>
-
-    <refsect1>
-      <title>Dummy Refsect1</title>
-      <para>This is just a placeholder.</para>
-    </refsect1>
-
-  </refentry>
-
-</article>
diff --git a/test/testdocs/refentry.010.xml b/test/testdocs/refentry.010.xml
deleted file mode 100644
index b1eea5ae..00000000
--- a/test/testdocs/refentry.010.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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>Unit Test: refentry.009</title>
-<releaseinfo role="CVS">$Id: refentry.010.xml 5601 2006-03-03 08:52:39Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<refentry id="minimal">
-<refmeta>
-  <refentrytitle>Minimal</refentrytitle>
-  <refmiscinfo class="foo">bar</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>Minimal</refname>
-<refpurpose>Test of a minimal RefEntry</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-</refsect1>
-</refentry>
-
-</article>
diff --git a/test/testdocs/reference.001.xml b/test/testdocs/reference.001.xml
deleted file mode 100644
index 24a5a77f..00000000
--- a/test/testdocs/reference.001.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<reference>
-<referenceinfo>
-<title>Unit Test: reference.001</title>
-<releaseinfo role="CVS">$Id: reference.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</referenceinfo>
-
-<title>Unit Test: reference.001</title>
-
-<refentry id="minimal">
-<refnamediv>
-<refname>Minimal</refname>
-<refpurpose>Test of a minimal RefEntry</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-</refsect1>
-</refentry>
-
-<refentry id="lessminimal">
-<refmeta>
-<refentrytitle>Also Minimal Title</refentrytitle>
-<manvolnum>3</manvolnum>
-</refmeta>
-<refnamediv>
-<refname>Also Minimal</refname>
-<refpurpose>Another test of a minimal RefEntry</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-</refsect1>
-</refentry>
-
-<refentry id="evenlessminimal">
-<refmeta>
-<refentrytitle>Fred</refentrytitle>
-<manvolnum>3</manvolnum>
-</refmeta>
-<refnamediv>
-<refname>Less Minimal</refname>
-<refname>Even Less Minimal</refname>
-<refpurpose>Test of a minimal RefEntry</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Description</title>
-<para>This is a minimal RefEntry.</para>
-</refsect1>
-</refentry>
-
-</reference>
diff --git a/test/testdocs/reference.002.xml b/test/testdocs/reference.002.xml
deleted file mode 100644
index ba26a27b..00000000
--- a/test/testdocs/reference.002.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<reference>
-  <referenceinfo>
-    <title>Unit Test: reference.002</title>
-    <releaseinfo role="CVS">$Id: reference.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-    <author><firstname>Michael</firstname><surname>Smith</surname>
-      <affiliation><address><email>smith@xml-doc.org</email></address></affiliation>
-    </author>
-  </referenceinfo>
-
-  <title>Unit Test: reference.002</title>
-
-  <refentry>
-    <refnamediv>
-      <refname>chown</refname>
-      <refpurpose>Change file owners and groups</refpurpose>
-    </refnamediv>
-
-    <refsect1>
-      <title>Description</title>
-      <para>[description of chown here]</para>
-    </refsect1>
-  </refentry>
-
-  <refentry>
-    <refmeta>
-      <refentrytitle>chgrp</refentrytitle>
-      <manvolnum>1</manvolnum>
-    </refmeta>
-    <refnamediv>
-      <refname>chgrp</refname>
-      <refpurpose>Change file groups</refpurpose>
-    </refnamediv>
-
-    <refsect1>
-      <title>Description</title>
-      <para>[description of chgrp here]</para>
-    </refsect1>
-  </refentry>
-
-  <refentry>
-    <refmeta>
-      <refentrytitle>chmod</refentrytitle>
-      <manvolnum>1</manvolnum>
-    </refmeta>
-    <refnamediv>
-      <refname>chmod</refname>
-      <refpurpose>Change access permissions</refpurpose>
-    </refnamediv>
-
-    <refsect1>
-      <title>Description</title>
-      <para>[description of chmod here]</para>
-    </refsect1>
-  </refentry>
-
-  <refentry>
-    <refnamediv>
-      <refname>mysql_convert_table_format</refname>
-      <refpurpose>MySQL table converter</refpurpose>
-    </refnamediv>
-
-    <refsect1>
-      <title>Description</title>
-      <para>[description of MySQL table converter here]</para>
-    </refsect1>
-  </refentry>
-
-  <refentry>
-    <refnamediv>
-      <refname>mysql_fix_privilege_tables</refname>
-      <refpurpose>Fixes MySQL privilege tables</refpurpose>
-    </refnamediv>
-
-    <refsect1>
-      <title>Description</title>
-      <para>[description of mysql_fix_privilege_tables table converter here]</para>
-    </refsect1>
-  </refentry>
-
-  <refentry>
-    <refnamediv>
-      <refname>Mail::SpamAssassin::PersistentAddrList</refname>
-      <refpurpose>persistent address list base class</refpurpose>
-    </refnamediv>
-
-    <refsect1>
-      <title>Description</title>
-      <para>[description here]</para>
-    </refsect1>
-  </refentry>
-</reference>
diff --git a/test/testdocs/remark.001.xml b/test/testdocs/remark.001.xml
deleted file mode 100644
index 2cd2faa5..00000000
--- a/test/testdocs/remark.001.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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>Unit Test: remark.001</title>
-<releaseinfo role="CVS">$Id: remark.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-  <para>
-    Para before the remark.
-  </para>
-  <remark>
-    Remark outside of a paragraph.  May require %show-comments% to be
-    turned on.
-  </remark>
-  <para>
-    Para after the remark.
-  </para>
-</article>
diff --git a/test/testdocs/remark.002.xml b/test/testdocs/remark.002.xml
deleted file mode 100644
index 2a51c740..00000000
--- a/test/testdocs/remark.002.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>Unit Test: remark.002</title>
-<releaseinfo role="CVS">$Id: remark.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-  <para>
-    Pre-remark text.
-    <remark>
-      Inline remark (inside a paragraph).  May require %show-comments% to be
-      turned on.
-    </remark>
-    Post-remark text.
-  </para>
-</article>
diff --git a/test/testdocs/revhistory.001.xml b/test/testdocs/revhistory.001.xml
deleted file mode 100644
index c86dfd16..00000000
--- a/test/testdocs/revhistory.001.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: revhistory.001.xml</title>
-<releaseinfo role="CVS">$Id: revhistory.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<revhistory>
-<revision>
-<revnumber>1.0</revnumber>
-<date>13 Mar 2002</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark.</revremark>
-</revision>
-<revision>
-<revnumber>0.9</revnumber>
-<date>Nov 20, 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.8</revnumber>
-<date>19 November 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.7</revnumber>
-<date>November 18, 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-</revhistory>
-</articleinfo>
-
-<para>This article tests revhistory. It appears in the articleinfo.</para>
-
-<para>This paragraph also contains the revhistory.
-<revhistory>
-<revision>
-<revnumber>1.0</revnumber>
-<date>13 Mar 2002</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark.</revremark>
-</revision>
-<revision>
-<revnumber>0.9</revnumber>
-<date>20 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.8</revnumber>
-<date>19 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-<revision>
-<revnumber>0.7</revnumber>
-<date>18 Nov 1998</date>
-<authorinitials>ndw</authorinitials>
-<revremark>Some remark about the revision</revremark>
-</revision>
-</revhistory>
-</para>
-
-<para>And this paragraph contains a different one:
-<revhistory>
-  <revision>
-      <revnumber>1.1.1</revnumber>
-      <date>12.6.2002</date>
-      <authorinitials>ndw</authorinitials>
-      <revdescription>
-        <itemizedlist>
-          <listitem><para>Item 1</para></listitem> 
-          <listitem><para>Item 2</para></listitem> 
-        </itemizedlist>
-      </revdescription>
-  </revision>
-</revhistory>
-</para>
-
-</article>
diff --git a/test/testdocs/screen.001.xml b/test/testdocs/screen.001.xml
deleted file mode 100644
index ce11ffa9..00000000
--- a/test/testdocs/screen.001.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>Unit Test: screen.001</title>
-<releaseinfo role="CVS">$Id: screen.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<screen>
-(let <co id="dl1"/>loopvar <co id="dl2"/>((count 1))
-  <co id="dl3"/>(if (> count 10)
-    <co id="dl4"/>#t
-    (<co id="dl5"/>loopvar <co id="dl6"/>(+ count 1))))</screen>
-
-</article>
diff --git a/test/testdocs/sect1.001.xml b/test/testdocs/sect1.001.xml
deleted file mode 100644
index 46c0863d..00000000
--- a/test/testdocs/sect1.001.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>Unit Test: sect1.001</title>
-<releaseinfo role="CVS">$Id: sect1.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-    <sect1 id="c1s1"><title>Section 1</title>
-      <para>blah.</para>
-      <sect2 id="c1s1s1"><title>Section 1.1</title>
-	<para>blah.</para>
-	<sect3 id="c1s1s1s1"><title>Section 1.1.1</title>
-	  <para>blah.</para>
-	  <sect4 id="c1s1s1s1s1"><title>Section 1.1.1.1</title>
-	    <para>blah.</para>
-	    <sect5 id="c1s1s1s1s1s1"><title>Section 1.1.1.1.1</title>
-	      <para>blah.</para>
-	    </sect5>
-	    <sect5 id="c1s1s1s1s1s2"><title>Section 1.1.1.1.2</title>
-	      <para>blah.</para>
-	    </sect5>
-	    <sect5 id="c1s1s1s1s1s3"><title>Section 1.1.1.1.3</title>
-	      <para>blah.</para>
-	    </sect5>
-	  </sect4>
-	  <sect4 id="c1s1s1s1s2"><title>Section 1.1.1.2</title>
-	    <para>blah.</para>
-	  </sect4>
-	  <sect4 id="c1s1s1s1s3"><title>Section 1.1.1.3</title>
-	    <para>blah.</para>
-	  </sect4>
-	</sect3>
-	<sect3 id="c1s1s1s2"><title>Section 1.1.2</title>
-	  <para>blah.</para>
-	</sect3>
-	<sect3 id="c1s1s1s3"><title>Section 1.1.3</title>
-	  <para>blah.</para>
-	</sect3>
-      </sect2>
-      <sect2 id="c1s1s2"><title>Section 1.2</title>
-	<para>blah.</para>
-      </sect2>
-      <sect2 id="c1s1s3"><title>Section 1.3</title>
-	<para>blah.</para>
-      </sect2>
-    </sect1>
-
-</article>
diff --git a/test/testdocs/sect1.002.xml b/test/testdocs/sect1.002.xml
deleted file mode 100644
index fa6b2254..00000000
--- a/test/testdocs/sect1.002.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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>Unit Test: sect1.002</title>
-<releaseinfo role="CVS">$Id: sect1.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-    <sect1 id="c1s2"><title>Section 2</title>
-      <para>blah.</para>
-      <sect2 id="c1s2s1"><title>Section 2.1</title>
-	<para>blah.</para>
-	<sect3 id="c1s2s1s1"><title>Section 2.1.1</title>
-	  <para>blah.</para>
-	  <sect4 id="c1s2s1s1s1"><title>Section 2.1.1.1</title>
-	    <para>blah.</para>
-	    <sect5 id="c1s2s1s1s1s1s"><title>Section 2.1.1.1.1</title>
-	      <para>blah.</para>
-	    </sect5>
-	    <sect5 id="c1s2s1s1s1s2"><title>Section 2.1.1.1.2</title>
-	      <para>blah.</para>
-	    </sect5>
-	    <sect5 id="c1s2s1s1s1s3"><title>Section 2.1.1.1.3</title>
-	      <para>blah.</para>
-	    </sect5>
-	  </sect4>
-	  <sect4 id="c1s2s1s1s2"><title>Section 2.1.1.2</title>
-	    <para>blah.</para>
-	  </sect4>
-	  <sect4 id="c1s2s1s1s3"><title>Section 2.1.1.3</title>
-	    <para>blah.</para>
-	  </sect4>
-	</sect3>
-	<sect3 id="c1s2s1s2"><title>Section 2.1.2</title>
-	  <para>blah.</para>
-	</sect3>
-	<sect3 id="c1s2s1s3"><title>Section 2.1.3</title>
-	  <para>blah.</para>
-	</sect3>
-      </sect2>
-      <sect2 id="c1s2s2"><title>Section 2.2</title>
-	<para>blah.</para>
-      </sect2>
-      <sect2 id="c1s2s3"><title>Section 2.3</title>
-	<para>blah.</para>
-      </sect2>
-    </sect1>
-    <sect1 id="c1s3"><title>Section 3</title>
-      <para>blah.</para>
-    </sect1>
-
-</article>
diff --git a/test/testdocs/section.001.xml b/test/testdocs/section.001.xml
deleted file mode 100644
index ce64aa8e..00000000
--- a/test/testdocs/section.001.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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>Unit Test: section.001</title>
-<releaseinfo role="CVS">$Id: section.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>See <xref linkend="c2s1s1s2"/>.</para>
-
-    <section id="c2s1"><title>Section 1</title>
-      <para>blah.</para>
-      <section id="c2s1s1"><title>Section 1.1</title>
-	<para>blah.</para>
-	<section id="c2s1s1s1"><title>Section 1.1.1</title>
-	  <para>blah.</para>
-	  <section id="c2s1s1s1s1"><title>Section 1.1.1.1</title>
-	    <para>blah.</para>
-	    <section id="c2s1s1s1s1s1"><title>Section 1.1.1.1.1</title>
-	      <para>blah.</para>
-	    </section>
-	    <section id="c2s1s1s1s1s2"><title>Section 1.1.1.1.2</title>
-	      <para>blah.</para>
-	    </section>
-	    <section id="c2s1s1s1s1s3"><title>Section 1.1.1.1.3</title>
-	      <para>blah.</para>
-	    </section>
-	  </section>
-	  <section id="c2s1s1s1s2"><title>Section 1.1.1.2</title>
-	    <para>blah.</para>
-	  </section>
-	  <section id="c2s1s1s1s3"><title>Section 1.1.1.3</title>
-	    <para>blah.</para>
-	  </section>
-	</section>
-	<section id="c2s1s1s2"><title>Section 1.1.2</title>
-	  <para>blah.</para>
-	</section>
-	<section id="c2s1s1s3"><title>Section 1.1.3</title>
-	  <para>blah.</para>
-	</section>
-      </section>
-      <section id="c2s1s2"><title>Section 1.2</title>
-	<para>blah.</para>
-      </section>
-      <section id="c2s1s3"><title>Section 1.3</title>
-	<para>blah.</para>
-      </section>
-    </section>
-
-</article>
diff --git a/test/testdocs/section.002.xml b/test/testdocs/section.002.xml
deleted file mode 100644
index f054777c..00000000
--- a/test/testdocs/section.002.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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>Unit Test: section.002</title>
-<releaseinfo role="CVS">$Id: section.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-    <section id="c2s2"><title>Section 2</title>
-      <para>blah.</para>
-      <section id="c2s2s1"><title>Section 2.1</title>
-	<para>blah.</para>
-	<section id="c2s2s1s1"><title>Section 2.1.1</title>
-	  <para>blah.</para>
-	  <section id="c2s2s1s1s1"><title>Section 2.1.1.1</title>
-	    <para>blah.</para>
-	    <section id="c2s2s1s1s1s1s"><title>Section 2.1.1.1.1</title>
-	      <para>blah.</para>
-	    </section>
-	    <section id="c2s2s1s1s1s2"><title>Section 2.1.1.1.2</title>
-	      <para>blah.</para>
-	    </section>
-	    <section id="c2s2s1s1s1s3"><title>Section 2.1.1.1.3</title>
-	      <para>blah.</para>
-	    </section>
-	  </section>
-	  <section id="c2s2s1s1s2"><title>Section 2.1.1.2</title>
-	    <para>blah.</para>
-	  </section>
-	  <section id="c2s2s1s1s3"><title>Section 2.1.1.3</title>
-	    <para>blah.</para>
-	  </section>
-	</section>
-	<section id="c2s2s1s2"><title>Section 2.1.2</title>
-	  <para>blah.</para>
-	</section>
-	<section id="c2s2s1s3"><title>Section 2.1.3</title>
-	  <para>blah.</para>
-	</section>
-      </section>
-      <section id="c2s2s2"><title>Section 2.2</title>
-	<para>blah.</para>
-      </section>
-      <section id="c2s2s3"><title>Section 2.3</title>
-	<para>blah.</para>
-      </section>
-    </section>
-    <section id="c2s3"><title>Section 3</title>
-      <para>blah.</para>
-    </section>
-
-</article>
diff --git a/test/testdocs/section.003.xml b/test/testdocs/section.003.xml
deleted file mode 100644
index 9910fe89..00000000
--- a/test/testdocs/section.003.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>Unit Test: section.003</title>
-<releaseinfo role="CVS">$Id: section.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-    <section id="c2s1"><title>This is a Section Title.</title>
-      <para>blah.</para>
-      <section id="c2s1s1"><title>This is a Really Long Section Title That's Almost Certainly Bound to Wrap Around on the Page</title>
-	<para>blah.</para>
-      </section>
-    </section>
-
-</article>
diff --git a/test/testdocs/section.004.xml b/test/testdocs/section.004.xml
deleted file mode 100644
index 552d50d1..00000000
--- a/test/testdocs/section.004.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter>
-<chapterinfo>
-<title>Unit Test: section.004</title>
-<releaseinfo role="CVS">$Id: section.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</chapterinfo>
-<title>Unit Test: section.004</title>
-
-<para>Blah.</para>
-
-    <section id="c2s2"><title>Section 1</title>
-      <para>blah.</para>
-      <section id="c2s2s1"><title>Section 1.1</title>
-	<para>blah.</para>
-	<section id="c2s2s1s1"><title>Section 1.1.1</title>
-	  <para>blah.</para>
-	  <section id="c2s2s1s1s1"><title>Section 1.1.1.1</title>
-	    <para>blah.</para>
-	    <section id="c2s2s1s1s1s1s"><title>Section 1.1.1.1.1</title>
-	      <para>blah.</para>
-	    </section>
-	    <section id="c2s2s1s1s1s2"><title>Section 1.1.1.1.2</title>
-	      <para>blah.</para>
-	    </section>
-	    <section id="c2s2s1s1s1s3"><title>Section 1.1.1.1.3</title>
-	      <para>blah.</para>
-	    </section>
-	  </section>
-	  <section id="c2s2s1s1s2"><title>Section 1.1.1.2</title>
-	    <para>blah.</para>
-	  </section>
-	  <section id="c2s2s1s1s3"><title>Section 1.1.1.3</title>
-	    <para>blah.</para>
-	  </section>
-	</section>
-	<section id="c2s2s1s2"><title>Section 1.1.2</title>
-	  <para>blah.</para>
-	</section>
-	<section id="c2s2s1s3"><title>Section 1.1.3</title>
-	  <para>blah.</para>
-	</section>
-      </section>
-      <section id="c2s2s2"><title>Section 1.2</title>
-	<para>blah.</para>
-      </section>
-      <section id="c2s2s3"><title>Section 1.3</title>
-	<para>blah.</para>
-      </section>
-    </section>
-    <section id="c2s3"><title>Section 2</title>
-      <para>blah.</para>
-    </section>
-</chapter>
diff --git a/test/testdocs/section.005.xml b/test/testdocs/section.005.xml
deleted file mode 100644
index d2333c7f..00000000
--- a/test/testdocs/section.005.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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>Unit Test: section.005</title>
-    <subtitle>Deeply nested sections with subtitles</subtitle>
-    <releaseinfo role="CVS">$Id: section.005.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-    <author><firstname>Michael</firstname><surname>Smith</surname>
-    <affiliation><address><email>smith@sideshowbarker.net</email></address></affiliation>
-    </author>
-  </articleinfo>
-
-  <para>See <xref linkend="c2s1s1s2"/>.</para>
-
-  <section id="c2s1">
-    <title>Section 1</title>
-    <subtitle>Subtitle</subtitle>
-    <para>blah.</para>
-    <section id="c2s1s1">
-      <title>Section 1.1</title>
-      <subtitle>Subtitle</subtitle>
-      <para>blah.</para>
-      <section id="c2s1s1s1">
-	<title>Section 1.1.1</title>
-	<subtitle>Subtitle</subtitle>
-	<para>blah.</para>
-	<section id="c2s1s1s1s1">
-	  <title>Section 1.1.1.1</title>
-	  <subtitle>Subtitle</subtitle>
-	  <para>blah.</para>
-	  <section id="c2s1s1s1s1s1">
-	    <title>Section 1.1.1.1.1</title>
-	    <subtitle>Subtitle</subtitle>
-	    <para>blah.</para>
-	  </section>
-	  <section id="c2s1s1s1s1s2">
-	    <title>Section 1.1.1.1.2</title>
-	    <subtitle>Subtitle</subtitle>
-	    <para>blah.</para>
-	    <section id="c2s1s1s1s1s2s1">
-	      <title>Section 1.1.1.1.2.1</title>
-	      <subtitle>Subtitle</subtitle>
-	      <para>blah.</para>
-	    </section>
-	  </section>
-	  <section id="c2s1s1s1s1s3">
-	    <title>Section 1.1.1.1.3</title>
-	    <subtitle>Subtitle</subtitle>
-	    <para>blah.</para>
-	    <simplesect id="c2s1s1s1s1s3s1">
-	      <title>Section 1.1.1.1.3.1</title>
-	      <subtitle>Subtitle</subtitle>
-	      <para>blah.</para>
-	    </simplesect>
-	  </section>
-	</section>
-	<section id="c2s1s1s1s2">
-	  <title>Section 1.1.1.2</title>
-	  <subtitle>Subtitle</subtitle>
-	  <para>blah.</para>
-	</section>
-	<section id="c2s1s1s1s3">
-	  <title>Section 1.1.1.3</title>
-	  <subtitle>Subtitle</subtitle>
-	  <para>blah.</para>
-	</section>
-      </section>
-      <section id="c2s1s1s2">
-	<title>Section 1.1.2</title>
-	<subtitle>Subtitle</subtitle>
-	<para>blah.</para>
-      </section>
-      <section id="c2s1s1s3">
-	<title>Section 1.1.3</title>
-	<subtitle>Subtitle</subtitle>
-	<para>blah.</para>
-      </section>
-    </section>
-    <section id="c2s1s2">
-      <title>Section 1.2</title>
-      <subtitle>Subtitle</subtitle>
-      <para>blah.</para>
-    </section>
-    <section id="c2s1s3">
-      <title>Section 1.3</title>
-      <subtitle>Subtitle</subtitle>
-      <para>blah.</para>
-    </section>
-  </section>
-
-</article>
diff --git a/test/testdocs/segmentedlist.001.xml b/test/testdocs/segmentedlist.001.xml
deleted file mode 100644
index b864fbbb..00000000
--- a/test/testdocs/segmentedlist.001.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>Unit Test: segmentedlist.001</title>
-<releaseinfo role="CVS">$Id: segmentedlist.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<segmentedlist><title>State Capitals</title>
-<segtitle>State</segtitle>
-<segtitle>Capital</segtitle>
-<seglistitem><seg>Alabama</seg><seg>Montgomery</seg></seglistitem>
-<seglistitem><seg>Alaska</seg><seg>Anchorage</seg></seglistitem>
-<seglistitem><seg>Arkansas</seg><seg>Little Rock</seg></seglistitem>
-</segmentedlist>
-
-</article>
diff --git a/test/testdocs/segmentedlist.002.xml b/test/testdocs/segmentedlist.002.xml
deleted file mode 100644
index ddfd771b..00000000
--- a/test/testdocs/segmentedlist.002.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>Unit Test: segmentedlist.002</title>
-<releaseinfo role="CVS">$Id: segmentedlist.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<segmentedlist><title>State Capitals</title>
-<?dbhtml list-presentation='table' table-summary="testing summary"?>
-<?dbfo list-presentation='table'?>
-<segtitle>State</segtitle>
-<segtitle>Capital</segtitle>
-<seglistitem><seg>Alabama</seg><seg>Montgomery</seg></seglistitem>
-<seglistitem><seg>Alaska</seg><seg>Anchorage</seg></seglistitem>
-<seglistitem><seg>Arkansas</seg><seg>Little Rock</seg></seglistitem>
-</segmentedlist>
-
-</article>
diff --git a/test/testdocs/segmentedlist.003.xml b/test/testdocs/segmentedlist.003.xml
deleted file mode 100644
index b92a8e01..00000000
--- a/test/testdocs/segmentedlist.003.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>Unit Test: segmentedlist.003</title>
-<releaseinfo role="CVS">$Id: segmentedlist.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Segmented list with embedded PI:</para>
-
-<segmentedlist>
-<segtitle>Label 1</segtitle>
-<segtitle>Label 2</segtitle>
-<seglistitem><?Pub Dtl?><seg>Content 1</seg>
-<seg>Content 2</seg>
-</seglistitem>
-</segmentedlist>
-
-</article>
diff --git a/test/testdocs/set.001.xml b/test/testdocs/set.001.xml
deleted file mode 100644
index e085263d..00000000
--- a/test/testdocs/set.001.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE set PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<set>
-<setinfo>
-<title>Unit Test: set.001</title>
-<releaseinfo role="CVS">$Id: set.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</setinfo>
-
-<book><title>First Book</title>
-<chapter><title>Chapter</title>
-<para>Some test data</para>
-</chapter>
-</book>
-
-<book><title>Second Book</title>
-<chapter><title>Chapter</title>
-<para>Some test data</para>
-</chapter>
-</book>
-
-<book><title>Third Book</title>
-<chapter><title>Chapter</title>
-<para>Some test data</para>
-</chapter>
-</book>
-
-</set>
diff --git a/test/testdocs/sgmltag.xml b/test/testdocs/sgmltag.xml
deleted file mode 100644
index 79efbd4b..00000000
--- a/test/testdocs/sgmltag.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: sgmltag.001.xml</title>
-<releaseinfo role="CVS">$Id: sgmltag.xml 5600 2006-03-03 08:43:12Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-<affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>There are several classes of “tag”:</para>
-
-<itemizedlist>
-<listitem><para><sgmltag class="attribute">attribute</sgmltag></para></listitem>
-<listitem><para><sgmltag class="attvalue">attvalue</sgmltag></para></listitem>
-<listitem><para><sgmltag class="element">element</sgmltag></para></listitem>
-<listitem><para><sgmltag class="emptytag">emptytag</sgmltag></para></listitem>
-<listitem><para><sgmltag class="endtag">endtag</sgmltag></para></listitem>
-<listitem><para><sgmltag class="genentity">genentity</sgmltag></para></listitem>
-<listitem><para><sgmltag class="numcharref">numcharref</sgmltag></para></listitem>
-<listitem><para><sgmltag class="paramentity">paramentity</sgmltag></para></listitem>
-<listitem><para><sgmltag class="pi">pi</sgmltag></para></listitem>
-<listitem><para><sgmltag class="sgmlcomment">sgmlcomment</sgmltag></para></listitem>
-<listitem><para><sgmltag class="starttag">starttag</sgmltag></para></listitem>
-<listitem><para><sgmltag class="xmlpi">xmlpi</sgmltag></para></listitem>
-</itemizedlist>
-
-</article>
diff --git a/test/testdocs/sidebar.001.xml b/test/testdocs/sidebar.001.xml
deleted file mode 100644
index e8f6e51f..00000000
--- a/test/testdocs/sidebar.001.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: sidebar.001.xml</title>
-<releaseinfo role="CVS">$Id: sidebar.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This is a sidebar test.</para>
-
-<para>Here is some content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-</para>
-
-<para>This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-</para>
-
-<sidebar>
-<title>Sidebar</title>
-<para>Here is some sidebar content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-</para>
-
-<para>This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-</para>
-</sidebar>
-
-<para>Back into the main flow. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-This is content. This is content. This is content. This is content.
-</para>
-
-</article>
diff --git a/test/testdocs/simplelist.001.xml b/test/testdocs/simplelist.001.xml
deleted file mode 100644
index 986e7c6e..00000000
--- a/test/testdocs/simplelist.001.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>Unit Test: simplelist.001</title>
-<releaseinfo role="CVS">$Id: simplelist.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>An inline simple list:
-<simplelist type="inline">
-<member>eggs</member>
-<member>milk</member>
-<member>butter</member>
-</simplelist>.
-</para>
-
-<para>A horizontal simple list:</para>
-
-<simplelist type="horiz" columns="3">
-<member>A</member>
-<member>B</member>
-<member>C</member>
-<member>D</member>
-<member>E</member>
-<member>F</member>
-<member>G</member>
-<member>H</member>
-<member>I</member>
-<member>J</member>
-<member>K</member>
-</simplelist>
-
-<para>A vertical simple list:</para>
-
-<simplelist type="vert" columns="3">
-<member>A</member>
-<member>B</member>
-<member>C</member>
-<member>D</member>
-<member>E</member>
-<member>F</member>
-<member>G</member>
-<member>H</member>
-<member>I</member>
-<member>J</member>
-<member>K</member>
-</simplelist>
-
-</article>
diff --git a/test/testdocs/simplelist.x001.xml b/test/testdocs/simplelist.x001.xml
deleted file mode 100644
index 352bdab8..00000000
--- a/test/testdocs/simplelist.x001.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<article>
-<articleinfo>
-<title>Unit Test: simplelist.x001.xml</title>
-<releaseinfo role="CVS">$Id$</releaseinfo>
-<!-- Change this: -->
-<author><firstname>Shaun</firstname><surname>McCance</surname>
-        <affiliation><address><email>shaunm@gnome.org</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>
-  Rendered inline:
-
-  <simplelist type="inline">
-    <member>A</member>
-    <member>B</member>
-    <member>C</member>
-    <member>D</member>
-    <member>E</member>
-    <member>F</member>
-    <member>G</member>
-    <member>H</member>
-  </simplelist>
-</para>
-
-<para>
-  Rendered horizontally:
-</para>
-
-<simplelist type="horiz" columns="3">
-  <member>A</member>
-  <member>B</member>
-  <member>C</member>
-  <member>D</member>
-  <member>E</member>
-  <member>F</member>
-  <member>G</member>
-  <member>H</member>
-</simplelist>
-
-<para>
-  Rendered vertically:
-</para>
-
-<simplelist type="vert" columns="3">
-  <member>A</member>
-  <member>B</member>
-  <member>C</member>
-  <member>D</member>
-  <member>E</member>
-  <member>F</member>
-  <member>G</member>
-  <member>H</member>
-</simplelist>
-
-</article>
diff --git a/test/testdocs/simplemsgentry.xml b/test/testdocs/simplemsgentry.xml
deleted file mode 100644
index da1d7632..00000000
--- a/test/testdocs/simplemsgentry.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter>
-<chapterinfo>
-<releaseinfo role="CVS">$Id: simplesect.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-</chapterinfo>
-<title>Unit Test: simplemsgentry</title>
-
-<msgset>
-<simplemsgentry level="user" origin="parser">
-  <msgtext>
-    <para>XML document structures must start and end within the same
-    entity.</para>
-  </msgtext>
-  <msgexplan>
-    <para>In XML, the end tag for an element must occur in the same
-entity as the start tag. You cannot include an external parsed entity
-that contains unbalanced tags, even if the result, after the content
-is included would be balanced.</para>
-  </msgexplan>
-</simplemsgentry>
-</msgset>
-
-</chapter>
diff --git a/test/testdocs/simplesect.001.xml b/test/testdocs/simplesect.001.xml
deleted file mode 100644
index 33b9a786..00000000
--- a/test/testdocs/simplesect.001.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter>
-<chapterinfo>
-<releaseinfo role="CVS">$Id: simplesect.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-</chapterinfo>
-<title>Unit Test: simplesect</title>
-
-<para>This test case is for simplesect.</para>
-
-<section>
-<title>A Section Title</title>
-
-<para>Some content <acronym>here</acronym>.</para>
-
-<simplesect>
-<title>First Simplesect</title>
-<para>Some content</para>
-</simplesect>
-</section>
-
-<section>
-<title>Another Section Title</title>
-
-<para>Some content</para>
-
-<section>
-<title>A Subsection Title</title>
-
-<para>Some content</para>
-
-<simplesect>
-<title>Second Simplesect</title>
-<subtitle>Subtitle</subtitle>
-<para>Some content</para>
-</simplesect>
-</section>
-</section>
-
-</chapter>
diff --git a/test/testdocs/stamp.001.xml b/test/testdocs/stamp.001.xml
deleted file mode 100644
index 915c39a1..00000000
--- a/test/testdocs/stamp.001.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>Unit Test: stamp.001</title>
-<releaseinfo role="CVS">$Id: stamp.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image.</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.002.xml b/test/testdocs/stamp.002.xml
deleted file mode 100644
index a0e5835e..00000000
--- a/test/testdocs/stamp.002.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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>Unit Test: stamp.002</title>
-<releaseinfo role="CVS">$Id: stamp.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: width=400; depth=512; contentdepth=200; align=center; valign=bottom</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="green"?>
-    <imagedata
-      width="400"
-      depth="512"
-      contentdepth="200"
-      align="center"
-      valign="bottom"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.003.xml b/test/testdocs/stamp.003.xml
deleted file mode 100644
index c9b78f18..00000000
--- a/test/testdocs/stamp.003.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>Unit Test: stamp.003</title>
-<releaseinfo role="CVS">$Id: stamp.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: width=512; depth=512; contentwidth=256; contentdepth=384</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      width="512"
-      depth="512"
-      contentwidth="256"
-      contentdepth="384"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.004.xml b/test/testdocs/stamp.004.xml
deleted file mode 100644
index f9f773d1..00000000
--- a/test/testdocs/stamp.004.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>Unit Test: stamp.004</title>
-<releaseinfo role="CVS">$Id: stamp.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: width=512; depth=512; scale=125; align=center</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      width="512"
-      depth="512"
-      scale="125"
-      align="center"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.005.xml b/test/testdocs/stamp.005.xml
deleted file mode 100644
index 2656c21c..00000000
--- a/test/testdocs/stamp.005.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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>Unit Test: stamp.005</title>
-<releaseinfo role="CVS">$Id: stamp.005.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: width=512; depth=512 (scalefit=1 by default in this case)</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      width="512"
-      depth="512"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.006.xml b/test/testdocs/stamp.006.xml
deleted file mode 100644
index cf4af397..00000000
--- a/test/testdocs/stamp.006.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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>Unit Test: stamp.006</title>
-<releaseinfo role="CVS">$Id: stamp.006.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: width=512; depth=512; scalefit=0</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      width="512"
-      depth="512"
-      scalefit="0"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.007.xml b/test/testdocs/stamp.007.xml
deleted file mode 100644
index 7ecb9875..00000000
--- a/test/testdocs/stamp.007.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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>Unit Test: stamp.007</title>
-<releaseinfo role="CVS">$Id: stamp.007.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: width=512; depth=512; scale=75</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      width="512"
-      depth="512"
-      scale="75"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.008.xml b/test/testdocs/stamp.008.xml
deleted file mode 100644
index 11233ee2..00000000
--- a/test/testdocs/stamp.008.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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>Unit Test: stamp.008</title>
-<releaseinfo role="CVS">$Id: stamp.008.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: contentwidth=50%</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      contentwidth="50%"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.009.xml b/test/testdocs/stamp.009.xml
deleted file mode 100644
index d1bb70fc..00000000
--- a/test/testdocs/stamp.009.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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>Unit Test: stamp.009</title>
-<releaseinfo role="CVS">$Id: stamp.009.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: contentwidth=50%; scale=125</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      contentwidth="50%"
-      scale="125"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.010.xml b/test/testdocs/stamp.010.xml
deleted file mode 100644
index 0f47ba88..00000000
--- a/test/testdocs/stamp.010.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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>Unit Test: stamp.010</title>
-<releaseinfo role="CVS">$Id: stamp.010.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: contentwidth=50%; contentdepth=50%</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      contentwidth="50%"
-      contentdepth="50%"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.011.xml b/test/testdocs/stamp.011.xml
deleted file mode 100644
index 14a8ebc8..00000000
--- a/test/testdocs/stamp.011.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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>Unit Test: stamp.011</title>
-<releaseinfo role="CVS">$Id: stamp.011.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: width=400; depth=512; scalefit=1; align=center; valign=bottom</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="green"?>
-    <imagedata
-      width="400"
-      depth="512"
-      scalefit="1"
-      align="center"
-      valign="bottom"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.012.xml b/test/testdocs/stamp.012.xml
deleted file mode 100644
index 95c2dfe7..00000000
--- a/test/testdocs/stamp.012.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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>Unit Test: stamp.012</title>
-<releaseinfo role="CVS">$Id: stamp.012.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: width=75%; scalefit=1</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="green"?>
-    <imagedata
-      width="75%"
-      scalefit="1"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-<para>The stamp image: depth=25%; scalefit=1</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="green"?>
-    <imagedata
-      depth="25%"
-      scalefit="1"
-      fileref="graphics/stamp.png"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/stamp.013.xml b/test/testdocs/stamp.013.xml
deleted file mode 100644
index 06fc713d..00000000
--- a/test/testdocs/stamp.013.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<article>
-<articleinfo>
-<title>Unit Test: stamp.013</title>
-<subtitle>Test having both contentwidth="x%" and contentdepth="y%"</subtitle>
-<releaseinfo role="CVS">$Id: stamp.013.xml 5433 2005-11-04 09:00:49Z xmldoc $</releaseinfo>
-<corpauthor>DocBook Project Development team</corpauthor>
-</articleinfo>
-
-<para>The stamp image has a natural size of 200x128 pixels.</para>
-
-<para>The stamp image: width=7.12cm; depth=7.12cm; scale=125; align=center</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      width="7.12cm"
-      depth="7.12cm"
-      scale="125"
-      align="center"
-      fileref="graphics/duck-small"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-<para>The stamp image: width=512; depth=512; contentwidth=50%; contentdepth=30%; align=center</para>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      width="512"
-      depth="512"
-      contentwidth="50%"
-      contentdepth="30%"
-      align="center"
-      fileref="graphics/duck-small"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      width="512"
-      depth="400"
-      contentwidth="500"
-      contentdepth="300"
-      align="left"
-      valign="top"
-      fileref="graphics/duck-small"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      depth="400"
-      contentwidth="500"
-      contentdepth="300"
-      align="left"
-      valign="top"
-      fileref="graphics/duck-small"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-<mediaobject>
-  <imageobject>
-    <?dbhtml background-color="blue"?>
-    <imagedata
-      contentwidth="500"
-      contentdepth="300"
-      align="left"
-      valign="top"
-      fileref="graphics/duck-small"/>
-  </imageobject>
-  <textobject><phrase>The DocBook Stamp</phrase></textobject>
-</mediaobject>
-
-
-</article>
diff --git a/test/testdocs/stepalternatives.001.xml b/test/testdocs/stepalternatives.001.xml
deleted file mode 100644
index 728059bb..00000000
--- a/test/testdocs/stepalternatives.001.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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>Unit Test: procedure.003</title>
-<releaseinfo role="CVS">$Id: stepalternatives.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<procedure>
-<para>Do the following:</para>
-<step>
-  <para>Step one</para>
-  <stepalternatives>
-    <step>
-      <para>Branch 1</para>
-      <substeps>
-        <step>
-          <para>a. </para>
-        </step>
-        <step>
-          <para>b. </para>
-        </step>
-      </substeps>
-    </step>
-    <step>
-      <para>Branch 2</para>
-      <substeps>
-        <step>
-          <para>a. </para>
-        </step>
-        <step>
-          <para>b. </para>
-        </step>
-      </substeps>
-    </step>
-  </stepalternatives>
-</step>
-<step>
-  <para>Step two</para>
-</step>
-</procedure>
-</article>
diff --git a/test/testdocs/subtitle.001.xml b/test/testdocs/subtitle.001.xml
deleted file mode 100644
index 400c0e5e..00000000
--- a/test/testdocs/subtitle.001.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<title>Unit Test: subtitle.001</title>
-<subtitle>Book Subtitle</subtitle>
-
-<part><title>Part Title</title><subtitle>Part Subtitle</subtitle>
-
-<chapter><title>Chapter Title</title><subtitle>Chapter Subtitle</subtitle>
-  <sect1><title>Sect1 Title</title><subtitle>Sect1 Subtitle</subtitle>
-    <sect2><title>Sect2 Title</title><subtitle>Sect2 Subtitle</subtitle>
-      <sect3><title>Sect3 Title</title><subtitle>Sect3 Subtitle</subtitle>
-        <para>Spoon!</para>
-      </sect3>
-    </sect2>
-  </sect1>
-</chapter>
-
-<chapter><title>Chapter Title</title><subtitle>Chapter Subtitle</subtitle>
-  <section><title>Section Title</title><subtitle>Section Subtitle</subtitle>
-    <section><title>Subsection Title</title><subtitle>Subsection Subtitle</subtitle>
-      <section><title>Subsubsection Title</title><subtitle>Subsubsection Subtitle</subtitle>
-        <para>Fork?</para>
-      </section>
-    </section>
-  </section>
-</chapter>
-
-</part>
-
-</book>
diff --git a/test/testdocs/superscript.001.xml b/test/testdocs/superscript.001.xml
deleted file mode 100644
index c2cd8df3..00000000
--- a/test/testdocs/superscript.001.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: superscript.001.xml</title>
-<releaseinfo role="CVS">$Id: superscript.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This article tests superscripts and subscripts, such as
-“H<subscript>2</subscript>O” and
-“a<superscript>2</superscript> + b<superscript>2</superscript> = c<superscript>2</superscript>”.</para>
-
-</article>
diff --git a/test/testdocs/svg-001.xml b/test/testdocs/svg-001.xml
deleted file mode 100644
index c5c8349f..00000000
--- a/test/testdocs/svg-001.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg:svg xmlns:svg="http://www.w3.org/2000/svg">
-  <svg:g transform="scale(0.5)">
-    <svg:polygon style="fill:red; stroke:blue; stroke-width:10"
-                 points="350, 75 379,161 469,161 397,215
-                         423,301 350,250 277,301 303,215
-                         231,161 321,161" />
-    <svg:polygon style="fill:lime; stroke:blue; stroke-width:10"
-                 points="850,75  958,137.5 958,262.5
-                         850,325 742,262.6 742,137.5"/>
-  </svg:g>
-</svg:svg>
diff --git a/test/testdocs/svg.001.xml b/test/testdocs/svg.001.xml
deleted file mode 100644
index 8b00c2b2..00000000
--- a/test/testdocs/svg.001.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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>Unit Test: svg.001.xml</title>
-<releaseinfo role="CVS">$Id: svg.001.xml 4105 2004-12-15 23:00:31Z xmldoc $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This article contains an SVG diagram (inline).</para>
-
-<mediaobject>
-  <imageobject>
-    <svg:svg xmlns:svg="http://www.w3.org/2000/svg"
-	height="4in" width="4in">
-      <svg:g transform="scale(0.5)">
-        <svg:polygon style="fill:red; stroke:blue; stroke-width:10"
-                     points="350, 75 379,161 469,161 397,215
-                             423,301 350,250 277,301 303,215
-                             231,161 321,161" />
-        <svg:polygon style="fill:lime; stroke:blue; stroke-width:10"
-                     points="850,75  958,137.5 958,262.5
-                             850,325 742,262.6 742,137.5"/>
-      </svg:g>
-    </svg:svg>
-  </imageobject>
-  <imageobject>
-    <imagedata
-      align="center"
-      fileref="graphics/svg-001-fallback.png"/>
-  </imageobject>
-  <textobject><phrase>Example SVG polygons</phrase></textobject>
-  <caption><para>Polygons</para></caption>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/svg.002.xml b/test/testdocs/svg.002.xml
deleted file mode 100644
index e2e1106a..00000000
--- a/test/testdocs/svg.002.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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>Unit Test: svg.002.xml</title>
-<releaseinfo role="CVS">$Id: article.001.xml,v 1.2 2002/04/18 22:15:39 nwalsh Exp $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This article contains an SVG diagram (external).</para>
-
-<mediaobject>
-  <imageobject>
-    <imagedata
-      align="center"
-      format="SVG"
-      fileref="graphics/svg-001.xml"/>
-  </imageobject>
-  <imageobject>
-    <imagedata
-      align="center"
-      fileref="graphics/svg-001-fallback.png"/>
-  </imageobject>
-  <textobject><phrase>Example SVG polygons</phrase></textobject>
-  <caption><para>Polygons</para></caption>
-</mediaobject>
-
-</article>
diff --git a/test/testdocs/table.001.xml b/test/testdocs/table.001.xml
deleted file mode 100644
index b88773d8..00000000
--- a/test/testdocs/table.001.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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>Unit Test: table.001</title>
-<releaseinfo role="CVS">$Id: table.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<table frame="all">
-<title>TFoot Test</title>
-<tgroup cols="2">
-<tfoot>
-<row>
-<entry>Foot Left</entry>
-<entry>Foot Right</entry>
-</row>
-</tfoot>
-<tbody>
-<row>
-<entry>Body Left</entry>
-<entry>Body Right</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-</article>
diff --git a/test/testdocs/table.002.xml b/test/testdocs/table.002.xml
deleted file mode 100644
index d8544172..00000000
--- a/test/testdocs/table.002.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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>Unit Test: table.002</title>
-<releaseinfo role="CVS">$Id: table.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<table id="width-test-1" frame="all">
-<title>Width Test 1</title>
-<tgroup cols="4" align="left">
-<colspec colnum="1" colname="c1" colwidth="1in"/>
-<colspec colnum="2" colname="c2" colwidth="1*"/>
-<colspec colnum="3" colname="c3" colwidth="5*"/>
-<colspec colnum="4" colname="c4" colwidth="1*+0.5in"/>
-<tbody>
-<row>
-<entry>1in</entry>
-<entry>1/7</entry>
-<entry>5/7</entry>
-<entry>1/7+0.5in</entry>
-</row>
-<row>
-<entry>some words to make the thing wrap around to test the width</entry>
-<entry>some words to make the thing wrap around to test the width</entry>
-<entry>some words to make the thing wrap around to test the width</entry>
-<entry>some words to make the thing wrap around to test the width</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-</article>
diff --git a/test/testdocs/table.003.xml b/test/testdocs/table.003.xml
deleted file mode 100644
index d345b471..00000000
--- a/test/testdocs/table.003.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>Unit Test: table.003</title>
-<releaseinfo role="CVS">$Id: table.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Just a normal paragraph with a footnote<footnote><para>This is the
-footnote.</para></footnote>.</para>
-
-<table frame="none">
-<title>Server machine minimum required
-software<footnote><para>Table title footnote test.</para></footnote></title>
-<indexterm>
-<primary>System requirements</primary>
-<secondary>Software</secondary>
-</indexterm>
-<tgroup cols="1">
-<colspec colname="col1" colnum="1" colwidth="2.50in"/>
-<thead valign="top">
-<row>
-<entry>Foo<footnote><para>Table cell footnote test.</para></footnote></entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry>foo</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-</article>
diff --git a/test/testdocs/table.004.xml b/test/testdocs/table.004.xml
deleted file mode 100644
index 07e73bea..00000000
--- a/test/testdocs/table.004.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>Unit Test: table.004</title>
-<releaseinfo role="CVS">$Id: table.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<informaltable frame="none">
-<tgroup cols="2">
-<colspec colname="col2" colnum="2" rowsep="1"/>
-<tbody>
-<row>
-<entry>foo</entry>
-</row>
-<row>
-<entry>foo</entry><entry>bar</entry>
-</row>
-<row>
-<entry>foo</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.005.xml b/test/testdocs/table.005.xml
deleted file mode 100644
index a70ebf7a..00000000
--- a/test/testdocs/table.005.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>Unit Test: table.005</title>
-<releaseinfo role="CVS">$Id: table.005.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This is a "portrait" paragraph.</para>
-
-<table frame="none" orient="land">
-<title>This is a "landscape" table</title>
-<tgroup cols="2">
-<colspec colname="col2" colnum="2" rowsep="1"/>
-<tbody>
-<row>
-<entry>foo</entry>
-</row>
-<row>
-<entry>foo</entry><entry>bar</entry>
-</row>
-<row>
-<entry>foo</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-<para>This is a "portrait" paragraph.</para>
-
-</article>
diff --git a/test/testdocs/table.006.xml b/test/testdocs/table.006.xml
deleted file mode 100644
index f768f969..00000000
--- a/test/testdocs/table.006.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?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>Unit Test: table.006</title>
-<releaseinfo role="CVS">$Id: table.006.xml 5294 2005-10-16 20:39:21Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>All frames:</para>
-
-<informaltable frame="all">
-<tgroup cols="3">
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>b foo</entry>
-<entry>b bar</entry>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-<para>No frames:</para>
-
-<informaltable frame="none">
-<tgroup cols="3">
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>b foo</entry>
-<entry>b bar</entry>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-<para>Outer edge:</para>
-
-<informaltable frame="all">
-<tgroup cols="3" rowsep="0" colsep="0">
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>b foo</entry>
-<entry>b bar</entry>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-<para>Rows:</para>
-
-<informaltable frame="topbot">
-<tgroup cols="3" rowsep="1" colsep="0">
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>b foo</entry>
-<entry>b bar</entry>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-<para>Columns:</para>
-
-<informaltable frame="sides">
-<tgroup cols="3" rowsep="0" colsep="1">
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>b foo</entry>
-<entry>b bar</entry>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-
-<para>Tic Tac Toe (colsep, rowsep):</para>
-
-<informaltable frame="none">
-<tgroup cols="3" rowsep="1" colsep="1">
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>b foo</entry>
-<entry>b bar</entry>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-<para>Tic Tac Toe (the perverse way, using colsep on colspec and rowsep on rows):</para>
-
-<informaltable frame="none">
-<tgroup cols="3">
-<colspec colnum="1" colsep="1"/>
-<colspec colnum="2" colsep="1"/>
-<tbody>
-<row rowsep="1">
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row rowsep="1">
-<entry>b foo</entry>
-<entry>b bar</entry>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-
-<para>Box in the middle:</para>
-
-<informaltable frame="none">
-<tgroup cols="3" rowsep="0" colsep="0">
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry rowsep="1">a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry colsep="1">b foo</entry>
-<entry colsep="1" rowsep="1">b bar</entry>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-<para>Jigsaw:</para>
-
-<informaltable frame="all">
-<tgroup cols="3" rowsep="0" colsep="0">
-<tbody>
-<row>
-<entry rowsep="1">a foo</entry>
-<entry colsep="1">a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry colsep="1">b foo</entry>
-<entry colsep="1" rowsep="1">b bar</entry>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.007.xml b/test/testdocs/table.007.xml
deleted file mode 100644
index 37fe9ca2..00000000
--- a/test/testdocs/table.007.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>Unit Test: table.007</title>
-<releaseinfo role="CVS">$Id: table.007.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Missing center cell...</para>
-
-<informaltable frame="none">
-<tgroup cols="3">
-<colspec colname="c2" colnum="2" colsep="1"/>
-<colspec colname="c3" colnum="3"/>
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row rowsep="1">
-<entry>b foo</entry>
-<entry namest="c3">b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.008.xml b/test/testdocs/table.008.xml
deleted file mode 100644
index 0da6c58d..00000000
--- a/test/testdocs/table.008.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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>Unit Test: table.008</title>
-<releaseinfo role="CVS">$Id: table.008.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Table style test.  The following tables should have column
-  separator between 2nd and 3rd columns, a row separator between the
-  2nd and 3rd rows, and an empty center cell.</para>
-
-<informaltable frame="none" tabstyle="style1">
-<tgroup cols="3">
-<colspec colname="c2" colnum="2" colsep="1"/>
-<colspec colname="c3" colnum="3"/>
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row rowsep="1">
-<entry>b foo</entry>
-<entry namest="c3">b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-<para>...</para>
-
-<informaltable frame="none">
-<tgroup cols="3">
-<colspec colname="c2" colnum="2" colsep="1"/>
-<colspec colname="c3" colnum="3"/>
-<tbody>
-<row>
-<entry>no style</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row rowsep="1">
-<entry>b foo</entry>
-<entry namest="c3">b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.009.xml b/test/testdocs/table.009.xml
deleted file mode 100644
index a5cdccd7..00000000
--- a/test/testdocs/table.009.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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>Unit Test: table.009</title>
-<releaseinfo role="CVS">$Id: table.009.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Nested table test.</para>
-
-<informaltable frame="all">
-<tgroup cols="3">
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>b foo</entry>
-<entrytbl cols="3">
-  <colspec colwidth="200"/>
-  <tbody>
-    <row>
-      <entry>a' foo</entry>
-      <entry>a' bar</entry>
-      <entry>a' baz</entry>
-    </row>
-    <row>
-      <entry>b' foo</entry>
-      <entry>b' bar</entry>
-      <entry morerows="1">b' and c' baz</entry>
-    </row>
-    <row>
-      <entry>c' foo</entry>
-      <entry>c' bar</entry>
-    </row>
-  </tbody>
-</entrytbl>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c bar</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-<para>Nested table test.</para>
-
-<informaltable frame="none">
-<tgroup cols="3" colsep="1" rowsep="1">
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>b foo</entry>
-<entrytbl cols="3">
-  <colspec colwidth="200"/>
-  <tbody>
-    <row>
-      <entry>a' foo</entry>
-      <entry>a' bar</entry>
-      <entry>a' baz</entry>
-    </row>
-    <row>
-      <entry>b' foo</entry>
-      <entry>b' bar</entry>
-      <entry morerows="1">b' and c' baz</entry>
-    </row>
-    <row>
-      <entry>c' foo</entry>
-      <entry>c' bar</entry>
-    </row>
-  </tbody>
-</entrytbl>
-<entry>b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c bar</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.010.xml b/test/testdocs/table.010.xml
deleted file mode 100644
index 700c9312..00000000
--- a/test/testdocs/table.010.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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 id="table.010">
-<articleinfo>
-<title>Unit Test: table.010</title>
-<releaseinfo role="CVS">$Id: table.010.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-
-<informaltable frame="all">
-<tgroup cols="2">
-<colspec colwidth="1.5in"/>
-<colspec colwidth="2.5in"/>
-<tbody>
-<row>
-<entry><emphasis
-role="bold">Address:</emphasis></entry>
-<entry><literallayout>Some literal layout
-text goes here.</literallayout>
-</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.011.xml b/test/testdocs/table.011.xml
deleted file mode 100644
index ffa4a0ee..00000000
--- a/test/testdocs/table.011.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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 id="table.011">
-<articleinfo>
-<title>Unit Test: table.011</title>
-<releaseinfo role="CVS">$Id: table.011.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname> <surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-  <para>
-Simple cell spacing test.  The following single-column table should
-show both cell contents starting at the same place.</para>
-
-  <para>Yes.</para>
-
-  <informaltable frame="all">
-    <tgroup cols="1">
-      <tbody>
-        <row>
-          <entry>First entry.</entry>
-        </row>
-        <row>
-          <entry>
-Second entry.</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</article>
diff --git a/test/testdocs/table.012.xml b/test/testdocs/table.012.xml
deleted file mode 100644
index 98007e52..00000000
--- a/test/testdocs/table.012.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>Unit Test: table.012</title>
-<releaseinfo role="CVS">$Id: table.012.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Table style test.</para>
-
-<informaltable frame="all">
-<tgroup cols="3">
-<colspec colname="c2" colnum="2" colsep="1"/>
-<colspec colname="c3" colnum="3"/>
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry><?dbhtml bgcolor="red"?><?dbfo bgcolor="red"?>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row rowsep="1">
-<entry>b foo</entry>
-<entry namest="c3">b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-<tgroup cols="2">
-<tbody>
-<row>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.013.xml b/test/testdocs/table.013.xml
deleted file mode 100644
index 03a0910a..00000000
--- a/test/testdocs/table.013.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>Unit Test: table.013</title>
-<releaseinfo role="CVS">$Id: table.013.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Test for entrytbl, bug #677564.</para>
-
-<informaltable frame="none">
-  <tgroup cols="3">
-    <tbody>
-      <row>
-        <entry>one</entry>
-        <entrytbl cols="1" colsep="0" rowsep="0">
-          <tbody>
-            <row>
-              <entry>Du texte dans une cellule.</entry>
-            </row>
-          </tbody>
-        </entrytbl>
-        <entry>three</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.014.xml b/test/testdocs/table.014.xml
deleted file mode 100644
index b9cdb2ae..00000000
--- a/test/testdocs/table.014.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>Unit Test: table.008</title>
-<releaseinfo role="CVS">$Id: table.014.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Table style test.</para>
-
-<informaltable frame="all">
-<tgroup cols="3">
-<colspec colname="c2" colnum="2" colsep="1"/>
-<colspec colname="c3" colnum="3"/>
-<tbody>
-<row>
-<entry>a foo</entry>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row rowsep="1">
-<entry>b foo</entry>
-<entry namest="c3">b baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-<entry>c baz</entry>
-</row>
-</tbody>
-</tgroup>
-<tgroup cols="2">
-<tbody>
-<row>
-<entry>a bar</entry>
-<entry>a baz</entry>
-</row>
-<row>
-<entry>c foo</entry>
-<entry>c foo</entry>
-</row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.015.xml b/test/testdocs/table.015.xml
deleted file mode 100644
index fc6deb05..00000000
--- a/test/testdocs/table.015.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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>Unit Test: table.015</title>
-<releaseinfo role="CVS">$Id: table.015.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<table frame="all">
-<title>Multi-page Table with THead and TFoot</title>
-<tgroup cols="2">
-<thead>
-<row>
-<entry>Head Left</entry>
-<entry>Head Right</entry>
-</row>
-</thead>
-<tfoot>
-<row>
-<entry>Foot Left</entry>
-<entry>Foot Right</entry>
-</row>
-</tfoot>
-<tbody>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-<row><entry>Body Left</entry><entry>Body Right</entry></row>
-</tbody>
-</tgroup>
-</table>
-
-</article>
diff --git a/test/testdocs/table.016.xml b/test/testdocs/table.016.xml
deleted file mode 100644
index 36e4ecee..00000000
--- a/test/testdocs/table.016.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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>Unit Test: table.016</title>
-<releaseinfo role="CVS">
-$Id: table.016.xml 5294 2005-10-16 20:39:21Z nwalsh $
-</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>Tables can nest in HTML.</para>
-
-<informaltable border="1">
-<tbody>
-<tr>
-  <td>One</td>
-  <td>Two</td>
-  <td>Three</td>
-  <td>Four</td>
-</tr>
-<tr>
-  <td>One</td>
-  <td colspan="2" rowspan="2">
-
-    <informaltable border="1">
-    <tbody>
-    <tr>
-      <td>One</td>
-      <td>Two</td>
-    </tr>
-    <tr>
-      <td>Three</td>
-      <td>Four</td>
-    </tr>
-    </tbody>
-    </informaltable>
-
-  </td>
-  <td>Four</td>
-</tr>
-<tr>
-  <td>One</td>
-  <td>Four</td>
-</tr>
-<tr>
-  <td>One</td>
-  <td colspan="2" rowspan="2">
-  </td>
-  <td>Four</td>
-</tr>
-<tr>
-  <td>One</td>
-  <td>Four</td>
-</tr>
-<tr>
-  <td>One</td>
-  <td>Two</td>
-  <td>Three</td>
-  <td>Four</td>
-</tr>
-</tbody>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.017.xml b/test/testdocs/table.017.xml
deleted file mode 100644
index 8013206b..00000000
--- a/test/testdocs/table.017.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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>Unit Test: table.017</title>
-<releaseinfo role="CVS">
-$Id: table.017.xml 4613 2005-04-20 11:54:35Z nwalsh $
-</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This test attempts to demonstrate the three hard cases:
-horizontal spans, vertical spans, and missing entries.</para>
-
-<informaltable frame="all">
-<tgroup cols="4">
-<colspec colname="b" colnum="2"/>
-<colspec colname="c" colnum="3"/>
-<colspec colname="d"/>
-<spanspec spanname="cd" namest="c" nameend="d"/>
-<tbody>
-  <row>
-    <entry>a1</entry>
-    <entry morerows="1" namest="b" nameend="c">b1-c2</entry>
-    <entry>d1</entry>
-  </row>
-  <row>
-    <entry morerows="2">a2-a4</entry>
-    <!-- b2, c2 spans from above -->
-    <entry>d2</entry>
-  </row>
-  <row>
-    <!-- a3 spans from above -->
-    <entry>b3</entry>
-    <entry>c3</entry>
-    <entry>d3</entry>
-  </row>
-  <row>
-    <!-- a4 spans from above -->
-    <entry>b4</entry>
-    <entry spanname="cd">c4-d4</entry>
-  </row>
-  <row>
-    <entry>a5</entry>
-    <entry>b5</entry>
-    <!-- c4 is missing -->
-    <entry colname="d">d5</entry>
-  </row>
-</tbody>
-</tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/table.018.xml b/test/testdocs/table.018.xml
deleted file mode 100644
index 8b2afeaf..00000000
--- a/test/testdocs/table.018.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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>Unit Test: table.018</title>
-<releaseinfo role="CVS">
-$Id: table.018.xml 4613 2005-04-20 11:54:35Z nwalsh $
-</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This test is a table with a long description.</para>
-
-<table frame="all">
-<title>A table with a title</title>
-<textobject>
-<phrase>Some short alt text</phrase>
-</textobject>
-<textobject>
-<para>This is the long description of this table.</para>
-</textobject>
-<tgroup cols="4">
-<colspec colname="b" colnum="2"/>
-<colspec colname="c" colnum="3"/>
-<colspec colname="d"/>
-<spanspec spanname="cd" namest="c" nameend="d"/>
-<tbody>
-  <row>
-    <entry>a1</entry>
-    <entry morerows="1" namest="b" nameend="c">b1-c2</entry>
-    <entry>d1</entry>
-  </row>
-  <row>
-    <entry morerows="2">a2-a4</entry>
-    <!-- b2, c2 spans from above -->
-    <entry>d2</entry>
-  </row>
-  <row>
-    <!-- a3 spans from above -->
-    <entry>b3</entry>
-    <entry>c3</entry>
-    <entry>d3</entry>
-  </row>
-  <row>
-    <!-- a4 spans from above -->
-    <entry>b4</entry>
-    <entry spanname="cd">c4-d4</entry>
-  </row>
-  <row>
-    <entry>a5</entry>
-    <entry>b5</entry>
-    <!-- c4 is missing -->
-    <entry colname="d">d5</entry>
-  </row>
-</tbody>
-</tgroup>
-</table>
-
-</article>
diff --git a/test/testdocs/table.x001.xml b/test/testdocs/table.x001.xml
deleted file mode 100644
index 3245e700..00000000
--- a/test/testdocs/table.x001.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<article>
-<articleinfo>
-<title>Unit Test: table.x001</title>
-<releaseinfo role="CVS">$Id$</releaseinfo>
-<!-- Change this: -->
-<author><firstname>Shaun</firstname><surname>McCance</surname>
-        <affiliation><address><email>shaunm@gnome.org</email></address></affiliation>
-</author>
-</articleinfo>
-
-<informaltable>
-  <tgroup cols="5">
-    <colspec colname="first"/>
-    <colspec colname="second"/>
-    <colspec colname="fourth" colnum="4"/>
-    <colspec colname="fifth"/>
-    <spanspec spanname="first-fourth"
-	      namest="first" nameend="fourth"/>
-    <spanspec spanname="fourth-fifth"
-	      namest="fourth" nameend="fifth"/>
-    <thead>
-      <row>
-	<entry>ONE</entry>
-	<entry>TWO</entry>
-	<entry>THREE</entry>
-	<entry>FOUR</entry>
-	<entry>FIVE</entry>
-      </row>
-    </thead>
-    <tbody>
-      <row rowsep="1">
-	<entry spanname="first-fourth">colspan=4 colspan=4 colspan=4</entry>
-	<entry>fe</entry>
-      </row>
-      <row>
-	<entry>fi</entry>
-	<entry>fo</entry>
-	<entry morerows="2"><screen>fum
-fum
-fum
-fum
-fum
-fum
-fum
-fum</screen></entry>
-        <entry>fe fi</entry>
-	<entry>fo fum</entry>
-      </row>
-      <row>
-	<entry morerows="1"><screen>rowspan=2
-rowspan=2
-rowspan=2
-rowspan=2</screen></entry>
-	<entry colname="fourth">fourth</entry>
-	<entry>fifth</entry>
-      </row>
-      <row>
-	<entry>second</entry>
-	<entry colname="fifth">fifth</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</informaltable>
-
-</article>
diff --git a/test/testdocs/template.xml b/test/testdocs/template.xml
deleted file mode 100644
index 2e7ba425..00000000
--- a/test/testdocs/template.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<article>
-<articleinfo>
-<title>Unit Test: <!--FIXME-->
-</title>
-<releaseinfo role="CVS">$Id$</releaseinfo>
-<!-- Change this: -->
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<!-- put your test here -->
-
-</article>
diff --git a/test/testdocs/textobject.001.xml b/test/testdocs/textobject.001.xml
deleted file mode 100644
index ea95d918..00000000
--- a/test/testdocs/textobject.001.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>Unit Test: textobject.001</title>
-<releaseinfo role="CVS">$Id: textobject.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The XML source for this document is:</para>
-
-<programlisting linenumbering="numbered"><textobject>
-<textdata fileref="textobject.001.xml"/>
-</textobject></programlisting>
-
-</article>
diff --git a/test/testdocs/textobject.002.xml b/test/testdocs/textobject.002.xml
deleted file mode 100644
index 73d96952..00000000
--- a/test/testdocs/textobject.002.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>Unit Test: textobject.001</title>
-<releaseinfo role="CVS">$Id: textobject.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>The XML source for this document is:</para>
-
-<programlisting linenumbering="numbered"><textobject>
-<textdata fileref="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
-</textobject></programlisting>
-
-</article>
diff --git a/test/testdocs/title.001.xml b/test/testdocs/title.001.xml
deleted file mode 100644
index 843f142c..00000000
--- a/test/testdocs/title.001.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: title.001.xml</title>
-<releaseinfo role="CVS">$Id: title.001.xml 4109 2004-12-16 16:17:53Z nwalsh $</releaseinfo>
-<authorgroup>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<author><firstname>Jane</firstname><surname>Doe</surname></author>
-</authorgroup>
-<abstract>
-<para>This is the abstract.</para>
-<para>It has several paras.</para>
-<para>It has several paras.</para>
-</abstract>
-</articleinfo>
-
-<para>This is a title test.</para>
-
-<section>
-<title>Test inlinemediaobject: <inlinemediaobject>
-<imageobject>
-<imagedata fileref="graphics/U1230.gif"/>
-</imageobject>
-</inlinemediaobject></title>
-
-<para>Does that duck show up in the ToC title?</para>
-</section>
-</article>
diff --git a/test/testdocs/toc.001.xml b/test/testdocs/toc.001.xml
deleted file mode 100644
index 927ef491..00000000
--- a/test/testdocs/toc.001.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: toc.001</title>
-<releaseinfo role="CVS">$Id: toc.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<toc>
-<tocchap>
-<tocentry>Preface</tocentry>
-<toclevel1>
-  <tocentry>Fake Entry</tocentry>
-  <tocentry pagenum="i">Why Read This Book?</tocentry>
-  <tocentry>This Book's Audience</tocentry>
-  <tocentry>Organization of This Book</tocentry>
-  <tocentry>Conventions Used in This Book</tocentry>
-  <tocentry>Getting This Book</tocentry>
-  <tocentry>Getting Examples from This Book</tocentry>
-  <tocentry>Getting DocBook</tocentry>
-  <tocentry>Request for Comments</tocentry>
-  <tocentry>Acknowledgements from Norm</tocentry>
-  <tocentry>Acknowledgements from Lenny</tocentry>
-  <tocentry>Acknowledgements from Norm and Lenny</tocentry>
-</toclevel1>
-</tocchap>
-<tocpart>
-<tocentry>Introduction</tocentry>
-<tocchap>
-<tocentry>Getting Started with SGML/XML</tocentry>
-<toclevel1>
-  <tocentry>HTML and SGML vs. XML</tocentry>
-  <tocentry>Basic SGML/XML Concepts</tocentry>
-  <tocentry>Elements and Attributes</tocentry>
-  <tocentry>Entities</tocentry>
-  <tocentry>How Does DocBook Fit In?</tocentry>
-  <toclevel2>
-    <tocentry>Testing a third level TOC</tocentry>
-  </toclevel2>
-</toclevel1>
-</tocchap>
-<tocchap>
-<tocentry>Creating DocBook Documents</tocentry>
-<toclevel1>
-  <tocentry>Making an SGML Document</tocentry>
-  <tocentry>Making an XML Document</tocentry>
-</toclevel1>
-</tocchap>
-</tocpart>
-</toc>
-
-<preface><title>Preface</title>
-
-<para>This book is really just a toc test.</para>
-
-</preface>
-
-</book>
diff --git a/test/testdocs/ulink.001.xml b/test/testdocs/ulink.001.xml
deleted file mode 100644
index 24a0bfa7..00000000
--- a/test/testdocs/ulink.001.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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" [
-<!ENTITY dh "&#xAD;">
-]>
-<article>
-<articleinfo>
-<title>Unit Test: ulink.001</title>
-<releaseinfo role="CVS">$Id: ulink.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This article tests ULink hyphenation.</para>
-
-<para>This is a really long URI with explicit discretionary hyphens:
-<ulink url="http://www.example.com/this/is/really/long/for/no/good/reason/except/to/test/what/happens/with/really/long/URIs/-/because/they/are/a/good/test/for/discretionary/hyphens/">http:/&dh;/&dh;www.example.com/&dh;this/&dh;is/&dh;really/&dh;long/&dh;for/&dh;no/&dh;good/&dh;reason/&dh;except/&dh;to/&dh;test/&dh;what/&dh;happens/&dh;with/&dh;really/&dh;long/&dh;URIs/&dh;-/&dh;because/&dh;they/&dh;are/&dh;a/&dh;good/&dh;test/&dh;for/&dh;discretionary/&dh;hyphens/</ulink>.</para>
-
-<para>This is a really long URI without explicit discretionary hyphens:
-<ulink url="http://www.example.com/this/is/really/long/for/no/good/reason/except/to/test/what/happens/with/really/long/URIs/-/because/they/are/a/good/test/for/discretionary/hyphens/"/>.</para>
-
-</article>
diff --git a/test/testdocs/ulink.002.xml b/test/testdocs/ulink.002.xml
deleted file mode 100644
index d0d3388e..00000000
--- a/test/testdocs/ulink.002.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book>
-<bookinfo>
-<title>Unit Test: ulink.002</title>
-<releaseinfo role="CVS">$Id: ulink.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<chapter>
-<title>Foo <ulink url="http://example.com/">URL</ulink></title>
-
-<para>This chapter tests a <sgmltag>ulink</sgmltag> in a
-<sgmltag>title</sgmltag>.
-</para>
-
-</chapter>
-</book>
diff --git a/test/testdocs/variablelist.001.xml b/test/testdocs/variablelist.001.xml
deleted file mode 100644
index 22248bfc..00000000
--- a/test/testdocs/variablelist.001.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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>Unit Test: variablelist.001</title>
-<releaseinfo role="CVS">$Id: variablelist.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<variablelist>
-<?dbfo list-presentation="list" term-width="1.25in" ?>
-<varlistentry>
-<term>short</term>
-<listitem>
-<para>A single short term with a description.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>more</term>
-<listitem>
-<para>Another single short term with a description.
-</para>
-<para>Another paragraph of description.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>again</term>
-<listitem>
-<para>YASSTWAD.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>short</term>
-<listitem>
-<para>A single short term with a description.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>more</term>
-<term>more</term>
-<term>more</term>
-<term>more</term>
-<listitem>
-<para>Several short terms in the same VLE.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>I'm still not satisfied.</term>
-<listitem>
-<para>A single long term with a description.
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-<variablelist>
-<varlistentry>
-<term>errnum :</term>
-<listitem>
-<para>the system error number. See the standard C errno documentation.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>Returns :</term>
-<listitem>
-<para>a string describing the error code. If the error code is
-unknown, it returns "unknown error (<code>&lt;code&gt;</code>)".
-The string can only be used until the next call to g_strerror().
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</article>
diff --git a/test/testdocs/variablelist.002.xml b/test/testdocs/variablelist.002.xml
deleted file mode 100644
index a2204c96..00000000
--- a/test/testdocs/variablelist.002.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>Unit Test: variablelist.002</title>
-<releaseinfo role="CVS">$Id: variablelist.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<variablelist>
-  <varlistentry>
-    <term>
-      <methodsynopsis>
-        <modifier>static</modifier>
-        <modifier>public</modifier>
-
-        <type>void</type>
-        <methodname>import</methodname>
-
-        <methodparam>
-          <type>HttpServletRequest</type>
-          <parameter>req</parameter>
-        </methodparam>
-      </methodsynopsis>
-    </term>
-  <listitem>
-  <para>Foobar</para>
-  </listitem>
-      </varlistentry>
-</variablelist>
-
-</article>
diff --git a/test/testdocs/variablelist.003.xml b/test/testdocs/variablelist.003.xml
deleted file mode 100644
index c833e982..00000000
--- a/test/testdocs/variablelist.003.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>Unit Test: variablelist.003</title>
-<releaseinfo role="CVS">$Id: variablelist.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<variablelist>
-<title>VariableList Title</title>
-<varlistentry><term>Term1</term>
-<listitem><para>Definition of Term1</para></listitem>
-</varlistentry>
-<varlistentry><term>Term2</term>
-<listitem><para>Definition of Term2</para></listitem>
-</varlistentry>
-<varlistentry id="someVLI"><term>Term3a</term><term>Term3b</term><term>Term3c</term>
-<listitem><para>Definition of Term3a,b,c</para></listitem>
-</varlistentry>
-</variablelist>
-
-</article>
diff --git a/test/testdocs/variablelist.004.xml b/test/testdocs/variablelist.004.xml
deleted file mode 100644
index 655ed7d3..00000000
--- a/test/testdocs/variablelist.004.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>Unit Test: variablelist.004</title>
-<releaseinfo role="CVS">$Id: variablelist.004.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<variablelist termlength="30">
-<title>VariableList With Long Terms</title>
-<varlistentry><term>Term1 is very long</term>
-<listitem><para>Definition of Term1</para></listitem>
-</varlistentry>
-<varlistentry><term>Term2 is even longer than term1</term>
-<listitem><para>Definition of Term2</para></listitem>
-</varlistentry>
-<varlistentry><term>Term3a</term><term>Term3b is also long</term><term>Term3c</term>
-<listitem><para>Definition of Term3a,b,c</para></listitem>
-</varlistentry>
-</variablelist>
-
-</article>
diff --git a/test/testdocs/wordsize.001.xml b/test/testdocs/wordsize.001.xml
deleted file mode 100644
index a2fc64ae..00000000
--- a/test/testdocs/wordsize.001.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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 id="ws">
-<articleinfo>
-<title>Unit Test: wordsize.001.xml</title>
-<releaseinfo role="CVS">
-$Id: wordsize.001.xml 4056 2004-11-23 13:28:50Z nwalsh $
-</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<para>This is a test of the <sgmltag class='attribute'>wordsize</sgmltag>
-effectivity attribute.
-Here's a 64 bit symbol: <symbol wordsize="64">width_8</symbol>.
-Here's a 32 bit symbol: <symbol wordsize="32">width_4</symbol>.</para>
-
-</article>
diff --git a/test/testdocs/xmlspace.001.xml b/test/testdocs/xmlspace.001.xml
deleted file mode 100644
index 38e6dccf..00000000
--- a/test/testdocs/xmlspace.001.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>Unit Test: xmlspace.001</title>
-<releaseinfo role="CVS">
-$Id: xmlspace.001.xml 4056 2004-11-23 13:28:50Z nwalsh $
-</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
-
-<programlisting linenumbering="numbered" xml:space="preserve">ProgramListing: This is a test
-  Only a test.
-Had this been a real emegency,
-  We would have fled in terror
-And you would not have been informed.
-
-Foo &lt;Bar&gt;</programlisting>
-
-</article>
diff --git a/test/testdocs/xref.001.xml b/test/testdocs/xref.001.xml
deleted file mode 100644
index ffa08385..00000000
--- a/test/testdocs/xref.001.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY blah "<para>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-Blah blah blah blah blah blah blah blah. Blah blah blah blah.
-Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-</para>">
-]>
-<book>
-<bookinfo>
-<title>Unit Test: xref.001</title>
-<releaseinfo role="CVS">$Id: xref.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</bookinfo>
-
-<dedication id="dedication"><title>Dedication</title>
-
-&blah;
-
-<para>For no good reason, this dedication includes cross-references:</para>
-
-<itemizedlist>
-<listitem><para>dedication: <xref linkend="dedication"/>.</para>
-</listitem>
-<listitem><para>preface: <xref linkend="preface"/>.</para>
-</listitem>
-<listitem><para>part: <xref linkend="part"/>.</para>
-</listitem>
-<listitem><para>chapter: <xref linkend="chapter"/>.</para>
-</listitem>
-<listitem><para>appendix: <xref linkend="appendix"/>.</para>
-</listitem>
-<listitem><para>para: <xref linkend="para"/>.</para>
-</listitem>
-<listitem><para>varlistentry: <xref linkend="varlistentry"/>.</para>
-</listitem>
-<listitem><para>orderedlistitem: <xref linkend="orderedlistitem"/>.</para>
-</listitem>
-</itemizedlist>
-
-</dedication>
-
-<preface id="preface"><title>Preface</title>
-
-<para>A preface.</para>
-
-&blah;
-
-</preface>
-
-<part id="part">
-<title>Part One Title</title>
-<partintro>
-<title>PartIntro Title</title>
-
-<para>Partintro content<footnote>
-<para>This is a footnote in a partintro.</para>
-</footnote>.</para>
-
-&blah;
-
-<sect1>
-<title>PartIntro Section</title>
-<para>PartIntros can actually have section content as well.</para>
-&blah;
-</sect1>
-</partintro>
-
-<chapter id="chapter"><title>Chapter</title>
-
-&blah;
-<para id="para">This paragraph has an ID.</para>
-
-
-<variablelist>
-<varlistentry id="varlistentry">
-<term>VarList Term</term>
-<listitem>
-<para>Test cross-ref to varlistentries, should use term text.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-      <orderedlist>
-        <listitem>
-          <para>first item</para>
-        </listitem>
-        <listitem id="orderedlistitem" xreflabel="ol1">
-          <para>second item, xref as "ol1".</para>
-        </listitem>
-      </orderedlist>
-</chapter>
-
-</part>
-<part><title>Appendixes</title>
-
-<appendix id="appendix"><title>First Appendix</title>
-
-&blah;
-
-</appendix>
-
-</part>
-</book>
diff --git a/test/testdocs/xref.002.xml b/test/testdocs/xref.002.xml
deleted file mode 100644
index bcb795fc..00000000
--- a/test/testdocs/xref.002.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: xref.002.xml</title>
-<releaseinfo role="CVS">$Id: xref.002.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-<modespec id="xreftext">Xref Endterm</modespec>
-</articleinfo>
-
-<para>This is an xref test.</para>
-
-<para>Cross reference to section one: <xref linkend="s1"/>.</para>
-
-<para>Cross reference to section two: <xref linkend="s2"/>.</para>
-
-<para>Cross reference to section one with endterm:
-<xref linkend="s1" endterm="xreftext"/>.</para>
-
-<para>Cross reference to section two with endterm:
-<xref linkend="s2" endterm="xreftext"/>.</para>
-
-<section id="s1">
-<title>Section One Title</title>
-
-<para>This text is irrelevant.</para>
-
-</section>
-
-<section id="s2" xreflabel="Section Two XRefLabel">
-<title>Section Two Title</title>
-
-<para>This text is irrelevant.</para>
-
-</section>
-
-</article>
diff --git a/test/testdocs/xref.003.xml b/test/testdocs/xref.003.xml
deleted file mode 100644
index 952c56fd..00000000
--- a/test/testdocs/xref.003.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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 id="article">
-<articleinfo>
-<title>Unit Test: xref.003.xml</title>
-<releaseinfo role="CVS">$Id: xref.003.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Adam</firstname><surname>Di Carlo</surname>
-        <affiliation><address><email>adam@onshored.com</email></address></affiliation>
-</author>
-    <titleabbrev>Unit 03</titleabbrev>
-</articleinfo>
-
-  <section>
-    <title>Xref test: titleabbrev</title>
-    <para>
-      We're testing that xref uses the <sgmltag>titleabbrev</sgmltag>
-      element where appropriate.
-    </para>
-    <para>
-      Article: <xref linkend="article"/>.
-    </para>
-    <para>
-      Section: <xref linkend="section"/>.
-    </para>
-    <para>
-      Figure: <xref linkend="figure"/>.
-    </para>
-    <para>
-      Example: <xref linkend="example"/>.
-    </para>
-    <para>
-      Table: <xref linkend="table"/>.
-    </para>
-    <!-- what about:
-    procedure, qandadiv, glossary, index, variablelist, etc. 
-    -->
-  </section>
-
-  <section id="section">
-    <title>Cross-reference targets</title>
-    <titleabbrev>Cross-ref targets</titleabbrev>
-
-    <para>
-      Targets for cross-reference tests.
-    </para>
-
-    <figure id="figure">
-      <title>Long Title for Figure</title>
-      <titleabbrev>Short Fig Title</titleabbrev>
-      <mediaobject>
-        <textobject>
-          <para>Bit of text</para>
-        </textobject>
-      </mediaobject>
-    </figure>
-
-    <example id="example">
-      <title>Long Title for Example</title>
-      <titleabbrev>Short Examp Title</titleabbrev>
-      <para>Substance of example</para>
-    </example>
-
-    <table id="table">
-      <title>Long Title for Table</title>
-      <titleabbrev>Short Table Title</titleabbrev>
-      <tgroup cols="1">
-        <tbody>
-          <row>
-            <entry>table cell</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-
-  </section>
-</article>
diff --git a/test/testdocs/xref.004.xml b/test/testdocs/xref.004.xml
deleted file mode 100644
index 5534061a..00000000
--- a/test/testdocs/xref.004.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article id="C.FMU20030102A" lang="fr">
-  <title>Test Article</title>
-  <!-- sections -->
-  <section>
-    <title>Some definitions</title>
-    <para><variablelist>
-	<varlistentry>
-	  <term id="def-1">The first word defined</term>
-	  <listitem>
-	      <para>The associate definition</para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term id="def-2">The second word defined</term>
-	  <listitem>
-	    <para>The associate definition</para>
-	  </listitem>
-	</varlistentry>
-      </variablelist></para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-  </section>
-  <!-- sections -->
-  <section>
-    <title>Some analysis using previous defined word</title>
-    <section>
-      <title><xref linkend="def-1" endterm="def-1" /></title>
-      <para>Few about first defined word aspect of the problem.</para>
-    </section>
-    <section>
-      <title><xref linkend="def-2" endterm="def-2" /></title>
-      <para>Something about 2nd aspect.</para>
-    </section>
-    <section>
-      <title>A boring title</title>
-      <para>Something boring.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-      <para>Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.
-Some text to make it go on for a few pages.</para>
-
-    </section>
-  </section>
-</article>
diff --git a/test/testdocs/xrefstyle.001.xml b/test/testdocs/xrefstyle.001.xml
deleted file mode 100644
index ea587175..00000000
--- a/test/testdocs/xrefstyle.001.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter id="chapter">
-<chapterinfo>
-<title>Unit Test: xrefstyle.001.xml</title>
-<releaseinfo role="CVS">$Id: xrefstyle.001.xml 4056 2004-11-23 13:28:50Z nwalsh $</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</chapterinfo>
-<title>Unit Test: xrefstyle.001.xml</title>
-
-<para>This is a test of xref styles.</para>
-
-<para>Short self-reference: <xref linkend="chapter"/>.</para>
-<para>Long self-reference: <xref role="title" linkend="chapter"/>.</para>
-
-</chapter>
diff --git a/test/timing/timeall b/test/timing/timeall
deleted file mode 100755
index cb739a7d..00000000
--- a/test/timing/timeall
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-helpdir="/usr/share/gnome/help/";
-
-title=$1
-if [ "x$title" = "x" ]; then
-    echo "You must specify a title for the timing run.";
-    exit 1;
-fi;
-
-mkdir -p "$title";
-mkdir -p "$title/_LOGS";
-rm -f "$title.times" && touch "$title.times"
-
-for doc in `ls $helpdir`; do
-    docdir="$helpdir$doc";
-    if [ -d "$docdir" ]; then
-	for lang in `ls $docdir`; do
-	    langdir="$docdir/$lang";
-	    if [ -d "$langdir" ]; then
-		docfile="$langdir/$doc.xml";
-		outdir="$title/$doc/$lang";
-		outfile="$outdir/$doc.xhtml";
-		logfile="$title/_LOGS/$doc.$lang.out";
-		mkdir -p "$outdir";
-		rm -f "$logfile" && touch "$logfile";
-		for i in 1 2 3 4 5; do
-		    xsltproc --xinclude --timing \
-			--stringparam "db.chunk.basename" "$doc" \
-			-o "$outfile" \
-			../../xslt/docbook/html/db2html.xsl \
-			"$docfile" 2>> $logfile;
-		done;
-		times=`grep 'Running stylesheet and saving result took' \
-                    "$logfile" | cut -d' ' -f7 - | sed -e 's/$/+/g'`;
-		total=`echo $times 0 | bc`;
-		avg=`echo $total / 5 | bc`;
-		echo "$doc/$lang  $avg" >> "$title.times";
-	    fi;
-	done;
-    fi;
-done;
diff --git a/xslt/common/css/README b/xslt/common/css/README
index e79f97b3..fdc2b1b0 100644
--- a/xslt/common/css/README
+++ b/xslt/common/css/README
@@ -16,6 +16,6 @@ Here's what each file is:
 * mallard.css.tmpl  - CSS for element styles specific to Mallard
 * docbook.css.tmpl  - CSS for element styles specific to DocBook
 
-The easiest way to test your changes to these files is with the lipsum test document,
-found under test/lipsum from the root of this repository.
+The easiest way to test your changes to these files is with the mallard test document,
+found under test/mallard from the root of this repository.
 That directory has a README that explains how to use it to test changes.
author	Shaun McCance <shaunm@redhat.com>	2020-12-30 21:27:54 -0500
committer	Shaun McCance <shaunm@redhat.com>	2020-12-30 21:28:10 -0500
commit	5df5b3aacf4728a993fe5e23f54af0abe563efcc (patch)
tree	8498a3223e0e21d5ce8542fd902b42fc5c08222e
parent	878542983f5ab904ae3c35c39b8e8a11bb70c661 (diff)
download	yelp-xsl-5df5b3aacf4728a993fe5e23f54af0abe563efcc.tar.gz