Revised and added stuff for testing the

textdata/imagedata/inlinegraphic markup for inserting external
text files, and rendering callout bugs in the inserted text.

diff --git a/testdocs/tests/programlistingco.002.xml b/testdocs/tests/programlistingco.002.xml
index d53877cc162c445125f8d3575ec5087d828af837..2d7fa683fa0e2a520b913f0db421dc237e9766b3 100644 (file)
--- a/testdocs/tests/programlistingco.002.xml
+++ b/testdocs/tests/programlistingco.002.xml
@@ -1,34 +1,97 @@
 <?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">
+"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>
-<releaseinfo role="CVS">$Id$</releaseinfo>
-<author><firstname>Norman</firstname><surname>Walsh</surname>
-        <affiliation><address><email>ndw@nwalsh.com</email></address></affiliation>
-</author>
-</articleinfo>
+  <articleinfo>
+    <title>Unit Test: programlistingco.002</title>
+    <subtitle>Tests for inserting external text files, with callouts</subtitle>
+    <releaseinfo role="CVS">$Id$</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>
 
-<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"
-><?dbhtml linenumbering.everyNth="2" linenumbering.separator=" >"
-?><?dbfo linenumbering.everyNth="2" linenumbering.separator=" >"
-?><inlinemediaobject>
-<imageobject>
-<imagedata format="linespecific" fileref="sample.txt"/>
-</imageobject>
-</inlinemediaobject></programlisting>
-</programlistingco>
+  <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>
 
 </article>