Added area/@linkends instance to programlistingco.001.xml and

removed redundant test case from calloutlist.003.xml.

diff --git a/testdocs/tests/calloutlist.003.xml b/testdocs/tests/calloutlist.003.xml
index 5c241b408c187ace8e637e1759276cf7972f3969..7a852fc75cd446ee4e4d2c17e28f8e1f056d1a6a 100644 (file)
--- a/testdocs/tests/calloutlist.003.xml
+++ b/testdocs/tests/calloutlist.003.xml
@@ -19,9 +19,9 @@
       &lt;date>2003-10-20&lt;/date> <co id="V1690_date-co" linkends="V1690_date"/>
     &lt;/info>
     &lt;refmeta>
-      &lt;refentrytitle>gtk&lt;:-options&lt;/refentrytitle> <co id="V1690_title-co" linkends="V1690_title"/>
+      &lt;refentrytitle>gtk-options&lt;/refentrytitle> <co id="V1690_title-co" linkends="V1690_title"/>
       &lt;manvolnum>7&lt;/manvolnum> <co id="V1690_manvolnum-co" linkends="V1690_manvolnum"/>
-      &lt;refmiscinfo class="source-name">&lt;1:GTK+&lt;/refmiscinfo> <co id="V1690_source-name-co" linkends="V1690_source-name"/>
+      &lt;refmiscinfo class="source-name">GTK+&lt;/refmiscinfo> <co id="V1690_source-name-co" linkends="V1690_source-name"/>
       &lt;refmiscinfo class="version">1.2&lt;/refmiscinfo> <co id="V1690_version-co" linkends="V1690_version"/>
       &lt;refmiscinfo class="manual">GTK+ User's Manual&lt;/refmiscinfo> <co id="V1690_manual-co" linkends="V1690_manual"/>
     &lt;/refmeta>
@@ -104,75 +104,6 @@ also that several items in co/@linkends are correctly handled.
 
 <section><title>Programlistingco</title>
 
-<para>In this case the markups are all at the end of the lines, except for line
-11. It checks that enough spaces are added to reach the specified column. It
-checks also that the area linkends coords hotspot appears.</para>
-
-<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 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" id="skipeof-desc">
-<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>
-
 <para>This case checks that spaces are added to reach the expected
 column.</para>
 

diff --git a/testdocs/tests/programlistingco.001.xml b/testdocs/tests/programlistingco.001.xml
index 06098eeabd1396004895e3593fca25dc16732604..2a506d557c5c679576e362f031cf4777aa164ece 100644 (file)
--- a/testdocs/tests/programlistingco.001.xml
+++ b/testdocs/tests/programlistingco.001.xml
@@ -13,7 +13,7 @@
 <programlistingco>
 <areaspec>
 <area coords="1" id="prologue"/>
-<area coords="4" id="skipeof"/>
+<area coords="4" id="skipeof" linkends="skipeof-desc"/>
 <areaset coords="" id="xreq">
 <area coords="9" id="require1"/>
 <area coords="10" id="require2"/>
@@ -56,9 +56,11 @@ exit;</programlisting>
 <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 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