Miscellaneous updates

diff --git a/testdocs/tests/article.004.xml b/testdocs/tests/article.004.xml
index 838591a215fa8967fd7fb587f984d364734f7b45..9b75f001cb2eb477ada35fefa426aeab644655a6 100644 (file)
--- a/testdocs/tests/article.004.xml
+++ b/testdocs/tests/article.004.xml
@@ -14,9 +14,30 @@
 <abstract>
 <para>This is the abstract.</para>
 <para>It has several paras.</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>

diff --git a/testdocs/tests/book.001.xml b/testdocs/tests/book.001.xml
index 6d4f5b9638704f764684181878b1f9c850e38cdc..f8719221f0b51752bfd06b47b840b38c4de2ec6e 100644 (file)
--- a/testdocs/tests/book.001.xml
+++ b/testdocs/tests/book.001.xml
@@ -117,13 +117,16 @@ Some abstract. Some abstract. Some abstract. Some abstract.
 </sect1>
 </partintro>
 
-<chapter id="chap1"><title>First Chapter</title>
+<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;

diff --git a/testdocs/tests/chapter.002.xml b/testdocs/tests/chapter.002.xml
index 419ce0a51386c11134ed34f4c32287df81ef50a5..42da54c27af5c6632640b713dd3c30187784169f 100644 (file)
--- a/testdocs/tests/chapter.002.xml
+++ b/testdocs/tests/chapter.002.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<chapter id="chapter">
+<chapter id="chapter" lang="fr">
 <chapterinfo>
 <releaseinfo role="CVS">$Id$</releaseinfo>
 <author><firstname>Norman</firstname><surname>Walsh</surname>

diff --git a/testdocs/tests/glossary.002.data.xml b/testdocs/tests/glossary.002.data.xml
index c993cb496a7fee9b50030be583991398709d939b..4f67baa387f173b3678fb5b313e621d6f4f8854f 100644 (file)
--- a/testdocs/tests/glossary.002.data.xml
+++ b/testdocs/tests/glossary.002.data.xml
@@ -2,17 +2,27 @@
 <!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                    "http://www.oasis-open.org/docbook/xml/4.1.2/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/testdocs/tests/glossary.002.xml b/testdocs/tests/glossary.002.xml
index b807c4e85f8871d0dcfbe214db6cd8f497cba3e7..e3425d3d069e1c9c2504149c3d1b5cce3bd7da75 100644 (file)
--- a/testdocs/tests/glossary.002.xml
+++ b/testdocs/tests/glossary.002.xml
@@ -13,9 +13,11 @@
 
 <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/testdocs/tests/glossary.003.xml b/testdocs/tests/glossary.003.xml
index b2a9667589b5cad3e784a804683b6af53e95a96d..72b7637fac625ec31f43deff59a24d015a9446e5 100644 (file)
--- a/testdocs/tests/glossary.003.xml
+++ b/testdocs/tests/glossary.003.xml
@@ -7,7 +7,7 @@
 <releaseinfo role="CVS">$Id$</releaseinfo>
 </articleinfo>
 
-<para>This is a test.</para>
+<para>This is a test. Xref to fifo: <xref linkend="fifo"/>.</para>
 
 <glossary>
 <glossentry><glossterm>test1</glossterm>
@@ -18,6 +18,18 @@
 <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/testdocs/tests/index.001.xml b/testdocs/tests/index.001.xml
new file mode 100644 (file)
index 0000000..cec5851
--- /dev/null
+++ b/testdocs/tests/index.001.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE set PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+              "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<set>
+<setinfo>
+<title>Unit Test: index.001</title>
+<releaseinfo role="CVS">$Id$</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/testdocs/tests/literallayout.003.xml b/testdocs/tests/literallayout.003.xml
index b287f3e00362a2721293707df6b8da9676f6811b..e5dd3971d5662655e88c667a0c4191ec19b63b66 100644 (file)
--- a/testdocs/tests/literallayout.003.xml
+++ b/testdocs/tests/literallayout.003.xml
@@ -10,6 +10,12 @@
 </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,

diff --git a/testdocs/tests/mediaobject.002.xml b/testdocs/tests/mediaobject.002.xml
index 78c725fef221fe1e9009e9d2cac1c8e9136565e3..cca7ecb5bd443d2ab154f2e30ae0df4baac88667 100644 (file)
--- a/testdocs/tests/mediaobject.002.xml
+++ b/testdocs/tests/mediaobject.002.xml
@@ -18,7 +18,7 @@
         srccredit="O'Reilly & Associates/Dover Archives"/>
     </imageobject>
     <textobject><phrase>The DocBook: TDG Duck</phrase></textobject>
-    <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

diff --git a/testdocs/tests/reference.001.xml b/testdocs/tests/reference.001.xml
index 99f19b62117b934640e36cd45a81d2df8f7578dd..e64240e4537708e2d0fe8cf3046815f5da5ba343 100644 (file)
--- a/testdocs/tests/reference.001.xml
+++ b/testdocs/tests/reference.001.xml
@@ -10,6 +10,8 @@
 </author>
 </referenceinfo>
 
+<title>Unit Test: reference.001</title>
+
 <refentry id="minimal">
 <refnamediv>
 <refname>Minimal</refname>

diff --git a/testdocs/tests/section.001.xml b/testdocs/tests/section.001.xml
index e4fbe836178eba6f1b6fe9ddc91623aa9f477e22..728187d442beafba49b6d831db3172e3a8f3c170 100644 (file)
--- a/testdocs/tests/section.001.xml
+++ b/testdocs/tests/section.001.xml
@@ -10,6 +10,8 @@
 </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>

diff --git a/testdocs/tests/section.004.xml b/testdocs/tests/section.004.xml
new file mode 100644 (file)
index 0000000..0ef475d
--- /dev/null
+++ b/testdocs/tests/section.004.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter>
+<chapterinfo>
+<title>Unit Test: section.004</title>
+<releaseinfo role="CVS">$Id$</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/testdocs/tests/table.009.xml b/testdocs/tests/table.009.xml
index f2d186033ef2f45dac059bff59b066414077b670..5e0510bca5de7f9b3ec6f838bfc51616f3ea5986 100644 (file)
--- a/testdocs/tests/table.009.xml
+++ b/testdocs/tests/table.009.xml
@@ -52,4 +52,46 @@
 </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/testdocs/tests/table.012.xml b/testdocs/tests/table.012.xml
new file mode 100644 (file)
index 0000000..e021775
--- /dev/null
+++ b/testdocs/tests/table.012.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<article>
+<articleinfo>
+<title>Unit Test: table.012</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>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/testdocs/tests/table.013.xml b/testdocs/tests/table.013.xml
new file mode 100644 (file)
index 0000000..2775246
--- /dev/null
+++ b/testdocs/tests/table.013.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<article>
+<articleinfo>
+<title>Unit Test: table.013</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>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/testdocs/tests/table.014.xml b/testdocs/tests/table.014.xml
new file mode 100644 (file)
index 0000000..bf8a585
--- /dev/null
+++ b/testdocs/tests/table.014.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<article>
+<articleinfo>
+<title>Unit Test: table.008</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>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/testdocs/tests/ulink.002.xml b/testdocs/tests/ulink.002.xml
new file mode 100644 (file)
index 0000000..bfe306e
--- /dev/null
+++ b/testdocs/tests/ulink.002.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<book>
+<bookinfo>
+<title>Unit Test: ulink.002</title>
+<releaseinfo role="CVS">$Id$</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>