Misc. updates

diff --git a/testdocs/book.xml b/testdocs/book.xml
index 6c9fa2941dfde7bf8065951100b107ec48af60ca..374ffa94bc3631a1d0d669f22efc50769b14353b 100644 (file)
--- a/testdocs/book.xml
+++ b/testdocs/book.xml
@@ -123,7 +123,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
 <title id="chaptertitle">Section <anchor id="stestfoo"/>Tests</title>
 
 <sect1><title>First Sect1</title>
-<para>Paragraph.</para>
+<para>Paragraph. See <xref linkend="testfig1"/>.</para>
 <figure id="testfig1"><title>Test Figure</title>
 <programlisting>This is a
   ProgramListing

diff --git a/testdocs/faq.xml b/testdocs/faq.xml
index 521f51fd20bada402d0ccdd21767485d723b01a3..fcaff6bcb6f9733218746f2f56624fd998f0e52d 100644 (file)
--- a/testdocs/faq.xml
+++ b/testdocs/faq.xml
@@ -28,7 +28,7 @@ See <xref linkend="faq-Two"/></para>
     </qandaentry>
 
     <qandaentry>
-      <question id="faq-Two"><para>Question two.</para></question>
+      <question id="faq-Twoc"><para>Question two.</para></question>
       <answer>
        <orderedlist>
          <listitem><para>testing a list</para></listitem>

diff --git a/testdocs/formalpara.xml b/testdocs/formalpara.xml
new file mode 100644 (file)
index 0000000..74c7132
--- /dev/null
+++ b/testdocs/formalpara.xml
@@ -0,0 +1,16 @@
+<?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>
+<title>Test Tables</title>
+
+<formalpara><title>Test title</title>
+<para>Some para</para>
+</formalpara>
+
+<formalpara><title>Test title:</title>
+<para>Some para</para>
+</formalpara>
+
+</article>
\ No newline at end of file

diff --git a/testdocs/inline.xml b/testdocs/inline.xml
index 495cecb0aa607285e44aa2c4549712e623450ee5..563d2bb781292d8bf0122ed8a19be8ef79a7e782 100644 (file)
--- a/testdocs/inline.xml
+++ b/testdocs/inline.xml
@@ -17,6 +17,10 @@
 <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/lists.xml b/testdocs/lists.xml
index 48ddc068183a61ef2b7651b379486169dba1f863..b3d7f0ad502d0bc7316b64c9899482f8d1e27a1f 100644 (file)
--- a/testdocs/lists.xml
+++ b/testdocs/lists.xml
@@ -27,6 +27,11 @@
 <listitem><para>This is the first item of an itemized list.
 &blah; &blah; &blah; &blah; &blah;</para>
 </listitem>
+<listitem><address><otheraddr><emphasis>Amberely Greeting Card
+Company,</emphasis></otheraddr> <street>11510 Goldcoast Drive,</street>
+<city>Cincinnati,</city> <state>OH</state> <postcode>45249-1695.</postcode>
+<phone>(513) 489-2775.</phone> <otheraddr><emphasis>Looking for:</emphasis>
+outrageous humor, no seasonal cards.</otheraddr></address><para/></listitem>
 <listitem><simpara>This is the second item of an itemized list. (Using simpara.)
 &blah; &blah; &blah; &blah; &blah;</simpara>
 </listitem>

diff --git a/testdocs/olink.xml b/testdocs/olink.xml
new file mode 100644 (file)
index 0000000..b6cef5b
--- /dev/null
+++ b/testdocs/olink.xml
@@ -0,0 +1,25 @@
+<?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 book.xml SYSTEM "book.xml" NDATA SGML>
+]>
+<article>
+<articleinfo>
+<title>OLink Test</title>
+<modespec id="book">file:///sourceforge/projects/docbook/testdocs/book.html</modespec>
+</articleinfo>
+
+<para>This is an <olink targetdocent="book.xml" linkmode="book">OLink</olink>
+with a linkmode.
+</para>
+
+<para>This is an <olink targetdocent="book.xml">OLink</olink>
+without a linkmode.
+</para>
+
+<para>This is an olink to a figure:
+<olink targetdocent="book.xml" localinfo="testfig2" type="href"/>.
+</para>
+
+</article>
\ No newline at end of file

diff --git a/testdocs/table.xml b/testdocs/table.xml
index c9823487aee0df5cc2f68f412de2225a6e336dce..61c354fa0ef579d192ffb07b4a8568de105632bd 100644 (file)
--- a/testdocs/table.xml
+++ b/testdocs/table.xml
@@ -4,6 +4,24 @@
 <chapter>
 <title>Tables</title>
 
+<table>
+<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>
+
 <table id="ug-t3-2">
 <title>Slicing Options</title>
 <tgroup cols="4" align="left">
@@ -74,4 +92,148 @@
 </tbody>
 </tgroup>
 </table>
+
+<para>1:</para>
+
+<!--
++........+........+........+........+
+|        |   B    |        |   D    |
++   A    +........+   C    +........+
+|        |        |        |   E    |
++........+........+........+........+
+-->
+
+<informaltable>
+<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>
+
+<para>2:</para>
+
+<!--
++........+........+........+........+
+|   A    |   B    |   C    |   D    |
++........+........+        +        +
+|   E    |   F    |        |        |
++        +........+        +        +
+|        |   G    |        |        |
++        +........+........+........+
+|        |   H    |        |   I    |
++........+........+........+........+
+-->
+
+<informaltable>
+<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>
+
+<para>3:</para>
+
+<!--
++........+........+........+........+
+|   A    |   B    |   C    |   D    |
++........+        +........+        +
+|   E    |        |   F    |        |
++        +        +........+........+
+|        |        |        |   G    |
++........+........+........+........+
+|   H    |        |   I    |   J    |
++........+........+........+........+
+-->
+
+<informaltable>
+<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>
+
+<para>4:</para>
+
+<!--
++........+........+........+........+
+|   A    |        |        |        |
++        +........+........+........+
+|        |   B    |        |   C    |
++        +........+........+........+
+|        |        |   D    |        |
++........+........+        +........+
+|        |        |        |   E    |
++........+........+........+........+
+-->
+
+<informaltable>
+<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>
+</row>
+<row>
+  <entry namest="c4d">E</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
 </chapter>