[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Wed, 31 Jan 2024 19:43:17 -0500 (EST) |
branch: master
commit 782716744d240c767040244cc4ac5231a0299aa8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Feb 1 01:43:01 2024 +0100
Sort index entries on demand in HTML
* tp/Texinfo/Convert/HTML.pm (get_info, convert, output): sort indices
when get_info is called for 'index_entries_by_letter'.
* tp/Texinfo/XS/main/IndicesXS.xs
(get_converter_indices_sorted_by_letter),
tp/Texinfo/XS/main/manipulate_indices.c
(converter_sort_indices_by_letter): add
converter_sort_indices_by_letter to sort index entries by letter with
a converter. Call it in get_converter_indices_sorted_by_letter.
* tp/Texinfo/XS/convert/call_html_perl_function.c
(get_call_index_entries_sorted_by_letter),
tp/Texinfo/XS/convert/convert_html.c
(html_get_info_index_entries_by_letter, convert_printindex_command):
add get_call_index_entries_sorted_by_letter to get sorted indices from
HTML by calling Texinfo::Convert::HTML::get_info and
get_sv_index_entries_sorted_by_letter. Add
html_get_info_index_entries_by_letter and call it when sorted indices
are needed.
* tp/Texinfo/Convert/HTML.pm (%XS_conversion_overrides),
tp/Texinfo/XS/convert/ConvertXS.xs: remove
_XS_get_index_entries_sorted_by_letter, _NonXS_sort_index_entries,
_XS_only_sort_index_entries, _sort_index_entries,
get_index_entries_sorted_by_letter, html_sort_index_entries.
---
ChangeLog | 30 ++++++++
tp/Texinfo/Convert/HTML.pm | 81 +++++-----------------
tp/Texinfo/XS/convert/ConvertXS.xs | 24 -------
tp/Texinfo/XS/convert/call_html_perl_function.c | 50 +++++++++++++
tp/Texinfo/XS/convert/call_html_perl_function.h | 3 +
tp/Texinfo/XS/convert/convert_html.c | 26 ++++---
tp/Texinfo/XS/convert/convert_html.h | 3 +-
tp/Texinfo/XS/main/IndicesXS.xs | 4 +-
tp/Texinfo/XS/main/manipulate_indices.c | 17 +++++
tp/Texinfo/XS/main/manipulate_indices.h | 1 +
.../res_parser/formatting_chm/formatting.2 | 2 +-
.../res_parser/formatting_epub/formatting.2 | 2 +-
.../res_parser/formatting_html32/formatting.2 | 2 +-
.../formatting_html_no_split/formatting.2 | 2 +-
.../res_parser/formatting_xhtml/formatting.2 | 2 +-
.../formatting_enable_encoding/formatting.2 | 2 +-
.../res_parser/formatting_epub_nodes/formatting.2 | 2 +-
.../res_parser/formatting_exotic/formatting.2 | 2 +-
.../layout/res_parser/formatting_fr/formatting.2 | 2 +-
.../res_parser/formatting_fr_icons/formatting.2 | 2 +-
.../res_parser/formatting_inline_css/formatting.2 | 2 +-
.../res_parser/formatting_mathjax/formatting.2 | 2 +-
.../formatting_numerical_entities/formatting.2 | 2 +-
.../formatting_sort_element_counts/formatting.2 | 2 +-
.../res_parser/formatting_texi2html/formatting.2 | 2 +-
.../formatting_texi2html_nodes/formatting.2 | 2 +-
.../formatting_weird_quotes/formatting.2 | 2 +-
.../res_parser/formatting_singular/formatting.2 | 2 +-
28 files changed, 157 insertions(+), 118 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b13d713500..0fb7b753b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2024-01-31 Patrice Dumas <pertusus@free.fr>
+
+ Sort index entries on demand in HTML
+
+ * tp/Texinfo/Convert/HTML.pm (get_info, convert, output): sort indices
+ when get_info is called for 'index_entries_by_letter'.
+
+ * tp/Texinfo/XS/main/IndicesXS.xs
+ (get_converter_indices_sorted_by_letter),
+ tp/Texinfo/XS/main/manipulate_indices.c
+ (converter_sort_indices_by_letter): add
+ converter_sort_indices_by_letter to sort index entries by letter with
+ a converter. Call it in get_converter_indices_sorted_by_letter.
+
+ * tp/Texinfo/XS/convert/call_html_perl_function.c
+ (get_call_index_entries_sorted_by_letter),
+ tp/Texinfo/XS/convert/convert_html.c
+ (html_get_info_index_entries_by_letter, convert_printindex_command):
+ add get_call_index_entries_sorted_by_letter to get sorted indices from
+ HTML by calling Texinfo::Convert::HTML::get_info and
+ get_sv_index_entries_sorted_by_letter. Add
+ html_get_info_index_entries_by_letter and call it when sorted indices
+ are needed.
+
+ * tp/Texinfo/Convert/HTML.pm (%XS_conversion_overrides),
+ tp/Texinfo/XS/convert/ConvertXS.xs: remove
+ _XS_get_index_entries_sorted_by_letter, _NonXS_sort_index_entries,
+ _XS_only_sort_index_entries, _sort_index_entries,
+ get_index_entries_sorted_by_letter, html_sort_index_entries.
+
2024-01-31 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/main/document.c (document_merged_indices): rename
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 16f7802de9..1b33574862 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -263,10 +263,6 @@ my %XS_conversion_overrides = (
"Texinfo::Convert::HTML::_check_htmlxref_already_warned"
=> "Texinfo::Convert::ConvertXS::html_check_htmlxref_already_warned",
- "Texinfo::Convert::HTML::_XS_get_index_entries_sorted_by_letter"
- => "Texinfo::Convert::ConvertXS::get_index_entries_sorted_by_letter",
- "Texinfo::Convert::HTML::_XS_only_sort_index_entries"
- => "Texinfo::Convert::ConvertXS::html_sort_index_entries",
"Texinfo::Convert::HTML::_prepare_conversion_units"
=> "Texinfo::Convert::ConvertXS::html_prepare_conversion_units",
"Texinfo::Convert::HTML::_prepare_units_directions_files"
@@ -2328,19 +2324,32 @@ sub get_info($$)
}
#} else {
# cluck();
- } elsif ($converter_info eq 'index_entries_by_letter'
- and $self->{'document'} and $self->{'converter_descriptor'}
- and $XS_convert) {
+ } elsif ($converter_info eq 'index_entries_by_letter') {
my $indices_information;
if ($self->{'document'}) {
$indices_information = $self->{'document'}->indices_information();
}
if ($indices_information) {
- $self->{'index_entries_by_letter'}
- = Texinfo::Indices::get_converter_indices_sorted_by_letter($self,
+ if (!$self->get_conf('TEST') and $self->{'converter_descriptor'}
+ and $XS_convert) {
+ # get from XS
+ $self->{'index_entries_by_letter'}
+ = Texinfo::Indices::get_converter_indices_sorted_by_letter($self,
$indices_information);
+ } else {
+ my $merged_index_entries
+ = $self->{'document'}->merged_indices();
+ my $index_entries_sort_strings;
+
+ ($self->{'index_entries_by_letter'}, $index_entries_sort_strings)
+ = Texinfo::Indices::sort_indices_by_letter(undef, $self,
+ $merged_index_entries,
+ $indices_information);
+ }
+ $self->{'converter_info'}->{'index_entries_by_letter'}
+ = $self->{'index_entries_by_letter'};
return $self->{'index_entries_by_letter'};
}
}
@@ -10289,56 +10298,6 @@ sub _prepare_output_units_global_targets($$$$)
}
}
-sub _XS_get_index_entries_sorted_by_letter($$)
-{
-}
-
-sub _NonXS_sort_index_entries($)
-{
- my $self = shift;
-
- my $indices_information;
- if ($self->{'document'}) {
- $indices_information = $self->{'document'}->indices_information();
- }
-
- if ($indices_information) {
-
- my $merged_index_entries
- = $self->{'document'}->merged_indices();
- my $index_entries_sort_strings;
-
- ($self->{'index_entries_by_letter'}, $index_entries_sort_strings)
- = Texinfo::Indices::sort_indices_by_letter(undef, $self,
- $merged_index_entries,
- $indices_information);
-
- # pass sorted index entries to XS for a reproducible sorting.
- if ($self->{'converter_descriptor'} and $XS_convert) {
- _XS_get_index_entries_sorted_by_letter($self,
- $self->{'index_entries_by_letter'});
- }
- }
-}
-
-sub _XS_only_sort_index_entries($)
-{
- my $self = shift;
- _NonXS_sort_index_entries($self);
-}
-
-sub _sort_index_entries($)
-{
- my $self = shift;
-
- # Sorting in Perl to have a reproducible output for tests
- if ($self->get_conf('TEST')) {
- _NonXS_sort_index_entries($self);
- } else {
- _XS_only_sort_index_entries($self);
- }
-}
-
sub _prepare_index_entries_targets($)
{
my $self = shift;
@@ -11918,8 +11877,6 @@ sub convert($$)
# Some information is not available yet.
$self->_reset_info();
- $self->_sort_index_entries();
-
# cache, as it is checked for each text element
if ($self->get_conf('OUTPUT_CHARACTERS')
and $self->get_conf('OUTPUT_ENCODING_NAME')
@@ -12640,8 +12597,6 @@ sub output($$)
# Some information is not available yet.
$self->_reset_info();
- $self->_sort_index_entries();
-
# cache, as it is checked for each text element
if ($self->get_conf('OUTPUT_CHARACTERS')
and $self->get_conf('OUTPUT_ENCODING_NAME')
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 42a9179379..22d0445d61 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -180,20 +180,6 @@ converter_document_warn (SV *converter_in, text, ...)
self->conf, MSG_document_warning, continuation, strdup
(text));
}
-void
-get_index_entries_sorted_by_letter (SV *converter_in, SV
*index_entries_sorted_by_letter)
- PREINIT:
- CONVERTER *self;
- INDEX_SORTED_BY_LETTER *index_entries_by_letter;
- CODE:
- self = get_sv_converter (converter_in,
- "get_index_entries_sorted_by_letter");
- index_entries_by_letter
- = get_sv_index_entries_sorted_by_letter
- (self->document->index_names,
- index_entries_sorted_by_letter);
- self->index_entries_by_letter = index_entries_by_letter;
-
# pass the stream of an unclosed file path.
# tried with OutputStream instead of FILE, but it did not work, there
# was an error with a missing type.
@@ -1689,16 +1675,6 @@ html_check_htmlxref_already_warned (SV *converter_in,
manual_name, SV *source_in
OUTPUT:
RETVAL
-void
-html_sort_index_entries (SV *converter_in)
- PREINIT:
- CONVERTER *self;
- CODE:
- self = get_sv_converter (converter_in,
- "html_sort_index_entries");
- if (self)
- html_sort_index_entries (self);
-
void
reset_output_init_conf (SV *sv_in)
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.c
b/tp/Texinfo/XS/convert/call_html_perl_function.c
index a810a01407..7acf951019 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.c
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.c
@@ -40,6 +40,8 @@
#include "build_perl_info.h"
#include "debug.h"
#include "build_html_perl_state.h"
+/* for get_sv_index_entries_sorted_by_letter */
+#include "get_perl_info.h"
#include "call_html_perl_function.h"
/* TODO the NOTE in build_perl_info.c about not using malloc/free should
@@ -2503,4 +2505,52 @@ call_button_direction_function (CONVERTER *self,
}
+INDEX_SORTED_BY_LETTER *
+get_call_index_entries_sorted_by_letter (CONVERTER *self)
+{
+ int count;
+ INDEX_SORTED_BY_LETTER *result = 0;
+ SV *index_entries_sorted_by_letter_sv;
+
+ dTHX;
+
+ if (!self->hv)
+ return 0;
+
+ dSP;
+
+ ENTER;
+ SAVETMPS;
+
+ PUSHMARK(SP);
+ EXTEND(SP, 1);
+
+ PUSHs(sv_2mortal (newRV_inc (self->hv)));
+ PUSHs(sv_2mortal (newSVpv ("index_entries_by_letter", 0)));
+
+ PUTBACK;
+
+ count = call_pv ("Texinfo::Convert::HTML::get_info",
+ G_SCALAR);
+
+ SPAGAIN;
+
+ if (count != 1)
+ croak("get_index_entries_sorted_by_letter should return 1 item\n");
+
+ index_entries_sorted_by_letter_sv = POPs;
+ if (SvOK (index_entries_sorted_by_letter_sv))
+ {
+ result
+ = get_sv_index_entries_sorted_by_letter (self->document->index_names,
+ index_entries_sorted_by_letter_sv);
+ }
+
+ PUTBACK;
+
+ FREETMPS;
+ LEAVE;
+
+ return result;
+}
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.h
b/tp/Texinfo/XS/convert/call_html_perl_function.h
index eead166301..f2eab2b9c9 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.h
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.h
@@ -159,4 +159,7 @@ FORMATTED_BUTTON_INFO *call_button_simple_function
(CONVERTER *self,
FORMATTED_BUTTON_INFO *call_button_direction_function (CONVERTER *self,
void *formatting_reference_sv,
int direction, const ELEMENT *element);
+
+INDEX_SORTED_BY_LETTER *get_call_index_entries_sorted_by_letter
+ (CONVERTER *self);
#endif
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index e68847a6f1..f6030b3b9a 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -4669,19 +4669,23 @@ get_copiable_anchor (CONVERTER *self, const char *id)
return 0;
}
-void
-html_sort_index_entries (CONVERTER *self)
+INDEX_SORTED_BY_LETTER *
+html_get_info_index_entries_by_letter (CONVERTER *self)
{
- const MERGED_INDICES *merged_indices
- = document_merged_indices (self->document);
+ if (self->index_entries_by_letter)
+ return self->index_entries_by_letter;
if (self->document->index_names)
{
- self->index_entries_by_letter
- = sort_indices_by_letter (&self->error_messages, self->conf,
- merged_indices,
- self->document->index_names);
+ /* get Perl sorting for reproducible tests */
+ if (self->conf->TEST.integer > 0)
+ self->index_entries_by_letter
+ = get_call_index_entries_sorted_by_letter (self);
+ else /* sets self->index_entries_by_letter */
+ converter_sort_indices_by_letter (self);
}
+
+ return self->index_entries_by_letter;
}
int
@@ -12454,8 +12458,10 @@ convert_printindex_command (CONVERTER *self, const
enum command_id cmd,
char *index_name_cmd_class;
char *alpha_text = 0;
char *non_alpha_text = 0;
+ INDEX_SORTED_BY_LETTER *index_entries_by_letter
+ = html_get_info_index_entries_by_letter (self);
- if (!self->index_entries_by_letter)
+ if (!index_entries_by_letter)
return;
if (html_in_string (self))
@@ -12467,7 +12473,7 @@ convert_printindex_command (CONVERTER *self, const enum
command_id cmd,
else
return;
- for (idx = self->index_entries_by_letter; idx->name; idx++)
+ for (idx = index_entries_by_letter; idx->name; idx++)
{
if (!strcmp (idx->name, index_name))
{
diff --git a/tp/Texinfo/XS/convert/convert_html.h
b/tp/Texinfo/XS/convert/convert_html.h
index 663510c363..a563b7380b 100644
--- a/tp/Texinfo/XS/convert/convert_html.h
+++ b/tp/Texinfo/XS/convert/convert_html.h
@@ -168,8 +168,7 @@ size_t html_check_htmlxref_already_warned (CONVERTER *self,
const char *manual_name,
const SOURCE_INFO *source_info);
-void html_merge_index_entries (CONVERTER *self);
-void html_sort_index_entries (CONVERTER *self);
+INDEX_SORTED_BY_LETTER *html_get_info_index_entries_by_letter (CONVERTER
*self);
void html_prepare_conversion_units (CONVERTER *self,
int *output_units_descriptor_ref,
diff --git a/tp/Texinfo/XS/main/IndicesXS.xs b/tp/Texinfo/XS/main/IndicesXS.xs
index c701377171..5cb9491003 100644
--- a/tp/Texinfo/XS/main/IndicesXS.xs
+++ b/tp/Texinfo/XS/main/IndicesXS.xs
@@ -162,8 +162,10 @@ get_converter_indices_sorted_by_letter (SV *converter_sv,
SV *indices_informatio
self = get_sv_converter (converter_sv, "get_indices_sorted_by_letter");
if (self)
{
+ INDEX_SORTED_BY_LETTER *index_entries_by_letter
+ = converter_sort_indices_by_letter (self);
RETVAL
- = build_sorted_indices_by_letter (self->index_entries_by_letter,
+ = build_sorted_indices_by_letter (index_entries_by_letter,
indices_information);
}
else
diff --git a/tp/Texinfo/XS/main/manipulate_indices.c
b/tp/Texinfo/XS/main/manipulate_indices.c
index c1cc8101a4..78e88ff21c 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.c
+++ b/tp/Texinfo/XS/main/manipulate_indices.c
@@ -29,6 +29,7 @@
#include "extra.h"
#include "errors.h"
#include "debug.h"
+#include "document.h"
#include "unicode.h"
#include "convert_to_text.h"
#include "convert_to_texinfo.h"
@@ -803,3 +804,19 @@ sort_indices_by_letter (ERROR_MESSAGE_LIST *error_messages,
return sorted_index_entries;
}
+
+INDEX_SORTED_BY_LETTER *
+converter_sort_indices_by_letter (CONVERTER *self)
+{
+ if (self->index_entries_by_letter)
+ return self->index_entries_by_letter;
+
+ const MERGED_INDICES *merged_indices
+ = document_merged_indices (self->document);
+
+ self->index_entries_by_letter
+ = sort_indices_by_letter (&self->error_messages, self->conf,
+ merged_indices,
+ self->document->index_names);
+ return self->index_entries_by_letter;
+}
diff --git a/tp/Texinfo/XS/main/manipulate_indices.h
b/tp/Texinfo/XS/main/manipulate_indices.h
index 1655972208..e305b334ed 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.h
+++ b/tp/Texinfo/XS/main/manipulate_indices.h
@@ -50,4 +50,5 @@ INDEX_SORTED_BY_LETTER *sort_indices_by_letter (
ERROR_MESSAGE_LIST *error_messages,
OPTIONS *options, const MERGED_INDICES *merged_indices,
INDEX **indices_information);
+INDEX_SORTED_BY_LETTER *converter_sort_indices_by_letter (CONVERTER *self);
#endif
diff --git a/tp/tests/coverage/res_parser/formatting_chm/formatting.2
b/tp/tests/coverage/res_parser/formatting_chm/formatting.2
index a8ddda5d80..79c67d1795 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/formatting.2
+++ b/tp/tests/coverage/res_parser/formatting_chm/formatting.2
@@ -308,7 +308,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:123: warning: empty index key in @findex
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -329,3 +328,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/coverage/res_parser/formatting_epub/formatting.2
b/tp/tests/coverage/res_parser/formatting_epub/formatting.2
index 781e7d8016..2d0c9ff589 100644
--- a/tp/tests/coverage/res_parser/formatting_epub/formatting.2
+++ b/tp/tests/coverage/res_parser/formatting_epub/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: no htmlxref.cnf entry found for `file n---ame@'
(possibly involving @mymacro)
formatting.texi:32: warning: no htmlxref.cnf entry found for `file name'
(possibly involving @mymacro)
formatting.texi:32: warning: no htmlxref.cnf entry found for `a comma, in
file' (possibly involving @mymacro)
@@ -372,3 +371,4 @@ formatting.texi:88: warning: @image file `f--ile@.' (for
HTML) not found, using
texi2any: @image file `f--ile@.' can not be copied
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
texi2any: @image file `filejk _" %@' can not be copied
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/coverage/res_parser/formatting_html32/formatting.2
b/tp/tests/coverage/res_parser/formatting_html32/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/coverage/res_parser/formatting_html32/formatting.2
+++ b/tp/tests/coverage/res_parser/formatting_html32/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.2
b/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.2
index e84c66d60d..082b249eb9 100644
--- a/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.2
+++ b/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:22: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -320,3 +319,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.2
b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.2
+++ b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2
index 781e7d8016..2d0c9ff589 100644
--- a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: no htmlxref.cnf entry found for `file n---ame@'
(possibly involving @mymacro)
formatting.texi:32: warning: no htmlxref.cnf entry found for `file name'
(possibly involving @mymacro)
formatting.texi:32: warning: no htmlxref.cnf entry found for `a comma, in
file' (possibly involving @mymacro)
@@ -372,3 +371,4 @@ formatting.texi:88: warning: @image file `f--ile@.' (for
HTML) not found, using
texi2any: @image file `f--ile@.' can not be copied
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
texi2any: @image file `filejk _" %@' can not be copied
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting.2
b/tp/tests/layout/res_parser/formatting_exotic/formatting.2
index e84c66d60d..082b249eb9 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:22: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -320,3 +319,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_fr/formatting.2
b/tp/tests/layout/res_parser/formatting_fr/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/layout/res_parser/formatting_fr/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_fr/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.2
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.2
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.2
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.2
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.2
index e84c66d60d..082b249eb9 100644
--- a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:22: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -320,3 +319,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_texi2html/formatting.2
b/tp/tests/layout/res_parser/formatting_texi2html/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_texi2html/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting.2
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2
index c4a9decc65..c948381bb4 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2
@@ -307,7 +307,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:32: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -328,3 +327,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
b/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
index 290e3f677f..004f7d9618 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
+++ b/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
@@ -308,7 +308,6 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
texexpand
-formatting.texi:123: warning: empty index key in @findex
formatting.texi:22: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
@@ -321,3 +320,4 @@ formatting.texi:88: warning: @image file `f-ile' (for HTML)
not found, using `f-
formatting.texi:88: warning: @image file `f-ile' (for HTML) not found, using
`f-ile.jpg' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' (for HTML) not found,
using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
formatting.texi:88: warning: @image file `filejk _" %@' (for HTML) not found,
using `filejk _" %@.jpg' (possibly involving @mymacro)
+formatting.texi:123: warning: empty index key in @findex