Updated tests

diff --git a/testdocs/tests/bibliography.001.xml b/testdocs/tests/bibliography.001.xml
index 4a02301f0b6bbffe3a5272782dd91cc4d4266462..dd235e144fb24bf84840a97ee84d65e3c58747db 100644 (file)
--- a/testdocs/tests/bibliography.001.xml
+++ b/testdocs/tests/bibliography.001.xml
@@ -27,6 +27,23 @@
   <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">

diff --git a/testdocs/tests/blockquote.001.xml b/testdocs/tests/blockquote.001.xml
new file mode 100644 (file)
index 0000000..a4d4ee0
--- /dev/null
+++ b/testdocs/tests/blockquote.001.xml
@@ -0,0 +1,35 @@
+<?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: blockquote.001.xml</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>
+
+<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>
+
+<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>
+
+</article>

diff --git a/testdocs/tests/book.001.xml b/testdocs/tests/book.001.xml
index 89ce75c7916028635eb2bfb93000dc6f8a64569f..c71b35dcdfe0059846862052faeb2efb6e3d180c 100644 (file)
--- a/testdocs/tests/book.001.xml
+++ b/testdocs/tests/book.001.xml
@@ -20,7 +20,7 @@ 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>
+<book id="book">
 <bookinfo>
 <title>Unit Test: book.001</title>
 <releaseinfo role="CVS">$Id$</releaseinfo>
@@ -94,13 +94,13 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 </revhistory>
 </bookinfo>
 
-<dedication><title>First Dedication</title>
+<dedication id="ded1"><title>First Dedication</title>
 
 &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
 
 </dedication>
 
-<dedication>
+<dedication id="ded2">
 
 <para>A second dedication without a title.</para>
 
@@ -108,7 +108,7 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 
 </dedication>
 
-<preface><title>Foreword</title>
+<preface id="forward"><title>Foreword</title>
 <?dbhtml filename="forward.html"?>
 
 <para>A preface.</para>
@@ -119,7 +119,7 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 
 </preface>
 
-<preface><title>Preface</title>
+<preface id="preface"><title>Preface</title>
 
 <para>Another preface.</para>
 
@@ -129,9 +129,9 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 
 </preface>
 
-<part>
+<part id="partI">
 <title>Part One Title</title>
-<partintro>
+<partintro id="pIpintro">
 <title>PartIntro Title</title>
 
 <para>Partintro content<footnote>
@@ -140,34 +140,34 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 
 &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
 
-<sect1>
+<sect1 id="pIpis1">
 <title>PartIntro Section</title>
 <para>PartIntros can actually have section content as well.</para>
 &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah; &blah;
 </sect1>
 </partintro>
 
-<chapter id="chapter"><title>First Chapter</title>
+<chapter id="chap1"><title>First 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><title>First Section</title>
+<section id="c1s1"><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><title>Second Section</title>
+<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><title>Third Section</title>
+<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;
@@ -176,27 +176,27 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 </section>
 </chapter>
 
-<chapter><title>Second Chapter</title>
+<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><title>First Section</title>
+<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><title>Second Section</title>
+<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><title>Third Section</title>
+<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;
@@ -205,7 +205,7 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 </section>
 </chapter>
 
-<chapter><title>Third Chapter</title>
+<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;
@@ -214,29 +214,29 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 </chapter>
 
 </part>
-<part><title>Appendixes</title>
+<part id="partII"><title>Appendixes</title>
 
-<appendix><title>First Appendix</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><title>First Section</title>
+<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><title>Second Section</title>
+<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><title>Third Section</title>
+<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;
@@ -245,27 +245,27 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 </section>
 </appendix>
 
-<appendix><title>Second Appendix</title>
+<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><title>First Section</title>
+<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><title>Second Section</title>
+<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><title>Third Section</title>
+<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;

diff --git a/testdocs/tests/draft.001.xml b/testdocs/tests/draft.001.xml
new file mode 100644 (file)
index 0000000..65502be
--- /dev/null
+++ b/testdocs/tests/draft.001.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/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$</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/testdocs/tests/footnote.002.xml b/testdocs/tests/footnote.002.xml
new file mode 100644 (file)
index 0000000..89b8973
--- /dev/null
+++ b/testdocs/tests/footnote.002.xml
@@ -0,0 +1,42 @@
+<?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: footnote.002</title>
+<releaseinfo role="CVS">$Id$</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>
+
+</article>

diff --git a/testdocs/tests/inline.001.xml b/testdocs/tests/inline.001.xml
index 4232499d3f04d1ac9f22961dc1e66dc3d33fbe63..732501ed65572deec8c9773f8978fba67c3c2c03 100644 (file)
--- a/testdocs/tests/inline.001.xml
+++ b/testdocs/tests/inline.001.xml
@@ -1,7 +1,7 @@
 <?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>
+<article id="article">
 <articleinfo>
 <title>Unit Test: inline.001.xml</title>
 <releaseinfo role="CVS">$Id$</releaseinfo>
@@ -12,15 +12,16 @@
 
 <para>This article tests inline objects.</para>
 
-<section><title>Trademark</title>
+<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>
-
-<para>This is a <phrase role="red">red phrase</phrase>.
-This <emphasis role="strong">emphasis is strong</emphasis>.
-</para>
+</section>
 
 </article>

diff --git a/testdocs/tests/programlisting.002.xml b/testdocs/tests/programlisting.002.xml
index da60e886857d41cd0d068a1cc0ca6d413a408347..1c7f4bbd116f45c68d0a969f648bcb70e11d658f 100644 (file)
--- a/testdocs/tests/programlisting.002.xml
+++ b/testdocs/tests/programlisting.002.xml
@@ -12,7 +12,7 @@
 
 <programlisting><inlinemediaobject>
 <imageobject>
-<imagedata format="linespecific" fileref="sample.txt"/>
+<imagedata format="linespecific" fileref="tests/programlisting.002.xml"/>
 </imageobject>
 </inlinemediaobject></programlisting>
 

diff --git a/testdocs/tests/table.004.xml b/testdocs/tests/table.004.xml
new file mode 100644 (file)
index 0000000..8b6d131
--- /dev/null
+++ b/testdocs/tests/table.004.xml
@@ -0,0 +1,30 @@
+<?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.004</title>
+<releaseinfo role="CVS">$Id$</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/testdocs/tests/table.005.xml b/testdocs/tests/table.005.xml
new file mode 100644 (file)
index 0000000..31de458
--- /dev/null
+++ b/testdocs/tests/table.005.xml
@@ -0,0 +1,35 @@
+<?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.004</title>
+<releaseinfo role="CVS">$Id$</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/testdocs/tests/ulink.001.xml b/testdocs/tests/ulink.001.xml
new file mode 100644 (file)
index 0000000..246ddf1
--- /dev/null
+++ b/testdocs/tests/ulink.001.xml
@@ -0,0 +1,23 @@
+<?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 dh "&#xAD;">
+]>
+<article>
+<articleinfo>
+<title>Unit Test: ulink.001</title>
+<releaseinfo role="CVS">$Id$</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>