texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * NEWS, tp/Texinfo/Convert/HTML.pm (_external_nod


From: Patrice Dumas
Subject: branch master updated: * NEWS, tp/Texinfo/Convert/HTML.pm (_external_node_href), tp/Texinfo/XS/convert/format_html.c (external_node_href): remove .inf or .info in cross-reference manual names, but warn that they should be removed. There are indeed manuals with .info in cross-references, for instance the glibc manual. Report from Gavin.
Date: Mon, 14 Oct 2024 15:41:04 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new fc60c03ffa * NEWS, tp/Texinfo/Convert/HTML.pm (_external_node_href), 
tp/Texinfo/XS/convert/format_html.c (external_node_href): remove .inf or .info 
in cross-reference manual names, but warn that they should be removed.  There 
are indeed manuals with .info in cross-references, for instance the glibc 
manual.  Report from Gavin.
fc60c03ffa is described below

commit fc60c03ffa9a6c1a5cc831f1c5a6037655b610d8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 14 21:40:54 2024 +0200

    * NEWS, tp/Texinfo/Convert/HTML.pm (_external_node_href),
    tp/Texinfo/XS/convert/format_html.c (external_node_href): remove .inf
    or .info in cross-reference manual names, but warn that they should be
    removed.  There are indeed manuals with .info in cross-references,
    for instance the glibc manual.  Report from Gavin.
---
 ChangeLog                                          | 16 +++++++---
 NEWS                                               |  3 +-
 tp/Texinfo/Convert/HTML.pm                         |  7 +++++
 tp/Texinfo/XS/convert/format_html.c                | 25 +++++++++++++++
 tp/t/results/html_tests/check_htmlxref.pl          | 36 +++++++++++++++++++---
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl | 36 +++++++++++++++++++---
 tp/t/results/html_tests/check_htmlxref_menu.pl     | 35 +++++++++++++++++++++
 .../check_htmlxref_menu/res_html/chapter.html      |  2 +-
 .../check_htmlxref_menu/res_html/first.html        |  4 +--
 .../check_htmlxref_menu/res_html/index.html        |  4 +--
 .../html_tests/check_htmlxref_no_use_nodes.pl      | 21 +++++++++++++
 .../res_html/chapter.html                          |  2 +-
 .../res_html/index.html                            |  4 +--
 13 files changed, 173 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9b0d7dd8f..b36d2f401b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
-2024-10-14  Gavin Smith <gavinsmith0123@gmail.com>
+2024-10-13  Patrice Dumas  <pertusus@free.fr>
 
-       * util/htmlxref.cnf (termcap): add link to single page version.
-       (Node anchors are broken as this is from an old version of
-       texi2html (1.52), but better than nothing.)
+       * NEWS, tp/Texinfo/Convert/HTML.pm (_external_node_href),
+       tp/Texinfo/XS/convert/format_html.c (external_node_href): remove .inf
+       or .info in cross-reference manual names, but warn that they should be
+       removed.  There are indeed manuals with .info in cross-references,
+       for instance the glibc manual.  Report from Gavin.
 
 2024-10-13  Patrice Dumas  <pertusus@free.fr>
 
@@ -31,6 +33,12 @@
 
        Report from Gavin.
 
+2024-10-14  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * util/htmlxref.cnf (termcap): add link to single page version.
+       (Node anchors are broken as this is from an old version of
+       texi2html (1.52), but better than nothing.)
+
 2024-10-13  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.tres, tp/t/html_tests.t (inline_in_node): test showing
diff --git a/NEWS b/NEWS
index 5c69b881bd..513b7806a3 100644
--- a/NEWS
+++ b/NEWS
@@ -52,8 +52,7 @@ See the manual for detailed information.
    An implementation of the conversion in C has been included.  Set the
     `TEXINFO_XS_CONVERT' environment variable to 1 to use.
  . HTML:
-   . Do not remove .inf or .info at the end of manual name for
-     cross-references to external nodes anymore.
+   . Warn if there is a .inf or .info suffix for cross-reference manual.
    . Use <pre> instead of <div><em> for displaymath formatting.
    . Remove border, cellpadding, cellspacing and align attributes, add
      classes and use CSS when needed.
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 636c1674c7..3414acf3ac 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -10680,6 +10680,13 @@ sub _external_node_href($$$)
       }
     }
     my $manual_base = $manual_name;
+    # in 2023 there were manuals with .info.  Warning added in 2024.
+    if ($manual_base =~ s/(\.info?)$//) {
+      $self->converter_line_warn(sprintf(__(
+                    "do not set %s suffix in reference for manual `%s'"),
+                                         $1, $manual_name),
+                             $source_command->{'source_info'});
+    }
     $manual_base =~ s/^.*\///;
     my $split_found;
     my $htmlxref_href;
diff --git a/tp/Texinfo/XS/convert/format_html.c 
b/tp/Texinfo/XS/convert/format_html.c
index de3b086e91..bcba223f73 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -739,6 +739,7 @@ external_node_href (CONVERTER *self, const ELEMENT 
*external_node,
   if (manual_content)
     {
       char *manual_name;
+      size_t len;
       char *manual_base = 0;
       char *p;
       char *htmlxref_href = 0;
@@ -776,6 +777,30 @@ external_node_href (CONVERTER *self, const ELEMENT 
*external_node,
         p++;
       manual_base = strdup (p);
 
+      p = 0;
+      len = strlen (manual_base);
+      if (len >= 4)
+        {
+          p = manual_base + len - 4;
+          if (strcmp (p, ".inf"))
+            p = 0;
+        }
+      if (!p && len >= 5)
+        {
+          p = manual_base + len - 5;
+          if (strcmp (p, ".info"))
+            p = 0;
+        }
+
+      if (p)
+        {
+          message_list_command_warn (&self->error_messages, self->conf,
+                                     source_command, 0,
+                "do not set %s suffix in reference for manual `%s'",
+                                     p, manual_name);
+          *p = '\0';
+        }
+
       htmlxref_manual = find_htmlxref_manual (&self->htmlxref, manual_base);
 
       if (htmlxref_manual)
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index bf32bd2134..ef52fb9a7a 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -981,8 +981,8 @@ Next: <a href="no_existing_no_manual_direction.html#Top" 
accesskey="n" rel="next
 </div>
 <h1 class="top" id="top"><span>top<a class="copiable-link" href="#top"> 
&para;</a></span></h1>
 
-<p><a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.info.html#a">c</a>
-<a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.info.html#a">c</a>
+<p><a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.html#a">c</a>
+<a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.html#a">c</a>
 </p>
 
 <ul class="mini-toc">
@@ -991,7 +991,7 @@ Next: <a href="no_existing_no_manual_direction.html#Top" 
accesskey="n" rel="next
 <hr>
 <a class="node-id" id="first"></a><div class="nav-panel">
 <p>
-Next: <a href="no_existing_no_manual.info.html#Top" accesskey="n" 
rel="next">(no_existing_no_manual.info)</a> &nbsp; </p>
+Next: <a href="no_existing_no_manual.html#Top" accesskey="n" 
rel="next">(no_existing_no_manual.info)</a> &nbsp; </p>
 </div>
 <h4 class="node"><span>first<a class="copiable-link" href="#first"> 
&para;</a></span></h4>
 
@@ -1003,7 +1003,7 @@ Next: <a href="chap_not_existing.html#Top" accesskey="n" 
rel="next">(chap_not_ex
 </div>
 <h2 class="chapter" id="Chapter"><span>1 Chapter<a class="copiable-link" 
href="#Chapter"> &para;</a></span></h2>
 
-<p>See <a data-manual="some_name_inf.inf" 
href="some_name_inf.inf.html#aa">(some_name_inf.inf)aa</a>.
+<p>See <a data-manual="some_name_inf.inf" 
href="some_name_inf.html#aa">(some_name_inf.inf)aa</a>.
 </p></div>
 </div>
 
@@ -1028,6 +1028,13 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 5,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -1035,6 +1042,13 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 6,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -1042,6 +1056,13 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 14,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -1063,6 +1084,13 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .inf suffix in reference for manual 
`some_name_inf.inf\'
+',
+    'line_nr' => 19,
+    'text' => 'do not set .inf suffix in reference for manual 
`some_name_inf.inf\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`some_name_inf.inf\'
 ',
diff --git a/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl 
b/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
index d567563631..0f4e9b79b1 100644
--- a/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
+++ b/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
@@ -981,8 +981,8 @@ Next: <a href="no_existing_no_manual_direction.html#Top" 
accesskey="n" rel="next
 </div>
 <h1 class="top" id="top"><span>top<a class="copiable-link" href="#top"> 
&para;</a></span></h1>
 
-<p><a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.info.html#a">c</a>
-<a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.info.html#a">c</a>
+<p><a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.html#a">c</a>
+<a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.html#a">c</a>
 </p>
 
 <ul class="mini-toc">
@@ -991,7 +991,7 @@ Next: <a href="no_existing_no_manual_direction.html#Top" 
accesskey="n" rel="next
 <hr>
 <a class="node-id" id="first"></a><div class="nav-panel">
 <p>
-Next: <a href="no_existing_no_manual.info.html#Top" accesskey="n" 
rel="next">(no_existing_no_manual.info)</a> &nbsp; </p>
+Next: <a href="no_existing_no_manual.html#Top" accesskey="n" 
rel="next">(no_existing_no_manual.info)</a> &nbsp; </p>
 </div>
 <h4 class="node"><span>first<a class="copiable-link" href="#first"> 
&para;</a></span></h4>
 
@@ -1003,7 +1003,7 @@ Next: <a href="chap_not_existing.html#Top" accesskey="n" 
rel="next">(chap_not_ex
 </div>
 <h2 class="chapter" id="Chapter"><span>1 Chapter<a class="copiable-link" 
href="#Chapter"> &para;</a></span></h2>
 
-<p>See <a data-manual="some_name_inf.inf" 
href="some_name_inf.inf.html#aa">(some_name_inf.inf)aa</a>.
+<p>See <a data-manual="some_name_inf.inf" 
href="some_name_inf.html#aa">(some_name_inf.inf)aa</a>.
 </p></div>
 </div>
 
@@ -1021,6 +1021,13 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
     'text' => 'no htmlxref.cnf entry found for 
`../there/no_existing_no_manual_direction\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 5,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -1028,6 +1035,13 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 6,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -1035,6 +1049,13 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 14,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -1056,6 +1077,13 @@ 
$result_converted_errors{'html'}->{'check_htmlxref_ignore_ref_top_up'} = [
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .inf suffix in reference for manual 
`some_name_inf.inf\'
+',
+    'line_nr' => 19,
+    'text' => 'do not set .inf suffix in reference for manual 
`some_name_inf.inf\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`some_name_inf.inf\'
 ',
diff --git a/tp/t/results/html_tests/check_htmlxref_menu.pl 
b/tp/t/results/html_tests/check_htmlxref_menu.pl
index 11729d5928..5c1dc8225b 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -969,6 +969,13 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 5,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -976,6 +983,13 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 6,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -990,6 +1004,13 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
     'text' => 'no htmlxref.cnf entry found for `other_no_existing_no_manual\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 14,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -997,6 +1018,13 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 14,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`chap_not_existing\'
 ',
@@ -1011,6 +1039,13 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_menu'} = [
     'text' => 'no htmlxref.cnf entry found for `dir\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .inf suffix in reference for manual 
`some_name_inf.inf\'
+',
+    'line_nr' => 19,
+    'text' => 'do not set .inf suffix in reference for manual 
`some_name_inf.inf\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`some_name_inf.inf\'
 ',
diff --git a/tp/t/results/html_tests/check_htmlxref_menu/res_html/chapter.html 
b/tp/t/results/html_tests/check_htmlxref_menu/res_html/chapter.html
index a923fac842..b9108f0560 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu/res_html/chapter.html
+++ b/tp/t/results/html_tests/check_htmlxref_menu/res_html/chapter.html
@@ -33,7 +33,7 @@ Next: <a href="../chap_not_existing_html/index.html" 
accesskey="n" rel="next">(c
 <hr>
 <h2 class="chapter" id="Chapter"><span>1 Chapter<a class="copiable-link" 
href="#Chapter"> &para;</a></span></h2>
 
-<p>See <a data-manual="some_name_inf.inf" 
href="../some_name_inf.inf_html/aa.html#aa">(some_name_inf.inf)aa</a>.
+<p>See <a data-manual="some_name_inf.inf" 
href="../some_name_inf_html/aa.html#aa">(some_name_inf.inf)aa</a>.
 </p></div>
 
 
diff --git a/tp/t/results/html_tests/check_htmlxref_menu/res_html/first.html 
b/tp/t/results/html_tests/check_htmlxref_menu/res_html/first.html
index 587bb932d0..bf48671684 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu/res_html/first.html
+++ b/tp/t/results/html_tests/check_htmlxref_menu/res_html/first.html
@@ -12,7 +12,7 @@
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
 <link href="index.html" rel="start" title="Top">
-<link href="../no_existing_no_manual.info_html/index.html" rel="next" 
title="(no_existing_no_manual.info)">
+<link href="../no_existing_no_manual_html/index.html" rel="next" 
title="(no_existing_no_manual.info)">
 <style type="text/css">
 <!--
 a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -26,7 +26,7 @@ span:hover a.copiable-link {visibility: visible}
 <body lang="en">
 <a class="node-id" id="first"></a><div class="nav-panel">
 <p>
-Next: <a href="../no_existing_no_manual.info_html/index.html" accesskey="n" 
rel="next">(no_existing_no_manual.info)</a> &nbsp; </p>
+Next: <a href="../no_existing_no_manual_html/index.html" accesskey="n" 
rel="next">(no_existing_no_manual.info)</a> &nbsp; </p>
 </div>
 <hr>
 <h4 class="node"><span>first<a class="copiable-link" href="#first"> 
&para;</a></span></h4>
diff --git a/tp/t/results/html_tests/check_htmlxref_menu/res_html/index.html 
b/tp/t/results/html_tests/check_htmlxref_menu/res_html/index.html
index 4b4df2f337..d42f6260de 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu/res_html/index.html
+++ b/tp/t/results/html_tests/check_htmlxref_menu/res_html/index.html
@@ -36,8 +36,8 @@ Next: <a 
href="../no_existing_no_manual_direction_html/index.html" accesskey="n"
 <hr>
 <h1 class="top" id="top"><span>top<a class="copiable-link" href="#top"> 
&para;</a></span></h1>
 
-<p><a data-manual="no_existing_no_manual.info" 
href="../no_existing_no_manual.info_html/a.html#a">c</a>
-<a data-manual="no_existing_no_manual.info" 
href="../no_existing_no_manual.info_html/a.html#a">c</a>
+<p><a data-manual="no_existing_no_manual.info" 
href="../no_existing_no_manual_html/a.html#a">c</a>
+<a data-manual="no_existing_no_manual.info" 
href="../no_existing_no_manual_html/a.html#a">c</a>
 </p>
 <table class="menu">
 <tr><td class="menu-entry-destination">&bull; <a href="first.html" 
accesskey="1">first</a>:</td><td class="menu-entry-description">
diff --git a/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl 
b/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
index 1fccde6930..e4fc54380f 100644
--- a/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
+++ b/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
@@ -955,6 +955,13 @@ $result_floats{'check_htmlxref_no_use_nodes'} = {};
 
 
 $result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 5,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -962,6 +969,13 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'
+',
+    'line_nr' => 6,
+    'text' => 'do not set .info suffix in reference for manual 
`no_existing_no_manual.info\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
@@ -983,6 +997,13 @@ 
$result_converted_errors{'file_html'}->{'check_htmlxref_no_use_nodes'} = [
     'text' => 'no htmlxref.cnf entry found for 
`../there/no_existing_no_manual_direction\'',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: do not set .inf suffix in reference for manual 
`some_name_inf.inf\'
+',
+    'line_nr' => 19,
+    'text' => 'do not set .inf suffix in reference for manual 
`some_name_inf.inf\'',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: no htmlxref.cnf entry found for 
`some_name_inf.inf\'
 ',
diff --git 
a/tp/t/results/html_tests/check_htmlxref_no_use_nodes/res_html/chapter.html 
b/tp/t/results/html_tests/check_htmlxref_no_use_nodes/res_html/chapter.html
index cb653c0bf3..3cbdb4c2f6 100644
--- a/tp/t/results/html_tests/check_htmlxref_no_use_nodes/res_html/chapter.html
+++ b/tp/t/results/html_tests/check_htmlxref_no_use_nodes/res_html/chapter.html
@@ -33,7 +33,7 @@ span:hover a.copiable-link {visibility: visible}
 <hr>
 <h2 class="chapter" id="Chapter"><span>1 Chapter<a class="copiable-link" 
href="#Chapter"> &para;</a></span></h2>
 
-<p>See <a data-manual="some_name_inf.inf" 
href="../some_name_inf.inf_html/aa.html#aa">(some_name_inf.inf)aa</a>.
+<p>See <a data-manual="some_name_inf.inf" 
href="../some_name_inf_html/aa.html#aa">(some_name_inf.inf)aa</a>.
 </p></div>
 
 
diff --git 
a/tp/t/results/html_tests/check_htmlxref_no_use_nodes/res_html/index.html 
b/tp/t/results/html_tests/check_htmlxref_no_use_nodes/res_html/index.html
index 3bcb66865a..cf70ee07fc 100644
--- a/tp/t/results/html_tests/check_htmlxref_no_use_nodes/res_html/index.html
+++ b/tp/t/results/html_tests/check_htmlxref_no_use_nodes/res_html/index.html
@@ -29,8 +29,8 @@ span:hover a.copiable-link {visibility: visible}
 <div class="top-level-extent" id="Top">
 <h1 class="top" id="top"><span>top<a class="copiable-link" href="#top"> 
&para;</a></span></h1>
 
-<p><a data-manual="no_existing_no_manual.info" 
href="../no_existing_no_manual.info_html/a.html#a">c</a>
-<a data-manual="no_existing_no_manual.info" 
href="../no_existing_no_manual.info_html/a.html#a">c</a>
+<p><a data-manual="no_existing_no_manual.info" 
href="../no_existing_no_manual_html/a.html#a">c</a>
+<a data-manual="no_existing_no_manual.info" 
href="../no_existing_no_manual_html/a.html#a">c</a>
 </p>
 
 <ul class="mini-toc">



reply via email to

[Prev in Thread] Current Thread [Next in Thread]